Version bump 0.6 series to fix DoS over CTCP. 0.6.3 to stable, tested on amd64 and x86. Drop old & affected.

Package-Manager: portage-2.2_rc85/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 18 insertions, 157 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 9fab4dfe758b..99aaa5498468 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.110 2010/09/21 10:20:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.111 2010/09/21 10:30:32 scarabeus Exp $
+
+*quassel-0.6.3 (21 Sep 2010)
+
+  21 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.5.2-fix_x11_detection.patch, -quassel-0.5.1.ebuild,
+  -quassel-0.6.2.ebuild, +quassel-0.6.3.ebuild, metadata.xml:
+  Version bump 0.6 series to fix DoS over CTCP. 0.6.3 to stable, tested on
+  amd64 and x86. Drop old & affected.
 
 *quassel-0.7.1 (21 Sep 2010)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 061aff3aff0c..0f5f71fff24c 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.5.2-fix_x11_detection.patch 854 RMD160 88585681941f9ed915edb4ec2f6a07d645ceb22e SHA1 80b6e5a9c75fb69d91f8ec86770369b20f412311 SHA256 1daa5834b1836756f74829e9d0861d9cfda7998a3a477c980fbdf5b2769c2500
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore-2.conf 756 RMD160 5f7ec7d1e46da202fdc18e2bd25827d307ec15fc SHA1 688039bd9616177eab803b7a4b12945e009cc806 SHA256 48079bebba2e723d582751b63b5d696ba506b364d20268c38f565f2c85257baa
 AUX quasselcore-2.init 1693 RMD160 729dad48f3cb5afd35bb76c731349109becee392 SHA1 f1a83d63398b3df5e7700921db22d76595a3a96c SHA256 5632cfbb1921561924af1d50196e0e9d1bb80caa90f5d98e551af7c30174458a
 AUX quasselcore.conf 496 RMD160 328fa5c018107a34e67a681da79f87c42c16bca5 SHA1 2a4cf7f8b1798fadbd6b42273d3b9a32470bb8a9 SHA256 120a7664ce3819164beeae973c2c950b462844b80fe38240b3de48514797cbf2
 AUX quasselcore.init 1802 RMD160 c170596dd415d32d3147b6cf1a263a48f4b12268 SHA1 87a62fa64d16edaa6d8435490259b0e452b2a80f SHA256 4f79a3cc0b8842309c3f65d154dba1a434f33a36cc140bac10387ad1f16b5ad6
-DIST quassel-0.5.1.tar.bz2 3339773 RMD160 411f70ed4b4162f8523bf5498cd22aca43171b5c SHA1 448c2712176d5c0328b439b60ee27e06645339ba SHA256 c2aa0694b775b33380cb5bb452512433fa9f0bf4820778e8ec98f621e5458f62
-DIST quassel-0.6.2.tar.bz2 2583515 RMD160 8a7cf2cf7c2ef23b5bac924b92159e6e8d8d3289 SHA1 3bd102a64033760de4a1fa738239c24d301cd4c1 SHA256 0a51001ad259a549f98a92b5f376e753aecbe94615c54ac65c3550970f3a23fe
+DIST quassel-0.6.3.tar.bz2 2584143 RMD160 816bc57a0c019482a0f6b000892119afc0afb441 SHA1 4532bd7d5d164883b97d4c86a4986b40d9645e40 SHA256 79259da9b36dc6a1b30724a0687fa2eac19354a9be6235af016329870e193f22
 DIST quassel-0.7.1.tar.bz2 2714990 RMD160 d82cbfafa9fe27119b1fa66cfa417b688b6e8e7e SHA1 791086da977033a1bbee3effa317668b3726bd7f SHA256 914a9cd21bfe4be1f78b2f6c96e54b52db7ed3c0adc4dce6bfabec38a30f7ecd
