summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2010-03-23 01:38:58 +0000
committerBen de Groot <yngwin@gentoo.org>2010-03-23 01:38:58 +0000
commitc13dba56e6b37dcf4c172f0dee21f812a7324fad (patch)
tree61758c2b1b6481ac35d7883f4e23a15e9f26d449 /net-misc
parentVersion bump (diff)
downloadgentoo-2-c13dba56e6b37dcf4c172f0dee21f812a7324fad.tar.gz
gentoo-2-c13dba56e6b37dcf4c172f0dee21f812a7324fad.tar.bz2
gentoo-2-c13dba56e6b37dcf4c172f0dee21f812a7324fad.zip
Fix directory ownership for '+non-root -caps'/'-non-root +caps' installations and add docs.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/strongswan/ChangeLog6
-rw-r--r--net-misc/strongswan/strongswan-4.3.6-r1.ebuild25
2 files changed, 21 insertions, 10 deletions
diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 138b73578047..22fae27f996d 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/strongswan
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.80 2010/03/16 18:37:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.81 2010/03/23 01:38:58 yngwin Exp $
+
+ 23 Mar 2010; Ben de Groot <yngwin@gentoo.org> strongswan-4.3.6-r1.ebuild:
+ Fix directory ownership for '+non-root -caps'/'-non-root +caps'
+ installations and add docs. (Changes by Matthias Dahl.)
*strongswan-4.3.6-r1 (16 Mar 2010)
diff --git a/net-misc/strongswan/strongswan-4.3.6-r1.ebuild b/net-misc/strongswan/strongswan-4.3.6-r1.ebuild
index 0fa937a01a5d..ee8ad6571487 100644
--- a/net-misc/strongswan/strongswan-4.3.6-r1.ebuild
+++ b/net-misc/strongswan/strongswan-4.3.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.3.6-r1.ebuild,v 1.2 2010/03/16 19:30:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.3.6-r1.ebuild,v 1.3 2010/03/23 01:38:58 yngwin Exp $
EAPI=2
@@ -91,11 +91,23 @@ src_configure() {
}
src_install() {
- einstall || die "einstall failed."
+ einstall || die "einstall failed"
doinitd "${FILESDIR}"/ipsec
- diropts -m 0750
+ local dir_ugid
+ if use non-root; then
+ fowners ${UGID}:${UGID} \
+ /etc/ipsec.conf \
+ /etc/ipsec.secrets \
+ /etc/strongswan.conf
+
+ dir_ugid="${UGID}"
+ else
+ dir_ugid="root"
+ fi
+
+ diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
dodir /etc/ipsec.d \
/etc/ipsec.d/aacerts \
/etc/ipsec.d/acerts \
@@ -106,12 +118,7 @@ src_install() {
/etc/ipsec.d/private \
/etc/ipsec.d/reqs
- if use caps; then
- fowners ${UGID}:${UGID} \
- /etc/ipsec.conf \
- /etc/ipsec.secrets \
- /etc/strongswan.conf
- fi
+ dodoc CREDITS NEWS README TODO
# shared libs are used only internally and there are no static libs,
# so it's safe to get rid of the .la files