Remove old versions, patches.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 30380381)

5 files changed, 6 insertions, 348 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index bee5db61a179..370434e4d391 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.286 2014/04/22 07:45:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.287 2014/04/22 07:54:18 djc Exp $
+
+  22 Apr 2014; Dirkjan Ochtman <djc@gentoo.org>
+  -files/openvpn-2.2.2-pkcs11.patch, -files/openvpn-9999-pkcs11.patch,
+  -openvpn-2.2.2.ebuild, -openvpn-2.3.0.ebuild:
+  Remove old versions, patches.
 
 *openvpn-2.3.3 (22 Apr 2014)
 
diff --git a/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch
deleted file mode 100644
index c7115cc357db..000000000000
--- a/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/easy-rsa/2.0/openssl-0.9.8.cnf b/easy-rsa/2.0/openssl-0.9.8.cnf
-index 340b8af..89602a2 100755
---- a/easy-rsa/2.0/openssl-0.9.8.cnf
-+++ b/easy-rsa/2.0/openssl-0.9.8.cnf
-@@ -283,8 +283,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
-diff --git a/easy-rsa/2.0/openssl-1.0.0.cnf b/easy-rsa/2.0/openssl-1.0.0.cnf
-index fa258a5..527919d 100755
---- a/easy-rsa/2.0/openssl-1.0.0.cnf
-+++ b/easy-rsa/2.0/openssl-1.0.0.cnf
-@@ -278,8 +278,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
diff --git a/net-misc/openvpn/files/openvpn-9999-pkcs11.patch b/net-misc/openvpn/files/openvpn-9999-pkcs11.patch
deleted file mode 100644
index 0df65c7b960b..000000000000
--- a/net-misc/openvpn/files/openvpn-9999-pkcs11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- easy-rsa/2.0/openssl-1.0.0.cnf.orig	2011-10-02 10:16:45.000000000 +0200
-+++ easy-rsa/2.0/openssl-1.0.0.cnf	2011-10-02 10:16:37.000000000 +0200
-@@ -278,8 +278,8 @@
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
---- easy-rsa/2.0/openssl-0.9.8.cnf.orig	2011-10-02 10:16:04.000000000 +0200
-+++ easy-rsa/2.0/openssl-0.9.8.cnf	2011-10-02 10:10:35.000000000 +0200
-@@ -283,8 +283,8 @@
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
deleted file mode 100644
index b9acca8fa1a3..000000000000
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.16 2013/01/06 20:12:40 tove Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs flag-o-matic user
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="examples iproute2 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.2.2-pkcs11.patch"
-	sed -i \
-		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
-		-e "s/-shared/-shared \${LDFLAGS}/" \
-		plugin/*/Makefile || die "sed failed"
-}
-
-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) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-
-	if use static ; then
-		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
-	fi
-
-	emake
-
-	if ! use minimal ; then
-		cd plugin
-		for i in *; do
-			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			emake -C "${i}" CC=$(tc-getCC) TARGET_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN} || die "make failed"
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# install openvpn-plugin.h
-	insinto /usr/include
-	doins openvpn-plugin.h
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	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
-	fi
-
-	# Install plugins and easy-rsa
-	doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/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 [ path_exists -o "${EROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${EROOT}/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
-}
diff --git a/net-misc/openvpn/openvpn-2.3.0.ebuild b/net-misc/openvpn/openvpn-2.3.0.ebuild
deleted file mode 100644
index b46284c2164c..000000000000
--- a/net-misc/openvpn/openvpn-2.3.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.0.ebuild,v 1.15 2013/05/20 17:44:09 ago Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	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 contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf || die
-	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service' || die
-}
-
-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 [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "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 plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.0 no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}