summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2014-05-11 18:36:00 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2014-05-11 18:36:00 +0000
commitdc66167ad0650f0c5bab9cb0cb27f27d347ea9b0 (patch)
tree65b46993c3194e41b5a501bdb54cfed970bc942f /www-misc
parentVersion bump. (diff)
downloadgentoo-2-dc66167ad0650f0c5bab9cb0cb27f27d347ea9b0.tar.gz
gentoo-2-dc66167ad0650f0c5bab9cb0cb27f27d347ea9b0.tar.bz2
gentoo-2-dc66167ad0650f0c5bab9cb0cb27f27d347ea9b0.zip
better systemd support, if use-flag ssl, ipv6 are enabled
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)
Diffstat (limited to 'www-misc')
-rw-r--r--www-misc/vdradmin-am/ChangeLog8
-rw-r--r--www-misc/vdradmin-am/vdradmin-am-3.6.9-r2.ebuild (renamed from www-misc/vdradmin-am/vdradmin-am-3.6.9-r1.ebuild)22
2 files changed, 26 insertions, 4 deletions
diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index 3bf5304bbed6..3260cb2a681f 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-misc/vdradmin-am
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.32 2014/04/19 18:08:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.33 2014/05/11 18:36:00 hd_brummy Exp $
+
+*vdradmin-am-3.6.9-r2 (11 May 2014)
+
+ 11 May 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+ -vdradmin-am-3.6.9-r1.ebuild, +vdradmin-am-3.6.9-r2.ebuild:
+ better systemd support, if use-flag ssl, ipv6 are enabled
*vdradmin-am-3.6.9-r1 (19 Apr 2014)
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r2.ebuild
index 129cbed3c2e5..fbc7f95e3d84 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.9-r1.ebuild,v 1.1 2014/04/19 18:08:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.9-r2.ebuild,v 1.1 2014/05/11 18:36:00 hd_brummy Exp $
-EAPI="5"
+EAPI=5
inherit eutils ssl-cert systemd user
@@ -53,15 +53,31 @@ pkg_setup() {
enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
}
+src_unpack() {
+ unpack ${A}
+ cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
src_prepare() {
sed -i vdradmind.pl \
-e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die
+
+ if use ipv6; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+ -i "${WORKDIR}"/vdradmind.service
+ fi
+
+ if use ssl; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+ -i "${WORKDIR}"/vdradmind.service
+ fi
}
src_install() {
newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
- systemd_dounit "${FILESDIR}"/vdradmind.service
+
+ systemd_dounit "${WORKDIR}"/vdradmind.service
systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
insinto /etc/logrotate.d