Version bump to 2.2.2 (bug 383537), some cleanups from darkside.

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

6 files changed, 221 insertions, 16 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 1cddfe74f257..b43845355ea1 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,13 @@
 # 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.218 2011/07/29 08:45:05 zmedico Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.219 2012/02/16 10:50:02 djc Exp $
+
+*openvpn-2.2.2 (16 Feb 2012)
+
+  16 Feb 2012; Dirkjan Ochtman <djc@gentoo.org>
+  files/openvpn-2.1_rc20-pkcs11.patch, +openvpn-2.2.2.ebuild,
+  +files/openvpn-2.2.2-pkcs11.patch:
+  Version bump to 2.2.2 (bug 383537), some cleanups from darkside.
 
   29 Jul 2011; Zac Medico <zmedico@gentoo.org> openvpn-2.2.0-r1.ebuild:
   Add ~x86-linux keyword.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index e65d4db6a452..e6167a4b2222 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
 AUX openvpn-2.1.init 4186 RMD160 e71c8cb5abee5d1b7c6485fc910f35822330a853 SHA1 a25b319834208d7ac65b090f85ee500f5e752cdc SHA256 d1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b
 AUX openvpn-2.1_rc13-peercred.patch 251 RMD160 26123eedc9b685fb01de93c1141588f8008562f5 SHA1 8132510ebbd891ec55ef36d0cb8a86cb64a0145f SHA256 e7c2025ec49d3a5c2d95d80ee3c26ed9ccd0587d1664860b3a1eceb2bb7c778f
-AUX openvpn-2.1_rc20-pkcs11.patch 622 RMD160 7d7a41796096ed8f54f646f4ce57cf91b53cad2e SHA1 1748474195bc318c5232290fca5a9d6edaf95e1c SHA256 f972c473645f880c27b3c72379c49183f1e27d352f401d5ea7e734fad99f2d6c
+AUX openvpn-2.1_rc20-pkcs11.patch 634 RMD160 a2471c205730230a7cdbf217eba3b5e042db13b8 SHA1 4fa9aa705ba5b932c30ac48d2993bfe11b79c8da SHA256 afeeb9a8af029a942d96f715133ef6c1376ff1410af01bdb312739b9c5674d86
+AUX openvpn-2.2.2-pkcs11.patch 1184 RMD160 c0b774d92d858afa7a79c54448bb8be61b255880 SHA1 c5df1b8f6a808ec058a27b8541b6c83ef248ea30 SHA256 100d545927d2bc4395f96777f1e5f0e577bb71edf3d452e91885da4229c7cb79
 AUX openvpn.init 1486 RMD160 7005230b0dc3ea400aa22c9a01c2aa034d8baace SHA1 1670c08a2bec65c2e3529aec8d377bad6cb2e0e5 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf
 AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e857053f86ea886dec8e8e6f45174df774 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd
 DIST openvpn-2.1.0_eurephia.patch 2774 RMD160 6d65df5110dff6c9b28262dc40ada15fc30bdf34 SHA1 3b96a0c10f2f1ef586b4f861efb7d048fd51fd44 SHA256 9604f1bcc8d60361795741fc74caa9f0fad3c087e4023ed2d0af0b13c6650896
 DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 RMD160 791db5911d714eabe437bff2aead3d18894e8b28 SHA1 992a54cc831461d78a9155f2d349a481433e211b SHA256 98dc1de039007109c0b24cccca4b9eb9061c391ee219b0e550d73c868015c45d
 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.2.2.tar.gz 911158 RMD160 60990f183bdd46933724b3bf39ba5861ed0258a6 SHA1 992373cdf12e1b50655b13765a6d36a87cfd3ca3 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00
 DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b92399df7d801972e3ca SHA1 d7ce041c4e7f0186091e17a2d178bd12e7a4696d SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21
-EBUILD openvpn-2.1.4.ebuild 5756 RMD160 bb072d99f691c83deb13bf28ebc0b8371289f684 SHA1 d96e70b08ef9ca858bf5f21946db44fd33cf9163 SHA256 0b5de7ae685a6cc5416ec6ba2adecfc51052e19f1d8114c2b4d1fedf2a06653a
+EBUILD openvpn-2.1.4.ebuild 5731 RMD160 0043436908aa35297420df45c1cdb1060f305663 SHA1 9d2fc4af9349434db07d41cabcb5c776de348ad7 SHA256 d4799b8908f3fb42ae5e1ecf3635e8f81bd2ce5110a109dda63e2b0389a3aa87
 EBUILD openvpn-2.2.0-r1.ebuild 5306 RMD160 0124761ec5e2ddd7a42e7277cbb38dbb142c591d SHA1 f71a68b6e28869f08144b08ec5ed3a8ce5346d50 SHA256 8cf58bb8252cb7fb277fc258ef0050e862456129d951444b5e8ad98b1f9dafad
 EBUILD openvpn-2.2.0.ebuild 5499 RMD160 868ffa4c4ea13eaf7e55ad62b7574e8350f92863 SHA1 8d7eb2ed7b7a0df8cdfa02baf4212275a6805f0f SHA256 78d4ded9754e7948a1886f95df8f8c9407c9bc788cff7c15bd550b62e7bf3ad3
