| 1 |
commit: 7a450c95a217fe142cb97a6a94ce5f775f41ef89 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 25 20:54:18 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 25 20:54:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a450c95 |
| 7 |
|
| 8 |
net-misc/libreswan: bump to 3.18 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0_p22 |
| 11 |
|
| 12 |
net-misc/libreswan/Manifest | 1 + |
| 13 |
.../{libreswan-9999.ebuild => libreswan-3.18.ebuild} | 12 ++++++++---- |
| 14 |
net-misc/libreswan/libreswan-9999.ebuild | 12 ++++++++---- |
| 15 |
3 files changed, 17 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/libreswan/Manifest b/net-misc/libreswan/Manifest |
| 18 |
index 2f8ed0a..227effa 100644 |
| 19 |
--- a/net-misc/libreswan/Manifest |
| 20 |
+++ b/net-misc/libreswan/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST libreswan-3.17.tar.gz 9168223 SHA256 28c286f57f6d8d00e1502ea283aac0f9f863edb2d759e50dc89df0e28c0d0d03 SHA512 4503ae82663f060f3af3fd74491ae94feb33a28f13f96cd04bb4a83bba17fe199f4ff7cba83850235829b373f803ba816d7a4199d4afb1da191c7323dd28a362 WHIRLPOOL c771218d7c0a26041bb946c2805f581086e9beae8827c2fbaad49eb032107f322316e6102b3161db014d1d6e5e222d682d23a1ac147ae65fc37b0c364440cbdc |
| 23 |
+DIST libreswan-3.18.tar.gz 8766228 SHA256 2ff61178913287567ed2736287df47e7f9a822ddcded967f3af5f03e95b5f17d SHA512 dfc831ae82814a26cac2eb7c8bef4385d8aebb1e62c63f31e0997d49fc6bbcc6e4e2bcd0e07d5c0c1347e5eaca5f6eb1fba98395bc882ab0fddb804a524b57f8 WHIRLPOOL 73ce41988d62d6702837d9ba6c2e123aad678b6d983711e6e5d3a60046bdbf2a37d8f650a8e4ffff24c551a27d50ecbef322bc40a083b852a142b2a5bcda2726 |
| 24 |
|
| 25 |
diff --git a/net-misc/libreswan/libreswan-9999.ebuild b/net-misc/libreswan/libreswan-3.18.ebuild |
| 26 |
similarity index 86% |
| 27 |
copy from net-misc/libreswan/libreswan-9999.ebuild |
| 28 |
copy to net-misc/libreswan/libreswan-3.18.ebuild |
| 29 |
index 2fd8e0c..316039d 100644 |
| 30 |
--- a/net-misc/libreswan/libreswan-9999.ebuild |
| 31 |
+++ b/net-misc/libreswan/libreswan-3.18.ebuild |
| 32 |
@@ -50,6 +50,11 @@ usetf() { |
| 33 |
usex "$1" true false |
| 34 |
} |
| 35 |
|
| 36 |
+src_prepare() { |
| 37 |
+ sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die |
| 38 |
+ default |
| 39 |
+} |
| 40 |
+ |
| 41 |
src_configure() { |
| 42 |
tc-export AR CC |
| 43 |
export INC_USRLOCAL=/usr |
| 44 |
@@ -73,17 +78,16 @@ src_configure() { |
| 45 |
|
| 46 |
src_compile() { |
| 47 |
emake all |
| 48 |
+ emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all |
| 49 |
} |
| 50 |
|
| 51 |
src_install() { |
| 52 |
- emake DESTDIR="${D}" install |
| 53 |
+ default |
| 54 |
+ emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install |
| 55 |
|
| 56 |
echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets |
| 57 |
fperms 0600 /etc/ipsec.secrets |
| 58 |
|
| 59 |
- systemd_dounit "${FILESDIR}/ipsec.service" |
| 60 |
- |
| 61 |
- dodoc CHANGES README |
| 62 |
dodoc -r docs |
| 63 |
|
| 64 |
find "${D}" -type d -empty -delete || die |
| 65 |
|
| 66 |
diff --git a/net-misc/libreswan/libreswan-9999.ebuild b/net-misc/libreswan/libreswan-9999.ebuild |
| 67 |
index 2fd8e0c..316039d 100644 |
| 68 |
--- a/net-misc/libreswan/libreswan-9999.ebuild |
| 69 |
+++ b/net-misc/libreswan/libreswan-9999.ebuild |
| 70 |
@@ -50,6 +50,11 @@ usetf() { |
| 71 |
usex "$1" true false |
| 72 |
} |
| 73 |
|
| 74 |
+src_prepare() { |
| 75 |
+ sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die |
| 76 |
+ default |
| 77 |
+} |
| 78 |
+ |
| 79 |
src_configure() { |
| 80 |
tc-export AR CC |
| 81 |
export INC_USRLOCAL=/usr |
| 82 |
@@ -73,17 +78,16 @@ src_configure() { |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
emake all |
| 86 |
+ emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all |
| 87 |
} |
| 88 |
|
| 89 |
src_install() { |
| 90 |
- emake DESTDIR="${D}" install |
| 91 |
+ default |
| 92 |
+ emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install |
| 93 |
|
| 94 |
echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets |
| 95 |
fperms 0600 /etc/ipsec.secrets |
| 96 |
|
| 97 |
- systemd_dounit "${FILESDIR}/ipsec.service" |
| 98 |
- |
| 99 |
- dodoc CHANGES README |
| 100 |
dodoc -r docs |
| 101 |
|
| 102 |
find "${D}" -type d -empty -delete || die |
Archives