Security cleanup, wrt bug #510380

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

3 files changed, 12 insertions, 144 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 99d3fe9532ad..ec395a48e444 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mumble
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.51 2014/06/04 16:04:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.52 2014/06/06 12:13:15 pinkbyte Exp $
+
+  06 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> -mumble-1.2.5.ebuild:
+  Security cleanup, wrt bug #510380
 
   04 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.6.ebuild:
   Stable for x86, wrt bug #510380
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 966ac9aa1766..9fc53194dda8 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -2,26 +2,18 @@
 Hash: SHA256
 
 AUX mumble-1.2.4-speech-dispatcher.patch 1289 SHA256 d9443303de024e2efb4c0969121f46b2ebbc45351ab5ab52181ac291aa7a4265 SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a WHIRLPOOL a1696342523dca02ea2c136239e9dbcc6066d4de7cbf195b4a288459b2886e93abb893ff85fad11e4afd21702ad8775002e9487a5068c315fa0b2a0269a07ee5
-DIST mumble-1.2.5.tar.gz 3200216 SHA256 915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf SHA512 bc1761f1e2fc833124ff2ff9af994be59dc9ef96a1ed49316d5383d9b5d91c37ddce87bf6afefc99315824a2a52c615162b2e6050c78f90beca591b58229e7b1 WHIRLPOOL 1f4b226c4036d35a73f65beb4ea66ec0c4363c6122320e8d70a52e0f40b0e2e550282206dcf158bf5a4bb1109202c38a9451374c1bbce96bc559c576a18346c3
 DIST mumble-1.2.6.tar.gz 3201577 SHA256 876cdecfb89798ab45020cdae0d64bd0fa899a9a97c2c7f4a6e706d4165fb6ff SHA512 cf67d171bb76d30fd0b098552ac1707423cdeb7d04031fd5f6693cad4661f3a2d99b8e8d653686fab00f46e66257f8fb75c819b9ad1d4f514a0d0b04c36a446e WHIRLPOOL 37654990d66fb01fc7265c5757ad8b79e9a10325b669735f3010486b15896e3d191bb705664a1151c4b0eea1cb6c17daef86e45c38247a1463ad72c273019ee7
-EBUILD mumble-1.2.5.ebuild 3162 SHA256 cd491a70ef4a5e3c721e4c3460bfcf3dc4aaf94fda4f1c101005a04f8ffc15b8 SHA512 522a9bebab5e54dd7ac082215e1444fd3ba46e06350b34d680ab311d9129c44e0c2ff48745a86e82eb33c4288fc6b2d34adf6b7798cb01f6c4231d2f2591653b WHIRLPOOL 111d993c5fd39953bc63b57a778229ccd07e56c0b4993846317ada545012528c148a6b54008e3187680a04534380fcbbb5efd1b615559a57bad04261bfc9d2f7
 EBUILD mumble-1.2.6.ebuild 3162 SHA256 2b27bf5359bce89e301f787a845952840fa015bc583494de1ff6a56695a8b6d6 SHA512 ff86ec2522cebd7468f9eadb269f7d48c7450a887835c109a7cce9ec7885ddc00ec04c574f4de7c2d7f31a694878b58cc87ec7d746a41d9a51629ecb8739a9ff WHIRLPOOL e8bd5f57cc0d1e900687326498cf50f924a5e6282246b3fd7b6f5398093f630ec8c82da1304e801482ea302e78550fbf23928154edd1624a1b0d50bf7330ab27
-MISC ChangeLog 9021 SHA256 88bd644e2ed3e2f092699fa8c62aac2c38191d1a479c747d2bcb2323328eefed SHA512 2eead06c11b0dc0d9a63b03c76e305f65b21ec53dd25f4b1626c421c7933513f0bc318bc22e421b9313dd95a51eb6e2df949b141935bfbb8336f5e7efae821b2 WHIRLPOOL 72c965399b60d977347418be72f3754a342c6ab641fcbbb5d9737fd77550ad5b4fd2503e0cfc443ca4b312116e820f8b562e8d7231615f6bd32116412de38175
+MISC ChangeLog 9135 SHA256 a89b758b4e3d14496e2c9a05ab81ec22f51224a8a5c388f59bac7b8874d31746 SHA512 967f292740a767a32e9160ecd1813c1dd60c000a0959c3a0455e6b813feb72032f7a4676809672b8d9917a379ac688c601cf53684b508e92e94738ffc50e7cc7 WHIRLPOOL 6a154132385bf075dd5745709555eecbfeec3962114c480f01f0aad48e39d658972584571d2a1983d0c3468debfb2492ac09ad8b934f872df62e1f6fe8a5c2ec
 MISC metadata.xml 531 SHA256 bfef84aab6afb7767bb73391e7ee505b4f5194517aca3a95afac72e0850862d4 SHA512 2b21ff45a1d2ceb3c2463894fd8ce6463a44404f0abed4af1459b520697f66405de533b1e39df36b4ba1245d09cdf43e5a974e67eb2c47af9db0fb70e47e1202 WHIRLPOOL 973ec7ea40bbf87b26c7659ad087f524f48ef054b9f513af11621cde449bdf1a247abde41ba1c558bf3e74f490943d16485f0e58057077d072473334aeba6575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTj0OdAAoJELp701BxlEWfsBkP/32u+O4ZparGhC0lsHKj3lRo
