Version bump and add patch for bug #293840

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

4 files changed, 230 insertions, 2 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index d78eaeb0d8b4..a774979c2317 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # 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.168 2009/11/15 14:23:26 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.169 2009/12/19 19:44:31 cedk Exp $
+
+*openvpn-2.1.0 (19 Dec 2009)
+
+  19 Dec 2009; Cédric Krier <cedk@gentoo.org> +openvpn-2.1.0.ebuild,
+  +files/openvpn-2.1.0-stdbool.patch:
+  Version bump and add patch for bug #293840
 
 *openvpn-2.1_rc21 (15 Nov 2009)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index ebb7da162859..3c3b88db5976 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -3,6 +3,7 @@ AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d
 AUX openvpn-2.0.7-persistent.patch 1857 RMD160 b3232feb19810ac405cd7af6bb692ed03f9c44c2 SHA1 5ac9d0ff58f56ef771d44bb1dc13322815339e72 SHA256 51de714f2191ac3ea59a7f7c5a0aa1c0bf15ee5d79ace10f2276d415cd0f59e0
 AUX openvpn-2.0.9-pam.patch 1190 RMD160 e914b19aeeb9d9d108394aa61bacd019a3223d4a SHA1 774c1d7fd322249a3ba9d42995640d94093a33b2 SHA256 c485acbb8dae4c9440ebd76a92e2de733faa6320ee6fb2d2408111c802a74b7e
 AUX openvpn-2.0.9-persistent.patch 1851 RMD160 18571bd041024001339fce6dc2472567047c5508 SHA1 a982646053e94f99f514080c2188215a7edcab2a SHA256 60a825023db6b1e1082bc3de4c2efb47e6cf6c5bb73c78de03c29ab8fe79c7ac
+AUX openvpn-2.1.0-stdbool.patch 548 RMD160 057deb0ca697ea437bde8f9ff08d27233e9af5ca SHA1 d762d85a69a40aadcc3e999db7debd5cdc7fc70e SHA256 fc4347f2f4e2dfc2a0ec400031f5329428e78e7dc6205b70070067e8c3b67237
 AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2
 AUX openvpn-2.1.init 4198 RMD160 02564fa325a33aee08c643869f56c9947c27e5fc SHA1 57b9cf1b1dc62b7b1c9940acdd43e890ed5c79a2 SHA256 0c3e385e534992f6329c15b4be97a343b2e69a21d778e2d193297f40a33a13e0
 AUX openvpn-2.1_rc13-peercred.patch 251 RMD160 26123eedc9b685fb01de93c1141588f8008562f5 SHA1 8132510ebbd891ec55ef36d0cb8a86cb64a0145f SHA256 e7c2025ec49d3a5c2d95d80ee3c26ed9ccd0587d1664860b3a1eceb2bb7c778f
@@ -12,6 +13,8 @@ AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e85705
 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
 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.0.tar.gz 879876 RMD160 3a97b9db31bc4828676c49ee18acbd06db53c75a SHA1 dc6ff5b1a14e4edb85ec92930b10e4ee5e8d03b3 SHA256 6634f89575040b1987a1e793b5d6fedb11088007eb150dbdab4a8cfdf3c0686e
+DIST openvpn-2.1.0_eurephia.patch 2774 RMD160 6d65df5110dff6c9b28262dc40ada15fc30bdf34 SHA1 3b96a0c10f2f1ef586b4f861efb7d048fd51fd44 SHA256 9604f1bcc8d60361795741fc74caa9f0fad3c087e4023ed2d0af0b13c6650896
 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
 DIST openvpn-2.1_rc20-ipv6-0.4.9.patch.gz 20193 RMD160 4d822c0b85e7665257ff397159bbab95b49cb6a0 SHA1 ec9acc41dea6b5025137fff007d51fe3139ae357 SHA256 f4b842dd62eae121a7c4b07864939467b6b4cf056d833ea70d11e7d585c9464f
@@ -20,12 +23,14 @@ DIST openvpn-2.1_rc20_eurephia.patch 8070 RMD160 cc4c1ac4c1873e13a453435088451e7
 DIST openvpn-2.1_rc21-ipv6-0.4.10.patch.gz 21032 RMD160 27f10b4e54eddd9aa07ea352d16a1977e4b89832 SHA1 52677168abb32e7adb19b60656a24ee908cbb385 SHA256 6c73c891b38b964d737f84d57dfc37694ec663f0e03701cd3c90f9fbf3280f6d
 DIST openvpn-2.1_rc21.tar.gz 845711 RMD160 2ba73bc6367fa849eb19126dd3bd8bdec9775f9e SHA1 b9a6a6a637fab4b419b8e038d12a42c021d9e34e SHA256 0982f3261be3ff5e834f5fc4ffb086a291f90185d8179d862cb92b303eefa13b
 DIST openvpn-2.1_rc21_eurephia.patch 2774 RMD160 08435165b64fd5fc267f8846c1044ed17ef24cb2 SHA1 f2dfddc3b3e1f95dfeae08c55ec6bdf8b24f6c7c SHA256 94d23c0ccebe6c1341d3291763c6b1a74fc04f80042f2b5b6282ccdf1facc693
