Version bump

Package-Manager: portage-2.1.4.4

6 files changed, 233 insertions, 4 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 25e6dcb02e2f..d33c708c3c99 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.134 2008/05/13 07:55:07 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.135 2008/05/14 17:02:24 cedk Exp $
+
+*openvpn-2.0.9 (14 May 2008)
+
+  14 May 2008; Cédric Krier <cedk@gentoo.org>
+  +files/openvpn-2.0.9-pam.patch, +files/openvpn-2.0.9-persistent.patch,
+  +openvpn-2.0.9.ebuild:
+  Version bump
 
   13 May 2008; Cédric Krier <cedk@gentoo.org> metadata.xml:
   Take ownership, after Alon Bar-Lev left
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 452cbffcc891..a6836be06afa 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,6 +1,8 @@
 AUX down.sh 943 RMD160 db43a525c9eb2ccb538e938e0b7f4359af22e4de SHA1 261acc68a24108526345a7d117bba15dbcebaa6e SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7
 AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d SHA1 09c362da6cea1d6f7e6ff060a4e92493a5b34cba SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92
 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.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2
 AUX openvpn-2.1.init 4084 RMD160 1f815a77c3d89ee55d568e8dce582020fd68fc39 SHA1 811db5279b360f8d95bfbcd460a85bbf2c65ecbf SHA256 d844103cd67717ce505e191a3b4a1835b7fafbb856de7540791cf0e5fe017ec9
 AUX openvpn-2.1_rc7-tap.patch 1470 RMD160 5f8ac08398ed7060dd287d030b25126a950ec987 SHA1 28ddec126c8ae121ba50888f32a56cbdfcfde5cd SHA256 272d0c03720c092756e3876517b3736c3f94640ab7e24fa322f5f6e8b6ff5282
@@ -8,9 +10,11 @@ AUX openvpn.init 1488 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 SHA1 48aab
 AUX up.sh 2560 RMD160 34c2f0845a2c3b2eebb20da5a5c316e81cd1ef5a SHA1 d7026eeb7586fb931e5f938ca00fcc63c63923ad SHA256 3a7cedba5909fa06d0eb36b3426f0e5bc21bdc28943beaaa241ab651b4388218
 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_rc7.tar.gz 787379 RMD160 67e80d7bfb554046c71c95ec15d478504057f903 SHA1 f9f57a8ef3af8ab51924784ad2aab5d5f5798581 SHA256 c07fcbc41465bf508caff70dcc4238b8c95e9b2f35bec7bf891f7164027ecbf8
 EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 SHA1 e973ea504b42a90d4de99756a0349d6cee80dea3 SHA256 7fac8d4cecd9595317533ee2d2b79e2c93d350b83cffc63c07168c093ed11e28
 EBUILD openvpn-2.0.7-r2.ebuild 4174 RMD160 d4917068d83748cb9667f1fdb2f6a912f9cc7fdd SHA1 4f6388a0271bae7c53533eb9e3148575b43edd2e SHA256 51f9ac56227e3425f5074bf4b59ecf53663195ac2e0426431da41552ba46701e
+EBUILD openvpn-2.0.9.ebuild 4174 RMD160 3eb65eeccfdc37f5ccd718e5d4934e4d60672061 SHA1 559acebad7131994ccb81e520ca08efefaa918fb SHA256 67d348cda2c182f7ed6f4c69b102e0ae3c0c2ee4e82c2dea679a4a1480c371f1
 EBUILD openvpn-2.1_rc7-r2.ebuild 4393 RMD160 a2612d19bb8b1ac21ad49505a740d7c0a4131196 SHA1 6064a4d5beda4a532b77c85119a7581e1434277c SHA256 926d1331d835501c5cf69246deb32113b8bf1bb3e570d3cbd49ff08152d30dd2
-MISC ChangeLog 21335 RMD160 82a704ec815dbaf79f75108ea4e2785ddaa64e8d SHA1 f48ee5ab41622c1eefaa84020584061b895f95e4 SHA256 09aa2ebe614b6a69284acc3db1ad9135203743dcc73d41a90ce7954a7adde7aa
+MISC ChangeLog 21526 RMD160 7b45022092ec4884b0019dc258c2e277db25329e SHA1 8bca1f2a3c27cff5c40d0e80b3e042fe8d129e6f SHA256 d7e5ef82ebf1ec7d68f90819af25c7743d27ac780704ea7068d22183151e5f54
 MISC metadata.xml 438 RMD160 45162891886be224d80f5a3a17bd6f62110f8679 SHA1 52bef0704923f89986a444fd659fb3c626eeb84c SHA256 0b67e21edfd6ca41f631a222b2201da124925feeb398396fe1e57d5efbe290e4
