summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2014-05-11 18:36:08 +0000
committerJoerg Bornkessel <hd_brummy@gentoo.org>2014-05-11 18:36:08 +0000
commitc9b5de7102894256373875907374a04f660ffa06 (patch)
treef2cc9b6bcb806cfcfa9608ccdf5e9c89d4939360 /www-misc
parentVersion bump. (diff)
downloadhistorical-c9b5de7102894256373875907374a04f660ffa06.tar.gz
historical-c9b5de7102894256373875907374a04f660ffa06.tar.bz2
historical-c9b5de7102894256373875907374a04f660ffa06.zip
better systemd support, if use-flag ssl, ipv6 are enabled
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x34C2808A
Diffstat (limited to 'www-misc')
-rw-r--r--www-misc/vdradmin-am/ChangeLog8
-rw-r--r--www-misc/vdradmin-am/Manifest11
-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
3 files changed, 32 insertions, 9 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/Manifest b/www-misc/vdradmin-am/Manifest
index 133d5d699547..d92b3470c802 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -7,14 +7,15 @@ AUX vdradmin-3.6.7.init 1988 SHA256 d903fb0ee336a9bd8c27054c89c5493465d38fd7f908
AUX vdradmind.conf 92 SHA256 e1ca8d661db9b3077495b2b51e1292e3dda531d840cbce0170f1b6d0597c3b05 SHA512 d54253b0eb684dfcfa924e141b5f0975cea659f3258a519afd625e692855de45d9c863a8d9eb11d4b16597fa76eee955694350f224b443733b238071b3ad9d16 WHIRLPOOL f5362fd588a1a8c202be29a923f6454f1ed45a94ed305e1858921f372b166455fbca56e7bd2ac0da5cb1a33d99be056d52705699c713bea53af4c48830c66640
AUX vdradmind.service 296 SHA256 76bf69f556d4210194fb7683efc1ff70b88ae226e3617769ab8616c88ff597c9 SHA512 996d6f1cbf1bc7f194b1087d900e7e1ce2d96a0866b39a9eefa51f81040627a5305c5ae42bc7692f44562ffe6697768fa715fb866e84290d06f08d3d8f6545ab WHIRLPOOL 44a692ca0a13c5d2924e78fd997698b88d1340d33b006a568679222618c67fe9684cb5f986a317870886b16d296a241bcf6a655fa83d62668169fa3a1c0c843f
DIST vdradmin-am-3.6.9.tar.bz2 562006 SHA256 5f0421ca0ea2b4c7669d5332d43b04af8b0c40d2964dd152a265c18f4d7f2715 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5 WHIRLPOOL 25f21395fda80a35b7e67fdcf1bdf2a789af73ba59c049d3604da8ecd4863e85c2e551334757d0ac53bfc33d128747ee570520171648be3818a406baa23b0737
-EBUILD vdradmin-am-3.6.9-r1.ebuild 4545 SHA256 5383a4cf34e0653c8f20919ebb1959e5be5d3e0cf34b0a11fe0546f69c65f9a9 SHA512 bbb49145cfeb2d58c77c79a496522dd737770bc798747d085527d6be66eae21a8bc2f8cf6f59079151cb5eb4153c9445e701a0a8baa1815d03747f96841bcc0d WHIRLPOOL 7bfcec24cf1fc04236fbff6aa672c5e39e0ecb6f7348f8a8794d458d4a16ccb37eded6568629f4036bbc297f2e460ba099edd46ab01b8cc210e4bfecbcb5c9f1
+EBUILD vdradmin-am-3.6.9-r2.ebuild 4887 SHA256 d396cb08c0e612c81402c77517b18201131ff566e6d0746d4ca8b91e89b025c7 SHA512 9718d2022887ebab678522217af739ba0df93725186b9b78fc6813cfc31987889e57b47a877539f357210b693f88a373d2afffde4d96b0b2d22b3effc8b9d451 WHIRLPOOL 67347ba2ed1e9754f63a01b98315e5ed8df2c36f1ccb175aa90c1cb1a3de7ea47bb5455b0fdeb0fac1d2e49bacf4d7495837d7b4e70011f62c55ae460c7a58dd
EBUILD vdradmin-am-3.6.9.ebuild 4438 SHA256 1840487b88c8ec9e0035ac18bca85bb3e51dee44962830beb2f34ff0e0a65bd8 SHA512 cf84e621d1c8431f7de44d722bd43b00953d3b717129edc840dbe4f5056346a73760315b64d12a4a9c93708ab21a7335b2a4c5df6319ea4544bdff42c0dc4b5c WHIRLPOOL e0be3a2eb44435bac57ef48ccf209a968eecab3255efa0dea594dab730b4fdb8d79ec7c57b9747ec2b666015bb7dbb108916f4d1439af7e6fbe5ad2b2df5084f
-MISC ChangeLog 11335 SHA256 5cc3b6e037fdb7a377fb5e23849023bbfd21b1f166132a26d484bf20f0b6a92b SHA512 c0eac6dbd44d59f57a08c150997d506bd895b2cd6a778a488db4ff632a708cead4c4a702c71c776f802dcda81b97a6a2973f3212b789aa1741b8a0e412600cf7 WHIRLPOOL 6a9595eb1382c850cbfcbe428fe825abb6d88a7bdb615456baaf5a96b0772abfe8779b25fc84445b684bc089971ca0e66fd133f13898ff43a80d3238f57c318e
+MISC ChangeLog 11554 SHA256 027b603e581187be515e075ce26366b190c8dd1c3122b4c03e477a4c7ee05120 SHA512 758f27054b08b4253186afe287b59a320d035fd389135e535ee8f7c29ff61d8d721c2142d69e64a54b30e105151f7367b0c19b6236b5ace774081aa887d3e874 WHIRLPOOL e9a13ebe220d30528b3add55689f8cf36bc0fb27376de77081928cc1c141a7717299d2a24a48781b2792ead4c6dc73d23998d5f391f7050137395f37e78f2d2f
MISC metadata.xml 652 SHA256 40a987f0caed004be4922c4d2a5f96472db5dc68aede439e3541a35c6ee8d412 SHA512 3803d4ebf228328849889e188f7e69d2d58e760ef0798f33a312e709672fa46e1ae8a3ea0f68946d4b98aa9c378d1e6549290c85fc75708eaa02cac145e3ceb6 WHIRLPOOL df37f3b6b8be798811eddc5a68d3543632a22ea1e7860ac7a16a8e089e46c01831d6b398e889f84ad40412e010300e55023f2e213a07f6e96c157d3c537a1ae7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
-iEYEAREIAAYFAlNSu7EACgkQCaWpQKGI+9RlWQCfb/i48+/hWCmzRfhJYckWX4pO
-EwMAnRuQf9kYvhB7p8x+kYM6Oldi1ooI
-=FCtv
+iD8DBQFTb8MWdn07HTTCgIoRCAoGAKCvak/mSOn8eM1lgTP5dlI+8dVs1wCglqnS
+ZVq0dG6QoKPWEWFd5LgA0M8=
+=40mb
-----END PGP SIGNATURE-----
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