commit: 7e2583438cc93d2d47d95a427733f57bcf4c4624
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 16:46:14 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 16:46:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e258343
media-sound/umurmur: Revbumps to remove polarssl support (bug #618358).
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-sound/umurmur/metadata.xml | 2 -
media-sound/umurmur/umurmur-0.2.16a-r1.ebuild | 24 ++----
media-sound/umurmur/umurmur-0.2.16a.ebuild | 87 ----------------------
...rmur-0.2.17.ebuild => umurmur-0.2.17-r1.ebuild} | 22 ++----
4 files changed, 13 insertions(+), 122 deletions(-)
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index 640782b9fdd..7ea309183ac 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -20,8 +20,6 @@
of Mumble is called Murmur, hence the name uMurmur.
</longdescription>
<use>
- <flag name="polarssl">Use <pkg>net-libs/polarssl</pkg>
- instead of <pkg>dev-libs/openssl</pkg></flag>
<flag name="shm">Enable shared memory support</flag>
</use>
<upstream>
diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index b8464e0867d..348df9a213b 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -11,17 +11,16 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls libressl polarssl shm"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls libressl shm"
-# ssl-provider precendence: polarssl, gnutls, libressl
+# ssl-provider precendence: gnutls, libressl
# and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
dev-libs/libconfig
- polarssl? ( >=net-libs/polarssl-1.0.0 )
- gnutls? ( !polarssl? ( >=net-libs/gnutls-3.0.0 ) )
- libressl? ( !polarssl? ( !gnutls? ( dev-libs/libressl ) ) )
- !gnutls? ( !polarssl? ( !libressl? ( dev-libs/openssl:0 ) ) )"
+ gnutls? ( >=net-libs/gnutls-3.0.0 )
+ libressl? ( !gnutls? ( dev-libs/libressl ) )
+ !gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
RDEPEND="${DEPEND}"
@@ -32,7 +31,6 @@ DOC_CONTENTS="
pkg_pretend() {
local ssl_provider=( )
- use polarssl && ssl_provider+=( polarssl )
use gnutls && ssl_provider+=( gnutls )
use libressl && ssl_provider+=( libressl )
@@ -56,7 +54,7 @@ src_configure() {
local myconf
econf \
- --with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
+ --with-ssl=$(usev gnutls || echo openssl) \
$(use_enable shm shmapi)
}
@@ -88,12 +86,4 @@ src_install() {
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
https://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.16a.ebuild
b/media-sound/umurmur/umurmur-0.2.16a.ebuild
deleted file mode 100644
index d5a3eb1f314..00000000000
--- a/media-sound/umurmur/umurmur-0.2.16a.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools systemd eutils readme.gentoo user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="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="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 )
- !gnutls? ( !polarssl? ( dev-libs/openssl:0 ) )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
- A configuration file has been installed at /etc/umurmur/umurmur.conf -
you
- may want to review it. See also\n
- https://github.com/umurmur/umurmur/wiki/Configuration "
-
-pkg_setup() {
- enewgroup murmur
- enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use polarssl && use gnutls; then
- ewarn "Both gnutls and polarssl requested, defaulting to
polarssl."
- fi
-
- econf \
- --with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
- $(use_enable shm shmapi)
-}
-
-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
https://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.17.ebuild
b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
similarity index 70%
rename from media-sound/umurmur/umurmur-0.2.17.ebuild
rename to media-sound/umurmur/umurmur-0.2.17-r1.ebuild
index d6bf0d7775e..fd839fd5831 100644
--- a/media-sound/umurmur/umurmur-0.2.17.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
@@ -12,16 +12,15 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls libressl polarssl shm"
+IUSE="gnutls libressl shm"
-# ssl-provider precendence: polarssl, gnutls, libressl
+# ssl-provider precendence: gnutls, libressl
# and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
dev-libs/libconfig
- polarssl? ( >=net-libs/polarssl-1.0.0 )
- gnutls? ( !polarssl? ( >=net-libs/gnutls-3.0.0 ) )
- libressl? ( !polarssl? ( !gnutls? ( dev-libs/libressl ) ) )
- !gnutls? ( !polarssl? ( !libressl? ( dev-libs/openssl:0 ) ) )"
+ gnutls? ( >=net-libs/gnutls-3.0.0 )
+ libressl? ( !gnutls? ( dev-libs/libressl ) )
+ !gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
RDEPEND="${DEPEND}"
@@ -34,7 +33,6 @@ S="${WORKDIR}/${P/_}"
pkg_pretend() {
local ssl_provider=( )
- use polarssl && ssl_provider+=( polarssl )
use gnutls && ssl_provider+=( gnutls )
use libressl && ssl_provider+=( libressl )
@@ -58,7 +56,7 @@ src_configure() {
local myconf
econf \
- --with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
+ --with-ssl=$(usev gnutls || echo openssl) \
$(use_enable shm shmapi)
}
@@ -90,12 +88,4 @@ src_install() {
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
https://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
}
