From 30155e8bbfefcd5ca9f2f7b8581fab980926cbed Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 6 Nov 2006 09:52:59 +0000 Subject: [PATCH] die if iproute2 support was requested, but built with the minimal USE flag. Fixes #154191 thanks to Martin Scherer. Package-Manager: portage-2.1.2_rc1-r2 --- net-misc/openvpn/Manifest | 40 ++--- .../openvpn/files/digest-openvpn-2.1_beta15 | 3 - net-misc/openvpn/openvpn-2.1_beta15.ebuild | 144 ------------------ 3 files changed, 16 insertions(+), 171 deletions(-) delete mode 100644 net-misc/openvpn/files/digest-openvpn-2.1_beta15 delete mode 100644 net-misc/openvpn/openvpn-2.1_beta15.ebuild diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest index f07aefa49131..88ca459771c3 100644 --- a/net-misc/openvpn/Manifest +++ b/net-misc/openvpn/Manifest @@ -24,28 +24,23 @@ RMD160 53d88eb11eecf5b3688fbeac4263bdc6bbf0bfdc files/up.sh 1629 SHA256 7078ac2bef9127c3d0ad7a48d62fe54e813aa6ce50289001aac45f209b048a12 files/up.sh 1629 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e -DIST openvpn-2.1_beta15.tar.gz 776778 RMD160 514246341a9979f1aec4c28b203d8a8f2c64408b SHA1 51bc91cb09f9863cf85c5b3c83755d2dc74dab5a SHA256 35daa28523095d637bc694d4e22f9a0e075f9e8b910998ca7bf2576fa9d8cc05 DIST openvpn-2.1_rc1.tar.gz 796620 RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 SHA1 252715678c8d2c5d708267e7947cf89242209f0a SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11 -EBUILD openvpn-2.0.6.ebuild 3861 RMD160 ab1cebb22bd90f5b9f7ad51d61e3c71ac429edd1 SHA1 b5c9bb2b4bfa325ede656cfee0a7e4c14f2f919d SHA256 9b173588e955a0b5da9a4b3a8fb2a5f95566ca210c64d0660b590139bb1879aa -MD5 997c0652659de943e575acd3f553fc51 openvpn-2.0.6.ebuild 3861 -RMD160 ab1cebb22bd90f5b9f7ad51d61e3c71ac429edd1 openvpn-2.0.6.ebuild 3861 -SHA256 9b173588e955a0b5da9a4b3a8fb2a5f95566ca210c64d0660b590139bb1879aa openvpn-2.0.6.ebuild 3861 -EBUILD openvpn-2.0.7.ebuild 3930 RMD160 727879802598fbf0aa9c1973dcbe4a611e7d1277 SHA1 d436cfae590224652f28bfca5035461072945639 SHA256 05b9a79a0e608106febd0b9262182c0c6a028b070fcea61e44e4e7f4a89c544f -MD5 2701531762ef5761383c133524ac7591 openvpn-2.0.7.ebuild 3930 -RMD160 727879802598fbf0aa9c1973dcbe4a611e7d1277 openvpn-2.0.7.ebuild 3930 -SHA256 05b9a79a0e608106febd0b9262182c0c6a028b070fcea61e44e4e7f4a89c544f openvpn-2.0.7.ebuild 3930 -EBUILD openvpn-2.1_beta15.ebuild 4200 RMD160 db8df547c0d81076b307afed291610d051404528 SHA1 ebd1b56f225fa4b88c1be3c3ac56f8ef0bc0aa4d SHA256 bebe76a2d80fc31f1ca9b2ec6b2ff7c80165f44e653bece9ba8e02d7fe4dec42 -MD5 3da39e46eaa4929712f44a47920ee9a0 openvpn-2.1_beta15.ebuild 4200 -RMD160 db8df547c0d81076b307afed291610d051404528 openvpn-2.1_beta15.ebuild 4200 -SHA256 bebe76a2d80fc31f1ca9b2ec6b2ff7c80165f44e653bece9ba8e02d7fe4dec42 openvpn-2.1_beta15.ebuild 4200 -EBUILD openvpn-2.1_rc1.ebuild 4197 RMD160 7df32cc426efc643bcc6adbb97823f8488cdab34 SHA1 f4c4aa5bccd9858cf88c0b4c35d2d27710e66bfa SHA256 c54d22cc16f5f6e86b32ba086d59758f6e88dd191eaf363090b3acd8d8951e93 -MD5 9f508ccd1a44b4201e7ab52a67d848fa openvpn-2.1_rc1.ebuild 4197 -RMD160 7df32cc426efc643bcc6adbb97823f8488cdab34 openvpn-2.1_rc1.ebuild 4197 -SHA256 c54d22cc16f5f6e86b32ba086d59758f6e88dd191eaf363090b3acd8d8951e93 openvpn-2.1_rc1.ebuild 4197 -MISC ChangeLog 15234 RMD160 06afd48fc7291eeff3db8099ea10016ea58b62d4 SHA1 5065eb99422b76178c12ad51d1c7766ed441553c SHA256 b1bb36770c21834283973dac6b5eb5fafcdd073e2667307c6e41e200b488a574 -MD5 736301f3d301850278a18e97db2d6843 ChangeLog 15234 -RMD160 06afd48fc7291eeff3db8099ea10016ea58b62d4 ChangeLog 15234 -SHA256 b1bb36770c21834283973dac6b5eb5fafcdd073e2667307c6e41e200b488a574 ChangeLog 15234 +EBUILD openvpn-2.0.6.ebuild 4118 RMD160 ce11d356741c634e7cd1a3efd6921eb80ae919b4 SHA1 9b0eaf42e6ee9e843c3786abf23daf1bd7dd88b8 SHA256 0529d354151fef7c89b54b42cbcba4db58830fee9c3858a56f0aa13f3c6c8ee0 +MD5 99bd255fe9faf60d8998dfb47ad4d59b openvpn-2.0.6.ebuild 4118 +RMD160 ce11d356741c634e7cd1a3efd6921eb80ae919b4 openvpn-2.0.6.ebuild 4118 +SHA256 0529d354151fef7c89b54b42cbcba4db58830fee9c3858a56f0aa13f3c6c8ee0 openvpn-2.0.6.ebuild 4118 +EBUILD openvpn-2.0.7.ebuild 4186 RMD160 088c8979b61e3d5fe2e92f51f8342b831f2499f3 SHA1 0c5b2dbfed43073e1ca5f8670c726b9f3a64c9f6 SHA256 567d794408d0ff108df399a546138698a4860150c27c11a66c07b835ba3a0050 +MD5 c460c3a340870131c3ef11743a2e3407 openvpn-2.0.7.ebuild 4186 +RMD160 088c8979b61e3d5fe2e92f51f8342b831f2499f3 openvpn-2.0.7.ebuild 4186 +SHA256 567d794408d0ff108df399a546138698a4860150c27c11a66c07b835ba3a0050 openvpn-2.0.7.ebuild 4186 +EBUILD openvpn-2.1_rc1.ebuild 4697 RMD160 f39bb1dc7624a53890721e60ca6b1e4a999f69d1 SHA1 bbc19074f758f0f7afc469d5cd83a423a03f179e SHA256 2969f5a4b9deb5509665c8b8000b0fbf17ee212752590b15b53f9ad28e6ff607 +MD5 7fa89ff5e05f4dd15dd45e231458a16b openvpn-2.1_rc1.ebuild 4697 +RMD160 f39bb1dc7624a53890721e60ca6b1e4a999f69d1 openvpn-2.1_rc1.ebuild 4697 +SHA256 2969f5a4b9deb5509665c8b8000b0fbf17ee212752590b15b53f9ad28e6ff607 openvpn-2.1_rc1.ebuild 4697 +MISC ChangeLog 15502 RMD160 e607728962403be198b57876d130b1606fd480fb SHA1 09fb9ce47ff92e816900cd39fc985c8e0e7fd607 SHA256 81ce66ce59b3fde0f9afe56887950abb6ea446ccebf7237d3b2007fdfe32658d +MD5 0a50bb939fef065957255dd0c5379929 ChangeLog 15502 +RMD160 e607728962403be198b57876d130b1606fd480fb ChangeLog 15502 +SHA256 81ce66ce59b3fde0f9afe56887950abb6ea446ccebf7237d3b2007fdfe32658d ChangeLog 15502 MISC metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 SHA1 23d2975ef0f709dc2e754a5867942e679ee60740 SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6 MD5 62aa0438042b29eba4a6afd971037761 metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 metadata.xml 440 @@ -56,9 +51,6 @@ SHA256 cc2c7e3423898778eb6f6b45bdd4ba18d2a20be748cfa8482eba4ca20c2f80bd files/di MD5 f8b2e9d63bd97591290f11cd6bf8ae2a files/digest-openvpn-2.0.7 241 RMD160 95c02dbccbc539ab7e6c2947ef7d187c3be3b6ad files/digest-openvpn-2.0.7 241 SHA256 a1f31a906a965a6209c5e248a0a36f80423f087dd519d8465503446f23f1446d files/digest-openvpn-2.0.7 241 -MD5 edd5005236b15c7b772b04361e7305e1 files/digest-openvpn-2.1_beta15 256 -RMD160 d0a07032e4976f9cb95e82c0d20471c8da28f971 files/digest-openvpn-2.1_beta15 256 -SHA256 a8696ba07f2abf7c9cab1ee3a0bd28527ccaee5d522635b9d19fb6d79173216d files/digest-openvpn-2.1_beta15 256 MD5 bb7afa7edeacc9e41966e22abf947db5 files/digest-openvpn-2.1_rc1 247 RMD160 3d9aea0ae09e97b06c00e158b96ea1ec46cb4bcf files/digest-openvpn-2.1_rc1 247 SHA256 cb762f95d659bb7f55c64f681b194e75afded7641d68a3528a2d80df14dc1a24 files/digest-openvpn-2.1_rc1 247 diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_beta15 b/net-misc/openvpn/files/digest-openvpn-2.1_beta15 deleted file mode 100644 index 3c069678b83b..000000000000 --- a/net-misc/openvpn/files/digest-openvpn-2.1_beta15 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2ddc1878c99ea3a9b348275338f7d502 openvpn-2.1_beta15.tar.gz 776778 -RMD160 514246341a9979f1aec4c28b203d8a8f2c64408b openvpn-2.1_beta15.tar.gz 776778 -SHA256 35daa28523095d637bc694d4e22f9a0e075f9e8b910998ca7bf2576fa9d8cc05 openvpn-2.1_beta15.tar.gz 776778 diff --git a/net-misc/openvpn/openvpn-2.1_beta15.ebuild b/net-misc/openvpn/openvpn-2.1_beta15.ebuild deleted file mode 100644 index eefebee74d0c..000000000000 --- a/net-misc/openvpn/openvpn-2.1_beta15.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_beta15.ebuild,v 1.5 2006/10/17 14:55:03 uberlord Exp $ - -inherit eutils gnuconfig multilib - -DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes." -SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz" -HOMEPAGE="http://openvpn.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads" - -DEPEND=">=dev-libs/lzo-1.07 - kernel_linux? ( - iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools ) - ) - !minimal? ( pam? ( virtual/pam ) ) - selinux? ( sec-policy/selinux-openvpn ) - ssl? ( >=dev-libs/openssl-0.9.6 )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch - epatch "${FILESDIR}/${PN}"-2.0.7-pam.patch - - gnuconfig_update -} - -src_compile() { - local myconf="" - # We cannot use use_enable with iproute2 as the Makefile stupidly - # enables it with --disable-iproute2 - use iproute2 && myconf="${myconf} --enable-iproute2" - if use minimal ; then - myconf="${myconf} --disable-plugins" - myconf="${myconf} --disable-pkcs11" - fi - - econf ${myconf} \ - $(use_enable passwordsave password-save) \ - $(use_enable ssl) \ - $(use_enable ssl crypto) \ - $(use_enable threads pthread) \ - || die "configure failed" - - use static && sed -e -i '/^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" ]] && continue - [[ ${i} == "auth-pam" ]] && ! use pam && continue - einfo "Building ${i} plugin" - cd "${i}" - emake || die "make failed" - cd .. - done - cd .. - fi -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # install documentation - dodoc AUTHORS ChangeLog PORTS README - - # 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 - newinitd "${FILESDIR}/openvpn-2.1.init" 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 -} -- 2.26.2