Version bump net-misc/openvpn to 2.1.3.

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

3 files changed, 194 insertions, 2 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 48f29938deba..2aff4cab1776 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.185 2010/09/27 11:32:20 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.186 2010/09/27 11:37:52 djc Exp $
+
+*openvpn-2.1.3 (27 Sep 2010)
+
+  27 Sep 2010; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.1.3.ebuild:
+  Version bump to 2.1.3.
 
   27 Sep 2010; Dirkjan Ochtman <djc@gentoo.org> -openvpn-2.0.9.ebuild,
   -openvpn-2.1_rc15.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 55e91881cb22..60293daf6a76 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -11,8 +11,10 @@ DIST openvpn-2.1.0.tar.gz 879876 RMD160 3a97b9db31bc4828676c49ee18acbd06db53c75a
 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.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_rc22-ipv6-0.4.10.patch.gz 21090 RMD160 34c4c2ebeef129230643ab40998b6546b2c832ea SHA1 41710ada46592507f6a64cf74e78bd06da232ced SHA256 da47f9599c3251bd39e3553f3fdab2581462092e22069de4e4d458c80f383da4
 EBUILD openvpn-2.1.0-r1.ebuild 5585 RMD160 3233f37b1f212150615c69d37e1678371b999172 SHA1 e5828788bf2654074726a47ae8dfe298f32896cb SHA256 de653bcce56d8d29c8d61b733afc629e55bc7e3d3a4622a92307d5b1867e2b1e
 EBUILD openvpn-2.1.2.ebuild 5599 RMD160 f448b4e6b3445643952fa275af72186866e7f5af SHA1 35d49e473f641669d95860708f8770dd70bd5c23 SHA256 14272bfed2fab1c438273574b1afa657ebef3b9dbc7e1bd7bdf51ffddc7abd7a
-MISC ChangeLog 28047 RMD160 ec7f51b073881aea429f5871a83e2209813919ed SHA1 3a71080a0c8074b939311d6a6b06e4a1787472ce SHA256 4d5bc9e970dfad242567df5e8bffc595290a91e204a546e30a44ebcb913e1e45
+EBUILD openvpn-2.1.3.ebuild 5596 RMD160 efa9abebdac4e45aa98db774489e9f8e138fbd37 SHA1 3e2069a0d5c625a6196dfc5fee4b0f2b81bea004 SHA256 15e9a40a765a3a4979d95ec39669d19a21c5dcf711cf83ce3a1fdaab68a9758a
+MISC ChangeLog 28174 RMD160 b7c69741fc8a53f8663a9c94ad2bc8d89b5d9a60 SHA1 124292b84874a80407a9d0528a64081359c06bf6 SHA256 74c3f2ca4a484e2c4652b6c83995b1fb8a8afad43698ad2988f3f55b1097b7d0
 MISC metadata.xml 831 RMD160 676787d48f1794d3769c159505c4f50673715fd0 SHA1 df225c398a434e6103716cc15539b6ed2e2cfa3c SHA256 1210ff6c2e7ef7c19c5c33df245be9845678bc8017a5e0477835ded1acbfa385
diff --git a/net-misc/openvpn/openvpn-2.1.3.ebuild b/net-misc/openvpn/openvpn-2.1.3.ebuild
new file mode 100644
index 000000000000..57ddf9ea9197
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.1.3.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.3.ebuild,v 1.1 2010/09/27 11:37:52 djc Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs autotools flag-o-matic
+
+IPV6_VERSION="0.4.11"
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://openvpn.net/release/${P}.tar.gz
+		ipv6? (
+			http://cloud.github.com/downloads/jjo/openvpn-ipv6/${PN}-2.1.1-ipv6-${IPV6_VERSION}.patch.gz
+		)
+		eurephia? (
+			mirror://sourceforge/eurephia/${PN}-2.1.0_eurephia.patch
+		)"
+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="eurephia 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_rc13-peercred.patch"
+	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
+	use ipv6 && epatch "${WORKDIR}/${PN}-2.1.1-ipv6-${IPV6_VERSION}.patch"
+	use eurephia && epatch "${DISTDIR}/${PN}-2.1.0_eurephia.patch"
+	sed -i \
+		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
+		-e "s/-shared/-shared \${LDFLAGS}/" \
+		plugin/*/Makefile || die "sed failed"
+	eautoreconf
+}
+
+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) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+
+	emake || die "make failed"
+
+	if ! use minimal ; then
+		cd plugin
+		for i in $( ls 2>/dev/null ); do
+			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
+			[[ ${i} == "auth-pam" ]] && ! use pam && continue
+			einfo "Building ${i} plugin"
+			cd "${i}"
+			emake CC=$(tc-getCC) || die "make failed"
+			cd ..
+		done
+		cd ..
+	fi
+}
+
+src_install() {
+	make 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"
+
+	# Empty dir
+	dodir /etc/openvpn
+	keepdir /etc/openvpn
+
+	# Install some helper scripts
+	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
+		prepalldocs
+	fi
+
+	# Install plugins and 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 [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
+		ewarn "WARNING: The openvpn init script has changed"
+		ewarn ""
+	fi
+
+	einfo "The openvpn init script expects to find the configuration file"
+	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	einfo ""
+	einfo "To create more VPNs, simply create a new .conf file for it and"
+	einfo "then create a symlink to the openvpn init script from a link called"
+	einfo "openvpn.newconfname - like so"
+	einfo "   cd /etc/openvpn"
+	einfo "   ${EDITOR##*/} foo.conf"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s openvpn openvpn.foo"
+	einfo ""
+	einfo "You can then treat openvpn.foo as any other service, so you can"
+	einfo "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
+}