Security bump (bug #552652). Removed old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 21 insertions, 95 deletions

diff --git a/media-sound/umurmur/ChangeLog b/media-sound/umurmur/ChangeLog
index ae2a4592a7ce..d65c066de2c5 100644
--- a/media-sound/umurmur/ChangeLog
+++ b/media-sound/umurmur/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/umurmur
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/ChangeLog,v 1.26 2015/05/27 11:09:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/ChangeLog,v 1.27 2015/06/20 16:42:05 polynomial-c Exp $
+
+*umurmur-0.2.16a (20 Jun 2015)
+
+  20 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> -umurmur-0.2.14.ebuild,
+  -umurmur-0.2.15.ebuild, +umurmur-0.2.16a.ebuild:
+  Security bump (bug #552652). Removed old.
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> umurmur-0.2.16.ebuild:
   Stable for x86, wrt bug #549656
diff --git a/media-sound/umurmur/umurmur-0.2.14.ebuild b/media-sound/umurmur/umurmur-0.2.14.ebuild
deleted file mode 100644
index 1aba67feccb3..000000000000
--- a/media-sound/umurmur/umurmur-0.2.14.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/umurmur-0.2.14.ebuild,v 1.5 2015/04/09 15:47:56 polynomial-c Exp $
-
-EAPI=5
-
-inherit systemd eutils readme.gentoo user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="http://code.google.com/p/umurmur/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="polarssl"
-
-DEPEND="<dev-libs/protobuf-c-1.0.0
-	dev-libs/libconfig
-	polarssl? ( >=net-libs/polarssl-1.0.0 )
-	!polarssl? ( dev-libs/openssl:0 )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur.conf - you may
-	want to review it. See also\n
-	http://code.google.com/p/umurmur/wiki/Configuring02x
-"
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_configure() {
-	local myconf
-
-	# build uses polarssl by default, but instead, make it use openssl
-	# unless polarssl is desired.
-	use !polarssl && myconf="${myconf} --with-ssl=openssl"
-
-	econf ${myconf}
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use polarssl ; then
-		elog
-		elog "Because you have enabled PolarSSL support, umurmurd will use a"
-		elog "predefined test-certificate and key if none are configured, which"
-		elog "is insecure. See http://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support"
-		elog "for more information on how to create your certificate and key"
-	fi
-}
diff --git a/media-sound/umurmur/umurmur-0.2.15.ebuild b/media-sound/umurmur/umurmur-0.2.16a.ebuild
index bfe5b22fd6bd..09b4b7ef62fb 100644
--- a/media-sound/umurmur/umurmur-0.2.15.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/umurmur-0.2.15.ebuild,v 1.3 2015/04/19 09:56:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/umurmur-0.2.16a.ebuild,v 1.1 2015/06/20 16:42:05 polynomial-c Exp $
 
 EAPI=5
 
 inherit autotools systemd eutils readme.gentoo user
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="http://code.google.com/p/umurmur/ https://github.com/fatbob313/umurmur"
-SRC_URI="https://github.com/fatbob313/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://code.google.com/p/umurmur/ https://github.com/umurmur/umurmur"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="polarssl"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gnutls polarssl shm"
 
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	dev-libs/libconfig
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
 	polarssl? ( >=net-libs/polarssl-1.0.0 )
-	!polarssl? ( dev-libs/openssl:0 )"
+	!gnutls? ( !polarssl? ( dev-libs/openssl:0 ) )"
 
 RDEPEND="${DEPEND}"
 
 DOC_CONTENTS="
 	A configuration file has been installed at /etc/umurmur.conf - you may
 	want to review it. See also\n
-	http://code.google.com/p/umurmur/wiki/Configuring02x
-"
+	https://github.com/umurmur/umurmur/wiki/Configuration "
 
 pkg_setup() {
 	enewgroup murmur
@@ -40,11 +40,13 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	# build uses polarssl by default, but instead, make it use openssl
-	# unless polarssl is desired.
-	use !polarssl && myconf="${myconf} --with-ssl=openssl"
+	if use polarssl && use gnutls; then
+		ewarn "Both gnutls and polarssl requested, defaulting to polarssl."
+	fi
 
-	econf ${myconf}
+	econf \
+		--with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
+		$(use_enable shm shmapi)
 }
 
 src_install() {