-EBUILD quassel-0.5.1.ebuild 3218 RMD160 39c25156b7ed5c938be60b9b189d7c52a18af088 SHA1 5b9b23f3c6a99ce9494ba4c6d0ceef131c0d7d2a SHA256 d7e361d29f8ab6caf2303600e1832caab14165eda7201557ec3cc0a2e3055cdf
-EBUILD quassel-0.6.2.ebuild 2902 RMD160 f26aa2810fbefc3061bc3dcfa485eac274924028 SHA1 6a5f25a28fda58908fe78efef59f6726f3256b84 SHA256 7ddca7b4d0f3ee38014d411d68e3e1c07b04a6b203936314bd1596dad0f97c33
+EBUILD quassel-0.6.3.ebuild 2902 RMD160 6cf6f255f2ff74cfcb70dc23cb426361df3424b0 SHA1 3408beeee988969c4a40034f2e44894681a49032 SHA256 a567e61a8b5f8402dcbc31a2544ac42630e2f3b3320a73197b7042a3bda6be6b
 EBUILD quassel-0.7.1.ebuild 4804 RMD160 2680fe3b72edc35ceca1242740f2046763edcbcc SHA1 be4fcc47873c6dc1b708ad56cc3f0df7066c2f4c SHA256 e0310744d43f9277ca5ab25e3c689e7dcdf5f1fa8a2d1b3b89e487c74c3d511a
 EBUILD quassel-9999.ebuild 4780 RMD160 819b05d177a05970dfdde573fe765e9696905216 SHA1 851b0d1ca96f19607ddc14dd7f06578107004330 SHA256 a3dc0f9dcc8a759358d785191493d2e94e39ca298de98ea2dad992db5f4f38c2
-MISC ChangeLog 18691 RMD160 fe9ee4b80fee25f76fbd4df6bd55d1b9f16d2033 SHA1 853d57d5534a2b5a90d301b033c4ae131eb298b4 SHA256 05b6cd801c1398a62d89e6fd530bea97be31bbc613e18acc650fe4222b3f4e9d
-MISC metadata.xml 1945 RMD160 6dcac40d693e9e30a172f7b7b7c6099ab5164217 SHA1 95480c396283f6468ac9e5196c83c292d4e053a1 SHA256 22f0bee934928d936a25344ed3b57fceb5950268484491698f2d8648c119c587
+MISC ChangeLog 19015 RMD160 70adcb0beeb6ad2738aa2149adea37d35a305450 SHA1 8a955a6eb23b0a39681b132fe01fdddc849db4fb SHA256 bde42994d0ead41eec984e622bd33f3296b5f181e02e9152515bce0d9c56d8f9
+MISC metadata.xml 1777 RMD160 a7056cd2fbca953cdbe5462aac48697a98ef628b SHA1 7bea6bda0bafaff84bf2c931d65133ce07a3c6e1 SHA256 0e1dedf188fb5600f39cea0b61809b73362cd0d42068ed42cd2da5591dbb731c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyYht0ACgkQHB6c3gNBRYdRyACfbVL9B6lQMbuLzvNvLU/ZPOJu
-Cc0AoI0L1pxLEyfD6AKnVpLlupAHDUmA
-=iTNj
+iEYEARECAAYFAkyYiS0ACgkQHB6c3gNBRYdIXACfVzVxUB55TQqMyxgCQXjFEB8N
+tY4An1zEcoepyeyDCPjC1xia7CycEMWr
+=iEJv
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/files/0.5.2-fix_x11_detection.patch b/net-irc/quassel/files/0.5.2-fix_x11_detection.patch
deleted file mode 100644
index 12f34fd67198..000000000000
--- a/net-irc/quassel/files/0.5.2-fix_x11_detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8df3e82b02a980d4e00f3dc9c90c11e96501cf6f Mon Sep 17 00:00:00 2001
-From: Manuel Nickschas <sputnick@quassel-irc.org>
-Date: Tue, 19 Jan 2010 21:51:41 +0100
-Subject: [PATCH] Don't require X11 headers for building quasselcore
-
----
- cmake/modules/Qt4ConfigDependentSettings.cmake |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake
-index 1956aa5..a6b6c3d 100644
---- a/cmake/modules/Qt4ConfigDependentSettings.cmake
-+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
-@@ -27,7 +27,7 @@
- IF(UNIX)
-   # on OS X X11 may not be required
-   IF (Q_WS_X11)
--    FIND_PACKAGE(X11 REQUIRED)
-+    FIND_PACKAGE(X11)
-   ENDIF (Q_WS_X11)
-   FIND_PACKAGE(Threads)
-   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
--- 
-1.6.5.1
-
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 7b5b2a7c0ac6..799c464661db 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -20,10 +20,6 @@
 			client/server model. The server and X flags are not needed in this
 			case but it is possible to enable them too.
 		</flag>