-wmt1etpNygCzDdJMxWj72unEuhq0ZmIs2hJaHA+QZYNcorCti24rw13g8BZNzGoQ
-Pg+f25wWikcj9vO1REGXXY3MEhA0HLxTA63v8VepyBwPpenQcbKf+DjDThzyv+Qc
-NZ9YrLrmEw5bzEj8tqVcFfs9PK7nlS0HQoQWDmewl59G8LD6DY4DIwZaADZhr6Fw
-5hqghm3D+9W2mfo/OD7oDVxIp1o4du7ky+U4a9Hiv7zcqFmBOd9izvkIv7Kpo433
-5dWga2JrStROCJZUzsBDaH4Ic1crVf0Zu+SgooALfkvv8e8s3VNtxxLBobJIFAkS
-RkpcT0+rsz2pQdbAzQFZEKjNXmDKg49hfsatBTWzZ/9Yg50S+JHl1+hcNrGVG7ZA
-0uROfBM7cq7VZ/Hlms8/q9Ri7Mvaj13r6oG22xowUJAoiOxP/3U/H78h2vMHT0s7
-tlaWK9ajU2/HoaxR5HYcvDl2UqI8O7wfCEADZG6Y/hPACbfcB64EiufSZnAQ9fPn
-blc1Qf0fW+Xs/JgyfFPC6BU8fEaa3bWIc1u77uQMFQZf2tRFFBCbnoH9mToE/RHl
-9AMEVnkXJW+eMn9SlC/5pf0U1JaSBiStTCzZ9KExSKCcZ7jSPLVuK3TBVWRu3egp
-K4naldX/gxKmMJmJ966d
-=BPaA
+iQEcBAEBCAAGBQJTkbA2AAoJECo/aRed9267OeEIAM3JLOkEycKWb/wxmBplsXnE
+tGjf8DWxj7cnS5vbp7Zz9MqI/+rGX+Y+Duho/KwxdXhovYwYKUpPnGpVTyZgZQxN
+XOtKwg+2pTXQCUI7mWUNZ0dQopczGolQc9Cao91Y1yMtYsti/AcA/A5A/HoZjZRH
+su04VTtQfHQhwCVe+o7AwQJDefNMyR4WAmZgVQSUSQEShl18jYUaq2/NIjNLizub
+r1ZejCn7P4WJVrtNe5FQ1Vd1ckU9zhIf2t2eLeG2u4LpG+CHhK86gRJ/iuGevH1v
+f1alyF7Jy1hKuKSlvRDC6HJ1qgbwclZrj4jbmjvr0gYksWtvI37otmWYiTqOfa4=
+=+grg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mumble/mumble-1.2.5.ebuild b/media-sound/mumble/mumble-1.2.5.ebuild
deleted file mode 100644
index fa2a385aad02..000000000000
--- a/media-sound/mumble/mumble-1.2.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.5.ebuild,v 1.3 2014/02/15 21:28:10 ago Exp $
-
-EAPI="5"
-
-QT_MINIMAL="4.6"
-
-inherit eutils multilib qt4-r2
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
-	>=dev-libs/openssl-1.0.0b
-	>=dev-libs/protobuf-2.2.0
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/opus-1.0.1
-	>=media-libs/speex-1.2_rc1
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	dev-qt/qtxmlpatterns:4
-	x11-proto/inputproto
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	g15? ( app-misc/g15daemon )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local conf_add
-
-	if has_version '<=sys-devel/gcc-4.2'; then
-		conf_add="${conf_add} no-pch"
-	else
-		use pch || conf_add="${conf_add} no-pch"
-	fi
-
-	use alsa || conf_add="${conf_add} no-alsa"
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use g15 || conf_add="${conf_add} no-g15"
-	use oss || conf_add="${conf_add} no-oss"
-	use portaudio || conf_add="${conf_add} no-portaudio"
-	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
-	use speech || conf_add="${conf_add} no-speechd"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add} \
-			bundled-celt \
-			no-bundled-opus \
-			no-bundled-speex \
-			no-embed-qt-translations \
-			no-server \
-			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_compile() {
-	# parallel make workaround, bug #445960
-	emake -j1
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-
-	insopts -o root -g root -m 0755
-	insinto "/usr/$(get_libdir)/mumble"
-	doins "${dir}"/libmumble.so.1.2.5
-	dosym libmumble.so.1.2.5 /usr/$(get_libdir)/mumble/libmumble.so.1
-	doins "${dir}"/libcelt0.so.0.{7,11}.0
-	doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}