Index: head/irc/quassel/Makefile =================================================================== --- head/irc/quassel/Makefile (revision 412217) +++ head/irc/quassel/Makefile (revision 412218) @@ -1,65 +1,64 @@ # Created by: Martin Wilke # $FreeBSD$ PORTNAME= quassel -PORTVERSION= 0.12.2 -PORTREVISION= 2 +PORTVERSION= 0.12.3 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ MAINTAINER= makc@FreeBSD.org COMMENT= Qt 5 based distributed IRC client USES= cmake:outsource compiler:c++11-lib cpe execinfo pkgconfig tar:bzip2 USE_QT5= core network buildtools_build qmake_build CMAKE_ARGS= -DWITH_KDE=off \ -DUSE_QT5=on CPE_VENDOR= quassel-irc CPE_PRODUCT= quassel_irc OPTIONS_DEFINE= NLS OPTIONS_MULTI= MODULE MODULE_DESC= Quassel components OPTIONS_MULTI_MODULE= MONO CORE CLIENT OPTIONS_DEFAULT= ${OPTIONS_MULTI_MODULE} OPTIONS_SUB= yes MONO_DESC= Quassel standalone client MONO_CMAKE_ON= -DWANT_MONO=on MONO_CMAKE_OFF= -DWANT_MONO=off CORE_DESC= Quassel core (for use with client) CORE_LIB_DEPENDS= libqca-qt5.so:${PORTSDIR}/devel/qca-qt5 CORE_USE= QT5=script,sql,sql-sqlite3_run CORE_CMAKE_ON= -DWANT_CORE=on CORE_CMAKE_OFF= -DWANT_CORE=off CLIENT_DESC= Quassel client (for use with core) CLIENT_CMAKE_ON= -DWANT_QTCLIENT=on CLIENT_CMAKE_OFF= -DWANT_QTCLIENT=off NLS_USE= QT5=linguisttools_build .include .if ${PORT_OPTIONS:MMONO} || ${PORT_OPTIONS:MCLIENT} USE_QT5+= dbus gui widgets phonon4 webkit LIB_DEPENDS+= libdbusmenu-qt5.so:${PORTSDIR}/devel/libdbusmenu-qt5 PLIST_SUB+= MONO_OR_CLIENT="" .else PLIST_SUB+= MONO_OR_CLIENT="@comment " .endif .if ${PORT_OPTIONS:MCORE} USE_RC_SUBR= quasselcore USERS= quasselcore GROUPS= ${USERS} SUB_FILES= pkg-message .endif post-patch-NLS-off: ${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \ ${WRKSRC}/CMakeLists.txt .include Index: head/irc/quassel/distinfo =================================================================== --- head/irc/quassel/distinfo (revision 412217) +++ head/irc/quassel/distinfo (revision 412218) @@ -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: head/irc/quassel/files/patch-git_07847739 =================================================================== --- head/irc/quassel/files/patch-git_07847739 (revision 412217) +++ head/irc/quassel/files/patch-git_07847739 (nonexistent) @@ -1,43 +0,0 @@ -commit 078477395aaec1edee90922037ebc8a36b072d90 -Author: Armin K -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 -+#include - #include - - #include "authhandler.h" Property changes on: head/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: head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp =================================================================== --- head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp (revision 412217) +++ head/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 users = network()->ircChannel(bufferInfo.bufferName())->ircUsers(); - foreach(IrcUser *user, users) { - if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode)) Property changes on: head/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