Stable on amd64 and x86, tested in chroot, both cli/server runs. Punt security affected. Per bug #382313.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

4 files changed, 30 insertions, 173 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index aaee22049fb4..81928afc2985 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.132 2011/09/08 19:22:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.133 2011/09/08 20:15:17 scarabeus Exp $
+
+  08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -quassel-0.7.2.ebuild,
+  quassel-0.7.3.ebuild:
+  Stable on amd64 and x86, tested in chroot, both cli/server runs. Punt
+  security affected. Per bug #382313.
 
 *quassel-0.7.3 (08 Sep 2011)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index af75e715d19f..0f84dd990b69 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,10 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore.conf 714 RMD160 96e0d621deb67f4901840f89aa483f42504ed675 SHA1 b75f8e5967aec6457cf20f8481c518eeeee16a35 SHA256 16cfaf919268ee3c3281fc4ad0dfc128b1c98f5edfc5cc522addd512f36d293c
 AUX quasselcore.init 1857 RMD160 ab3a730bfba0b92522ddf52b1efabcd58a2cff86 SHA1 d8452aa6e2663a1926e5e864e7d65bf0d1a2e685 SHA256 af041a6c800ffb443d008b861c639bf32580b3655f7db3bc00db833374af6b2e
-DIST quassel-0.7.2.tar.bz2 2714322 RMD160 02e779a4cf0bab683691ff30767bd9625909d195 SHA1 dbbd8ebfde5aa12fb6b6841558049220d88bb9dc SHA256 b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c
 DIST quassel-0.7.3.tar.bz2 2714969 RMD160 60bb7ae75403a5aeb7616e15f7d9d505b244292c SHA1 5cb44cadd1520aa26675555aa5c967f2a28fb86e SHA256 9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d
-EBUILD quassel-0.7.2.ebuild 4765 RMD160 c2ffeb60ae4b4e8ee75c1d3961998c04f51fd8fd SHA1 f28fc0215bb6fe3f98b6a4285a4ff869e3e5042e SHA256 f67fb4dc65c8eb4562e190b2b2fe7b2f5d9fcf89691a64cb8580f31d6897c926
-EBUILD quassel-0.7.3.ebuild 4766 RMD160 292e90735437ed0c64e3a2ec5bb651f6d5b44823 SHA1 5545338d05f9a1f0b6c8807dae864deb07372461 SHA256 7f4768a7ea5320bfa1f8a0e3cf8577ded47261aa70e6c48243dc8b1ff9036b9f
+EBUILD quassel-0.7.3.ebuild 4766 RMD160 525dd8cbcbef78ae1ccd5630da6564b49ef78e3a SHA1 1094cd603605a0e578086586a97ac82574a30862 SHA256 a7c97913ac9874a3794894b841ee93f270d57b06eda736b50c755056aa552d4a
 EBUILD quassel-9999.ebuild 4729 RMD160 842b407a2e770c8ace2b0d03c0c792957a593f8c SHA1 402d07867fd5d2886a40e82aebe831f258dc8b6f SHA256 7c1c9fc71f0df8d490b1fa4bcb3f5384641c3a1f49a27e482515cf909699d074
-MISC ChangeLog 21994 RMD160 aa7c97d04dfb618085536219697a9b2431641adf SHA1 b485a256b72f5051d07a5c3edd88534d56e1e622 SHA256 1b82aa913caad85762181acbf6671b1c2f190075c413236f1d509867d7686935
+MISC ChangeLog 22209 RMD160 7f014a51d8a089c92d5796ea578139a236aee254 SHA1 baf9212918b58fbefdcce7698bf7a628e86d1983 SHA256 09e928c94efde5551f07b9ee879db107ed0fe271d10bb3aa0bde5e042083a56f
 MISC metadata.xml 1777 RMD160 a7056cd2fbca953cdbe5462aac48697a98ef628b SHA1 7bea6bda0bafaff84bf2c931d65133ce07a3c6e1 SHA256 0e1dedf188fb5600f39cea0b61809b73362cd0d42068ed42cd2da5591dbb731c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOaSJfAAoJEOSiRoyO7jvoDIUP/R8vAbX2eg4mEv1vQNgyl9pn
