From 3c2da7db070d1d6cfcedf11ebe431ce561753c46 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sun, 1 May 2011 10:40:19 +0000 Subject: Fix issues with docdir and remaining eurephia mentions (bug 365487). Package-Manager: portage-2.1.9.46/cvs/Linux x86_64 --- net-misc/openvpn/ChangeLog | 7 +- net-misc/openvpn/Manifest | 9 +- net-misc/openvpn/openvpn-2.2.0-r1.ebuild | 169 +++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 5 deletions(-) create mode 100644 net-misc/openvpn/openvpn-2.2.0-r1.ebuild (limited to 'net-misc/openvpn') diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index d69e06b9995a..30f25c6783f5 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,11 @@ # 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.215 2011/04/30 21:13:19 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.216 2011/05/01 10:40:19 djc Exp $ + +*openvpn-2.2.0-r1 (01 May 2011) + + 01 May 2011; Dirkjan Ochtman +openvpn-2.2.0-r1.ebuild: + Fix issues with docdir and remaining eurephia mentions (bug 365487). 30 Apr 2011; Dirkjan Ochtman openvpn-2.2.0.ebuild: Upgrade to EAPI=4 for 2.2.0, get rid of prepalldocs. diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest index 6d5499e2fdd9..6e75af75383a 100644 --- a/net-misc/openvpn/Manifest +++ b/net-misc/openvpn/Manifest @@ -15,13 +15,14 @@ DIST openvpn-2.1.4.tar.gz 863726 RMD160 3d4be2fe625883598370d74e8f7d9274eb40a636 DIST openvpn-2.2.0.tar.gz 898381 RMD160 32aa52c886d98b6b92150dfc64d3a9c07f6e8b30 SHA1 97e3389814a1bcef5a6d22774534a30e41d48bff SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567 DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b92399df7d801972e3ca SHA1 d7ce041c4e7f0186091e17a2d178bd12e7a4696d SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21 EBUILD openvpn-2.1.4.ebuild 5756 RMD160 bb072d99f691c83deb13bf28ebc0b8371289f684 SHA1 d96e70b08ef9ca858bf5f21946db44fd33cf9163 SHA256 0b5de7ae685a6cc5416ec6ba2adecfc51052e19f1d8114c2b4d1fedf2a06653a +EBUILD openvpn-2.2.0-r1.ebuild 5271 RMD160 55e96c8580846cb73499507cbd45aba892023a14 SHA1 ae6d7cb8a907420f7c142c5aa85e30300eae2d93 SHA256 b58a3ccc4caa88a3ecd57ff51281945e6f0948cbc5288beed299b369c27748d4 EBUILD openvpn-2.2.0.ebuild 5499 RMD160 868ffa4c4ea13eaf7e55ad62b7574e8350f92863 SHA1 8d7eb2ed7b7a0df8cdfa02baf4212275a6805f0f SHA256 78d4ded9754e7948a1886f95df8f8c9407c9bc788cff7c15bd550b62e7bf3ad3 -MISC ChangeLog 31493 RMD160 66bbd8a671c9d916e881af0989bb80996020c1da SHA1 3aa5080484772f637258d19635a7f0a824f9ca2c SHA256 3e058fde8912239928fc8c60481a28a6efa2959ec5f4b5178ebd8bee5989211f +MISC ChangeLog 31672 RMD160 54b9a45840a039a384b458d8074582c151189aec SHA1 a212de393975b73df22bc08d98df8fc049f083da SHA256 e1896b43164d6c62519af76d06eca4450a1a44aef7f2ae3e2fbddd8fd7c0f0f6 MISC metadata.xml 831 RMD160 676787d48f1794d3769c159505c4f50673715fd0 SHA1 df225c398a434e6103716cc15539b6ed2e2cfa3c SHA256 1210ff6c2e7ef7c19c5c33df245be9845678bc8017a5e0477835ded1acbfa385 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk28e3oACgkQxeMuLWsGW/ukzgCgmRjGwaH2LzNmmQhop15i8z6J -w+QAoKHlCIieAedEKXQVRBLF/vJNrFrF -=q9Yg +iEYEARECAAYFAk29OKgACgkQxeMuLWsGW/vdbQCdG4OKRJ8AU3pgMlKzCksDkIDv +RH4AnRXM2nsh0U+xhhw6LP+HCYRAbGcZ +=PjW1 -----END PGP SIGNATURE----- diff --git a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild new file mode 100644 index 000000000000..b022203b78e8 --- /dev/null +++ b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild @@ -0,0 +1,169 @@ +# 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.2.0-r1.ebuild,v 1.1 2011/05/01 10:40:19 djc Exp $ + +EAPI=4 + +inherit eutils multilib toolchain-funcs autotools flag-o-matic + +IPV6_VERSION="2.2RC2-ipv6-20110424-2" +DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes." +SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz + ipv6? ( + http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz + )" +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="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_rc20-pkcs11.patch" + use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch" + sed -i \ + -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \ + -e "s/-shared/-shared \${LDFLAGS}/" \ + plugin/*/Makefile || die "sed failed" + if use ipv6; 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) \ + --docdir="${DESTDIR}/usr/share/doc/${PF}" +} + +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 + + # Install some helper scripts + keepdir /etc/openvpn + 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 + 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 a community-maintained IPv6 patch." + einfo "For more information please visit:" + einfo "http://www.greenie.net/ipv6/openvpn.html" + fi +} -- cgit v1.2.3-65-gdbad