-		<flag name="oxygen">
-			Install oxygen icons. Highly recommended for KDE-4.1 and KDE-4.2 (or
-			usage without kde). KDE-4.3 will ship the icons by default.
-		</flag>
 		<flag name="phonon">
 			Build client with phonon backend support. This enables sound
 			playback in client.
diff --git a/net-irc/quassel/quassel-0.5.1.ebuild b/net-irc/quassel/quassel-0.5.1.ebuild
deleted file mode 100644
index ab890dd54a34..000000000000
--- a/net-irc/quassel/quassel-0.5.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.5.1.ebuild,v 1.6 2010/06/17 20:48:46 patrick Exp $
-
-EAPI="2"
-
-MY_P="${P/_/-}"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
-HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-SLOT="0"
-IUSE="dbus debug kde monolithic +oxygen phonon postgres +server +ssl webkit X"
-
-LANGS="cs da de fi fr hu it nb_NO ru sl tr"
-for l in ${LANGS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-RDEPEND="
-	dbus? ( x11-libs/qt-dbus:4 )
-	monolithic? (
-		!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
-		postgres? ( x11-libs/qt-sql:4[postgres] >=dev-db/postgresql-base-8.3 )
-		x11-libs/qt-script:4
-		x11-libs/qt-gui:4
-		kde? ( >=kde-base/kdelibs-4.1 )
-		phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
-		webkit? ( x11-libs/qt-webkit:4 )
-	)
-	!monolithic? (
-		server? (
-			!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
-			postgres? ( x11-libs/qt-sql:4[postgres] )
-			x11-libs/qt-script:4
-		)
-		X? (
-			x11-libs/qt-gui:4
-			kde? ( >=kde-base/kdelibs-4.1 )
-			phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
-			webkit? ( x11-libs/qt-webkit:4 )
-		)
-	)
-	ssl? ( x11-libs/qt-core:4[ssl] )
-	"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use monolithic && ! use server && ! use X ; then
-		eerror "You have to build at least one of the monolithic client (USE=monolithic),"
-		eerror "the quasselclient (USE=X) or the quasselcore (USE=server)."
-		die "monolithic, server and X flag unset."
-	fi
-}
-
-src_configure() {
-	local my_langs
-	for i in ${LINGUAS}; do
-		my_langs="${i},${my_langs}"
-	done
-
-	local mycmakeargs="
-		$(cmake-utils_use_want X QTCLIENT)
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want monolithic MONO)
-		$(cmake-utils_use_with webkit WEBKIT)
-		$(cmake-utils_use_with phonon PHONON)
-		$(cmake-utils_use_with kde KDE)
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with oxygen OXYGEN)
-		-DWITH_LIBINDICATE=OFF
-		-DEMBED_DATA=OFF
-		-DLINGUAS=${my_langs}
-		"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		newinitd "${FILESDIR}"/quasselcore-2.init quasselcore || die "newinitd failed"
-		newconfd "${FILESDIR}"/quasselcore-2.conf quasselcore || die "newconfd failed"
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn
-		ewarn "In order to use the quassel init script you must set the"
-		ewarn "QUASSEL_USER variable in ${ROOT%/}/etc/conf.d/quasselcore to your username."
-		ewarn "Note: This is the user who runs the quasselcore and is independent"
-		ewarn "from the users you set up in the quasselclient."
-	fi
-
-	if ( use server || use monolithic ) && use ssl ; then
-		elog
-		elog "Information on how to enable SSL support for client/core connections"
-		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
-	fi
-}
diff --git a/net-irc/quassel/quassel-0.6.2.ebuild b/net-irc/quassel/quassel-0.6.3.ebuild
index 28b8e58f7bc3..b6a87bb8676a 100644
--- a/net-irc/quassel/quassel-0.6.2.ebuild
+++ b/net-irc/quassel/quassel-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.6.2.ebuild,v 1.2 2010/09/18 08:44:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.6.3.ebuild,v 1.1 2010/09/21 10:30:32 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://quassel-irc.org/"
 SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 SLOT="0"
 IUSE="ayatana dbus debug kde monolithic phonon postgres +server +ssl webkit X"