+JmLcPM48idjW14oy+z2XTodbuU7DPcIrb39nj0r+jkZ0gX80YG2wGMy0yVa7TWv2
+eMEvALWX2kyOaFc401fAb5K6zOu9rg67WsQLddVqolvh4h8TeoLsPhoXJA3Msm3U
+bB7fjNpCBYpqIsgqsBc7qVuW4n+R1TGe4jqFwNfiGgYooG2vSeb/acBCjBp+1DwJ
+ozOoZc2755u99T1HzYOlhqdXb6Xrp5UUMcfN1UEhU8CIsVUqqPCeglJEzTCUgf4k
+5Qx0UA9FYhgvJXClk8uG4XwT8NrTY69QlsVfHauux3DOer5l5Lmp3Yz5IZRGaHge
+spbc51DpUF0BTueAirSHLxv074ghaI24x0akrjWqgygNcGMez/mS9MBSEfV2lToC
+CgczCeTj2kFdtyenaqI5/Hc/rNSWaePD/5Pov66OvY/Rh6nCFibr2ekIyShP8Q+e
+950NQrIGLjkaLPfat1KiGEb7Huf++W+/QLPptBeIKDp6vwTHoJYXSLF7C9yA3wQk
+PEqbTWZKvQyDnCFMOj6WCmO34gkVKu7Hs/LtR1Ymcnk8MvIqtUODOiodTCaFVu9e
+KsH0OAGPmJGiOYCLiwrB20v+Uas8TjUYVX+xGliXkMIJLFquKoqkA1Q1XngxXnay
+5jnFqjBog9UM3v3L4acD
+=Xpmy
+-----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.7.2.ebuild b/net-irc/quassel/quassel-0.7.2.ebuild
deleted file mode 100644
index 572f834e08ce..000000000000
--- a/net-irc/quassel/quassel-0.7.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.2.ebuild,v 1.6 2011/08/17 16:49:17 chithanh Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
-EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && GIT_ECLASS="git-2"
-
-QT_MINIMAL="4.6.0"
-KDE_MINIMAL="4.4"
-
-inherit cmake-utils eutils versionator ${GIT_ECLASS}
-
-DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
-HOMEPAGE="http://quassel-irc.org/"
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
-
-SERVER_RDEPEND="
-	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
-	)
-	!postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] )
-	postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[postgres] )
-	>=x11-libs/qt-script-${QT_MINIMAL}:4
-"
-
-GUI_RDEPEND="
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	ayatana? ( dev-libs/libindicate-qt )
-	dbus? (
-		>=x11-libs/qt-dbus-${QT_MINIMAL}:4
-		dev-libs/libdbusmenu-qt
-	)
-	kde? (
-		>=kde-base/kdelibs-${KDE_MINIMAL}
-		>=kde-base/oxygen-icons-${KDE_MINIMAL}
-		ayatana? ( kde-misc/plasma-widget-message-indicator )
-	)
-	phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-${QT_MINIMAL} ) )
-	webkit? ( >=x11-libs/qt-webkit-${QT_MINIMAL}:4 )
-"
-
-RDEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}:4[ssl?]
-	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
-	)
-	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
-	)
-	"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-S="${WORKDIR}/${P/_/-}"
-
-REQUIRED_USE="
-	|| ( X server monolithic )
-	crypt? ( || ( server monolithic ) )
-	postgres? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) )
-	phonon? ( || ( X monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	ayatana? ( || ( X monolithic ) )
-	webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
-	if use server; then
-		QUASSEL_DIR=/var/lib/${PN}
-		QUASSEL_USER=${PN}
-		# create quassel:quassel user
-		enewgroup "${QUASSEL_USER}"
-		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with ayatana LIBINDICATE)
-		$(cmake-utils_use_want X QTCLIENT)
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want monolithic MONO)
-		$(cmake-utils_use_with webkit)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with dbus)
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with !kde OXYGEN)
-		$(cmake-utils_use_with crypt)
-		"-DEMBED_DATA=OFF"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		# prepare folders in /var/
-		keepdir "${QUASSEL_DIR}"
-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-		# init scripts
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
-
-		# logrotate
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed"
-	fi
-}
-
-pkg_postinst() {
-	if use monolithic && use ssl ; then
-		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
-
-	if use server; then
-		einfo "If you want to generate SSL certificate remember to run:"
-		einfo "	emerge --config =${CATEGORY}/${PF}"
-	fi
-
-	# temporary info mesage
-	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
-		echo
-		ewarn "Please note that all configuration moved from"
-		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
-		ewarn "to: ${QUASSEL_DIR}."
-		echo
-		ewarn "For migration, stop the core, move quasselcore files (pretty much"
-		ewarn "everything apart from quasselclient.conf and settings.qss) into"
-		ewarn "new location and then start server again."
-	fi
-}
-
-pkg_config() {
-	if use server && use ssl; then
-		# generate the pem file only when it does not already exist
-		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
-			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
-			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
-				-out "${QUASSEL_DIR}/quasselCert.pem"
-			# permissions for the key
-			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
-			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
-		else
-			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
-			einfo "Remove it if you want to create new one."
-		fi
-	fi
-}
diff --git a/net-irc/quassel/quassel-0.7.3.ebuild b/net-irc/quassel/quassel-0.7.3.ebuild
index 115b2a49984a..b9415e16006e 100644
--- a/net-irc/quassel/quassel-0.7.3.ebuild
+++ b/net-irc/quassel/quassel-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.3.ebuild,v 1.1 2011/09/08 19:22:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7.3.ebuild,v 1.2 2011/09/08 20:15:17 scarabeus Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
 IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"