Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7582103b7bd3ff04288d41fede5d5c22cc0376fe
commit 7582103b7bd3ff04288d41fede5d5c22cc0376fe Author: Marius Cirsta <[email protected]> Date: Sat Dec 12 18:08:23 2015 +0200 quassel-0.12.2-1-x86_64 * remove KDE integration for now * version bump diff --git a/source/kde-extra/quassel/CVE-2014-8483.patch b/source/kde-extra/quassel/CVE-2014-8483.patch deleted file mode 100644 index 3c15a71..0000000 --- a/source/kde-extra/quassel/CVE-2014-8483.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 8b5ecd226f9208af3074b33d3b7cf5e14f55b138 -Author: Manuel Nickschas <[email protected]> -Date: Tue Oct 21 21:20:07 2014 +0200 - - Check for invalid input in encrypted buffers - - The ECB Blowfish decryption function assumed that encrypted input would - always come in blocks of 12 characters, as specified. However, buggy - clients or annoying people may not adhere to that assumption, causing - the core to crash while trying to process the invalid base64 input. - - With this commit we make sure that we're not overstepping the bounds of - the input string while decoding it; instead we bail out early and display - the original input. Fixes #1314. - - Thanks to Tucos for finding that one! - -diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp -index 7cc75d0..7d1fe46 100644 ---- a/src/core/cipher.cpp -+++ b/src/core/cipher.cpp -@@ -364,6 +364,10 @@ QByteArray Cipher::blowfishECB(QByteArray cipherText, bool direction) - } - else - { -+ // ECB Blowfish encodes in blocks of 12 chars, so anything else is malformed input -+ if ((temp.length() % 12) != 0) -+ return cipherText; -+ - temp = b64ToByte(temp); - while ((temp.length() % 8) != 0) temp.append('\0'); - } -@@ -376,8 +380,13 @@ QByteArray Cipher::blowfishECB(QByteArray cipherText, bool direction) - if (!cipher.ok()) - return cipherText; - -- if (direction) -+ if (direction) { -+ // Sanity check -+ if ((temp2.length() % 8) != 0) -+ return cipherText; -+ - temp2 = byteToB64(temp2); -+ } - - return temp2; - } diff --git a/source/kde-extra/quassel/FrugalBuild b/source/kde-extra/quassel/FrugalBuild index 1d1acaf..d9a8087 100644 --- a/source/kde-extra/quassel/FrugalBuild +++ b/source/kde-extra/quassel/FrugalBuild @@ -2,28 +2,27 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=quassel -pkgver=0.11.0 +pkgver=0.12.2 pkgrel=1 pkgdesc="A modern, cross-platform, distributed IRC client." url="http://quassel-irc.org"; -depends=('libqtwebkit' 'libknotify' 'libqtsql' 'qca' 'libkdewidgets' "kdelibs>=$_F_kde_ver") -makedepends=('qt4-linguist' 'automoc4' 'kdelibs-compiletime') +depends=('qt5-base' 'qt5-script' 'qt5-webkit' 'libdbusmenu-qt5' 'qca-qt5') +makedepends=('qt5-tools') groups=('kde-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/downloads" -source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2) +source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2 + qt55.patch fixFindSSL.patch) _F_gnome_iconcache=y Finclude cmake gnome-scriptlet -sha1sums=('d7b31f8e1ee4465ec33dd77f689fec59f4b78a36') +sha1sums=('12e9a88597f724498c40a1548b5f788e7c40858c' \ + '57e814b7fb5c6c220f9372621a58ef8e3886db1a' \ + '2fb960dc3cafd0a90e52f10c67704ff9b312db71') replaces=('conspire') -# FSA fix *** -source=(${source[@]} CVE-2014-8483.patch) -sha1sums=(${sha1sums[@]} 'cc37f75d36baa17799e41d8c220ead8aabd749b0') -# *********** build() { - CMake_build -DWITH_KDE=1 + CMake_build -DWITH_KDE=0 -DUSE_QT5=1 Fbuild_gnome_scriptlet } diff --git a/source/kde-extra/quassel/fixFindSSL.patch b/source/kde-extra/quassel/fixFindSSL.patch new file mode 100644 index 0000000..b36a78a --- /dev/null +++ b/source/kde-extra/quassel/fixFindSSL.patch @@ -0,0 +1,56 @@ +From d6ee316170f0362e8052d39118671fb36f3c8abf Mon Sep 17 00:00:00 2001 +From: Weng Xuetian <[email protected]> +Date: Wed, 11 Nov 2015 16:13:33 -0800 +Subject: [PATCH] Fix SSL detection + +CMAKE_POSITION_INDEPENDENT_CODE will always append fPIE flag as last compiler flag when calling try_compile which makes check_cxx_source_compiles fails. Move the SSL check before set CMAKE_POSITION_INDEPENDENT_CODE and append Qt5Core_EXECUTABLE_COMPILE_FLAGS to CMAKE_CXX_FLAGS solve the problem. +--- + CMakeLists.txt | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a35fa8f..c2ef8b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -413,6 +413,20 @@ if (NOT WIN32) + ) + endif() + ++# Check for SSL support in Qt ++# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile ++# a small test program checking the defines. This works for both Qt4 and Qt5. ++cmake_push_check_state(RESET) ++set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") ++check_cxx_source_compiles(" ++ #include \"qglobal.h\" ++ #if defined QT_NO_OPENSSL || defined QT_NO_SSL ++ # error \"No SSL support\" ++ #endif ++ int main() {}" ++ HAVE_SSL) ++cmake_pop_check_state() + + # Additional compile settings + ##################################################################### +@@ -476,20 +490,6 @@ if (NOT ZLIB_FOUND) + endif() + endif() + +-# Check for SSL support in Qt +-# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile +-# a small test program checking the defines. This works for both Qt4 and Qt5. +-cmake_push_check_state(RESET) +-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) +-check_cxx_source_compiles(" +- #include \"qglobal.h\" +- #if defined QT_NO_OPENSSL || defined QT_NO_SSL +- # error \"No SSL support\" +- #endif +- int main() {}" +- HAVE_SSL) +-cmake_pop_check_state() +- + if (HAVE_SSL) + add_definitions(-DHAVE_SSL) + endif() diff --git a/source/kde-extra/quassel/qt55.patch b/source/kde-extra/quassel/qt55.patch new file mode 100644 index 0000000..a6fd846 --- /dev/null +++ b/source/kde-extra/quassel/qt55.patch @@ -0,0 +1,50 @@ +From 078477395aaec1edee90922037ebc8a36b072d90 Mon Sep 17 00:00:00 2001 +From: Armin K <[email protected]> +Date: Sat, 2 May 2015 23:04:53 +0200 +Subject: [PATCH] Fix build with Qt-5.5 + +http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c +--- + src/client/treemodel.cpp | 5 ++--- + src/common/peer.h | 1 + + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp +index f599803..fd47bc0 100644 +--- a/src/client/treemodel.cpp ++++ b/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(); +diff --git a/src/common/peer.h b/src/common/peer.h +index 02eb3c0..79204b4 100644 +--- a/src/common/peer.h ++++ b/src/common/peer.h +@@ -22,6 +22,7 @@ + #define PEER_H + + #include <QAbstractSocket> ++#include <QDataStream> + #include <QPointer> + + #include "authhandler.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
