From 9837a3f09dc0fbaa06e1d82f8eea790f03628d70 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 2 Sep 2011 06:58:11 +0000 Subject: [PATCH] Fix the gnutls uselfag to be wrapped around ssl one. Use use_with calls instead of bash conditions. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- net-misc/wget/ChangeLog | 7 +++- net-misc/wget/Manifest | 18 +++----- net-misc/wget/wget-1.13.3-r1.ebuild | 59 -------------------------- net-misc/wget/wget-1.13.3-r2.ebuild | 29 +++++-------- net-misc/wget/wget-1.13.3.ebuild | 65 ----------------------------- 5 files changed, 22 insertions(+), 156 deletions(-) delete mode 100644 net-misc/wget/wget-1.13.3-r1.ebuild delete mode 100644 net-misc/wget/wget-1.13.3.ebuild diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog index b76741e29551..0d4a270acbea 100644 --- a/net-misc/wget/ChangeLog +++ b/net-misc/wget/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/wget # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.143 2011/09/02 05:16:27 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.144 2011/09/02 06:58:11 scarabeus Exp $ + + 02 Sep 2011; Tomáš Chvátal -wget-1.13.3.ebuild, + -wget-1.13.3-r1.ebuild, wget-1.13.3-r2.ebuild: + Fix the gnutls uselfag to be wrapped around ssl one. Use use_with calls + instead of bash conditions. *wget-1.13.3-r2 (02 Sep 2011) diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 53d4efe5718c..f326dab88c9a 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX wget-1.12-CVE-2010-2252.patch 7161 RMD160 5d550714018feaaa1a6af966974b69f3710e2fcf SHA1 e464bafa17ca31e1e4d1e63034cd3517a513bd2e SHA256 aca852c923577ce17ff3050c0eae20bd77defa719aad1d7233407e2b492681a8 AUX wget-1.12-debug-tests.patch 4482 RMD160 6fe85307685aa5ff8821100b26c69f67d7290d7a SHA1 b9e9e1a805c28aec6aa5a3cff9248cddf8f08ac9 SHA256 f043466367bcf895cc03319f5f8d2397e455ced6dd045b150695689df7220f1b @@ -11,19 +11,13 @@ AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a DIST wget-1.13.3.tar.xz 1448908 RMD160 27884a72edbe55bc39a2a99c6517250253074419 SHA1 99e095825da4de51bd62eb479774c24366d59509 SHA256 8d8346caec575a0d4953b5a16dcdf37fedcb739f4d5db85307749996375489ba EBUILD wget-1.12-r3.ebuild 2250 RMD160 904891d523522814845046e62508812d564ee1d2 SHA1 9307dde7e5412a282996a8aee9c0737d790bb36e SHA256 db1f22e3f8f61d94d7702f7d6788bcd1512b8e11acce04d039bbf44eb0bf3310 -EBUILD wget-1.13.3-r1.ebuild 1895 RMD160 79946e4a0cb1767a69d40a05212ee952e56873a2 SHA1 35696df28a943ec72df44c2e2d0311a3cfc332e3 SHA256 96bc4e460295adcf4ee65cbca4070aa0a3d69af3f6ed40bd09fb8010223e6c2d -EBUILD wget-1.13.3-r2.ebuild 2190 RMD160 3460a3a757734674bb3b57268bf9c6426191688d SHA1 7a0235d5dce69b51bba7dbeeb759a4a3aae97984 SHA256 e5ab21fdaccced49918cee1eb54ae131c9d0c1ce0670e8b13b7740ceb509618e -EBUILD wget-1.13.3.ebuild 1851 RMD160 d922866508201be9f80d390d6f41d366497fa85f SHA1 7ac261c9a64b826db68e04f9669dfe068a6eda8f SHA256 344fa1f3aec49d8912a306bb8bbbdcda8e377fe8fd6e0c13ccfe23d727dcf69b -MISC ChangeLog 21508 RMD160 3f96ff7acea9baac701a561c5f53ae3ba6d1cec7 SHA1 e26ed28443e13b0815838b2d3bf3a4a38871cdc7 SHA256 6780592bd8a55eca100a55dbc386c9475da967b1c117fc9f6d7071508f35ff53 +EBUILD wget-1.13.3-r2.ebuild 2050 RMD160 606a67db48500aca1eb74419d21f9a6549c45d8e SHA1 792a999f828a60007747cfa5442b0cf1de664a9d SHA256 3c0df9f93834367d5329df7101b9eef2c5e02ffe3b6ced2539915d3e360b16c4 +MISC ChangeLog 21738 RMD160 01c998ef25fbdc06331f7a64077faae1854d258c SHA1 88ce7dfb6e1fde6febdeb9056e25f2c484041df9 SHA256 649e0c9a43e1861b74602396df9ef509c5800c6e39d07297d334dce8d8859f1b MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOYGaxAAoJEEqz6FtPBkyjNOcH/j6mEsgSU12cCfCVvO/9NdR2 -wt9SWi4SMYqSvS9M3OCzVMhzA9rLX3IOlu2lbCCcr0KjdOlvGQQ9+diuSTdrqmMb -zc2NIzM4umW18+5fIEvQwC4qfjf3Snb1HAguR1cyOy0//GILn8EQNpZfqRRvBj+r -NvzanCW4Dpg8pLdIjfJeO2L/UUqu51Tm4yrs+IvomUX5pUDMYgxChtFotHSSkGhR -JISQNqvF3szuVnTRql6Drk/EPaBxwPRb+SegQVxxBPov8rFHo7Wb331tinnfOynh -/uEFx+zxiVUopsAiehEX9Hd5a0xGwWPNomZqgxObboeG9SNg36oo7b2BZeXaJXk= -=t/PJ +iEUEARECAAYFAk5gfpAACgkQHB6c3gNBRYdKOQCgvfp9TNTFCQ0xM7rQY26daDLD +gz8AmOTJn3ypVHd2sksgOsnRUx5WieM= +=9Nt/ -----END PGP SIGNATURE----- diff --git a/net-misc/wget/wget-1.13.3-r1.ebuild b/net-misc/wget/wget-1.13.3-r1.ebuild deleted file mode 100644 index 47f5663579d3..000000000000 --- a/net-misc/wget/wget-1.13.3-r1.ebuild +++ /dev/null @@ -1,59 +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/wget/wget-1.13.3-r1.ebuild,v 1.2 2011/09/01 18:33:59 grobian Exp $ - -EAPI=4 - -inherit eutils flag-o-matic - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="http://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug idn ipv6 nls ntlm +ssl static" - -RDEPEND="idn? ( net-dns/libidn ) - ssl? ( >=dev-libs/openssl-0.9.6b )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -REQUIRED_USE="ntlm? ( ssl )" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.13-static-link-libz.patch -} - -src_configure() { - # openssl-0.9.8 now builds with -pthread on the BSD's - use elibc_FreeBSD && use ssl && append-ldflags -pthread - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1 - - use static && append-ldflags -static - econf \ - --disable-rpath \ - $(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \ - $(use_enable idn iri) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable debug) -} - -src_install() { - default - - use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${ED}"/etc/wgetrc - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info -} diff --git a/net-misc/wget/wget-1.13.3-r2.ebuild b/net-misc/wget/wget-1.13.3-r2.ebuild index 0d141d5a261d..7693492be00c 100644 --- a/net-misc/wget/wget-1.13.3-r2.ebuild +++ b/net-misc/wget/wget-1.13.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild,v 1.1 2011/09/02 05:16:27 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild,v 1.2 2011/09/02 06:58:11 scarabeus Exp $ EAPI=4 @@ -16,12 +16,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="debug gnutls idn ipv6 nls ntlm +ssl static" RDEPEND="idn? ( net-dns/libidn ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6b ) )" + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( >=dev-libs/openssl-0.9.6b ) + )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" -REQUIRED_USE="ntlm? ( !gnutls ssl )" +REQUIRED_USE="ntlm? ( !gnutls ssl ) + gnutls? ( ssl )" DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) @@ -36,24 +39,12 @@ src_configure() { # the included gnutls -- force ioctl.h to include this header [[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1 - local myconf - if use gnutls ; then - myconf+=" --with-ssl=gnutls" - elif use ssl ; then - myconf+=" --with-ssl=openssl" - else - myconf+=" --without-ssl" - fi - - if use gnutls || use ssl ; then - myconf+=" --enable-opie --enable-digest" - else - myconf+=" --disable-opie --disable-digest" - fi - use static && append-ldflags -static econf \ --disable-rpath \ + $(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) \ + $(use_enable ssl opie) \ + $(use_enable ssl digest) \ $(use_enable idn iri) \ $(use_enable ipv6) \ $(use_enable nls) \ diff --git a/net-misc/wget/wget-1.13.3.ebuild b/net-misc/wget/wget-1.13.3.ebuild deleted file mode 100644 index 0e990eca446c..000000000000 --- a/net-misc/wget/wget-1.13.3.ebuild +++ /dev/null @@ -1,65 +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/wget/wget-1.13.3.ebuild,v 1.1 2011/09/01 09:24:29 chainsaw Exp $ - -EAPI=4 - -inherit eutils flag-o-matic - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="http://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="debug idn ipv6 nls ntlm +ssl static" - -RDEPEND="idn? ( net-dns/libidn ) - ssl? ( >=dev-libs/openssl-0.9.6b )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -REQUIRED_USE="ntlm? ( ssl )" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -src_configure() { - # openssl-0.9.8 now builds with -pthread on the BSD's - use elibc_FreeBSD && use ssl && append-ldflags -pthread - - use static && append-ldflags -static - econf \ - --disable-rpath \ - $(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \ - $(use_enable idn iri) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable ntlm) \ - $(use_enable debug) -} - -src_install() { - default - - use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${ED}"/etc/wgetrc - - sed -i \ - -e "s:/usr/local/etc:${EROOT}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info -} - -pkg_preinst() { - ewarn "The /etc/wget/wgetrc file has been relocated to /etc/wgetrc" - if [[ -e ${EROOT}/etc/wget/wgetrc ]] ; then - if [[ -e ${EROOT}/etc/wgetrc ]] ; then - ewarn "You have both /etc/wget/wgetrc and /etc/wgetrc ... you should delete the former" - else - einfo "Moving /etc/wget/wgetrc to /etc/wgetrc for you" - mv "${EROOT}"/etc/wget/wgetrc "${EROOT}"/etc/wgetrc - rmdir "${EROOT}"/etc/wget 2>/dev/null - fi - fi -} -- 2.26.2