diff options
| author |   Alexander Tsoy <alexander@tsoy.me> | 2017-05-17 11:13:29 +0300 |
|---|---|---|
| committer |   Manuel Rüger <mrueg@gentoo.org> | 2017-05-29 00:39:21 +0200 |
| commit | a85313eceb8e3e8d4031051c0d35336e41f42d7d (patch) | |
| tree | 6e55db647c173ff2a19b141e4b19d6b06d0fa033 /net-vpn | |
| parent | dev-java/icedtea-bin: Version bump to 7.2.6.10 wrt bug #619458 (diff) | |
| download | gentoo-a85313eceb8e3e8d4031051c0d35336e41f42d7d.tar.gz gentoo-a85313eceb8e3e8d4031051c0d35336e41f42d7d.tar.bz2 gentoo-a85313eceb8e3e8d4031051c0d35336e41f42d7d.zip | |
net-vpn/openvpn: fix installation of systemd units and tmpfiles
Bug: https://bugs.gentoo.org/618722
Diffstat (limited to 'net-vpn')
| -rw-r--r-- | net-vpn/openvpn/openvpn-2.4.2-r1.ebuild (renamed from net-vpn/openvpn/openvpn-2.4.2.ebuild) | 6 | ||||
| -rw-r--r-- | net-vpn/openvpn/openvpn-9999.ebuild | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/net-vpn/openvpn/openvpn-2.4.2.ebuild b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild index 09d3fffa7ae2..830141cf3bb6 100644 --- a/net-vpn/openvpn/openvpn-2.4.2.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild @@ -66,6 +66,8 @@ src_prepare() { src_configure() { use static && append-ldflags -Xcompiler -static + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ + TMPFILES_DIR="/usr/lib/tmpfiles.d" \ econf \ $(usex mbedtls '--with-crypto-library=mbedtls' '') \ $(use_enable inotify async-push) \ @@ -110,10 +112,6 @@ src_install() { insinto /usr/share/doc/${PF}/examples doins -r sample contrib fi - - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - use systemd && systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service - use systemd && systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service } pkg_postinst() { diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index 125b8c14fee1..8a34713832c5 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -64,6 +64,8 @@ src_prepare() { src_configure() { use static && append-ldflags -Xcompiler -static + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ + TMPFILES_DIR="/usr/lib/tmpfiles.d" \ econf \ --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \ $(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \ @@ -109,10 +111,6 @@ src_install() { insinto /usr/share/doc/${PF}/examples doins -r sample contrib fi - - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service - systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service } pkg_postinst() { |