Added systemd USE flag to forward console query to systemd, #515982

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF1989B07

3 files changed, 143 insertions, 5 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index a5c06c345574..714056fed09a 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.290 2014/06/09 10:58:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.291 2014/07/03 07:34:48 pva Exp $
+
+*openvpn-2.3.4-r1 (03 Jul 2014)
+
+  03 Jul 2014; Peter Volkov <pva@gentoo.org> +openvpn-2.3.4-r1.ebuild:
+  Added systemd USE flag to forward console query to systemd, #515982
 
   09 Jun 2014; Markus Meier <maekke@gentoo.org> openvpn-2.3.3.ebuild:
   arm stable, bug #511668
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index f71ba6f6c861..f35d660a81f6 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -16,14 +16,15 @@ DIST openvpn-2.3.4.tar.gz 1191101 SHA256 af506d5f48568fa8d2f2435cb3fad35f9a9a8f2
 EBUILD openvpn-2.3.1.ebuild 4143 SHA256 8dad20422d32628c0ee91b6d3ccb103e75c2c901ce9c1240ef95102f4c02dc53 SHA512 6792c68e8a5bbe43a93a3c9a128ae853edd21e0c918cf689d2db088b984aecdc570d5281bff263aca6078b07ddd0ba172c3c9b4ccace0fc690357d5fb13aff00 WHIRLPOOL 33cdd572f00952748a2ab05c39924495173e217df315a56f91036b45a268da1e8c687de381d8cdd5850a26ee6a6d3010053fee671db0901be55c664697900e6b
 EBUILD openvpn-2.3.2.ebuild 4131 SHA256 c3c95da613ac170ca6db06e721e0d3add9724fb3a2dbc07111aa9f0e36c6cc69 SHA512 d35632f2719f50fd0cb4202d737bd1cdbeeee96e5bc455070316a79b5b4bd61f5f47e76cdf27e136a15ee1883ba7e67db723a28d8597eca6629cf93e430e6715 WHIRLPOOL 689bcc9ffb76dc12987df2b57d9cb7e5c4f28079a1540cd8b32e10b392205798a72e6a9ec35cf016f421c3d9a985af2530d444258ff7deaceb1b19076a1451bf
 EBUILD openvpn-2.3.3.ebuild 4188 SHA256 527524016f7fca769bd5c6b45434c2920d30b674f3ca88dafcd9e6ee80eae2ae SHA512 73713c2350aacbb36b8205def0f5703ca294e1509895a6b1821a58f067ac19471c1de15104589004b588ac511720cd7e4a300c766eba8e39b9948e862aa5127b WHIRLPOOL 0249a4fec0f90afaadfa0bbaf0d616d3506b516aeb98270c293430270b8ed509a13913dd70b02df09f6bd0c881cd19d53badc70f1f037dbbbc0a197f1510c170
+EBUILD openvpn-2.3.4-r1.ebuild 4356 SHA256 f2635cacc33d4087ed944346279e007b52a68fbba028244ec0ef203db25a8010 SHA512 ec324129b4adea759c08d817973016fa1e92873f9b028a3401f30d99e796b76116a8ec00c58abb904e431aab79d38abcc6eda1378ca82ba00e97f89d5f2aa85e WHIRLPOOL c69e6054f8d28252f83696465b09ec598a9d7131819925c1e3c3edee81b69df4b252b7144e93313955c404191d8115b298adafcd7c941bb6e388fa13e1ab6578
 EBUILD openvpn-2.3.4.ebuild 4187 SHA256 ff86a65a6eaf6cb32e93d8c4f48973755f90accccb74ab26906a293accc98acb SHA512 4963bc40ac192a489b8082dfcf8a2359fb28e668d63b47a092f2460baf90d788cc1877e91e5e48c6c76510f5f45971846ea94a3368febd42b1fea63ee458d0da WHIRLPOOL 9ea750a6f72a098e32b169d4adea289ceb26bd8eb72aab84d00a98b6ad139750136234fd43d2ddbb9ff724f8a20f370d84a351419d78a8bfe88308b1fc22c9d7
 EBUILD openvpn-9999.ebuild 3938 SHA256 afcf2646c697ed990fc21546bdbac75ee9dc70fe125be4036fa294aee71e57db SHA512 ad23685991fd6398e795fb02b074be29d4abe9e008286a742caf0a3f37e51f85d6579a19f634cd2f8e42730e9226c2c0efe993dd85599c5efa19eb9a2c5c820f WHIRLPOOL 1dca3d38e7bbdc72567a253af0c12fdf6ff79eaaf1064bb874259e13507c52bdd4a4704e3da9d72eb6ce2afd8519b4acec3b757de996f21012c8e9df589f6b2e
