Version bump. Fixes security bug #500486 (CVE-2014-004{4,5}).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x5270BA51

3 files changed, 150 insertions, 16 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 5975e1c913a3..105497cf3b30 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mumble
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.44 2013/11/17 23:59:11 tgurr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.45 2014/02/07 17:02:47 tgurr Exp $
+
+*mumble-1.2.5 (07 Feb 2014)
+
+  07 Feb 2014; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.5.ebuild:
+  Version bump. Fixes security bug #500486 (CVE-2014-004{4,5}).
 
   17 Nov 2013; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.3-r2.ebuild,
   -files/mumble-1.2.3-fix-cert-validation.patch,
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 2324094756fd..ab5d683f759a 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 AUX mumble-1.2.4-speech-dispatcher.patch 1289 SHA256 d9443303de024e2efb4c0969121f46b2ebbc45351ab5ab52181ac291aa7a4265 SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a WHIRLPOOL a1696342523dca02ea2c136239e9dbcc6066d4de7cbf195b4a288459b2886e93abb893ff85fad11e4afd21702ad8775002e9487a5068c315fa0b2a0269a07ee5
 DIST mumble-1.2.4.tar.gz 3200084 SHA256 a1cf8383d99a02719b16c5440e3a5fb5375a8aa060f203bfa5d25bc69f919c9b SHA512 f5b353d060046fb20f5f2c0cdd097721354bc33304f95129d865fdbaa1cee2babfbd40e5a79adf3f46e8a219be65abfe3ccd02687a6140fdf7c03b2fc209765b WHIRLPOOL 6e207035e1357d4ebc42d0d812a12e4aa1f7ed423f33cabc17ad888766a2427d7137281923c2c2de09e2f71acac096fefa4e6b279241a2ddd498b0c2a0a38147
+DIST mumble-1.2.5.tar.gz 3200216 SHA256 915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf SHA512 bc1761f1e2fc833124ff2ff9af994be59dc9ef96a1ed49316d5383d9b5d91c37ddce87bf6afefc99315824a2a52c615162b2e6050c78f90beca591b58229e7b1 WHIRLPOOL 1f4b226c4036d35a73f65beb4ea66ec0c4363c6122320e8d70a52e0f40b0e2e550282206dcf158bf5a4bb1109202c38a9451374c1bbce96bc559c576a18346c3
 EBUILD mumble-1.2.4.ebuild 3162 SHA256 e7d3eb4bd97c522bca6dc081b1ef88fed3d26316f0f912e579e6d4c81567eac0 SHA512 1cf8fda07a45bfe12fe15ba19ef2d6d75a6d1e5fcc80a30e226143c3b08f661f0b2019822041b08eadaa32721d34e9eb4b4e81b685bad014956e661df3122761 WHIRLPOOL eb4957fe00974ffcaf119df88bfdbeb20af685a44e89022d3122455c7dad94e53e9e9bead2987f67913d08c2ee08562e2b1c94254cd3c2311a57e7b343d5e9fa
-MISC ChangeLog 8202 SHA256 517ef761e9975d719680e77b4dacabf0ac869c496d684fa9dcb49de40d819f58 SHA512 947deb8620ba0754700e0f5cc2017576a3604517e70950280615c0a22dd28c2338f6272bc545390fd80ebdfbfbc8f7b6307016eb4e5fd49a9a16a56bdda669cd WHIRLPOOL 4294a9d0279f91ff1a04db746359f2ffca5df9baaf927509683107cc34e5ee690f4905ad3d6b3ab8cdbbfe652e11a2824bc81b3b8d6e24a1a19fafebffc7f956
+EBUILD mumble-1.2.5.ebuild 3166 SHA256 8b3c9cc66eeab888e1282134d0c06c0fa57de0e32bc834e90a1f7bf9adc16428 SHA512 a2e30565b7c8efa101518fd104a421363d3722b62ca80795de5de9250363977af47f1d075028ab0539eef2fe1ae1b2157e802971daa1822f5de52416a5176f34 WHIRLPOOL f173a76e13b2527f277f2e35144d5246e755385b49a0c6f3b5baa8dc2a4ecffc15ac5bbdb4d4c4a907b6192c0d4db4127cbe01605dd42beb7e7ca73a045b2797
+MISC ChangeLog 8362 SHA256 12b5ec824334b0f7d2bea7285ab14c363fda6ecfcd39ff8c4f765dc35981111d SHA512 d0f2150ea0591cb2b9228a08b7cb6875ef9cd9cf8635303e422413ceb5a915b7987f2fa7a6dda9769e222ad2955afde7706b2c3469004b3e6f264870f322dc74 WHIRLPOOL 5fbc5c5f1da9872676d8a8b9944a71bbc3a3b94f08790674139e08b85c9623bdd4bf3dbe4e46696e8dd351bcae5e5a6e575d5e6a3cca340b900d65788ba80289
 MISC metadata.xml 531 SHA256 bfef84aab6afb7767bb73391e7ee505b4f5194517aca3a95afac72e0850862d4 SHA512 2b21ff45a1d2ceb3c2463894fd8ce6463a44404f0abed4af1459b520697f66405de533b1e39df36b4ba1245d09cdf43e5a974e67eb2c47af9db0fb70e47e1202 WHIRLPOOL 973ec7ea40bbf87b26c7659ad087f524f48ef054b9f513af11621cde449bdf1a247abde41ba1c558bf3e74f490943d16485f0e58057077d072473334aeba6575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSiVhOAAoJEGm3FC1ScLpRd2cP/iRyfxIMRUi1RbD3axplLhoK