-MISC ChangeLog 31866 RMD160 483e2a7e215d13361f2e1fa0fa3be19fe3b083d4 SHA1 704e915e263fea454454b2cf55524fba7c328842 SHA256 322465f769690d3e78c1faa278c44b24bcdff1589d38d7e37bc5778542558ba2
+EBUILD openvpn-2.2.2.ebuild 4827 RMD160 499137a1dba04ad44e6e8ddc04370365dd59fe88 SHA1 0f7ac0daca337f819cf12dd1309b2e84ad90f503 SHA256 c1f93d9dc34e8014b6b1200b975ca1dd7dde1d19d0303f437b241e5539764c92
+MISC ChangeLog 32107 RMD160 52cf8d872bf6a67ef9ca1b042e5e9d02a307ae19 SHA1 c0ea8a2d74ad6f1435fad0e6fe042cb1ceb4f360 SHA256 ab0670b45b20d03a4dda164858df642e84e910f86b2f8c5d7fa05cd1be651fe8
 MISC metadata.xml 808 RMD160 40e1ada3063edc2ae986c33b1ad78d150bcb4523 SHA1 5a8edc3cf4a935ebc255b71327c4e5cc8362f0ed SHA256 06fb4ae72a9389520966db3f497088b9d23de0ef0b1e74d5c2066980bef221a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRUACgkQfXuS5UK5QB1L3wQAqJIv6E77PnTVfdTrzi0dC/YT
-7yEYOniOluWUU2NrAo+u7mr/KN5ya/nEZX6I8TKA/q0N+VP+Mq/wZGxmVwnT/ZBb
-6zjoxIiBdqsjiu3bQwHux/8cvIPMsOeDSEKF8LoLiCfLg9obnWXJdRnwV/50rCiP
-7dx48EJcfCGOp32vwyQ=
-=Opfy
+iEYEAREKAAYFAk8832UACgkQxeMuLWsGW/vlTwCgpYl5X7BY8jzmavM4TngEwM6o
+mroAn0VToh0JD9T6MchwMGC9Y+fXNVQl
+=YK2g
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch
index cebb5927eb0f..6fe37f6810a5 100644
--- a/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch
+++ b/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch
@@ -1,6 +1,6 @@
 diff -ru openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf
---- openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf	2009-10-11 01:04:36.000000000 +0200
-+++ openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf	2009-10-11 01:05:53.000000000 +0200
+--- openvpn-2.1_rc20~/easy-rsa/2.0/openssl-1.0.0.cnf	2009-10-11 01:04:36.000000000 +0200
++++ openvpn-2.1_rc20/easy-rsa/2.0/openssl-1.0.0.cnf	2009-10-11 01:05:53.000000000 +0200
 @@ -283,9 +283,9 @@
  #pkcs11 = pkcs11_section
  
diff --git a/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch
new file mode 100644
index 000000000000..c7115cc357db
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch
@@ -0,0 +1,36 @@
+diff --git a/easy-rsa/2.0/openssl-0.9.8.cnf b/easy-rsa/2.0/openssl-0.9.8.cnf
+index 340b8af..89602a2 100755
+--- a/easy-rsa/2.0/openssl-0.9.8.cnf
++++ b/easy-rsa/2.0/openssl-0.9.8.cnf
+@@ -283,8 +283,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
+ #pkcs11 = pkcs11_section
+ 
+ [ pkcs11_section ]
+-engine_id = pkcs11
+-dynamic_path = /usr/lib/engines/engine_pkcs11.so
+-MODULE_PATH = $ENV::PKCS11_MODULE_PATH
+-PIN = $ENV::PKCS11_PIN
+-init = 0
++#engine_id = pkcs11
++#dynamic_path = /usr/lib/engines/engine_pkcs11.so
++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
++#PIN = $ENV::PKCS11_PIN
++#init = 0
+diff --git a/easy-rsa/2.0/openssl-1.0.0.cnf b/easy-rsa/2.0/openssl-1.0.0.cnf
+index fa258a5..527919d 100755
+--- a/easy-rsa/2.0/openssl-1.0.0.cnf
++++ b/easy-rsa/2.0/openssl-1.0.0.cnf
+@@ -278,8 +278,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
+ #pkcs11 = pkcs11_section
+ 
+ [ pkcs11_section ]
+-engine_id = pkcs11
+-dynamic_path = /usr/lib/engines/engine_pkcs11.so
+-MODULE_PATH = $ENV::PKCS11_MODULE_PATH
+-PIN = $ENV::PKCS11_PIN
+-init = 0
++#engine_id = pkcs11
++#dynamic_path = /usr/lib/engines/engine_pkcs11.so
++#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
++#PIN = $ENV::PKCS11_PIN
++#init = 0
diff --git a/net-misc/openvpn/openvpn-2.1.4.ebuild b/net-misc/openvpn/openvpn-2.1.4.ebuild
index 7416fa75fd52..1b7b9ff418b7 100644
--- a/net-misc/openvpn/openvpn-2.1.4.ebuild
+++ b/net-misc/openvpn/openvpn-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1.4.ebuild,v 1.8 2011/03/21 08:22:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.4.ebuild,v 1.9 2012/02/16 10:50:02 djc Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ IPV6_VERSION="0.4.11"
 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://cloud.github.com/downloads/jjo/openvpn-ipv6/${PN}-2.1.1-ipv6-${IPV6_VERSION}.patch.gz
+			mirror://github/jjo/openvpn-ipv6/${PN}-2.1.1-ipv6-${IPV6_VERSION}.patch.gz
 		)
 		eurephia? (
 			mirror://sourceforge/eurephia/${PN}-2.1.0_eurephia.patch
diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
new file mode 100644
index 000000000000..ef50384bb9c9
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.1 2012/02/16 10:50:02 djc Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs autotools flag-o-matic
+
+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"
+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 ~x86-linux"
+IUSE="examples iproute2 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.2.2-pkcs11.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) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() {
+
+	if use static ; then
+		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
+	fi
+
+	emake
+
+	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)
+		done
+		cd ..
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# install openvpn-plugin.h
+	insinto /usr/include
+	doins openvpn-plugin.h
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# 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-{config-files,keys,scripts} contrib
+	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}" "PREFIX=${EPREFIX}/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
+}