Version bump openvpn to 2.2.0, add ipv6 payload support (bug 335563).

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 200 insertions, 2 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index cea614bb6bd1..acba420e1f06 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.212 2011/03/21 08:22:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.213 2011/04/30 21:02:53 djc Exp $
+
+*openvpn-2.2.0 (30 Apr 2011)
+
+  30 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.2.0.ebuild:
+  Version bump to 2.2.0, add ipv6 payload support (bug 335563).
 
   21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> openvpn-2.1.4.ebuild:
   ppc/ppc64 stable wrt #354661
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 9ca2508306b9..9735d80b2417 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 65openvpn 45 RMD160 580e7f52f0c5ba91d3bc91f1155afc43fb153a96 SHA1 0d58cc3a3093e8df4b6e423934e93691722739b3 SHA256 d5758e39fdc75dcbb5a788b1afa743c3c1f08c63c535aa32c300b965474d765c
 AUX down.sh 943 RMD160 db43a525c9eb2ccb538e938e0b7f4359af22e4de SHA1 261acc68a24108526345a7d117bba15dbcebaa6e SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7
 AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2
@@ -11,8 +14,18 @@ DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 RMD160 791db5911d714eabe437bff2aea
 DIST openvpn-2.1.2.tar.gz 861104 RMD160 5d9606bf8b0ba716d68ef13c81a3e84d8b5a99b3 SHA1 021f808bba79be238bd0a38cfcb8b92dd04b85a3 SHA256 36ec37ba17b536b69aa3459a891c15be6218f1ca0ec329df8b7ea63bb695e153
 DIST openvpn-2.1.3.tar.gz 860672 RMD160 ec0f63d63442eb3a26448747a5b0956e27b09809 SHA1 91058e78c58c2e66298c7132bea1ddba52baaa82 SHA256 5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36
 DIST openvpn-2.1.4.tar.gz 863726 RMD160 3d4be2fe625883598370d74e8f7d9274eb40a636 SHA1 07c59c5b89b762761bfe1a6997ec847279f5a2da SHA256 67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5
+DIST openvpn-2.2.0.tar.gz 898381 RMD160 32aa52c886d98b6b92150dfc64d3a9c07f6e8b30 SHA1 97e3389814a1bcef5a6d22774534a30e41d48bff SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567
+DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b92399df7d801972e3ca SHA1 d7ce041c4e7f0186091e17a2d178bd12e7a4696d SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21
 EBUILD openvpn-2.1.2.ebuild 5586 RMD160 bc34ac566a4e16b03b74fb92731bc8d0423fdbb9 SHA1 697047fe65fc186fd9d1749c42638e1c79f61acc SHA256 04509ed3cd6afc18a52056035e1dfeda6d1e3c82054405c840b95aff05594766
 EBUILD openvpn-2.1.3.ebuild 5733 RMD160 6b02d6740ff77a1ee48372d403c07b09bb712409 SHA1 79b7eaa057abb3a5547edb528fcd646b82725714 SHA256 ab3c7f6601b344e1514a213e373a0fe5ce62283c1a0ba69710f25c797a4b0660
 EBUILD openvpn-2.1.4.ebuild 5756 RMD160 bb072d99f691c83deb13bf28ebc0b8371289f684 SHA1 d96e70b08ef9ca858bf5f21946db44fd33cf9163 SHA256 0b5de7ae685a6cc5416ec6ba2adecfc51052e19f1d8114c2b4d1fedf2a06653a