+DIST openvpn-2.1_rc22-ipv6-0.4.10.patch.gz 21090 RMD160 34c4c2ebeef129230643ab40998b6546b2c832ea SHA1 41710ada46592507f6a64cf74e78bd06da232ced SHA256 da47f9599c3251bd39e3553f3fdab2581462092e22069de4e4d458c80f383da4
 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 4266 RMD160 21afbb0a8dc307ccfc989f10bb934895f2a9b0c6 SHA1 42aa8365eb6903dc164d1ff4661067ddecef9bf4 SHA256 1281eab97a97d8212659ce494ddb66e8c992ad59a7a2d3adca81a6f033b9e6f2
+EBUILD openvpn-2.1.0.ebuild 5551 RMD160 c56ea0ca750a455179a8ef6302fbe777886cc083 SHA1 256a16edb669da985ca5c77e56c0d7f772510ab3 SHA256 128ac169d1a8f72d110ffdf941f65693ae47ed1ac909fa581725fe214c14dc54
 EBUILD openvpn-2.1_rc15.ebuild 4679 RMD160 f814096d99990986e910c1ecc933df636a586a71 SHA1 8ffbab4ca728b933029f7bf9876e862477401b06 SHA256 66012cc09038cc22dc33962cbe6cea5051e1106141f21b9dad202da51ab2e7db
 EBUILD openvpn-2.1_rc19.ebuild 4685 RMD160 738549b27fc91bab472cdc83589c02cbb718e2a2 SHA1 74da0799d955e8f78f375e044ac32c6a6c41e7bb SHA256 278bf6d40ecc63a0f5a077b4dd1ec726efdfe5919718565a3e2d25646fbca5d5
 EBUILD openvpn-2.1_rc20.ebuild 5430 RMD160 1496406547e3eb871aa9540f535714ebad931fe6 SHA1 3a13d8c306387201411ba5dffdb5355c9373981b SHA256 8b529b7937b50832463dcd50ff642ee4d929f36ebdf655945da8e46768d3c367
 EBUILD openvpn-2.1_rc21.ebuild 5488 RMD160 b59322eafea45860b18cbdabae00727265e192fa SHA1 ead7f1079204379ff77830f178f6efa8dee61df1 SHA256 16e27575161bbd7fc0c5f3347b9876481237ecaa0998ad9e7d3f757da0cc9a93
-MISC ChangeLog 25689 RMD160 87b4fe9a3efdffc97ec0d9617be1326789b4f4e1 SHA1 f4e3ae82318dab36f9f7de4ce581ba560667c20e SHA256 3cd9b20aacf98e9cbb071f90fe8f101ac377cfd7b4b40ffcdcd5facbc331d5e1
+MISC ChangeLog 25873 RMD160 dc08f1d9c04b9ccaed5af9a88b501921c10ffc8d SHA1 e2bb13671d2f54fd86ad8dd2c01d8ef13de08f56 SHA256 8f64224cffeedb700bf87f9006077eb5f63a66f153ca09dbe6db190549a031a8
 MISC metadata.xml 733 RMD160 c6fec2d3dfa62bf6800c0f47760a21e4cb2f0f6a SHA1 22f9b0d1527a69ecba158110f24aa23503ffd2e0 SHA256 8292ee60e6cb2eab0b1e3a7ca9b21cb935b1fbaf858113fa5e7bf4b32026633e
diff --git a/net-misc/openvpn/files/openvpn-2.1.0-stdbool.patch b/net-misc/openvpn/files/openvpn-2.1.0-stdbool.patch
new file mode 100644
index 000000000000..ab91159953f9
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.1.0-stdbool.patch
@@ -0,0 +1,28 @@
+diff -ru openvpn-2.1.0~/basic.h openvpn-2.1.0/basic.h
+--- openvpn-2.1.0~/basic.h	2009-12-19 20:31:43.000000000 +0100
++++ openvpn-2.1.0/basic.h	2009-12-19 20:31:56.000000000 +0100
+@@ -22,22 +22,11 @@
+  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <stdbool.h>
++
+ #ifndef BASIC_H
+ #define BASIC_H
+ 
+-/* bool definitions */
+-#ifndef bool
+-#define bool int
+-#endif
+-
+-#ifndef true
+-#define true 1
+-#endif
+-
+-#ifndef false
+-#define false 0
+-#endif
+-
+ #define BOOL_CAST(x) ((x) ? (true) : (false))
+ 
+ /* size of an array */
diff --git a/net-misc/openvpn/openvpn-2.1.0.ebuild b/net-misc/openvpn/openvpn-2.1.0.ebuild
new file mode 100644
index 000000000000..77ad27ced51b
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.1.0.ebuild
@@ -0,0 +1,189 @@
+# 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.0.ebuild,v 1.1 2009/12/19 19:44:31 cedk Exp $
+
+inherit eutils multilib toolchain-funcs autotools
+
+IPV6_VERSION="0.4.10"
+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_rc22-ipv6-${IPV6_VERSION}.patch.gz
+		)
+		eurephia? (
+			mirror://sourceforge/eurephia/${P}_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 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}"
+
+	epatch "${FILESDIR}/${PN}-2.1_rc13-peercred.patch"
+	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
+	epatch "${FILESDIR}/${PN}-2.1.0-stdbool.patch"
+	use ipv6 && epatch "${WORKDIR}/${PN}-2.1_rc22-ipv6-${IPV6_VERSION}.patch"
+	use eurephia && epatch "${DISTDIR}/${P}_eurephia.patch"
+	sed -i \
+		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
+		-e "s/-shared/-shared \${LDFLAGS}/" \
+		plugin/*/Makefile || die "sed failed"
+	eautoreconf
+}
+
+src_compile() {
+	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 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
+	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
+}