diff options
author | Dirkjan Ochtman <djc@gentoo.org> | 2011-04-30 21:04:57 +0000 |
---|---|---|
committer | Dirkjan Ochtman <djc@gentoo.org> | 2011-04-30 21:04:57 +0000 |
commit | a1ab141fac0bcade6b7e3f0729f84ad7f18f7002 (patch) | |
tree | df3a36f14eaa3ede60ae017902f7c5de067c71ee /net-misc | |
parent | Version bump openvpn to 2.2.0, add ipv6 payload support (bug 335563). (diff) | |
download | gentoo-2-a1ab141fac0bcade6b7e3f0729f84ad7f18f7002.tar.gz gentoo-2-a1ab141fac0bcade6b7e3f0729f84ad7f18f7002.tar.bz2 gentoo-2-a1ab141fac0bcade6b7e3f0729f84ad7f18f7002.zip |
Remove some old versions.
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/openvpn/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/openvpn/openvpn-2.1.2.ebuild | 185 | ||||
-rw-r--r-- | net-misc/openvpn/openvpn-2.1.3.ebuild | 185 |
3 files changed, 5 insertions, 371 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index acba420e1f06..f00dc1a3fdff 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openvpn # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.213 2011/04/30 21:02:53 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.214 2011/04/30 21:04:57 djc Exp $ + + 30 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> -openvpn-2.1.2.ebuild, + -openvpn-2.1.3.ebuild: + Remove old versions. *openvpn-2.2.0 (30 Apr 2011) diff --git a/net-misc/openvpn/openvpn-2.1.2.ebuild b/net-misc/openvpn/openvpn-2.1.2.ebuild deleted file mode 100644 index a9f8ecaa31c8..000000000000 --- a/net-misc/openvpn/openvpn-2.1.2.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.2.ebuild,v 1.9 2010/10/19 02:23:27 jer Exp $ - -EAPI=2 - -inherit eutils multilib toolchain-funcs autotools flag-o-matic - -IPV6_VERSION="0.4.11" -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.1-ipv6-${IPV6_VERSION}.patch.gz - ) - eurephia? ( - mirror://sourceforge/eurephia/${PN}-2.1.0_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.1-ipv6-${IPV6_VERSION}.patch" - use eurephia && epatch "${DISTDIR}/${PN}-2.1.0_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 -} diff --git a/net-misc/openvpn/openvpn-2.1.3.ebuild b/net-misc/openvpn/openvpn-2.1.3.ebuild deleted file mode 100644 index 882a37b907cc..000000000000 --- a/net-misc/openvpn/openvpn-2.1.3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.3.ebuild,v 1.12 2011/01/10 19:30:03 ranger Exp $ - -EAPI=2 - -inherit eutils multilib toolchain-funcs autotools flag-o-matic - -IPV6_VERSION="0.4.11" -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.1-ipv6-${IPV6_VERSION}.patch.gz - ) - eurephia? ( - mirror://sourceforge/eurephia/${PN}-2.1.0_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.1-ipv6-${IPV6_VERSION}.patch" - use eurephia && epatch "${DISTDIR}/${PN}-2.1.0_eurephia.patch" - sed -i \ - -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \ - -e "s/-shared/-shared \${LDFLAGS}/" \ - plugin/*/Makefile || die "sed failed" - if use ipv6 || use eurephia; then - eautoreconf - fi -} - -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) -} - -src_compile() { - - if use static ; then - sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed" - fi - - emake || die "make failed" - - 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) || die "make failed" - done - cd .. - fi -} - -src_install() { - emake 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" || die "rmdir failed" - keepdir /etc/openvpn - - # Install some helper scripts - exeinto /etc/openvpn - doexe "${FILESDIR}/up.sh" || die "doexe failed" - doexe "${FILESDIR}/down.sh" || die "doexe failed" - - # Install the init script and config file - newinitd "${FILESDIR}/${PN}-2.1.init" openvpn || die "newinitd failed" - newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn || die "newconfd failed" - - # 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 - doenvd "${FILESDIR}/65openvpn" # config-protect 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 [ 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 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 -} |