Version bump

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 170 insertions, 2 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index c886a6957b9c..46ad936ef81a 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.153 2009/06/28 13:31:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.154 2009/08/01 15:04:41 cedk Exp $
+
+*openvpn-2.1_rc19 (01 Aug 2009)
+
+  01 Aug 2009; Cédric Krier <cedk@gentoo.org> +openvpn-2.1_rc19.ebuild:
+  Version bump
 
   28 Jun 2009; Brent Baude <ranger@gentoo.org> openvpn-2.0.9.ebuild:
   Marking openvpn-2.0.9 ppc64 for bug 272546
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 0f6cf2a92174..0e2b97051710 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -12,9 +12,11 @@ DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
 DIST openvpn-2.0.9.tar.gz 669076 RMD160 e2b73071c8d6e9fba93afe46355a35882773d936 SHA1 6e900994bc9e4a14096173931c565ac27b0e7bb5 SHA256 347c551e7c88affc1f4b7a4b715080253c9298dcc512ed29fe8ca5cd26d015d9
 DIST openvpn-2.1_rc15.tar.gz 833429 RMD160 90333139815a1681ab7a6aeba9bc5a005c5a9713 SHA1 a07f9b24947428e905d0c41339b9ed522358c672 SHA256 66cfe347da6ab29ae39c80527714079cdb5699fdf453f7e031dd2ec0172d13a5
+DIST openvpn-2.1_rc19.tar.gz 839955 RMD160 aee1c3f302a8b79d558b80aa9dc236d5501cde84 SHA1 6fad4ea35b466591dc737c47f6a90ec4d9be742e SHA256 d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33
 EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 SHA1 e973ea504b42a90d4de99756a0349d6cee80dea3 SHA256 7fac8d4cecd9595317533ee2d2b79e2c93d350b83cffc63c07168c093ed11e28
 EBUILD openvpn-2.0.7-r2.ebuild 4170 RMD160 ef75f17baaf6ac5932e7f9c5fabce4721a6c82c0 SHA1 cd9a3c4eb180689f9f4196d697a3ce06eae29a86 SHA256 38e1d07c767e64b9c46d3798e75deb73ff7fd583e173a2518230174d4ce1b3a5
 EBUILD openvpn-2.0.9.ebuild 4268 RMD160 ecb1c779963803103e25768279c703cd3c294f69 SHA1 4c623fcd488c37182bd45194d097ac903936d1be SHA256 7ba91adc99838b26e1b936870755265813787216031c926012d89d873d2cbe73
 EBUILD openvpn-2.1_rc15.ebuild 4685 RMD160 cf3185f148156ed31b38b01add65ab72c58cf1ba SHA1 6b541e27630bd86e0ec4ab673ac44c535cf3dcc2 SHA256 eef14548dc0fa88732603b54a7284965166b2cb79cb293427daec6762c9f2a5a
-MISC ChangeLog 23815 RMD160 9ae8ed5bf811c7a52ebe0b11d4c96c39ba13a055 SHA1 00e02b4c7dbb582bb1668bccb3eaa5fb5aa45534 SHA256 c30d33dc51ab97db2449938fa645baf03332dbca0f5524d96a5688541465fa97
+EBUILD openvpn-2.1_rc19.ebuild 4685 RMD160 738549b27fc91bab472cdc83589c02cbb718e2a2 SHA1 74da0799d955e8f78f375e044ac32c6a6c41e7bb SHA256 278bf6d40ecc63a0f5a077b4dd1ec726efdfe5919718565a3e2d25646fbca5d5
+MISC ChangeLog 23935 RMD160 dc53c432018ffc7c8d999087071e7a6fdcf92164 SHA1 f6f1464365cf35af9f22747126d829809ce44b34 SHA256 99eec8b2003ab01137d86556d9f49f19f194ed440972d2ba925efb56ecb1412c
 MISC metadata.xml 681 RMD160 38d44e8ca26011bef8b9072c41b7797dd32184bf SHA1 304f109764fe69865bf4ea490b8d3a6839a5ab9e SHA256 6f6898ac4534eeed083629ee9c581da086a65b728af16306d3a39edf100e7911
diff --git a/net-misc/openvpn/openvpn-2.1_rc19.ebuild b/net-misc/openvpn/openvpn-2.1_rc19.ebuild
new file mode 100644
index 000000000000..af1a1ab01b0e
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.1_rc19.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc19.ebuild,v 1.1 2009/08/01 15:04:41 cedk Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://openvpn.net/release/${P}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="examples iproute2 minimal pam passwordsave selinux ssl static pkcs11 threads userland_BSD"
+
+DEPEND=">=dev-libs/lzo-1.07
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2 ) !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}"
+
+pkg_setup() {
+	if use iproute2 ; then
+		if built_with_use sys-apps/iproute2 minimal ; then
+			eerror "iproute2 support requires that sys-apps/iproute2 was not"
+			eerror "built with the minimal USE flag"
+			die "iproute2 support not available"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
+		-e "s/-shared/-shared \${LDFLAGS}/" \
+		plugin/*/Makefile || die "sed failed"
+}
+
+src_compile() {
+	local myconf=""
+
+	if use minimal ; then
+		myconf="${myconf} --disable-plugins"
+		myconf="${myconf} --disable-pkcs11"
+	else
+		myconf="$(use_enable pkcs11)"
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.1_rc13-peercred.patch"
+	econf ${myconf} \
+		$(use_enable passwordsave password-save) \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		$(use_enable iproute2) \
+		|| die "configure failed"
+
+	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
+	# 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
+}