diffstat for quassel-0.12.4 quassel-0.12.4 changelog | 28 ++++++++++++++++++++ control | 31 +++++------------------ patches/01_default_network_channel.patch | 16 ----------- patches/fix_ssl_qt5.6_gcc5.patch | 25 ++++++++++++++++++ patches/kubuntu_01_default_network_channel.patch | 20 ++++++++++++++ patches/series | 3 +- quassel-core.dirs | 1 quassel-core.install | 1 quassel-core.ufw.profile | 4 ++ rules | 2 + usr.bin.quasselcore | 27 ++++++++++++++++++++ 11 files changed, 118 insertions(+), 40 deletions(-) diff -Nru quassel-0.12.4/debian/changelog quassel-0.12.4/debian/changelog --- quassel-0.12.4/debian/changelog 2016-04-26 17:12:24.000000000 +0000 +++ quassel-0.12.4/debian/changelog 2016-08-01 12:29:37.000000000 +0000 @@ -1,3 +1,31 @@ +quassel (1:0.12.4-2ubuntu2) yakkety; urgency=medium + + * Fix SSL issues with Qt5.6 and GCC5. + - Add fix_ssl_qt5.6_gcc5.patch (from upstream git master) + + -- Michael Marley Mon, 01 Aug 2016 07:49:05 -0400 + +quassel (1:0.12.4-2ubuntu1) yakkety; urgency=medium + + * Merge with Debian. (LP: #1589128) (LP: #1582802) + * Dropped changes include: + - Specify 2048-bit RSA key (default anyway now). + - Many indentation differences. + - Sysvinit file differences, different name for systemd file, + upstart file (no longer needed). + - More complicated debian/rules. + - Less hardening in Ubuntu, +all in Debian. + - Some maintainer script transition for very old versions. + - Changelog entries (manual combining welcome). + - Qt 4 build dependencies. + * Remaining changes: + - Kubuntu channel tweak. + - Dropping of (different) transitional packages since 16.04 LTS released. + - Apparmor profile. + - Ufw profile. + + -- Timo Jyrinki Mon, 01 Aug 2016 09:12:45 +0300 + quassel (1:0.12.4-2) unstable; urgency=medium * Fix FTBFS when building only architecture dependent packages. diff -Nru quassel-0.12.4/debian/control quassel-0.12.4/debian/control --- quassel-0.12.4/debian/control 2016-04-26 16:08:56.000000000 +0000 +++ quassel-0.12.4/debian/control 2016-08-01 06:26:16.000000000 +0000 @@ -1,11 +1,13 @@ Source: quassel Section: net Priority: optional -Maintainer: Debian KDE Extras Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Thomas Mueller , Felix Geyer , Scott Kitterman Build-Depends: debhelper (>= 9.20130504~), + dh-apparmor, cmake, dh-systemd, libqca-qt5-2-dev, @@ -45,8 +47,8 @@ Package: quassel-client Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, quassel-data (= ${source:Version}), dbus-x11 -Breaks: quassel-client-kde4 (<< 0.12.2) -Replaces: quassel-client-kde4 (<< 0.12.2) +Breaks: quassel-client-qt4 (<< 0.12.2) +Replaces: quassel-client-qt4 (<< 0.12.2) Description: distributed IRC client - client component Quassel is a modern, cross-platform, distributed IRC client, meaning that one or more clients can attach to and detach from the central core. It's @@ -58,8 +60,8 @@ Package: quassel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5sql5-sqlite, quassel-data (= ${source:Version}), dbus-x11 -Breaks: quassel-kde4 (<< 0.12.2) -Replaces: quassel-kde4 (<< 0.12.2) +Breaks: quassel-qt4 (<< 0.12.2) +Replaces: quassel-qt4 (<< 0.12.2) Description: distributed IRC client - monolithic core+client Quassel is a modern, cross-platform, distributed IRC client, meaning that one or more clients can attach to and detach from the central core. It's @@ -75,7 +77,7 @@ Depends: ${misc:Depends} Recommends: oxygen-icon-theme Suggests: inxi -Conflicts: quassel-data-kde4 +Conflicts: quassel-data-qt4 Description: distributed IRC client - shared data Quassel is a modern, cross-platform, distributed IRC client, meaning that one or more clients can attach to and detach from the central core. It's @@ -83,20 +85,3 @@ such as WeeChat or irssi, but graphical. . This package provides files used by the Quassel client packages. - -Package: quassel-client-kde4 -Section: oldlibs -Priority: extra -Architecture: all -Depends: ${misc:Depends}, quassel-client (>= 0.12.2) -Description: transitional package to quassel-client - This is an empty package to transition to quassel-client, it can be safely - removed. - -Package: quassel-kde4 -Section: oldlibs -Priority: extra -Architecture: all -Depends: ${misc:Depends}, quassel (>= 0.12.2) -Description: transitional package to quassel - This is an empty package to transition to quassel, it can be safely removed. diff -Nru quassel-0.12.4/debian/patches/01_default_network_channel.patch quassel-0.12.4/debian/patches/01_default_network_channel.patch --- quassel-0.12.4/debian/patches/01_default_network_channel.patch 2015-09-03 16:35:16.000000000 +0000 +++ quassel-0.12.4/debian/patches/01_default_network_channel.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Debian specific channels are added. - Debian IRC server with the default channel #debian is added - as well as the #debian-user channel on OFTC. -Author: Thomas Mueller -Last-Update: 2010-02-02 ---- quassel-0.4.0.orig/data/networks.orig.ini 2009-02-17 19:22:59.000000000 +0100 -+++ quassel-0.4.0/data/networks.ini 2009-02-19 00:06:38.000000000 +0100 -@@ -25,0 +26,5 @@ -+[DebianIRC] -+Default=Yes -+DefaultChannels=#debian -+Servers=irc.debian.org:6667 -+ -@@ -41,0 +47,2 @@ -+Default=Yes -+DefaultChannels=#debian-user diff -Nru quassel-0.12.4/debian/patches/fix_ssl_qt5.6_gcc5.patch quassel-0.12.4/debian/patches/fix_ssl_qt5.6_gcc5.patch --- quassel-0.12.4/debian/patches/fix_ssl_qt5.6_gcc5.patch 1970-01-01 00:00:00.000000000 +0000 +++ quassel-0.12.4/debian/patches/fix_ssl_qt5.6_gcc5.patch 2016-08-01 12:29:37.000000000 +0000 @@ -0,0 +1,25 @@ +From 4768c9e99f99b581d4e32e797db91d0182391696 Mon Sep 17 00:00:00 2001 +From: martin +Date: Tue, 7 Jun 2016 00:37:22 +0200 +Subject: [PATCH] Fix the SSL check with Qt 5.6 and GCC 5 (#199) + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d89a300..d238691 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -438,6 +438,11 @@ endif() + 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}") ++ ++if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE) ++ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING") ++endif() ++ + check_cxx_source_compiles(" + #include \"qglobal.h\" + #if defined QT_NO_SSL diff -Nru quassel-0.12.4/debian/patches/kubuntu_01_default_network_channel.patch quassel-0.12.4/debian/patches/kubuntu_01_default_network_channel.patch --- quassel-0.12.4/debian/patches/kubuntu_01_default_network_channel.patch 1970-01-01 00:00:00.000000000 +0000 +++ quassel-0.12.4/debian/patches/kubuntu_01_default_network_channel.patch 2015-04-27 08:11:12.000000000 +0000 @@ -0,0 +1,20 @@ +Index: quassel-0.5.0~git090717/data/networks.ini +=================================================================== +--- quassel-0.5.0~git090717.orig/data/networks.ini 2009-07-14 16:58:22.000000000 -0400 ++++ quassel-0.5.0~git090717/data/networks.ini 2009-07-15 14:08:19.000000000 -0400 +@@ -19,10 +19,14 @@ + Servers=irc.enterthegame.com:6667 + + [Freenode] +-Default=Yes + DefaultChannels=#quassel + Servers=chat.freenode.net:6665,chat.freenode.net:7000 + ++[Kubuntu IRC] ++Default=Yes ++DefaultChannels=#kubuntu ++Servers=irc.ubuntu.com:8001 ++ + [GalaxyNet] + Servers=irc.galaxynet.org:6662,irc.galaxynet.org:7000,boston.ma.us.galaxynet.org:6661 + diff -Nru quassel-0.12.4/debian/patches/series quassel-0.12.4/debian/patches/series --- quassel-0.12.4/debian/patches/series 2016-02-11 21:00:54.000000000 +0000 +++ quassel-0.12.4/debian/patches/series 2016-08-01 12:29:37.000000000 +0000 @@ -1,2 +1,3 @@ -01_default_network_channel.patch +kubuntu_01_default_network_channel.patch 03_force_icon_theme.patch +fix_ssl_qt5.6_gcc5.patch diff -Nru quassel-0.12.4/debian/quassel-core.dirs quassel-0.12.4/debian/quassel-core.dirs --- quassel-0.12.4/debian/quassel-core.dirs 2015-09-06 17:38:43.000000000 +0000 +++ quassel-0.12.4/debian/quassel-core.dirs 2016-08-01 06:09:27.000000000 +0000 @@ -1 +1,2 @@ +etc/ufw/applications.d lib/systemd/system diff -Nru quassel-0.12.4/debian/quassel-core.install quassel-0.12.4/debian/quassel-core.install --- quassel-0.12.4/debian/quassel-core.install 2015-09-06 13:52:43.000000000 +0000 +++ quassel-0.12.4/debian/quassel-core.install 2016-08-01 06:09:45.000000000 +0000 @@ -1 +1,2 @@ +debian/usr.bin.quasselcore /etc/apparmor.d usr/bin/quasselcore diff -Nru quassel-0.12.4/debian/quassel-core.ufw.profile quassel-0.12.4/debian/quassel-core.ufw.profile --- quassel-0.12.4/debian/quassel-core.ufw.profile 1970-01-01 00:00:00.000000000 +0000 +++ quassel-0.12.4/debian/quassel-core.ufw.profile 2015-04-27 08:11:12.000000000 +0000 @@ -0,0 +1,4 @@ +[Quassel] +title=Quassel Core +description=Quassel IRC core/server component +ports=4242/tcp diff -Nru quassel-0.12.4/debian/rules quassel-0.12.4/debian/rules --- quassel-0.12.4/debian/rules 2016-04-26 17:05:00.000000000 +0000 +++ quassel-0.12.4/debian/rules 2016-08-01 06:07:26.000000000 +0000 @@ -11,12 +11,14 @@ override_dh_install: dh_install --fail-missing + install -o root -g root -m 644 debian/quassel-core.ufw.profile debian/quassel-core/etc/ufw/applications.d/quasselcore # replace inxi with a symlink ifneq (,$(filter quassel-data, $(shell dh_listpackages))) rm debian/quassel-data/usr/share/quassel/scripts/inxi endif override_dh_installinit: + dh_apparmor -pquassel-core --profile-name=usr.bin.quasselcore dh_installinit -r --error-handler=exit --name=quasselcore override_dh_systemd_enable: diff -Nru quassel-0.12.4/debian/usr.bin.quasselcore quassel-0.12.4/debian/usr.bin.quasselcore --- quassel-0.12.4/debian/usr.bin.quasselcore 1970-01-01 00:00:00.000000000 +0000 +++ quassel-0.12.4/debian/usr.bin.quasselcore 2015-04-27 08:11:12.000000000 +0000 @@ -0,0 +1,27 @@ +# Author: Felix Geyer +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public +# License published by the Free Software Foundation. + +#include + +/usr/bin/quasselcore { + #include + #include + #include + #include + + /var/lib/quassel/ rw, + /var/lib/quassel/** rwk, + + /var/log/quassel/* rw, + + /etc/xdg/Trolltech.conf r, + deny /etc/xdg/Trolltech.conf k, + /etc/ssl/openssl.cnf r, + /usr/lib/ssl/openssl.cnf r, + + # Site-specific additions and overrides. See local/README for details. + #include +}