-MISC ChangeLog 40758 SHA256 ba85271a6dfa2e3feb1f2a9d897202348e181bc437c24215ec83b7f473cd7d87 SHA512 2bd4d09be2582a5be1b5d92d6bed48429adea676e114f9c992586f5ef3689cbcdb5c3049c77548a6bb8458ab49d2624211bf04b2715a392de363ecef333aaa85 WHIRLPOOL 93b5bafc67b5d5c621b9cab053962da107117f3776fdb98fb4d65472ad76508508c25142f53963f92d1adeb2a474e0a7dc508a17803a7128d388fea7e5a78a6d
+MISC ChangeLog 40930 SHA256 3fb9d43fc313e966569bf64c929c0b0848be9a6a320df0de16df2ccb864065a4 SHA512 7f434fa62bae5cb9446675d566836818bf3a975a88e05505070b3809219f679555577f7f2fd1405f18653cce673de2c0bfc1d428ea777eaf31316acc6d4f5712 WHIRLPOOL 4294cb7da7a38a00b1c28852cd6a9373d6adabbbf2308fd5d2021720159383fb1ba64184c164b69827708dd01d24707a4da3f6420f478fbff4a453995ffeed64
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOVlVgACgkQkKaRLQcq0GJKdgCfRr1Le/1IYKremJAjft7gP4T0
-BwsAn0ThutVb6buACadossj00B7hoY/H
-=YvrS
+iF4EAREIAAYFAlO1B7UACgkQGrk+8vGYmweczAD/TqSkAzto/m5rFOJHPml51nK9
+hRzQ8aLipTiDo42k9wYBAPODaXJpoS0AtTi4dGw9n22/8Wmq/cqKhgH4DNkm1Ow3
+=VBe8
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..415af783d0f7
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4-r1.ebuild,v 1.1 2014/07/03 07:34:48 pva Exp $
+
+EAPI=4
+
+inherit multilib autotools flag-o-matic user systemd
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			polarssl? ( ssl )
+			!plugins? ( !pam !down-root )"
+
+DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-openvpn )
+	ssl? (
+		!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 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Set correct pass to systemd-ask-password binary
+	sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
+	eautoreconf
+}
+
+src_configure() {
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+	local myconf
+	echo "DROPPY"
+	use polarssl && echo "FLOZZY"
+	use polarssl && myconf="--with-crypto-library=polarssl"
+	econf \
+		${myconf} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
+		$(use_enable passwordsave password-save) \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
+		$(use_enable iproute2) \
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	default
+	find "${ED}/usr" -name '*.la' -delete
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# dodoc does not supportly support directory traversal, #15193
+		insinto /usr/share/doc/${PF}/examples
+		doins -r sample contrib
+	fi
+
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
+}
+
+pkg_postinst() {
+	# Add openvpn user so openvpn servers can drop privs
+	# Clients should run as root so they can change ip addresses,
+	# dns information and other such things.
+	enewgroup openvpn
+	enewuser openvpn "" "" "" openvpn
+
+	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+		ewarn "WARNING: The openvpn init script has changed"
+		ewarn ""
+	fi
+
+	elog "The openvpn init script expects to find the configuration file"
+	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	elog ""
+	elog "To create more VPNs, simply create a new .conf file for it and"
+	elog "then create a symlink to the openvpn init script from a link called"
+	elog "openvpn.newconfname - like so"
+	elog "   cd /etc/openvpn"
+	elog "   ${EDITOR##*/} foo.conf"
+	elog "   cd /etc/init.d"
+	elog "   ln -s openvpn openvpn.foo"
+	elog ""
+	elog "You can then treat openvpn.foo as any other service, so you can"
+	elog "stop one vpn and start another if you need to."
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+
+	einfo ""
+	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
+	einfo "They can now be emerged via app-crypt/easy-rsa."
+}