Security cleanup, bug #492782

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 12 insertions, 184 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 6af4248dfc5f..9de7c46d32f2 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.163 2013/12/22 18:12:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.164 2013/12/23 12:37:43 pinkbyte Exp $
+
+  23 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> -quassel-0.9.1.ebuild:
+  Security cleanup, bug #492782
 
   22 Dec 2013; Pacho Ramos <pacho@gentoo.org> quassel-0.9.2.ebuild:
   amd64 stable, bug #492782
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index bcb77ee52942..9c796bc7ea5f 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -5,17 +5,19 @@ AUX missing-bsd-includes.patch 1138 SHA256 0e63c51f5816c266b027c88952d4901d25ba2
 AUX quassel.logrotate 105 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780 WHIRLPOOL 5b5185a6a68c12ce08ec5b41bb10644e487308f81b3e5d554524b05f70573410e31b299ac5fcec8806390deb37d0529ac69c435d0fcbaac005e59aec5a4095c5
 AUX quasselcore.conf 714 SHA256 16cfaf919268ee3c3281fc4ad0dfc128b1c98f5edfc5cc522addd512f36d293c SHA512 e03df342f47945f948106883a7757262ab7a8a7d21f0b4dd01cfcc95e836c2e00f2e0177a353b4f7a4b6f80ffa970be06d49aa9a42cad1f3834382267e5a0d7f WHIRLPOOL d1054f5ee635579b0a41fbbf025ba5202d57288a236afb62230da165b91499598f88b7fbbbe46560843338fb2a0fa30b38eb0205b71e8f0e8894a6c53e5b92ec
 AUX quasselcore.init 1857 SHA256 af041a6c800ffb443d008b861c639bf32580b3655f7db3bc00db833374af6b2e SHA512 0405af90fe65589e163d6b2470ea4d4d3b8dad49ee3b89caba9bcffd7186bd92f204da4f8404e5ed489a949fc89b898f0b94c94c8382f90f89ccda5e2b8e2382 WHIRLPOOL 7fefa3e977f5edce047c8f928e52b3dfc702a151930a92365be7d9eb0e88adffa924164e080bf8170dfb4a95c357cb9b059394d3854464f93d58f577ecea41de
-DIST quassel-0.9.1.tar.bz2 2777104 SHA256 39e97bd67160d6575a57d4f71c4b1be5c13461ca238baef462ab43164419864e SHA512 c14a709872e40071a655f5c59fa8eb544f5f2097d3edecfa51d4b59e59936b8c5f0f4b1d6cd26414d94c5c88003662ed03347dc763415b66b8278e354d549977 WHIRLPOOL 94a90f0f711911d4187b68d7cb3e6e7f8e623825d351f2f1d0279376d2932fa91b7a4b39cdd260dd0303e7fb14b57803c2bb6030e57bfe353c3b1fd636832aad
 DIST quassel-0.9.2.tar.bz2 2782855 SHA256 f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0 SHA512 81e343b9b7df7473c9d899df9ad8c4baa779545ac4fe15c3b7d47f3e9473d24aa78c8cfc1833b79ec5b4b3173e8d83e22394a50b7184f348b3f1155bb3724f3d WHIRLPOOL 0b5b45c1bb400f5e2728d5e74f35bc5ef010c029c242940b83c4e6ec3a0c0d16d0c9d9848278d075a548e4e15736f142cc99d4741b8e4901d6589b7f7e05996f
-EBUILD quassel-0.9.1.ebuild 5071 SHA256 35bc529f45599dd0f148a1fc5518bd638dc9729401e7345ba88f1f5974494176 SHA512 59644c42538d7c85d5bfe7bb77b3a360b8b434d66594f803f40e8cc25a12924efc0d66a7ca8ece196ceab76c99f63717d619bff70525651965c8ee2485673218 WHIRLPOOL 1f231bebaa60d7861587d2deea5995fadfb59562028726a51361177265e8f0df80548d30dee0715d21a47715aa707d5ed79875b40fd9c749a5dec668f2666b4d
 EBUILD quassel-0.9.2.ebuild 5162 SHA256 990e079cd0732ae1ed07ccaece5ffc2e96e131acccb1caa75cb229a990c3c560 SHA512 bb7581fa1bb4adee5575aee887f2d278a9ef90615a28a5d9b90a3ae37c3a45db2a3d9da427f1f62ca0b4ab3277962841c7acd0f8dbc57c699f0cfc0fc9650338 WHIRLPOOL 1f78b276bba7607a4e6a8d1b1b68addc1470ba69e5e1ab8af62aa3cd3b85d2b7db7dd2eec74bdba515df854dab8e337cfadcb83acabdd711054e8220f38fd55b
 EBUILD quassel-9999.ebuild 5098 SHA256 c884ead2b2829aad4bc6a01d7474f86eb6bab0bc7b982f3c1891f73ac93400ef SHA512 67aeb021bbabb182bd3da677406d3d2bd1d46ba0bb0c8e68f1952f8522722d2a08b09a94fe002b63efd0231712237bdd47c6097e43c0038c51d6d8dd08cc87b9 WHIRLPOOL 35a5184b549672b12c5543df3b83231740571b5ca7e227b4bc730d83626938799969971f96dcdaa3e425f5a9408a68ad61d5b733b5f3a25fcd786dfbdb01bfb8