diff --git a/net-misc/openvpn/files/openvpn-2.0.9-pam.patch b/net-misc/openvpn/files/openvpn-2.0.9-pam.patch
new file mode 100644
index 000000000000..38be232b8dd3
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.0.9-pam.patch
@@ -0,0 +1,32 @@
+diff -ru openvpn-2.0.9~/plugin/auth-pam/Makefile openvpn-2.0.9/plugin/auth-pam/Makefile
+--- openvpn-2.0.9~/plugin/auth-pam/Makefile	2008-05-13 23:21:30.000000000 +0200
++++ openvpn-2.0.9/plugin/auth-pam/Makefile	2008-05-13 23:21:46.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ # If PAM modules are not linked against libpam.so, set DLOPEN_PAM to 1. This
+ # must be done on SUSE 9.1, at least.
+-DLOPEN_PAM=1
++DLOPEN_PAM=0
+ 
+ ifeq ($(DLOPEN_PAM),1)
+ 	LIBPAM=-ldl
+diff -ru openvpn-2.0.9~/plugin/auth-pam/pamdl.c openvpn-2.0.9/plugin/auth-pam/pamdl.c
+--- openvpn-2.0.9~/plugin/auth-pam/pamdl.c	2008-05-13 23:21:30.000000000 +0200
++++ openvpn-2.0.9/plugin/auth-pam/pamdl.c	2008-05-13 23:21:46.000000000 +0200
+@@ -10,7 +10,6 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ #include <security/pam_appl.h>
+-#include <security/_pam_macros.h>
+ 
+ #include "pamdl.h"
+ 
+@@ -74,7 +73,7 @@
+     return real_pam_set_item(pamh, item_type, item);
+ }
+ 
+-int pam_get_item(const pam_handle_t *pamh, int item_type, const void **item)
++int pam_get_item(pam_handle_t *pamh, int item_type, const void **item)
+ {
+     int (*real_pam_get_item)(const pam_handle_t *, int, const void **);
+     RESOLVE_PAM_FUNCTION(pam_get_item, int,
diff --git a/net-misc/openvpn/files/openvpn-2.0.9-persistent.patch b/net-misc/openvpn/files/openvpn-2.0.9-persistent.patch
new file mode 100644
index 000000000000..e042124ea497
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.0.9-persistent.patch
@@ -0,0 +1,44 @@
+diff -ru openvpn-2.0.9~/init.c openvpn-2.0.9/init.c
+--- openvpn-2.0.9~/init.c	2008-05-13 23:21:30.000000000 +0200
++++ openvpn-2.0.9/init.c	2008-05-13 23:22:51.000000000 +0200
+@@ -347,7 +347,8 @@
+ 	msg (M_FATAL|M_OPTERR,
+ 	     "options --mktun or --rmtun should only be used together with --dev");
+       tuncfg (options->dev, options->dev_type, options->dev_node,
+-	      options->tun_ipv6, options->persist_mode);
++	      options->tun_ipv6, options->persist_mode,
++	      &options->tuntap_options);
+       return true;
+     }
+ #endif
+diff -ru openvpn-2.0.9~/tun.c openvpn-2.0.9/tun.c
+--- openvpn-2.0.9~/tun.c	2008-05-13 23:21:30.000000000 +0200
++++ openvpn-2.0.9/tun.c	2008-05-13 23:22:51.000000000 +0200
+@@ -1095,13 +1095,14 @@
+ #ifdef TUNSETPERSIST
+ 
+ void
+-tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode)
++tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options)
+ {
+   struct tuntap *tt;
+ 
+   ALLOC_OBJ (tt, struct tuntap);
+   clear_tuntap (tt);
+   tt->type = dev_type_enum (dev, dev_type);
++  tt->options = *options;
+   open_tun (dev, dev_type, dev_node, ipv6, tt);
+   if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0)
+     msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev);
+diff -ru openvpn-2.0.9~/tun.h openvpn-2.0.9/tun.h
+--- openvpn-2.0.9~/tun.h	2008-05-13 23:21:30.000000000 +0200
++++ openvpn-2.0.9/tun.h	2008-05-13 23:22:51.000000000 +0200
+@@ -194,7 +194,7 @@
+ int read_tun (struct tuntap* tt, uint8_t *buf, int len);
+ 
+ void tuncfg (const char *dev, const char *dev_type, const char *dev_node,
+-	     bool ipv6, int persist_mode);
++	     bool ipv6, int persist_mode, const struct tuntap_options *options);
+ 
+ const char *guess_tuntap_dev (const char *dev,
+ 			      const char *dev_type,
diff --git a/net-misc/openvpn/openvpn-2.0.9.ebuild b/net-misc/openvpn/openvpn-2.0.9.ebuild
new file mode 100644
index 000000000000..94fb8a2856c7
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.0.9.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.9.ebuild,v 1.1 2008/05/14 17:02:24 cedk Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
+RESTRICT="!ssl? ( test )"
+
+RDEPEND=">=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 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+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}/${P}-pam.patch"
+	epatch "${FILESDIR}/${P}-persistent.patch"
+
+}
+
+src_compile() {
+	local myconf=""
+	# We cannot use use_enable with iproute2 as the Makefile stupidly
+	# enables it with --disable-iproute2
+	use iproute2 && myconf="${myconf} --enable-iproute2"
+	use minimal && myconf="${myconf} --disable-plugins"
+
+	econf ${myconf} \
+		$(use_enable passwordsave password-save) \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		|| 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" ]] && continue
+			[[ ${i} == "auth-pam" ]] && ! use pam && continue
+			einfo "Building ${i} plugin"
+			cd "${i}"
+			emake || die "make failed"
+			cd ..
+		done
+		cd ..
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# Empty dir
+	dodir /etc/openvpn
+	keepdir /etc/openvpn
+
+	# Install the init script
+	newinitd "${FILESDIR}/openvpn.init" 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
+		exeinto "/usr/share/${PN}/easy-rsa"
+		doexe *-* pkitool
+		insinto "/usr/share/${PN}/easy-rsa"
+		doins README openssl.cnf vars
+		cd ../..
+
+		exeinto "/usr/$(get_libdir)/${PN}"
+		doexe plugin/*/*.so
+	fi
+}
+
+pkg_postinst() {
+	ewarn "WARNING: The openvpn init script has changed"
+	ewarn ""
+	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 ! use minimal ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+	einfo ""
+	einfo "It is recommended that you create your tun/tap interfaces using"
+	einfo "the net.tun0/net.tap0 scripts provided by baselayout instead of"
+	einfo "using the 'server' directive in openvpn configuration files."
+	einfo "This will insure that the interface really is up after openvpn"
+	einfo "starts."
+	einfo "Note that you cannot use net.tun0/net.tap0 and the server option,"
+	einfo "otherwise openvpn will not start."
+	ebeep
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 9a364ddf6450..12d0113bb422 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -5,6 +5,6 @@ AUX rdesktop-keymap-sk 1561 RMD160 0f8378b6eadd549ef735d92887d1c51003bbfbdf SHA1
 DIST rdesktop-1.5.0.tar.gz 245137 RMD160 350e08166d0b7620b4ed9c6594addae7ec53d15a SHA1 e3086bf865191eed41631813125f482e279c7f3d SHA256 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
 DIST rdesktop-1.6.0.tar.gz 284728 RMD160 cf604cd1bc0707b485deb653efa3e47e21fabc4c SHA1 b8bfd03d4640d285a0aee5b3fb199a47cb4225f2 SHA256 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
 EBUILD rdesktop-1.5.0-r3.ebuild 1783 RMD160 4791d17927c0183285c50bdf6068be3e9ce21228 SHA1 57993a663c6012095915206fef182ae803b3bc41 SHA256 9feb43424214f14bf5512682a5233537d09430c2dfb4a7b833f1186ff51b9f5f
-EBUILD rdesktop-1.6.0.ebuild 1681 RMD160 e62574de390f82be598f0aba4ee43e56e1b99784 SHA1 fdecfe63180a67cf834bda6a8652ff72ddb6f506 SHA256 9adeb125586c32329868b61ab1b51043cb78f7fd0b6768869a1199925f1c0022
-MISC ChangeLog 13821 RMD160 a8da942b917ab8c6e0acfcf379957bfe3b4a1cdb SHA1 065ff4a70b86a28140fe5a742eddf47adc7777a6 SHA256 63ef8a85c6a60f59b6fd452b31bbc5a465c4a3e68435773e73b98243d3abda48
+EBUILD rdesktop-1.6.0.ebuild 1684 RMD160 3d24324f9eb4e8f461335de0392bf4acc122125c SHA1 ff7f38c2d5eb4d966f07f6e9212032010ea232f9 SHA256 54d789d51190748d3901765664add483f2010cc14483ec8098d35018c361395a
+MISC ChangeLog 13929 RMD160 503b731dd7ebb371b9b2901da16a5a1d9e08fb59 SHA1 23dbb137f8e8a7019631d1f2fb899b98cfb59152 SHA256 e7a75204c8d8c04857378f4b39212980a8f9d5e0e97d89227c0eb9171394b159
 MISC metadata.xml 576 RMD160 6d167378b556f6054d016c0677669fc789cbe090 SHA1 f68faeded75f10b8933892e72abdddc554dd52a4 SHA256 d85f18c5df2596c0226aa08778d6881cc2c4616dcde9b23ca99cbca62caa5f45