Fix directory ownership for '+non-root -caps'/'-non-root +caps' installations and...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 138b73578047e04c6f2e83ab60992dc21848525d..22fae27f996da5e1d1b62226e1743e69cce81962 100644 (file)
--- 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/Manifest b/net-misc/strongswan/Manifest
index 92aaf07d6d2de2ae0da524513713ae5af25803b7..885f9d3ab25ab99b00983f03a304849d2f9034ef 100644 (file)
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -10,7 +10,7 @@ EBUILD strongswan-4.2.17.ebuild 2812 RMD160 29491eb031f13c780eacc38f3231d0bb476f
 EBUILD strongswan-4.3.3.ebuild 2750 RMD160 50ea7a0e30dcf598f889a1365db8ec7805cec856 SHA1 9e98e2eb6bb26b1927d7ad4ff789fc04935e997c SHA256 f6fb07f907578eea9028368659a776248eabdba3869ebd04a8f4b08b9f0a809a
 EBUILD strongswan-4.3.4.ebuild 3765 RMD160 1f94475dc6ecc8e30be2457d85a671ee6027cced SHA1 14ac5ce3c1babece2969537eab4259c371912c19 SHA256 307caf1edb75110743a3bf56619271d9493f755fcaeb817cb599d31246a5edb1
 EBUILD strongswan-4.3.5.ebuild 3759 RMD160 473a22ef91a31529f646cc5d5249957c1bdf71d2 SHA1 a424e03d679785c229e3714d8166792eb50531be SHA256 36e27c266d192aeb54d404b84bf609e4faa9825733617a2a3734ec14c1d70b60
-EBUILD strongswan-4.3.6-r1.ebuild 6527 RMD160 83d1e1eb6cd8a5b292a19d8709c60571b617d597 SHA1 0d72f0607b7073fcec244255c20ec9b8c1bbe3ae SHA256 7ee8f6288ee55aa54d088ebf66b97def2028dac436f4195153819846f8c2a24d
+EBUILD strongswan-4.3.6-r1.ebuild 6652 RMD160 4f9cc2557597596d63f682b59f4314c3c5c66f1d SHA1 9fb1ea9912a1ff15066ca3651658323fb63e5b3e SHA256 c8ddd25f7838cf9c94642d8cc9f12ae1eef92d956bc0a55b1be399bb743e9cbf
 EBUILD strongswan-4.3.6.ebuild 3759 RMD160 c6a07a383cd5ad553a539f4794c88ed167ae5415 SHA1 67427e4382b8c68a2ee272630b801ec3e13f0ce7 SHA256 182fe06c642242c6048815c86ebfe77c1574746bffd429714bbabff263ae6951
-MISC ChangeLog 14319 RMD160 a46c59c8ac4369854ae5589dd0ef6be544c2c11d SHA1 5efd9d3dc3cb59443b762de0449ef38c43661d1b SHA256 fb3e939545881be85d83cb536314a9d505254c4ea3d3f3428e121d3953eca35f
+MISC ChangeLog 14519 RMD160 dac1cda38bceb46068792803baf87a26e1c7bd75 SHA1 eded413fe3812e9e88232eb078e3e75d68b50c7e SHA256 890f8b85d2e2dc1783a60dfdbbdf9a6fd8f4d146279703b35f85a477b455e27c
 MISC metadata.xml 1276 RMD160 0fb9ce53d85de2cbd5b640f77c7742ceb19bec11 SHA1 961790fed6e1189c26671b8ce1aef2e2d0328699 SHA256 2a4b623e516b5e9d820dbc53e3c7bc1b76946d7a20deb2fca21f5a92e2e0679c

diff --git a/net-misc/strongswan/strongswan-4.3.6-r1.ebuild b/net-misc/strongswan/strongswan-4.3.6-r1.ebuild
index 0fa937a01a5d4635ce97475a2da2823f0390e276..ee8ad65714877b4b05aba42ad60e1c3775c29631 100644 (file)
--- 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