-MISC ChangeLog 31088 RMD160 250b49f821a70c90423141d89ce9cda72cb42934 SHA1 6137618d5b3096f9ed98a001c04999e08b16359f SHA256 616040455c09df0f583650866c65c6b8a242d37ad1c66a3ffbe78b905a0be8fe
+EBUILD openvpn-2.2.0.ebuild 5513 RMD160 8162885ae8acd83b4b8bc4987a6692696265697a SHA1 29ca2d8caa4cea03016432d3d9693d5885fcd71e SHA256 bff7fc4f677dede582b63586dac7a37dab78302ab73c0d3652a1242e3dad9fc3
+MISC ChangeLog 31247 RMD160 fa5cdf84f53dea7b9d38cb02a22980b6468f2956 SHA1 9068a7094ba05656cace37552d092d7b8a09dc9d SHA256 adc8221154874c49af54b52e469d4160ee74a455b49ebcc6c31e652d3b0d1589
 MISC metadata.xml 831 RMD160 676787d48f1794d3769c159505c4f50673715fd0 SHA1 df225c398a434e6103716cc15539b6ed2e2cfa3c SHA256 1210ff6c2e7ef7c19c5c33df245be9845678bc8017a5e0477835ded1acbfa385
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk28eR4ACgkQxeMuLWsGW/sM7wCfVRV22xp15MNnd+7oF0juybmO
+0I0AniUQVGvth9DNRgbef9ZO6TV6ks9V
+=B6Np
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.2.0.ebuild b/net-misc/openvpn/openvpn-2.2.0.ebuild
new file mode 100644
index 000000000000..44b59e439e22
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.2.0.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.0.ebuild,v 1.1 2011/04/30 21:02:53 djc Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs autotools flag-o-matic
+
+IPV6_VERSION="2.2RC2-ipv6-20110424-2"
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
+		ipv6? (
+			http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
+		)"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD"
+
+DEPEND=">=dev-libs/lzo-1.07
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	!minimal? ( pam? ( virtual/pam ) )
+	selinux? ( sec-policy/selinux-openvpn )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
+	use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch"
+	sed -i \
+		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
+		-e "s/-shared/-shared \${LDFLAGS}/" \
+		plugin/*/Makefile || die "sed failed"
+	if use ipv6; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# basic.h defines a type 'bool' that conflicts with the altivec
+	# keyword bool which has to be fixed upstream, see bugs #293840
+	# and #297854.
+	# For now, filter out -maltivec on ppc and append -mno-altivec, as
+	# -maltivec is enabled implicitly by -mcpu and similar flags.
+	(use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec
+
+	local myconf=""
+
+	if use minimal ; then
+		myconf="${myconf} --disable-plugins"
+		myconf="${myconf} --disable-pkcs11"
+	else
+		myconf="$(use_enable pkcs11)"
+	fi
+
+	econf ${myconf} \
+		$(use_enable passwordsave password-save) \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable iproute2)
+}
+
+src_compile() {
+
+	if use static ; then
+		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
+	fi
+
+	emake || die "make failed"
+
+	if ! use minimal ; then
+		cd plugin
+		for i in *; do
+			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
+			[[ ${i} == "auth-pam" ]] && ! use pam && continue
+			einfo "Building ${i} plugin"
+			emake -C "${i}" CC=$(tc-getCC) || die "make failed"
+		done
+		cd ..
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+	use eurephia && dodoc README.eurephia
+
+	# remove empty dir
+	rmdir "${D}/usr/share/doc/openvpn" || die "rmdir failed"
+	keepdir /etc/openvpn
+
+	# Install some helper scripts
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh" || die "doexe failed"
+	doexe "${FILESDIR}/down.sh" || die "doexe failed"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn || die "newinitd failed"
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn || die "newconfd failed"
+
+	# 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-{config-files,keys,scripts} contrib
+		prepalldocs
+	fi
+
+	# Install plugins and easy-rsa
+	doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
+	if ! use minimal ; then
+		cd easy-rsa/2.0
+		make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
+		cd ../..
+
+		exeinto "/usr/$(get_libdir)/${PN}"
+		doexe plugin/*/*.so
+	fi
+}
+
+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 minimal ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+
+	if use ipv6 ; then
+		einfo ""
+		einfo "This build contains IPv6-Patch from JuanJo Ciarlante."
+		einfo "For more information please visit:"
+		einfo "http://github.com/jjo/openvpn-ipv6"
+	fi
+
+	if use eurephia ; then
+		einfo ""
+		einfo "This build contains eurephia patch."
+		einfo "For more information please visit:"
+		einfo "http://www.eurephia.net/"
+	fi
+}