| 1 |
commit: a85313eceb8e3e8d4031051c0d35336e41f42d7d |
| 2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
| 3 |
AuthorDate: Wed May 17 08:13:29 2017 +0000 |
| 4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 28 22:39:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85313ec |
| 7 |
|
| 8 |
net-vpn/openvpn: fix installation of systemd units and tmpfiles |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/618722 |
| 11 |
|
| 12 |
net-vpn/openvpn/{openvpn-2.4.2.ebuild => openvpn-2.4.2-r1.ebuild} | 6 ++---- |
| 13 |
net-vpn/openvpn/openvpn-9999.ebuild | 6 ++---- |
| 14 |
2 files changed, 4 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-vpn/openvpn/openvpn-2.4.2.ebuild b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild |
| 17 |
similarity index 94% |
| 18 |
rename from net-vpn/openvpn/openvpn-2.4.2.ebuild |
| 19 |
rename to net-vpn/openvpn/openvpn-2.4.2-r1.ebuild |
| 20 |
index 09d3fffa7ae..830141cf3bb 100644 |
| 21 |
--- a/net-vpn/openvpn/openvpn-2.4.2.ebuild |
| 22 |
+++ b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild |
| 23 |
@@ -66,6 +66,8 @@ src_prepare() { |
| 24 |
|
| 25 |
src_configure() { |
| 26 |
use static && append-ldflags -Xcompiler -static |
| 27 |
+ SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ |
| 28 |
+ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ |
| 29 |
econf \ |
| 30 |
$(usex mbedtls '--with-crypto-library=mbedtls' '') \ |
| 31 |
$(use_enable inotify async-push) \ |
| 32 |
@@ -110,10 +112,6 @@ src_install() { |
| 33 |
insinto /usr/share/doc/${PF}/examples |
| 34 |
doins -r sample contrib |
| 35 |
fi |
| 36 |
- |
| 37 |
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
| 38 |
- use systemd && systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service |
| 39 |
- use systemd && systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service |
| 40 |
} |
| 41 |
|
| 42 |
pkg_postinst() { |
| 43 |
|
| 44 |
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild |
| 45 |
index 125b8c14fee..8a34713832c 100644 |
| 46 |
--- a/net-vpn/openvpn/openvpn-9999.ebuild |
| 47 |
+++ b/net-vpn/openvpn/openvpn-9999.ebuild |
| 48 |
@@ -64,6 +64,8 @@ src_prepare() { |
| 49 |
|
| 50 |
src_configure() { |
| 51 |
use static && append-ldflags -Xcompiler -static |
| 52 |
+ SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ |
| 53 |
+ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ |
| 54 |
econf \ |
| 55 |
--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \ |
| 56 |
$(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \ |
| 57 |
@@ -109,10 +111,6 @@ src_install() { |
| 58 |
insinto /usr/share/doc/${PF}/examples |
| 59 |
doins -r sample contrib |
| 60 |
fi |
| 61 |
- |
| 62 |
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
| 63 |
- systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service |
| 64 |
- systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service |
| 65 |
} |
| 66 |
|
| 67 |
pkg_postinst() { |
Archives