Revision bump. Add gnutls USE flag and fix ssl issues (bugs #381441 and #381513).

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 93 insertions, 7 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 2f2e714e9217..b76741e29551 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,12 @@
 # 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.142 2011/09/01 18:33:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.143 2011/09/02 05:16:27 radhermit Exp $
+
+*wget-1.13.3-r2 (02 Sep 2011)
+
+  02 Sep 2011; Tim Harder <radhermit@gentoo.org> +wget-1.13.3-r2.ebuild:
+  Revision bump. Add gnutls USE flag and fix ssl issues (bugs #381441 and
+  #381513).
 
   01 Sep 2011; Fabian Groffen <grobian@gentoo.org> wget-1.13.3-r1.ebuild:
   Fix compilation on Solaris
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 77f670f63dd4..53d4efe5718c 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
@@ -12,13 +12,18 @@ DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d S
 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 21315 RMD160 d167ab70e4b0808f6807c59b64e51b7ca2132978 SHA1 7eb6f04845a6935491858f24efc670725aac313b SHA256 37c4b4b909c0e4831353577b7600d1f98d365a7ba2d8c045293c08ed011f6d19
+MISC ChangeLog 21508 RMD160 3f96ff7acea9baac701a561c5f53ae3ba6d1cec7 SHA1 e26ed28443e13b0815838b2d3bf3a4a38871cdc7 SHA256 6780592bd8a55eca100a55dbc386c9475da967b1c117fc9f6d7071508f35ff53
 MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5f0B0ACgkQX3X2B8XHTomi5ACdHf8cG5AK9oBzKm6wEyb5CT30
-N3AAn0hdnMT5wqyyNxPophC+Dnu9iLWl
-=n949
+iQEcBAEBCgAGBQJOYGaxAAoJEEqz6FtPBkyjNOcH/j6mEsgSU12cCfCVvO/9NdR2
+wt9SWi4SMYqSvS9M3OCzVMhzA9rLX3IOlu2lbCCcr0KjdOlvGQQ9+diuSTdrqmMb
+zc2NIzM4umW18+5fIEvQwC4qfjf3Snb1HAguR1cyOy0//GILn8EQNpZfqRRvBj+r
+NvzanCW4Dpg8pLdIjfJeO2L/UUqu51Tm4yrs+IvomUX5pUDMYgxChtFotHSSkGhR
+JISQNqvF3szuVnTRql6Drk/EPaBxwPRb+SegQVxxBPov8rFHo7Wb331tinnfOynh
+/uEFx+zxiVUopsAiehEX9Hd5a0xGwWPNomZqgxObboeG9SNg36oo7b2BZeXaJXk=
+=t/PJ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/wget-1.13.3-r2.ebuild b/net-misc/wget/wget-1.13.3-r2.ebuild
new file mode 100644
index 000000000000..0d141d5a261d
--- /dev/null
+++ b/net-misc/wget/wget-1.13.3-r2.ebuild
@@ -0,0 +1,75 @@
+# 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 $
+
+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 gnutls idn ipv6 nls ntlm +ssl static"
+
+RDEPEND="idn? ( net-dns/libidn )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6b ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="ntlm? ( !gnutls 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
+
+	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_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable debug) \
+		${myconf}
+}
+
+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
+}