diff options
| author |   Dirkjan Ochtman <djc@gentoo.org> | 2015-07-12 19:30:58 +0000 |
|---|---|---|
| committer | Dirkjan Ochtman <djc@gentoo.org> | 2015-07-12 19:30:58 +0000 |
| commit | 63bf2b6a779b71042a69c0602166efe34c3bd67e (patch) | |
| tree | 75b1b9131b29b944574ea70c40d16cedfde6886d /net-misc | |
| parent | Remove some accidentally committed debugging cruft (diff) | |
| download | gentoo-2-63bf2b6a779b71042a69c0602166efe34c3bd67e.tar.gz gentoo-2-63bf2b6a779b71042a69c0602166efe34c3bd67e.tar.bz2 gentoo-2-63bf2b6a779b71042a69c0602166efe34c3bd67e.zip | |
Bring openvpn-9999 in line with 2.3.7 (fix bug 554638)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 30380381)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openvpn/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openvpn/openvpn-9999.ebuild | 19 |
2 files changed, 17 insertions, 7 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 61e8643f8481..d44ee3747664 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openvpn # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.322 2015/07/12 19:17:58 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.323 2015/07/12 19:30:58 djc Exp $ + + 12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild: + Bring openvpn-9999 in line with 2.3.7 (fix bug 554638) 12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.3.6-r1.ebuild, openvpn-2.3.6-r2.ebuild, openvpn-2.3.6.ebuild, openvpn-2.3.7.ebuild: diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild index 408b3956954a..a60c6841c55f 100644 --- a/net-misc/openvpn/openvpn-9999.ebuild +++ b/net-misc/openvpn/openvpn-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.8 2014/11/02 09:13:00 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.9 2015/07/12 19:30:58 djc Exp $ EAPI=4 @@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl +lzo static userland_BSD" +IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins +polarssl selinux socks +ssl static systemd userland_BSD" REQUIRED_USE="static? ( !plugins !pkcs11 ) polarssl? ( ssl ) @@ -25,10 +25,11 @@ DEPEND=" ) pam? ( virtual/pam ) ssl? ( - !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.1.0 ) + !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 ) ) lzo? ( >=dev-libs/lzo-1.07 ) - pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )" + pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) + systemd? ( sys-apps/systemd )" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-openvpn ) " @@ -52,8 +53,10 @@ src_configure() { $(use_enable pkcs11) \ $(use_enable plugins) \ $(use_enable iproute2) \ + $(use_enable socks) \ $(use_enable pam plugin-auth-pam) \ - $(use_enable down-root plugin-down-root) + $(use_enable down-root plugin-down-root) \ + $(use_enable systemd) } src_install() { @@ -78,6 +81,10 @@ 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() { |