Clean up cruft from old versions.

(Portage version: 2.1.9.19/cvs/Linux x86_64)

4 files changed, 6 insertions, 262 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/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
-}