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

(Portage version: 2.1.10.46/cvs/Linux x86_64)

5 files changed, 210 insertions, 6 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/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
+}