Clean up cruft from old versions.

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

5 files changed, 7 insertions, 268 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 9984a6ff9c6a..c8df421578ce 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.194 2010/10/19 07:32:37 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.195 2010/10/19 07:40:27 djc Exp $
+
+  19 Oct 2010; Dirkjan Ochtman <djc@gentoo.org>
+  -files/openvpn-2.0.9-pam.patch, -files/openvpn-2.0.9-persistent.patch,
+  -openvpn-2.1.0-r1.ebuild:
+  Clean up cruft from old versions.
 
   19 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.1.3.ebuild:
   Update ebuild to use new path_exists function.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 3f4d1129786c..9e637d10ef84 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,20 +1,15 @@
 AUX down.sh 943 RMD160 db43a525c9eb2ccb538e938e0b7f4359af22e4de SHA1 261acc68a24108526345a7d117bba15dbcebaa6e SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7
-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 4186 RMD160 e71c8cb5abee5d1b7c6485fc910f35822330a853 SHA1 a25b319834208d7ac65b090f85ee500f5e752cdc SHA256 d1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b
 AUX openvpn-2.1_rc13-peercred.patch 251 RMD160 26123eedc9b685fb01de93c1141588f8008562f5 SHA1 8132510ebbd891ec55ef36d0cb8a86cb64a0145f SHA256 e7c2025ec49d3a5c2d95d80ee3c26ed9ccd0587d1664860b3a1eceb2bb7c778f
 AUX openvpn-2.1_rc20-pkcs11.patch 622 RMD160 7d7a41796096ed8f54f646f4ce57cf91b53cad2e SHA1 1748474195bc318c5232290fca5a9d6edaf95e1c SHA256 f972c473645f880c27b3c72379c49183f1e27d352f401d5ea7e734fad99f2d6c
 AUX openvpn.init 1486 RMD160 7005230b0dc3ea400aa22c9a01c2aa034d8baace SHA1 1670c08a2bec65c2e3529aec8d377bad6cb2e0e5 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf
 AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e857053f86ea886dec8e8e6f45174df774 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd
-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.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 5586 RMD160 bc34ac566a4e16b03b74fb92731bc8d0423fdbb9 SHA1 697047fe65fc186fd9d1749c42638e1c79f61acc SHA256 04509ed3cd6afc18a52056035e1dfeda6d1e3c82054405c840b95aff05594766
 EBUILD openvpn-2.1.3.ebuild 5646 RMD160 31f97e712820f440ddf1b2260c452c18dcb34d57 SHA1 2d17a34c774bdaa2a15e55ef0979cc29015fd886 SHA256 e43e11ee42a175567f625330db9d81654fcab2ec1565d0c73c10b929c5369e2a
-MISC ChangeLog 29039 RMD160 b0c263e979dd3504f338c67836069bea6a956945 SHA1 bb38eae7b2728da02b88206fe6ca3b278ef77695 SHA256 f628de2eac4c3742bda421328e1090e9ab7e32f6358f572a1aeda06e77b903bc
+MISC ChangeLog 29225 RMD160 de03d473d55d1b84195e37632f3e23691fd7a9f2 SHA1 3643a4444efb3e5f63a5626bd62402ce506a8a84 SHA256 1ad1129c396df4d3d7b04ef1f3ccd0bde149cc9670d081634f38e4ff2f6b43d9
 MISC metadata.xml 831 RMD160 676787d48f1794d3769c159505c4f50673715fd0 SHA1 df225c398a434e6103716cc15539b6ed2e2cfa3c SHA256 1210ff6c2e7ef7c19c5c33df245be9845678bc8017a5e0477835ded1acbfa385
diff --git a/net-misc/openvpn/files/openvpn-2.0.9-pam.patch b/net-misc/openvpn/files/openvpn-2.0.9-pam.patch
deleted file mode 100644
index 38be232b8dd3..000000000000
--- a/net-misc/openvpn/files/openvpn-2.0.9-pam.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index e042124ea497..000000000000
--- a/net-misc/openvpn/files/openvpn-2.0.9-persistent.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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.1.0-r1.ebuild b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
deleted file mode 100644
index 98ca4830083b..000000000000
--- a/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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.0-r1.ebuild,v 1.12 2010/09/07 02:17:15 josejx Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs autotools flag-o-matic
-
-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 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_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_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
-}