-KdPx37K6uSmFSXxsOfJENb5IJCB1tqI16TrkayjjuMa99ENDm4/5fzwLVnrfqlHb
-GPyxAq0JKUC+WTXawz+vlHwy8vFj2iECHjlB43tepNYr8IgCNMVovKQDyd7j9wKK
-DWhG1WCM9DCX+pZWrDZGxMAuOJW08Tw9apos8yzvMEgNN/CXMRh+YzshxXYY4S7i
-yKZ76XBup9cDzM04nzcp3+kidWHaaHNceFUfVVp44EWS01lz6JWquS76WptA9z/e
-Y9G/EeXCXtB0u4F9dSI/914l7sd3UapoJSmSQXCmNJT3b90qwNfL3LtUG22w2RW4
-ABrAjO+hQT7lfmU5f7hvlQfbVauoyX7PR2W4Yfx8hTRPD8SgfPksBKB2NrSum9Za
-zoPyj5MMWaA/uULkRQ5HotRR+Luvs7ID6QnCkrVZY8PJAg0UblBiuzZyYUEFZym9
-pncfN+f+sDmSmSOlUrNPVlJhjeM9OKKNynLzF8zvEUKc8wooEpSfbIJoYAjdDvMt
-hv1cyaRaNgyjp6oHB83On/Dn7vdWHyf2ycy8eu0mVrvUw8LynXkSaW9VFHcmr0OE
-5xG9998Ial8vzIuKsQ8gOxhvmySTZ39CMXJw//KRz7h7EZCu1lgb9zKsT5nqyGb1
-sxjX9/mC+HhRQqueEQIZ
-=2vrW
+iQIcBAEBCAAGBQJS9RHBAAoJEGm3FC1ScLpR31wP/jwtc+BGOg9Q6LsKGvbQcyD3
+DsbAwWihjoc3+ueSBTjV1pYrGEb1E1vwyCW03rH4GI41XncaA/4OcQgfgEAXcXuU
+D4pT4AV1PMMHxBiq40KkiXmTtg+0hSPdpbi04NpyhOqf6jXLb9h5LvfpyLeq0hBr
+Lf2HuoLqK7ItN+mdryDMFMBZ8fMc/cL40B4nN9mhDg+bR8Qjt5ywWIAPq4kQXF83
+Lo7SgdnAUE9WG/4so0Any+jf0ZqAz/2XhN8t+9GXpqZdhBtVgzrBE7btULw3HlPW
+KmuV2wz6KqfvL3S0dRUfXGd56MMCRNPdYMM2fo/EwTP8NM6V86PaMXSiaZrjjsQs
+bn1J4HlVS5AI7K+gUtN72HihzQCp7zcpfyRnI7OaUS4kFkLrw4VSo0bFSSrcF7FF
+CUQI1e1E6s60BO7czkcz1wVZTNCOXM1tE5pF7PsqEn3R2IaVyY0gQ+Ae9+b4EgRo
+iIEFbfcx05OisrCOuNbV/LRtD29H4wrLzrycIXA8dQdtYrli+mqqHb+pPcRKtAuj
+nEgyl8RvHPVxh1RihjjiNEVZy7pUF9oF5ZQIczMTZRSiIlTkSpoNfmbSlEQuxAmu
+z0mMSXxMq4SNoUaYUcDFRD16ZYRvAfiLCrwedXsj2TRbdZYxnjqI+9PfunJTMtte
+LHS/3kScN4BF/u7i6XKI
+=3CmN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mumble/mumble-1.2.5.ebuild b/media-sound/mumble/mumble-1.2.5.ebuild
new file mode 100644
index 000000000000..0d4ce98bc1ee
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.5.ebuild
@@ -0,0 +1,127 @@
+# 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.1 2014/02/07 17:02:47 tgurr 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
+}