-MISC ChangeLog 25955 SHA256 4774dad11514c072bf869b0e3b7a37a7be8bfa2058b9d98af272effc101b3f9f SHA512 08576929dcfbc511e3374050beba7a59b553d67b6821aeaa960cbe2eb8c6257022264e0835dab5b57fa00c9b85eea0d94389390d9aff9dcae413d1c74bc0eef5 WHIRLPOOL 17e24881bd2fa3e6c399bab4314939b7ae88bd7c6c814b9caa73d9940e2a71053fa91c53bd2cf4ee01ceabda74b5e65ce843f07b1e39e738014c7c3db76fbbed
+MISC ChangeLog 26064 SHA256 96099e463a2e7456a6e8767cc09b6053f96b80796e7e1377ca2906f803724b21 SHA512 8a1303c55f1a74a77e8e051ca7d9f802b485062ee2e420785c69b153de751cf8347311273784d76e72c68cbaed33493422509149f50cbbe8777800357d5e6d45 WHIRLPOOL 053e5382199b4840fa164043a319a43b08bfa64e47df9a712cdbe069286a8f2ce330c8d4492aa6e80841adb83d37add4aeca69a2aa34974969e59670b819186e
 MISC metadata.xml 1595 SHA256 57553131f53d0e797e4eaece5861a6a3e367c62b5f0b3b81f0a92a040fbd37b7 SHA512 a917e0badcabfa0ebde851a6abbbcab2fdf8ef4803c3527381b6161b1ece72f4f0282494948b0fc380be76495b520fb02e1bda36da48a4f80c3914e20800cb28 WHIRLPOOL 1bd4951fdaf8ae1f244f83a2d93b464f1bf22778fbd67af26048070b3ff5b6f2e964c55dc451f350faaabf1722889cfaa5db582e44932119dfe0229a1ef4cb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3K4sACgkQCaWpQKGI+9TRqQCfQzChdqMANVjTV/eWp0SxRo3w
-85gAnRzedPSUtmcdkre6l6VnUuLH6TNk
-=JKLN
+iQEcBAEBCAAGBQJSuC6zAAoJECo/aRed9267UyQIAL3JBqNFkUGZbnkswCqXZQtw
+W6rPY4eZTp3cvVxkkgOnxtee3zPw13tTtQ/ZSYJSvtDsioBhUDsvfEw2cBm/5PXM
+pyaNzoab23Szr+Lv1ll3QL4cDnojjBcbCS5twL+xCHmCZ18TBfyLYWhJd5fpRXf1
+qm+WA3qAqLDh25fVX7cA8LjwCL/BQwnmZqbWlBXkHoV575vA4yIaX3Z9ymWShR9i
+y4x0RKzUwyclxfx0H6ckfG9DWY760eDKa1kBRjFY2ZI0u5l7+g/+zXqONtT9NgsW
+Dv6XqhFIQwi/oJPr1RnKXks/q7AkTFzKjLw6VvnmWvuTCZ4ka23Qeaf/BK8ajTU=
+=BHsV
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.9.1.ebuild b/net-irc/quassel/quassel-0.9.1.ebuild
deleted file mode 100644
index c1a880a6d935..000000000000
--- a/net-irc/quassel/quassel-0.9.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.1.ebuild,v 1.5 2013/10/23 23:58:13 creffett Exp $
-
-EAPI=4
-
-inherit cmake-utils eutils pax-utils user versionator
-
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
-EGIT_BRANCH="master"
-[[ "${PV}" == "9999" ]] && inherit git-2
-
-QT_MINIMAL="4.6.0"
-KDE_MINIMAL="4.4"
-
-DESCRIPTION="Qt4/KDE4 IRC client supporting 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 ~arm ppc x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
-	)
-	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
-	syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
-	>=dev-qt/qtgui-${QT_MINIMAL}:4
-	ayatana? ( dev-libs/libindicate-qt )
-	dbus? (
-		>=dev-qt/qtdbus-${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 >=dev-qt/qtphonon-${QT_MINIMAL}:4 ) )
-	webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 )
-"
-
-RDEPEND="
-	>=dev-qt/qtcore-${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 ) )
-	syslog? ( || ( 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 syslog)
-		$(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
-		# needs PAX marking wrt bug#346255
-		pax-mark m "${ED}/usr/bin/quasselcore"
-
-		# prepare folders in /var/
-		keepdir "${QUASSEL_DIR}"
-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-		# init scripts
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
-
-		# logrotate
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
-	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
-
-	if use server || use monolithic ; then
-		einfo "Quassel can use net-misc/oidentd package if installed on your system."
-		einfo "Consider installing it if you want to run quassel within identd daemon."
-	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
-}