Attachment 167516 Details for Bug 207562 – Patch to update to new version

[patch] Patch to update to new version

p (text/plain), 4.01 KB, created by groot on 2016-02-28 14:42:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-02-28 14:42:15 UTC

Size: 4.01 KB

patch

obsolete

>Index: irc/quassel/Makefile
>===================================================================
>--- irc/quassel/Makefile	(revision 409653)
>+++ irc/quassel/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	quassel
>-PORTVERSION=	0.12.2
>-PORTREVISION=	2
>+PORTVERSION=	0.12.3
> CATEGORIES=	irc
> MASTER_SITES=	http://www.quassel-irc.org/pub/
> 
>Index: irc/quassel/distinfo
>===================================================================
>--- irc/quassel/distinfo	(revision 409653)
>+++ irc/quassel/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (quassel-0.12.2.tar.bz2) = 6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897
>-SIZE (quassel-0.12.2.tar.bz2) = 3681838
>+SHA256 (quassel-0.12.3.tar.bz2) = 4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434
>+SIZE (quassel-0.12.3.tar.bz2) = 3687078
>Index: irc/quassel/files/patch-git_07847739
>===================================================================
>--- irc/quassel/files/patch-git_07847739	(revision 409653)
>+++ irc/quassel/files/patch-git_07847739	(nonexistent)
>@@ -1,43 +0,0 @@
>-commit 078477395aaec1edee90922037ebc8a36b072d90
>-Author: Armin K <krejzi@email.com>
>-Date:   Sat May 2 23:04:53 2015 +0200
>-
>-    Fix build with Qt-5.5
>-
>-    http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
>-
>---- src/client/treemodel.cpp
>-+++ src/client/treemodel.cpp
>-@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
>-     ChildStatus cs = _childStatus;
>- #ifndef QT_NO_DEBUG
>-     QModelIndex parent = indexByItem(parentItem);
>--#endif
>-     Q_ASSERT(cs.parent == parent);
>-     Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
>--
>-+#endif
>-     _aboutToRemoveOrInsert = false;
>-     for (int i = cs.start; i <= cs.end; i++) {
>-         connectItem(parentItem->child(i));
>-@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
>- #ifndef QT_NO_DEBUG
>-     ChildStatus cs = _childStatus;
>-     QModelIndex parent = indexByItem(parentItem);
>--#endif
>-     Q_ASSERT(cs.parent == parent);
>-     Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
>-+#endif
>-     _aboutToRemoveOrInsert = false;
>- 
>-     endRemoveRows();
>---- src/common/peer.h
>-+++ src/common/peer.h
>-@@ -22,6 +22,7 @@
>- #define PEER_H
>- 
>- #include <QAbstractSocket>
>-+#include <QDataStream>
>- #include <QPointer>
>- 
>- #include "authhandler.h"
>
>Property changes on: irc/quassel/files/patch-git_07847739
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: irc/quassel/files/patch-src_core_coreuserinputhandler.cpp
>===================================================================
>--- irc/quassel/files/patch-src_core_coreuserinputhandler.cpp	(revision 409653)
>+++ irc/quassel/files/patch-src_core_coreuserinputhandler.cpp	(nonexistent)
>@@ -1,12 +0,0 @@
>-Fix CVE-2015-8547
>---- src/core/coreuserinputhandler.cpp.orig	2015-04-23 20:47:17 UTC
>-+++ src/core/coreuserinputhandler.cpp
>-@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const 
>-     if (!isNumber || maxModes == 0) maxModes = 1;
>- 
>-     QStringList nickList;
>--    if (nicks == "*") { // All users in channel
>-+    if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
>-         const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
>-         foreach(IrcUser *user, users) {
>-             if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))
>
>Property changes on: irc/quassel/files/patch-src_core_coreuserinputhandler.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 207562: 167516 | 168795