bump(net-misc/wget): sync with upstream

Fixes certificate errors like:

    Resolving commondatastorage.googleapis.com... 74.125.224.139, 74.125.224.138, 74.125.224.140, ...
    Connecting to commondatastorage.googleapis.com|74.125.224.139|:443... connected.
    ERROR: certificate common name `*.googleusercontent.com' doesn't match requested host name `commondatastorage.googleapis.com'.
This commit is contained in:
Michael Marineau 2014-06-27 10:52:40 -07:00
parent ce6e69ca2b
commit 28ce5fba5d
23 changed files with 1651 additions and 711 deletions

View File

@ -1,13 +0,0 @@
DEFINED_PHASES=configure install preinst prepare setup
DEPEND=idn? ( net-dns/libidn ) ssl? ( >=dev-libs/openssl-0.9.6b ) nls? ( sys-devel/gettext )
DESCRIPTION=Network utility to retrieve files from the WWW
EAPI=2
HOMEPAGE=http://www.gnu.org/software/wget/
IUSE=debug idn ipv6 nls ntlm +ssl static
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3
RDEPEND=idn? ( net-dns/libidn ) ssl? ( >=dev-libs/openssl-0.9.6b )
SLOT=0
SRC_URI=mirror://gnu/wget/wget-1.12.tar.bz2
_eclasses_=eutils 4878e7f88afc0ba0866ac112190b0fd4 flag-o-matic 65cef1287b9d62b1a0f180765d1e0c69 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=6b64be6246d7bd41855ee3700d748bff

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=configure install prepare
DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Network utility to retrieve files from the WWW
EAPI=4
HOMEPAGE=http://www.gnu.org/software/wget/
IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
SLOT=0
SRC_URI=mirror://gnu/wget/wget-1.14.tar.xz
_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 4878e7f88afc0ba0866ac112190b0fd4 flag-o-matic 65cef1287b9d62b1a0f180765d1e0c69 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing 89580da5ec17ad687fcde876c542b91e toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=f34b7e4830567ce547e3eb2cd477844f

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=configure install prepare
DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Network utility to retrieve files from the WWW
EAPI=4
HOMEPAGE=http://www.gnu.org/software/wget/
IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
SLOT=0
SRC_URI=mirror://gnu/wget/wget-1.14.tar.xz
_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 4878e7f88afc0ba0866ac112190b0fd4 flag-o-matic 65cef1287b9d62b1a0f180765d1e0c69 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing 89580da5ec17ad687fcde876c542b91e toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=68b25a442103219884ca73be0eb3db4f

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=configure install prepare
DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Network utility to retrieve files from the WWW
EAPI=4
HOMEPAGE=http://www.gnu.org/software/wget/
IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
SLOT=0
SRC_URI=mirror://gnu/wget/wget-1.15.tar.xz
_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 4878e7f88afc0ba0866ac112190b0fd4 flag-o-matic 65cef1287b9d62b1a0f180765d1e0c69 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing 89580da5ec17ad687fcde876c542b91e toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=305083ecbb33d11f44c09b35e6d83081

View File

@ -0,0 +1,744 @@
# ChangeLog for net-misc/wget
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.183 2014/05/16 10:59:20 polynomial-c Exp $
*wget-1.15-r1 (16 May 2014)
16 May 2014; Lars Wendler <polynomial-c@gentoo.org> -wget-1.15.ebuild,
+wget-1.15-r1.ebuild, files/wget-1.15-pkg-config.patch:
Fixed compilation with zlib, uuid, pcre and/or openssl (bug #510414). Removed
old.
*wget-1.15 (23 Jan 2014)
23 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> +wget-1.15.ebuild,
+files/wget-1.15-pkg-config.patch, +files/wget-1.15-test_fix.patch:
Version bump.
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> wget-1.14-r1.ebuild,
wget-1.14.ebuild:
Add arm64 love.
13 Jan 2014; Mike Frysinger <vapier@gentoo.org> wget-1.14-r1.ebuild:
Cut over to new configure flags rather than set ac_cv_xxx vars directly
#497896 by James Le Cuirot.
04 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -wget-1.12-r3.ebuild,
-wget-1.13.3-r2.ebuild, -wget-1.13.4.ebuild, -wget-1.13.4-r1.ebuild,
-files/wget-1.12-CVE-2010-2252.patch, -files/wget-1.12-debug-tests.patch,
-files/wget-1.12-linking.patch, -files/wget-1.12-sae.patch,
-files/wget-1.12-sni.patch, -files/wget-1.13.4-no-gets.patch,
-files/wget-1.13-static-link-libz.patch, -files/wgetrc-ipv6:
Removed old versions and files.
*wget-1.14-r1 (23 Dec 2013)
23 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+files/wget-1.14-gnutls-ssl.patch, +files/wget-1.14-pkg-config.patch,
+files/wget-1.14-wgetrc.patch, +wget-1.14-r1.ebuild:
Add fix from upstream for gnutls/ssl connection rejections #479948 by Scott
Bertilson. Document user agent issue in /etc/wgetrc wrt portage fetching
#327229. Update the pkg-config patch to cover more libraries #438912.
04 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> wget-1.14.ebuild,
+files/wget-1.14-texi2pod.patch:
Fixed building with >=perl-5.18 (bug #484022).
05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Add upstream CPE tag (security info) from ChromiumOS.
03 Mar 2013; Mike Frysinger <vapier@gentoo.org> wget-1.14.ebuild:
Drop openssl workarounds as the pkg-config patch should handle things for us
now #459080 by Julian Ospald.
21 Feb 2013; Zac Medico <zmedico@gentoo.org> wget-1.14.ebuild:
Add ~arm-linux keyword.
28 Jan 2013; Mike Frysinger <vapier@gentoo.org> wget-1.13.4-r1.ebuild,
wget-1.14.ebuild:
Use slot 0 for openssl as pointed out by Zac Medico.
16 Dec 2012; Raúl Porcel <armin76@gentoo.org> wget-1.14.ebuild:
alpha/ia64/m68k/s390/sh/sparc stable wrt #438858
21 Nov 2012; Markus Meier <maekke@gentoo.org> wget-1.14.ebuild:
arm stable, bug #438858
21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> wget-1.14.ebuild:
Stable for x86, wrt bug #438858
13 Nov 2012; Brent Baude <ranger@gentoo.org> wget-1.14.ebuild:
Marking wget-1.14 ppc64 for bug 438858
22 Oct 2012; Michael Weber <xmw@gentoo.org> wget-1.14.ebuild:
ppc stable (bug 438858)
22 Oct 2012; Agostino Sarubbo <ago@gentoo.org> wget-1.14.ebuild:
Stable for AMD64, wrt bug #438858
20 Oct 2012; Jeroen Roovers <jer@gentoo.org> wget-1.14.ebuild:
Stable for HPPA (bug #438858).
23 Aug 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml,
wget-1.14.ebuild:
Add USE="pcre uuid zlib" flags to control new deps #432468 by Yuta SATOH.
*wget-1.14 (06 Aug 2012)
06 Aug 2012; Mike Frysinger <vapier@gentoo.org> +wget-1.14.ebuild:
Version bump.
06 Aug 2012; Mike Frysinger <vapier@gentoo.org> wget-1.13.3-r2.ebuild,
wget-1.13.4.ebuild, wget-1.13.4-r1.ebuild:
Drop ipv6 wgetrc tweaking since the default already has it.
17 Jun 2012; Raúl Porcel <armin76@gentoo.org> wget-1.13.4-r1.ebuild:
alpha/ia64/m68k/s390/sh/sparc stable wrt #406657
29 May 2012; Brent Baude <ranger@gentoo.org> wget-1.13.4-r1.ebuild:
Marking wget-1.13.4-r1 ppc for bug 406657
26 May 2012; Markus Meier <maekke@gentoo.org> wget-1.13.4-r1.ebuild:
arm stable, bug #406657
24 May 2012; Jeroen Roovers <jer@gentoo.org> wget-1.13.4-r1.ebuild:
Stable for HPPA (bug #406657).
23 May 2012; Brent Baude <ranger@gentoo.org> wget-1.13.4-r1.ebuild:
Marking wget-1.13.4-r1 ppc64 for bug 406657
22 May 2012; Mike Frysinger <vapier@gentoo.org>
+files/wget-1.13.4-no-gets.patch, wget-1.13.4-r1.ebuild:
Fix building with glibc-2.16+.
22 May 2012; Agostino Sarubbo <ago@gentoo.org> wget-1.13.4-r1.ebuild:
Stable for amd64, wrt bug #406657
22 May 2012; Jeff Horelick <jdhore@gentoo.org> wget-1.13.4-r1.ebuild:
marked x86 per bug 406657
05 May 2012; Jeff Horelick <jdhore@gentoo.org> wget-1.13.4-r1.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> wget-1.13.4-r1.ebuild:
keyword ~amd64-fbsd
13 Jan 2012; Mike Frysinger <vapier@gentoo.org> wget-1.13.4-r1.ebuild:
Depend on pkgconfig since we use it now for openssl #398527 by Viktor
Görzen.
20 Dec 2011; Mike Frysinger <vapier@gentoo.org>
files/wget-1.13.4-openssl-pkg-config.patch:
Set LIBSSL when using pkg-config as the NTLM check uses it #395349 by
Vladimir Berezhnoy.
01 Dec 2011; Mike Frysinger <vapier@gentoo.org> wget-1.13.4-r1.ebuild:
Fix the static-libs logic the right way #392713 by Piotr Karbowski.
01 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> wget-1.13.4-r1.ebuild:
QA: do not try to be smart about setting dependencies, when the tricks don't
work, instead duplicate the info and get it right for now.
*wget-1.13.4-r1 (01 Dec 2011)
01 Dec 2011; Mike Frysinger <vapier@gentoo.org> +wget-1.13.4-r1.ebuild,
+files/wget-1.13.4-openssl-pkg-config.patch:
Switch to pkg-config for looking up openssl #246556 by Rick Farina.
*wget-1.13.4 (18 Sep 2011)
18 Sep 2011; Tim Harder <radhermit@gentoo.org> +wget-1.13.4.ebuild:
Version bump. Add explicit build dependency on xz-utils.
06 Sep 2011; Fabian Groffen <grobian@gentoo.org>
files/wget-1.13-static-link-libz.patch:
Add upstream reference for path, fix commented .ac code
02 Sep 2011; Tim Harder <radhermit@gentoo.org> wget-1.13.3-r2.ebuild:
Remove unused myconf variable.
02 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -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)
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
*wget-1.13.3-r1 (01 Sep 2011)
01 Sep 2011; Jeremy Olexa <darkside@gentoo.org> -wget-1.12-r2.ebuild,
+wget-1.13.3-r1.ebuild, +files/wget-1.13-static-link-libz.patch:
Revision bump with full Gentoo Prefix support, signed off by maintainer with
discussion on IRC. Remove old version.
*wget-1.13.3 (01 Sep 2011)
01 Sep 2011; Tony Vroon <chainsaw@gentoo.org> +wget-1.13.3.ebuild:
Version bump. EAPI 4 port by Tomáš "scarabeus" Chvátal in bug #381405.
28 Feb 2011; Brent Baude <ranger@gentoo.org> wget-1.12-r3.ebuild:
stable ppc64, bug 349114
13 Jan 2011; Jeroen Roovers <jer@gentoo.org> wget-1.12-r3.ebuild:
Stable for HPPA (bug #349114).
07 Jan 2011; Brent Baude <ranger@gentoo.org> wget-1.12-r3.ebuild:
stable ppc, bug 349114
04 Jan 2011; Raúl Porcel <armin76@gentoo.org> wget-1.12-r3.ebuild:
alpha/ia64/m68k/s390/sh stable wrt #349114
03 Jan 2011; Michael Weber <xmw@gentoo.org> wget-1.12-r3.ebuild:
sparc stable (bug 349114)
31 Dec 2010; Markos Chandras <hwoarang@gentoo.org> wget-1.12-r3.ebuild:
Stable on amd64 wrt bug #349114
28 Dec 2010; Markus Meier <maekke@gentoo.org> wget-1.12-r3.ebuild:
arm stable, bug #349114
27 Dec 2010; Thomas Kahle <tomka@gentoo.org> wget-1.12-r3.ebuild:
x86 stable per bug 349114
*wget-1.12-r3 (26 Nov 2010)
26 Nov 2010; Mike Frysinger <vapier@gentoo.org> +wget-1.12-r3.ebuild,
+files/wget-1.12-sae.patch:
Add patch from upstream for SSL SAE #344939 by Michał Górny.
19 Sep 2010; Raúl Porcel <armin76@gentoo.org> wget-1.12-r2.ebuild:
s390 stable wrt #329941
06 Sep 2010; Jeroen Roovers <jer@gentoo.org> wget-1.12-r2.ebuild:
Stable for HPPA PPC (bug #329941).
06 Sep 2010; Brent Baude <ranger@gentoo.org> wget-1.12-r2.ebuild:
Marking wget-1.12-r2 ppc64 for bug 329941
05 Sep 2010; Markos Chandras <hwoarang@gentoo.org> wget-1.12-r2.ebuild:
Stable on amd64 wrt bug #329941
04 Sep 2010; Raúl Porcel <armin76@gentoo.org> wget-1.12-r2.ebuild:
alpha/arm/ia64/s390/sh/sparc stable wrt #329941
04 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> wget-1.12-r2.ebuild:
x86 stable wrt security bug #329941
22 Aug 2010; Mike Frysinger <vapier@gentoo.org> wget-1.12-r2.ebuild,
files/wget-1.12-CVE-2010-2252.patch:
Fix some iri tests after CVE patch #333965 by Xake.
*wget-1.12-r2 (21 Aug 2010)
21 Aug 2010; Mike Frysinger <vapier@gentoo.org> +wget-1.12-r2.ebuild,
+files/wget-1.12-CVE-2010-2252.patch, files/wget-1.12-sni.patch:
Add fix from upstream for CVE-2010-2252 #329941 by Stefan Behte. Tweak by
Sergei Trofimovich for IPv6 behavor in SNI patch #333839.
14 Feb 2010; Mike Frysinger <vapier@gentoo.org> wget-1.12-r1.ebuild:
Upgrade to EAPI=2 so we can set +ssl in IUSE #304887 by Kerin Millar.
*wget-1.12-r1 (17 Jan 2010)
17 Jan 2010; Mike Frysinger <vapier@gentoo.org> +wget-1.12-r1.ebuild,
+files/wget-1.12-sni.patch:
Add SNI support #301312 by Andreas Nüßlein.
18 Oct 2009; Brent Baude <ranger@gentoo.org> wget-1.12.ebuild:
Marking wget-1.12 ppc64 for bug 286058
15 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> wget-1.12.ebuild:
Stabilizing for ppc, bug 286058
14 Oct 2009; Mike Frysinger <vapier@gentoo.org>
files/wget-1.12-debug-tests.patch:
Update debug test patch to cover USE=idn #288156 by Paolo Pedroni and info
from Kent Fredric.
07 Oct 2009; Markus Meier <maekke@gentoo.org> wget-1.12.ebuild:
amd64 stable, bug #286058
07 Oct 2009; Raúl Porcel <armin76@gentoo.org> wget-1.12.ebuild:
alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #286058
06 Oct 2009; Jeroen Roovers <jer@gentoo.org> wget-1.12.ebuild:
Stable for HPPA (bug #286058).
06 Oct 2009; Christian Faulhammer <fauli@gentoo.org> wget-1.12.ebuild:
stable x86, security bug 286058
26 Sep 2009; Mike Frysinger <vapier@gentoo.org> wget-1.12.ebuild,
+files/wget-1.12-debug-tests.patch:
Automatically skip tests that require USE=debug #286173 by Alexis Ballier.
23 Sep 2009; Mike Frysinger <vapier@gentoo.org> wget-1.12.ebuild,
+files/wget-1.12-linking.patch, metadata.xml:
Add support for USE=idn by Lars Wendler #286058, add support for USE=ntlm,
and forward port the linking patch.
*wget-1.12 (23 Sep 2009)
23 Sep 2009; Mike Frysinger <vapier@gentoo.org> +wget-1.12.ebuild:
Version bump #286058 by Alex Legler.
07 Sep 2009; Jeroen Roovers <jer@gentoo.org> wget-1.11.4.ebuild:
Stable for HPPA (bug #281876).
01 Sep 2009; Raúl Porcel <armin76@gentoo.org> wget-1.11.4.ebuild:
arm/ia64/s390/sh/sparc stable wrt #281876
31 Aug 2009; <chainsaw@gentoo.org> wget-1.11.4.ebuild:
Marked stable on AMD64 as requested by Mike "SpanKY" Friesinger in bug
#281876. Tested as portage fetcher for emerge -fe world with empty DISTDIR
on a dual Opteron 2435 system.
31 Aug 2009; Brent Baude <ranger@gentoo.org> wget-1.11.4.ebuild:
stable ppc64, bug 281876
30 Aug 2009; Tobias Klausmann <klausman@gentoo.org> wget-1.11.4.ebuild:
Stable on alpha, bug #281876
29 Aug 2009; nixnut <nixnut@gentoo.org> wget-1.11.4.ebuild:
ppc stable #281876
18 Aug 2009; Christian Faulhammer <fauli@gentoo.org> wget-1.11.4.ebuild:
stable x86, bug 281876
18 Aug 2009; Jeroen Roovers <jer@gentoo.org> wget-1.11.3.ebuild:
Stable for HPPA (bug #281876).
18 Aug 2009; Mike Frysinger <vapier@gentoo.org> wget-1.11.1.ebuild,
wget-1.11.3.ebuild, wget-1.11.4.ebuild:
Drop USE=socks5 since it no longer exists #281866 by jackieku.
*wget-1.11.4 (16 Aug 2008)
16 Aug 2008; Mike Frysinger <vapier@gentoo.org> +wget-1.11.4.ebuild:
Version bump #231312 by cilly.
14 Aug 2008; Raúl Porcel <armin76@gentoo.org> wget-1.11.3.ebuild:
alpha/ia64/sparc/x86 stable
*wget-1.11.3 (18 Jun 2008)
18 Jun 2008; Mike Frysinger <vapier@gentoo.org> +wget-1.11.3.ebuild:
Version bump #228045 by Conrad Kostecki.
07 May 2008; Markus Meier <maekke@gentoo.org> wget-1.11.1.ebuild:
amd64 stable, bug #220569
06 May 2008; Brent Baude <ranger@gentoo.org> wget-1.11.1.ebuild:
stable ppc, bug 220569
06 May 2008; Raúl Porcel <armin76@gentoo.org> wget-1.11.1.ebuild:
alpha/ia64/sparc/x86 stable wrt #220569
06 May 2008; Jeroen Roovers <jer@gentoo.org> wget-1.11.1.ebuild:
Stable for HPPA (bug #220569).
*wget-1.11.2 (06 May 2008)
06 May 2008; Mike Frysinger <vapier@gentoo.org> +wget-1.11.2.ebuild:
Version bump #220439 by Petr Pisar.
*wget-1.11.1 (26 Mar 2008)
26 Mar 2008; Mike Frysinger <vapier@gentoo.org> +wget-1.11.1.ebuild:
Version bump.
*wget-1.11-r1 (16 Feb 2008)
16 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+files/wget-1.11-progress-bar-assert.patch, +wget-1.11-r1.ebuild:
Grab fix from upstream for progress bar assert failure in some locales
#208484 by Maxim Britov.
28 Jan 2008; <pva@gentoo.org> wget-1.10.2.ebuild, wget-1.11.ebuild:
License changed to GPL-3, thank you Winterheart for report, quotation fix.
*wget-1.11 (28 Jan 2008)
28 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+files/wget-1.11-linking.patch, +wget-1.11.ebuild:
Version bump #207872 by Matthias Vill.
25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing seemant from metadata.xml as per #202469. Assigning to
maintainer-needed.
22 Oct 2007; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r5.ebuild,
wget-1.10.2.ebuild:
homepage update thanks to Petr Pisar in bug #196738
17 Oct 2006; Roy Marples <uberlord@gentoo.org> wget-1.10.2.ebuild:
Added ~sparc-fbsd keyword.
12 Oct 2006; Fabian Groffen <grobian@gentoo.org> wget-1.9.1-r5.ebuild,
wget-1.10.2.ebuild:
Dropped ppc-macos keyword, see you in prefix
30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> wget-1.10.2.ebuild:
Add ~x86-fbsd keyword.
05 Dec 2005; Bryan Østergaard <kloeri@gentoo.org> wget-1.10.2.ebuild:
Stable on alpha.
20 Nov 2005; Hardave Riar <hardave@gentoo.org> wget-1.10.2.ebuild:
Stable on mips.
03 Nov 2005; Daniel Ostrow <dostrow@gentoo.org> wget-1.10.2.ebuild:
Stable on ppc64.
25 Oct 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.10.2.ebuild:
Fix for bug #110035, so now it will build statically and with ssl support.
Azarah wrote the patch for that, and upstram has been notified of it.
bug #109299 was the original bug he found, but that was a user issue.
bug #110035 is the actual issue.
20 Oct 2005; Luis Medinas <metalgod@gentoo.org> wget-1.10.2.ebuild:
Marked Stable on amd64. Bug #109097.
19 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> wget-1.10.2.ebuild:
Stable on sparc
19 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> wget-1.10.2.ebuild:
Stable on ppc.
19 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> wget-1.10.2.ebuild:
Stable on hppa. See bug #109097.
19 Oct 2005; Andrej Kacian <ticho@gentoo.org> wget-1.10.2.ebuild:
Stable on x86, security bug #109097.
*wget-1.10.2 (13 Oct 2005)
13 Oct 2005; Seemant Kulleen <seemant@gentoo.org> -wget-1.10.ebuild,
+wget-1.10.2.ebuild:
Version bump to newest security fix, thanks to Carlo in bug #109125
12 Sep 2005; Seemant Kulleen <seemant@gentoo.org> +files/wgetrc-ipv6,
-wget-1.9.1-r3.ebuild, wget-1.10.ebuild:
add a note about preferring ipv6 in the wgetrc file, closing bug #102209
28 Jul 2005; Kito <kito@gentoo.org> wget-1.9.1-r5.ebuild:
stable on ppc-macos.
19 Jul 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.10.ebuild:
added a patch for uclibc and bumped the patchball version. Thanks to
solar@gentoo.org in bug #96716
*wget-1.10 (18 Jul 2005)
18 Jul 2005; Seemant Kulleen <seemant@gentoo.org> +wget-1.10.ebuild:
version bump thanks to Tijs Zwinkels <gentoobugs@tumblecow.net> for
notifying me in bug #96716, and to: emanuele.giaquinta@gmail.com for porting
the patchset over in the same bug
18 Jul 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r5.ebuild:
adjust patches: debian CAN fix and Mandrake largefile to compile with
gcc-2.95. Thanks to Az in irc and solar@gentoo.org in bug #93703
16 May 2005; Tom Gall <tgall@gentoo.org> wget-1.9.1-r5.ebuild:
ppc64 stable, for #83920
16 May 2005; Stephen Bennett <spb@gentoo.org> wget-1.9.1-r5.ebuild:
Mips stable for #83920
16 May 2005; Rene Nussbaumer <killerfox@gentoo.org> wget-1.9.1-r5.ebuild:
Stable on hppa; bug #83920
16 May 2005; <plasmaroo@gentoo.org> wget-1.9.1-r5.ebuild:
Stable on IA64; bug #83920.
16 May 2005; Bryan Østergaard <kloeri@gentoo.org> wget-1.9.1-r5.ebuild:
Stable on alpha.
16 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> wget-1.9.1-r5.ebuild:
Stable on sparc wrt #seemantoni
16 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r5.ebuild:
stable on x86 and amd64
16 May 2005; Michael Hanselmann <hansmi@gentoo.org> ChangeLog,
wget-1.9.1-r5.ebuild:
Stable on ppc.
*wget-1.9.1-r5 (16 May 2005)
16 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r4.ebuild,
+wget-1.9.1-r5.ebuild:
ouch, I didn't see CAN 2004-1488, so this patch from Debian fixes both 1487
and 1488. Thanks muchly to Evgeny Stambulchik <fnevgeny@weizmann.ac.il> in
bug #83920
*wget-1.9.1-r4 (10 May 2005)
10 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r3.ebuild,
+wget-1.9.1-r4.ebuild:
revision bump which now adds patches from mandrake's source rpm to handle
large files properly and other misc. fixes: french and german translations;
proper handling of username/passwords in urls; spelling referrer correctly,
printing out the percentage in the output, removing rpath from the binary,
and finally in wgetrc: passive ftp is the default (closing bug #89814 by Tor
Klingberg <tor.klingberg@gmx.net>), and the references to /usr/local/etc now
point to /etc instead. The de and fr patches should fix bug #77138 by: Sven <skoehler@upb.de>
10 May 2005; Seemant Kulleen <seemant@gentoo.org>
-files/wget-1.9.1+ipvmisc.patch, -files/wget-1.9.1-locale.patch,
-files/wget-1.9-uclibc.patch, -files/wget-CAN-2004-1487.patch,
wget-1.9.1-r3.ebuild:
move patches to a tarball on the mirrors. No more 25K things in files
10 May 2005; Seemant Kulleen <seemant@gentoo.org>
-files/wget-1.8.2-2Glimit.diff, -files/wget-1.8.2-gentoo.diff,
wget-1.9.1-r3.ebuild:
remove unused patches
10 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r3.ebuild:
make sure to RDEPEND on a socks5 implementation -- dante is the only one I
can figure out that does implement it. Closing bug #89523 by Mihai Limbasan
<mihailim@gmail.com>
14 Mar 2005; Hardave Riar <hardave@gentoo.org> wget-1.9.1-r3.ebuild:
Stable on mips, bug #74008.
06 Mar 2005; Olivier Crête <tester@gentoo.org> wget-1.9.1-r3.ebuild:
Stable on x86 per security bug #74008
03 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> wget-1.9.1-r3.ebuild:
Stable on alpha, bug 74008.
02 Mar 2005; Jason Wever <weeve@gentoo.org> wget-1.9.1-r3.ebuild:
Stable on sparc wrt security bug #74008.
02 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> wget-1.9.1-r3.ebuild:
Stable ppc-macos
02 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> wget-1.9.1-r3.ebuild:
Stable on ppc.
02 Mar 2005; Markus Rothe <corsair@gentoo.org> wget-1.9.1-r3.ebuild:
Stable on ppc64; bug #74008
02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> wget-1.9.1-r3.ebuild:
stable on amd64. see #74008
*wget-1.9.1-r3 (02 Mar 2005)
02 Mar 2005; <solar@gentoo.org> +files/wget-CAN-2004-1487.patch,
+wget-1.9.1-r3.ebuild:
- security bump for bug 74008. CAN-2004-1487 - overwrite files via ".." in
path component
09 Jan 2005; Sven Wegener <swegener@gentoo.org> wget-1.8.2-r3.ebuild,
wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild:
Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
04 Jan 2005; Chris White <chriswhite@gentoo.org>
+files/wget-1.9.1-locale.patch, wget-1.9.1-r2.ebuild:
Added fix for bug #70734 per seemant's request as he's leaving and won't be
able to fix it for awhile.
29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
Change encoding to UTF-8 for GLEP 31 compliance
15 Jun 2004; <solar@gentoo.org> wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild,
files/wget-1.9-uclibc.patch:
basic uclibc support added
08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> wget-1.9.1-r2.ebuild:
Stable on alpha.
02 Jun 2004; Travis Tilley <lv@gentoo.org> wget-1.9.1-r2.ebuild:
stable on amd64
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> wget-1.8.2-r3.ebuild,
wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild:
Add inherit eutils
18 Mar 2004; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r3.ebuild,
wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild:
HOMEPAGE fix thanks to: Dice Random <dice@warpenguin.com> in bug #45041
10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r2.ebuild,
files/wget-1.9.1+ipvmisc.patch:
port patch fix from 1.9 to this patch, closing the same bug again
05 Dec 2003; Daniel Robbins <drobbins@gentoo.org> wget-1.8.2.ebuild:
making autoconf a non-conditional DEPEND, closing bug #34114.
*wget-1.9-r2 (04 Dec 2003)
04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9-r1.ebuild,
wget-1.9-r2.ebuild, wget-1.9.1-r1.ebuild:
fix the ipvmisc patch to allow name resolution as well as ipaddresses. The fix
was found by: Josh Grebe <josh@brokedown.net> in bug #33827 opened by Marcin
Kryczek <crytcheck@napisy.org>
01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r2.ebuild:
why was autoconf moved into nls USE check???? Closing bug #34411 by Daniel
Ahlberg <aliz@gentoo.org>
*wget-1.9.1-r2 (30 Nov 2003)
30 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.1-r2.ebuild:
Fix german locale, closes bug #34515
27 Nov 2003; Brad House <brad_mssw@gentoo.org> wget-1.9-r1.ebuild,
wget-1.9.1-r1.ebuild:
always require autoconf to be installed for this package
27 Nov 2003; Brad House <brad_mssw@gentoo.org> wget-1.9-r1.ebuild:
make autoconf a dep, as in a stage3 build it requires autoconf
20 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.1-r1.ebuild:
Enabled ipv6 support
*wget-1.9-r1 (18 Nov 2003)
19 Nov 2003; Nicholas Jones <carpaski@gentoo.org> wget-1.8.2-r3.ebuild,
wget-1.9-r1.ebuild, wget-1.9.1-r1.ebuild:
Fixed all the deps so that autoconf and gettext were 'nls' USE. Added
autoconf to 1.9-r1.
18 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r2.ebuild,
wget-1.9-r1.ebuild, wget-1.9.1-r1.ebuild, wget-1.9.1.ebuild:
1.9-r1 restored as stable release -- WITH THE PATCH. DON'T ANYONE F'ING REMOVE
IT
18 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> wget-1.8.2-r3.ebuild,
wget-1.9.1-r1.ebuild:
sys-devl/autoconf -> sys-devel/autoconf; repoman: Trim trailing whitespace
*wget-1.9.1-r1 (17 Nov 2003)
17 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.1-r1.ebuild,
wget-1.9.1.ebuild:
Version bump to add patch to fix ipv4
17 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.ebuild:
1.9 has bugs removed for 1.9.1
*wget-1.9.1 (14 Nov 2003)
14 Nov 2003; Martin Holzer <mholzer@gentoo.org> wget-1.9.1.ebuild:
Version bumped.
10 Nov 2003; Brandon Low <lostlogic@gentoo.org> wget-1.9-r2.ebuild:
Actually remove the patch
10 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.ebuild:
wget-1.9 marked as stable.
*wget-1.9-r2 (10 Nov 2003)
10 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.8.2-r2.ebuild,
wget-1.9-r2.ebuild:
Removed ipv6 support till the patch is reworked.
*wget-1.9-r1 (03 Nov 2003)
03 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9-r1.ebuild:
added a patch to make ipv6 and ipv4 both work, instead of being mutually
exclusive. The patch was written by: ari edelkind
<edelkind-gentoo-bugzilla@episec.com> and submitted in bug #31798 by Bernd
Wurst <mail@bernd-wurst.de>
01 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r2.ebuild,
wget-1.8.2-r3.ebuild:
changed the SRC_URI for the new percentage patches to point to the Gentoo
mirrors instead. Closes bug #32514 by Stony Yakovac <stonyy@tek.com>
*wget-1.9 (22 Oct 2003)
22 Oct 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.ebuild:
version bump -- this one should have support for ipv6, >2G fetches, and ipv6
out of the box
*wget-1.8.2-r3 (14 Oct 2003)
14 Oct 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r2.ebuild,
wget-1.8.2-r3.ebuild, files/wget-1.8.2-2Glimit.diff,
files/wget-1.8.2-gentoo.diff, files/wget-1.8.2-r2-gentoo.diff:
Added debian's patch to let wget download files larger than 2G. Ciaranm in
#gentoo/#gentoo-sparc found the patch at:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=137989 . This closes bug
#30985 by katerina <kllba@operamail.com>
*wget-1.8.2-r2 (20 Dec 2002)
06 Jul 2003; Joshua Kinard <kumba@gentoo.org> wget-1.8.2-r2.ebuild:
Changed ~mips to mips in KEYWORDS
Cleaned up Changelog
19 May 2003; Joshua Kinard <kumba@gentoo.org> wget-1.8.2-r2.ebuild:
Add gnuconfig eclass, and gnuconfig_update to src_compile to allow
proper detection of linux-mips systems. Also added ~mips to KEYWORDS.
21 Feb 2003; Zach Welch <zwelch@gentoo.org> wget-1.8.2-r2.ebuild :
Added arm to keywords.
09 Feb 2003; Guy Martin <gmsoft@gentoo.org> wget-1.8.2-r2.ebuild :
Added hppa to keywords.
20 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> wget-1.8.2.ebuild, wget-1.8.2-r1.ebuild
wget-1.8.2-r2.ebuild :
Updated SRC_URI and HOMEPAGE.
20 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
Security update - added patch from RedHat.
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
*wget-1.8.2-r1 (31 Oct 2002)
31 Oct 2002; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r1.ebuild
files/digest-wget-1.8.2-r1 :
Added debian's patch for ipv6 if "ipv6" is in USE. Thanks to:
andre@tomt.net (Andre Tomt) in bug #8286 for the patch.
*wget-1.8.2 (29 May 2002)
18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
Added mips to keywords
23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
Removed bootcd USE flag
09 Jul 2002; phoen][x <phoenix@gentoo.org> wget-1.8.2.ebuild :
Added KEYWORDS, LICENSE, SLOT.
29 May 2002; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2.ebuild
files/digest-wget-1.8.2 :
Version bump. The patch still works, so there is no noticeable difference
to the user.
*wget-1.8.1-r1 (22 Feb 2002)
23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
Removed bootcd USE flag
09 Jul 2002; phoen][x <phoenix@gentoo.org> wget-1.8.2.ebuild :
Added KEYWORDS, LICENSE, SLOT.
22 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Added openssl to RDEPEND as
well so that .tbz2 installation works. This fixes bug #799.
*wget-1.8.1 (1 Feb 2002)
1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
Added initial ChangeLog which should be updated whenever the package is
updated in any way. This changelog is targetted to users. This means that the
comments should well explained and written in clean English. The details about
writing correct changelogs are explained in the skel.ChangeLog file which you
can find in the root directory of the portage repository.

View File

@ -1 +1,34 @@
DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX wget-1.13.4-openssl-pkg-config.patch 765 SHA256 c592ee602f88c1eac2d88decc8862cd0f435193ad9cd8059f810dd0b661690f4 SHA512 15b352e07ae1519d06890604a2f83bb00e9a0d797a2c816db8d112ca76951da259373da45575137554d0decc7550103ae789b780c298fe7c5ff33ac147538344 WHIRLPOOL 833f9a93b09c83b80b274dc571d4fa2abfd1596d6d2911b113ef0b074d1272fc843be02b475fdc698930f40b4faddea9ac5498d5cf10a5bcf52c9a70e3e532b3
AUX wget-1.14-gnutls-ssl.patch 2178 SHA256 b636075031b80d667ea0204423b71e4ef4a8f12302b75521ceba241e57637c60 SHA512 039be2eac5a91c835776c1b7d45abad4132b39f45e5c4409d598c5bb2f360c03f44fbe08c22b5cd8a33b461c01fce94eba6c84b5d99fc5aef93cd87c06b0dc74 WHIRLPOOL be1159d2eeed51991159333435a419e8a13bd9f29b5292e336ea8953957584d2d257e5340a4042e328ceb8c6654031d36f2ffdf3bd288aad4df9a8878fb38630
AUX wget-1.14-pkg-config.patch 6187 SHA256 ccece749fef2a378611d809103651831cfaa69c528629d37a4c2e3656d0fe63c SHA512 6a895f435b7d650d706cebda1d430b32a6769b021c14593723907c0e4ccb6399fd45b663d6bd926e9d5a9ec2d9cfe700ec0e81b5b83bf533e299244764edd452 WHIRLPOOL 1064e042404bdb645a82c8025748d697661f503c457fcef10337fe1f13dd1f9b41ead038321f2a61af5880410a72d9776f115b9d5ba93142340aa7d3276c3bae
AUX wget-1.14-texi2pod.patch 969 SHA256 b494c2a97b0c993621a38f63f3053854bba00c8ed555dc9df4a6dcbdf84dc8ab SHA512 1c04cb24067a89f37e53232c9262b3e462c0ba019474a8459dcb705fa273c8db0dea81d9fe788a554785a5fe713a02b8c0c93f179fa952d002e8a39142a6d4d3 WHIRLPOOL 549c027e1d79750e1d50460622bef414425f1dfc4914f408e87a52aa3b4b4c2b5c0a83d81c1507e3abc4860b3337221c870212247527a6db1b100a01db9723c3
AUX wget-1.14-wgetrc.patch 1284 SHA256 c0ca848e78ebe3d5ceb8f41d1271bb7f92c4d8edb98063af86a2b6279a2d0b2d SHA512 ce9623cb8da5fb0b1bc44a399c1f4c5af2e967d85032c3a0ec05e341c9dcebf45c223615fb320acf62b24b63561e91c1018bd615d2b7169b9835bffe211c7c32 WHIRLPOOL 1cac60e1f29e40e3ebe01bb7b424c5431dd4451f7447ff50066698e21aea52e7f56249bc85f59eb01a89414f7e0bc4f8b460f5aa4da728cb8622c62d77c619ad
AUX wget-1.15-pkg-config.patch 5901 SHA256 37b33b6123e8472e4359cb1e595e7236efe532dac2668ed4258a798f269e512e SHA512 1a566e1bf4af4b32252accbcd982325ee9df8e892b2e213f33db3c10a2e4b925d9c444d09532711f009db09dc3398709bb920db8dbf91e7fc4f9b5fe321475df WHIRLPOOL 3359f8333cd76e47a4d2c39f2fd40b0d3453e14f7abe003516d27147662617deee3064b88d0a496e7927551ed3bf61d2dde99adeff978618cd12551624b66dfd
AUX wget-1.15-test_fix.patch 847 SHA256 29cce71f521834a09977340f75454b8831ff6309f165041aa93da161fe0761a2 SHA512 cc97a1d57ab17c2e34961c7c4f3b2fee906e6027366987233ced310acacf7d8a96cadbe13a09a7fa31bf7040e18a046435dc1edc558cf8481c59d1016ad4f07c WHIRLPOOL ecfd898ddca8e01c877c5c7f33895867c0bc1b5c636ff26474c63639b001bbe31c1ecf23c386a80f43cb84f1bfd9ad9c2198e22bb9099e190182e3b9a90112bd
DIST wget-1.14.tar.xz 1584060 SHA256 1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b SHA512 b01351b3e086c713c0f64af34d87e013d2edb69b76fa84699b3afa4975622993053c4e367f965218c8a3326a85b734f3ee8bcce8ba0c72a89bb2208f3b1759ef WHIRLPOOL 8071b49a28ac03c832d965bfb9c00e4f28f59098c896c40c73081e56ec0091fbe8290b115e3eaa85b81c90006a39e3efba811f30dea5d33b726fc62d2b307824
DIST wget-1.15.tar.xz 1679908 SHA256 d18a5f4354c9854b1f1b9897353443bceed8e19a391d36d4dbebe85cc9d480fb SHA512 1cb49e083500cb2753f023d9b4594b61d6e909994ea327ed9b861424df77df3ffbe7c431af9ee73de0eda083b3bb28cf22a53c2b3a3b781754fce39f4c13fae4 WHIRLPOOL 5d649f7fba4ad4f1482a75c960f845cef22db1711178bd22ed29a6fd1242f483e53ca2501e62b59bad23fbbf554ddff1f74fc2e79bd4ecaeefd7e28795c743f4
EBUILD wget-1.14-r1.ebuild 2790 SHA256 4638bccfe9a760c0974889f79b1230436083b4312f1f6c6cd9e84dfd78983faa SHA512 44cca80deed49c8cde34eb7931c1b718cd7602152d7c2cadd47d49b03f763588cb37706b1c50f7828a2f06b7923fbca10c5a4610fa2c6f3efbc91d820c74d472 WHIRLPOOL 75c4271faa98106a1f6bfa0e8294e0527e9d6c2caf50ca7cd0dae2b8584222f12b39322b7b3f8c2cd70b5eb9c5fcb30fa6787a857aef3c451471be2d88959950
EBUILD wget-1.14.ebuild 2636 SHA256 3603addd5ca6d21501997584a2fc185bc6314b843c6c3296166f082938bd74aa SHA512 4fabe38bb5c10638fd77ca47544ef24c44783146f97a7ca98e893e78cee408c8652414e7fc49d1d618ff0b72c83bc3b851fd2f61fd05cb06dc0b02c7d8e4da97 WHIRLPOOL b3423bebb6c567b35916b6979be10b7986a30003ce1944ffe0ecdd0ed4740c200af81e08cb4b0cc10e88be085e02e07dc220325cb34d72145f008eff4d061a05
EBUILD wget-1.15-r1.ebuild 2500 SHA256 01e6f1ebe23cb13854441fdc0e78257b370ab1bb5934a2622257cf836a2ab726 SHA512 230277d6e90429d17284fcd33938c99e41bebdc8d3ee44707c0deb367f0ebf8bfb1ac6678a79e9907ac48db8db784554f39726a65840b0e1c54b7c10b0f53d04 WHIRLPOOL 713ce78ed2b89aec130a8d063ff5f2406ba8a527941ac72da75128d75ff62790765fe4a2ea1a5bbca03e6738d9ce7d265d2fd3a5d78b36abf7e0131751d297d7
MISC ChangeLog 27683 SHA256 511af6f112093215a141b361027e700f08e73d679a7ad832003b8f554c84da88 SHA512 13269f991cbcbc84bd91b438cbff3e945767ebecb8dbdef8b40adaec19cea1943a906db36e010fb76d8886b094ebbc962fe0fe13bca5cced8b0edb796e1ec9a1 WHIRLPOOL 84675445e45cd4735be546696606ef5cab6532ad9cbde04c67c0cb2397f99209283ba31250c0c488045acf4f42427b71064b9ed754d352df557f0a8ca1956429
MISC metadata.xml 480 SHA256 623ea871cdd741de1f7b1bdde73f38d222d489ed7496694a3b8f2fff7d49cf44 SHA512 4dae8e65a95c5f03e0434fce20012581fb75e33310598ef6b099b11ad611dfdbc5043b0223b1cd791500b1d4dcd19c52ab94142587508b2ed362b11cc7acddb1 WHIRLPOOL 189bc2a775087a96010a7426b562cf55e9426bad2da13e085d14dcf713631466ee4fe9c3dffe1ee578482d7d5bf0e4cac2510af431a4ef1ec21626770fe284b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAEBCAAGBQJTde+JAAoJEPiazRVxLXTFQmcP/2pq2ZOudCdJ40s2dZooaAKa
NMup4eaKSLui2v2TdTwF2pDdwXVqZwVO9iSiNxNvBl01yvtLHB5NjtToCYJ3PuvP
+J8HL0uAZ2lhg8Fcdk3cq79swIhrc6aTsZu3TKsg+TTYJ/vSLpwOkoyfZQh76HCo
46FJFdDfFh42WXQtiAuNPVCIqD2Sjkjpku99pVAPBBN0yH+ZuqvWFhGHlLJ/T8UB
TtjJsPKDNi+k53jIrtFOPs29WRJLK5c4kjUU9vQ/WgAL00a9ZNye7ep92kHnYNVK
fbLRyAiHBIwit9KHg+HXq7Gov1VYRJFDS5yGx/J9APlT7Xixa26PBoCVBjojHaio
Fgu4MPgZ0hsgS+22P7xU1vE+gsMhPr+uKBs3i0uLOszIfySKjoYHmmABmRCNBEEP
uM60fDPcQaxQVk3JPX96eNjfpktNU7XXOIian8hz5+oQoRDEGRbkQ7zxHNruerAs
nnW+pau27RO1Q2C2/REOoOFKs0szJPb58MHsSaWN3CUaxgjfsBHyE+O+R5WVISDC
MqyOFgszuaXkcUm/QmVVY9aWv+sYx9NMMM10ks5PBcd+qpVJCrYkzEoL17QGr6Si
htCaqWSdsowvm8UNDM0m1baoB/KRROV/VHad7Pvg2zKltyIKJxKxiYl9UZnuotqr
af3zqSr9NwGysA4PCcdi
=O68I
-----END PGP SIGNATURE-----

View File

@ -1,207 +0,0 @@
http://bugs.gentoo.org/329941
based on upstream commit, but tweaked to work with wget-1.12 and
remove useless style changes
------------------------------------------------------------
revno: 2409
committer: Giuseppe Scrivano <gscrivano@gnu.org>
branch nick: wget
timestamp: Wed 2010-07-28 21:22:22 +0200
message:
Introduce --trust-server-names. Close CVE-2010-2252.
diff:
NEWS:
** By default, on server redirects, use the original URL to get the
local file name. Close CVE-2010-2252.
ChangeLog:
2010-07-28 Giuseppe Scrivano <gscrivano@gnu.org>
* http.h (http_loop): Add new argument `original_url'
* http.c (http_loop): Add new argument `original_url'. Use
`original_url' to get a filename if `trustservernames' is false.
* init.c (commands): Add "trustservernames".
* options.h (library): Add variable `trustservernames'.
* main.c (option_data): Add trust-server-names.
(print_help): Describe --trust-server-names.
* retr.c (retrieve_url): Pass new argument to `http_loop'.
=== modified file 'doc/wget.texi'
--- doc/wget.texi 2010-05-27 10:45:15 +0000
+++ doc/wget.texi 2010-07-28 19:22:22 +0000
@@ -1498,6 +1498,13 @@
@code{Content-Disposition} headers to describe what the name of a
downloaded file should be.
+@cindex Trust server names
+@item --trust-server-names
+
+If this is set to on, on a redirect the last component of the
+redirection URL will be used as the local file name. By default it is
+used the last component in the original URL.
+
@cindex authentication
@item --auth-no-challenge
@@ -2810,6 +2817,10 @@
Turn on recognition of the (non-standard) @samp{Content-Disposition}
HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
+@item trust_server_names = on/off
+If set to on, use the last component of a redirection URL for the local
+file name.
+
@item continue = on/off
If set to on, force continuation of preexistent partially retrieved
files. See @samp{-c} before setting it.
=== modified file 'src/http.c'
--- src/http.c 2010-07-20 17:42:13 +0000
+++ src/http.c 2010-07-28 19:22:22 +0000
@@ -2593,8 +2593,9 @@
/* The genuine HTTP loop! This is the part where the retrieval is
retried, and retried, and retried, and... */
uerr_t
-http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
- int *dt, struct url *proxy, struct iri *iri)
+http_loop (struct url *u, struct url *original_url, char **newloc,
+ char **local_file, const char *referer, int *dt, struct url *proxy,
+ struct iri *iri)
{
int count;
bool got_head = false; /* used for time-stamping and filename detection */
@@ -2641,7 +2642,8 @@
}
else if (!opt.content_disposition)
{
- hstat.local_file = url_file_name (u);
+ hstat.local_file =
+ url_file_name (opt.trustservernames ? u : original_url);
got_name = true;
}
@@ -2679,7 +2681,7 @@
/* Send preliminary HEAD request if -N is given and we have an existing
* destination file. */
- file_name = url_file_name (u);
+ file_name = url_file_name (opt.trustservernames ? u : original_url);
if (opt.timestamping
&& !opt.content_disposition
&& file_exists_p (file_name))
=== modified file 'src/http.h'
--- src/http.h 2010-05-08 19:56:15 +0000
+++ src/http.h 2010-07-28 19:22:22 +0000
@@ -33,8 +33,8 @@
struct url;
-uerr_t http_loop (struct url *, char **, char **, const char *, int *,
- struct url *, struct iri *);
+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *,
+ int *, struct url *, struct iri *);
void save_cookies (void);
void http_cleanup (void);
time_t http_atotm (const char *);
=== modified file 'src/init.c'
--- src/init.c 2010-05-08 19:56:15 +0000
+++ src/init.c 2010-07-28 19:22:22 +0000
@@ -252,6 +252,7 @@
{ "timeout", NULL, cmd_spec_timeout },
{ "timestamping", &opt.timestamping, cmd_boolean },
{ "tries", &opt.ntry, cmd_number_inf },
+ { "trustservernames", &opt.trustservernames, cmd_boolean },
{ "useproxy", &opt.use_proxy, cmd_boolean },
{ "user", &opt.user, cmd_string },
{ "useragent", NULL, cmd_spec_useragent },
=== modified file 'src/main.c'
--- src/main.c 2010-06-20 10:10:35 +0000
+++ src/main.c 2010-07-28 19:22:22 +0000
@@ -266,5 +266,6 @@
{ "timeout", 'T', OPT_VALUE, "timeout", -1 },
{ "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
{ "tries", 't', OPT_VALUE, "tries", -1 },
+ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
{ "user", 0, OPT_VALUE, "user", -1 },
{ "user-agent", 'U', OPT_VALUE, "useragent", -1 },
@@ -680,6 +681,8 @@
N_("\
-I, --include-directories=LIST list of allowed directories.\n"),
N_("\
+ --trust-server-names use the name specified by the redirection url last component.\n"),
+ N_("\
-X, --exclude-directories=LIST list of excluded directories.\n"),
N_("\
-np, --no-parent don't ascend to the parent directory.\n"),
=== modified file 'src/options.h'
--- src/options.h 2010-05-08 19:56:15 +0000
+++ src/options.h 2010-07-28 19:22:22 +0000
@@ -242,6 +242,7 @@
char *encoding_remote;
char *locale;
+ bool trustservernames;
#ifdef __VMS
int ftp_stmlf; /* Force Stream_LF format for binary FTP. */
#endif /* def __VMS */
=== modified file 'src/retr.c'
--- src/retr.c 2010-05-08 19:56:15 +0000
+++ src/retr.c 2010-07-28 19:22:22 +0000
@@ -731,7 +731,8 @@
#endif
|| (proxy_url && proxy_url->scheme == SCHEME_HTTP))
{
- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri);
+ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt,
+ proxy_url, iri);
}
else if (u->scheme == SCHEME_FTP)
{
make sure tests pass after this change
https://bugs.gentoo.org/333965
https://savannah.gnu.org/bugs/index.php?30841
--- tests/Test-iri-forced-remote.px
+++ tests/Test-iri-forced-remote.px
@@ -174,7 +174,7 @@ my %urls = (
},
);
-my $cmdline = $WgetTest::WGETPATH . " --iri --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/";
my $expected_error_code = 0;
--- tests/Test-iri-list.px
+++ tests/Test-iri-list.px
@@ -143,7 +143,7 @@ my %urls = (
},
);
-my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt";
+my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names -i http://localhost:{{port}}/url_list.txt";
my $expected_error_code = 0;
--- tests/Test-iri.px
+++ tests/Test-iri.px
@@ -186,7 +186,7 @@ my %urls = (
},
);
-my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
my $expected_error_code = 0;

View File

@ -1,129 +0,0 @@
Remove debug code from tests (since they'd require USE=debug)
http://bugs.gentoo.org/286173
http://bugs.gentoo.org/288156
diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-cmd.px
--- a/tests/Test-idn-cmd.px Fri Sep 25 10:17:49 2009 -0700
+++ b/tests/Test-idn-cmd.px Sun Sep 27 11:29:01 2009 -0700
@@ -28,7 +28,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
. " -e http_proxy=localhost:{{port}} --local-encoding=EUC-JP $euc_jp_hostname";
my $expected_error_code = 0;
diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-headers.px
--- a/tests/Test-idn-headers.px Fri Sep 25 10:17:49 2009 -0700
+++ b/tests/Test-idn-headers.px Sun Sep 27 11:29:01 2009 -0700
@@ -40,7 +40,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
. " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
my $expected_error_code = 0;
diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-meta.px
--- a/tests/Test-idn-meta.px Fri Sep 25 10:17:49 2009 -0700
+++ b/tests/Test-idn-meta.px Sun Sep 27 11:29:01 2009 -0700
@@ -41,7 +41,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
. " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
my $expected_error_code = 0;
diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-robots.px
--- a/tests/Test-idn-robots.px Fri Sep 25 10:17:49 2009 -0700
+++ b/tests/Test-idn-robots.px Sun Sep 27 11:29:01 2009 -0700
@@ -48,7 +48,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
. " -e http_proxy=localhost:{{port}} --local-encoding=EUC-JP"
. " http://$euc_jp_hostname/";
diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-proxy-auth-basic.px
--- a/tests/Test-proxy-auth-basic.px Fri Sep 25 10:17:49 2009 -0700
+++ b/tests/Test-proxy-auth-basic.px Sun Sep 27 11:29:01 2009 -0700
@@ -25,7 +25,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " --debug --user=fiddle-dee-dee --password=Dodgson"
+my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee --password=Dodgson"
. " -e http_proxy=localhost:{{port}} http://no.such.domain/needs-auth.txt";
my $expected_error_code = 0;
diff -r ee7b9018a483 tests/Test-E-k-K.px
--- a/tests/Test-E-k-K.px Fri Oct 09 02:23:26 2009 -0700
+++ b/tests/Test-E-k-K.px Tue Oct 13 21:18:51 2009 -0400
@@ -61,7 +61,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " -d -r -nd -E -k -K http://localhost:{{port}}/index.php";
+my $cmdline = $WgetTest::WGETPATH . " -r -nd -E -k -K http://localhost:{{port}}/index.php";
my $expected_error_code = 0;
diff -r ee7b9018a483 tests/Test-cookies-401.px
--- a/tests/Test-cookies-401.px Fri Oct 09 02:23:26 2009 -0700
+++ b/tests/Test-cookies-401.px Tue Oct 13 21:18:51 2009 -0400
@@ -29,7 +29,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " -d http://localhost:{{port}}/one.txt"
+my $cmdline = $WgetTest::WGETPATH . " http://localhost:{{port}}/one.txt"
. " http://localhost:{{port}}/two.txt";
my $expected_error_code = 6;
diff -r ee7b9018a483 tests/Test-ftp-bad-list.px
--- a/tests/Test-ftp-bad-list.px Fri Oct 09 02:23:26 2009 -0700
+++ b/tests/Test-ftp-bad-list.px Tue Oct 13 21:18:51 2009 -0400
@@ -29,7 +29,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " -d -nH -Nc -r ftp://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " -nH -Nc -r ftp://localhost:{{port}}/";
my $expected_error_code = 0;
diff -r ee7b9018a483 tests/Test-iri-list.px
--- a/tests/Test-iri-list.px Fri Oct 09 02:23:26 2009 -0700
+++ b/tests/Test-iri-list.px Tue Oct 13 21:18:51 2009 -0400
@@ -143,7 +143,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " --iri -d -i http://localhost:{{port}}/url_list.txt";
+my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt";
my $expected_error_code = 0;
diff -r ee7b9018a483 tests/Test-iri.px
--- a/tests/Test-iri.px Fri Oct 09 02:23:26 2009 -0700
+++ b/tests/Test-iri.px Tue Oct 13 21:18:51 2009 -0400
@@ -186,7 +186,7 @@
},
);
-my $cmdline = $WgetTest::WGETPATH . " -d --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
my $expected_error_code = 0;

View File

@ -1,149 +0,0 @@
For static linking, we need to use -l<libname> and not <full path to lib>,
else it tries to link against the .so. The lib-link.m4 code is limited here.
Martin Schlemmer <azarah@gentoo.org>
--- configure
+++ configure
@@ -5862,7 +5862,7 @@ fi
LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
else
haveit=
for x in $ltrpathdirs; do
@@ -5875,10 +5875,10 @@ fi
ltrpathdirs="$ltrpathdirs $found_dir"
fi
if test "$acl_hardcode_direct" = yes; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
else
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
haveit=
for x in $rpathdirs; do
if test "X$x" = "X$found_dir"; then
@@ -5910,7 +5910,7 @@ fi
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
fi
if test "$acl_hardcode_minus_L" != no; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
else
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
fi
@@ -6854,7 +6854,7 @@ fi
LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
else
haveit=
for x in $ltrpathdirs; do
@@ -6867,10 +6867,10 @@ fi
ltrpathdirs="$ltrpathdirs $found_dir"
fi
if test "$acl_hardcode_direct" = yes; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
else
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
haveit=
for x in $rpathdirs; do
if test "X$x" = "X$found_dir"; then
@@ -6902,7 +6902,7 @@ fi
LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
fi
if test "$acl_hardcode_minus_L" != no; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
else
LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
fi
@@ -26907,7 +26907,7 @@ fi
LTLIBGNUTLS="${LTLIBGNUTLS}${LTLIBGNUTLS:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
else
haveit=
for x in $ltrpathdirs; do
@@ -26920,10 +26920,10 @@ fi
ltrpathdirs="$ltrpathdirs $found_dir"
fi
if test "$acl_hardcode_direct" = yes; then
- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
else
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
haveit=
for x in $rpathdirs; do
if test "X$x" = "X$found_dir"; then
@@ -26955,7 +26955,7 @@ fi
LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-L$found_dir"
fi
if test "$acl_hardcode_minus_L" != no; then
- LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
+ LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
else
LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
fi
@@ -27183,7 +27183,7 @@ if test "${ac_cv_libgnutls+set}" = set; then
else
ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBGNUTLS"
+ LIBS="$LIBGNUTLS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -27636,7 +27636,7 @@ fi
LTLIBSSL="${LTLIBSSL}${LTLIBSSL:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
else
haveit=
for x in $ltrpathdirs; do
@@ -27649,10 +27649,10 @@ fi
ltrpathdirs="$ltrpathdirs $found_dir"
fi
if test "$acl_hardcode_direct" = yes; then
- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
else
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
haveit=
for x in $rpathdirs; do
if test "X$x" = "X$found_dir"; then
@@ -27684,7 +27684,7 @@ fi
LIBSSL="${LIBSSL}${LIBSSL:+ }-L$found_dir"
fi
if test "$acl_hardcode_minus_L" != no; then
- LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
+ LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
else
LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
fi
@@ -27912,7 +27912,7 @@ if test "${ac_cv_libssl+set}" = set; then
else
ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBSSL"
+ LIBS="$LIBSSL $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF

View File

@ -1,133 +0,0 @@
http://bugs.gentoo.org/301312
http://savannah.gnu.org/bugs/index.php?26786
http://lists.gnu.org/archive/html/bug-wget/2009-03/msg00033.html
--- src/gnutls.c
+++ src/gnutls.c
@@ -45,6 +45,7 @@ as that of the covered work. */
#include "connect.h"
#include "url.h"
#include "ssl.h"
+#include "host.h"
/* Note: some of the functions private to this file have names that
begin with "wgnutls_" (e.g. wgnutls_read) so that they wouldn't be
@@ -181,7 +182,7 @@ static struct transport_implementation w
};
bool
-ssl_connect (int fd)
+ssl_connect (int fd, const char *hostname)
{
static const int cert_type_priority[] = {
GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0
@@ -189,8 +190,17 @@ ssl_connect (int fd)
struct wgnutls_transport_context *ctx;
gnutls_session session;
int err;
+
gnutls_init (&session, GNUTLS_CLIENT);
gnutls_set_default_priority (session);
+
+ /* We set the server name but only if it's not an IP address. */
+ if (!is_ip_address(hostname))
+ {
+ gnutls_server_name_set (session, GNUTLS_NAME_DNS,
+ hostname, strlen(hostname));
+ }
+
gnutls_certificate_type_set_priority (session, cert_type_priority);
gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, credentials);
gnutls_transport_set_ptr (session, (gnutls_transport_ptr) fd);
--- src/host.c
+++ src/host.c
@@ -904,3 +904,19 @@ host_cleanup (void)
host_name_addresses_map = NULL;
}
}
+
+/* Determine whether or not a hostname is an IP address that we recognise. */
+bool
+is_ip_address (const char *name)
+{
+ const char *endp;
+
+ endp = name + strlen(name);
+ if (is_valid_ipv4_address(name, endp))
+ return true;
+#ifdef ENABLE_IPV6
+ if (is_valid_ipv6_address(name, endp))
+ return true;
+#endif
+ return false;
+}
--- src/host.h
+++ src/host.h
@@ -102,4 +102,6 @@ bool sufmatch (const char **, const char
void host_cleanup (void);
+bool is_ip_address(const char *);
+
#endif /* HOST_H */
--- src/http.c
+++ src/http.c
@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat
if (conn->scheme == SCHEME_HTTPS)
{
- if (!ssl_connect_wget (sock))
+ if (!ssl_connect_wget (sock, u->host))
{
fd_close (sock);
return CONSSLERR;
--- src/openssl.c
+++ src/openssl.c
@@ -47,6 +47,7 @@ as that of the covered work. */
#include "connect.h"
#include "url.h"
#include "ssl.h"
+#include "host.h"
/* Application-wide SSL context. This is common to all SSL
connections. */
@@ -390,7 +391,7 @@ static struct transport_implementation o
Returns true on success, false on failure. */
bool
-ssl_connect_wget (int fd)
+ssl_connect_wget (int fd, const char *hostname)
{
SSL *conn;
struct openssl_transport_context *ctx;
@@ -401,6 +402,19 @@ ssl_connect (int fd)
conn = SSL_new (ssl_ctx);
if (!conn)
goto error;
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ /* If the SSL library was build with support for ServerNameIndication
+ then use it whenever we have a hostname. If not, don't, ever. */
+ if (!is_ip_address(hostname))
+ {
+ if (!SSL_set_tlsext_host_name(conn, hostname)) {
+ DEBUGP (("Failed to set TLS server-name indication."));
+ goto error;
+ }
+ }
+#endif
+
if (!SSL_set_fd (conn, fd))
goto error;
SSL_set_connect_state (conn);
--- src/ssl.h
+++ src/ssl.h
@@ -33,7 +33,7 @@ as that of the covered work. */
#define GEN_SSLFUNC_H
bool ssl_init (void);
-bool ssl_connect_wget (int);
+bool ssl_connect_wget (int, const char *);
bool ssl_check_certificate (int, const char *);
#endif /* GEN_SSLFUNC_H */

View File

@ -0,0 +1,31 @@
detect openssl via pkg-config if it's available
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,17 @@ dnl
dnl Checks for libraries.
dnl
+PKG_PROG_PKG_CONFIG
+
AS_IF([test x"$with_ssl" = xopenssl], [
+ PKG_CHECK_MODULES([OPENSSL], [openssl], [
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+ AC_LIBOBJ([openssl])
+ LIBS="$OPENSSL_LIBS $LIBS"
+ CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
+ LIBSSL=" " # ntlm check below wants this #395349
+ ], [
+
dnl some versions of openssl use zlib compression
AC_CHECK_LIB(z, compress)
@@ -294,6 +303,8 @@ AS_IF([test x$ssl_found != xyes],
])
+])
+
], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [

View File

@ -0,0 +1,68 @@
https://bugs.gentoo.org/479948
From ae80fd2ec75fafdbec9895b9d973f2966209d588 Mon Sep 17 00:00:00 2001
From: mancha <mancha1@hush.com>
Date: Sun, 5 May 2013 07:16:58 +0200
Subject: [PATCH] gnutls: do not abort on non-fatal alerts during handshake
Signed-off-by: mancha <mancha1@hush.com>
---
src/ChangeLog | 6 ++++++
src/gnutls.c | 25 ++++++++++++++++++++++---
2 files changed, 28 insertions(+), 3 deletions(-)
2013-05-05 mancha <mancha1@hush.com> (tiny change)
* gnutls.c (ssl_connect_wget): Don't abort on non-fatal alerts
received during handshake. For example, when connecting to servers
using TSL-SNI that send warning-level unrecognized_name alerts.
diff --git a/src/gnutls.c b/src/gnutls.c
index 769b005..54422fc 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -376,8 +376,9 @@ ssl_connect_wget (int fd, const char *hostname)
{
struct wgnutls_transport_context *ctx;
gnutls_session_t session;
- int err;
+ int err,alert;
gnutls_init (&session, GNUTLS_CLIENT);
+ const char *str;
/* We set the server name but only if it's not an IP address. */
if (! is_valid_ip_address (hostname))
@@ -440,10 +441,28 @@ ssl_connect_wget (int fd, const char *hostname)
return false;
}
- err = gnutls_handshake (session);
+ /* We don't stop the handshake process for non-fatal errors */
+ do
+ {
+ err = gnutls_handshake (session);
+ if (err < 0)
+ {
+ logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
+ if (err == GNUTLS_E_WARNING_ALERT_RECEIVED ||
+ err == GNUTLS_E_FATAL_ALERT_RECEIVED)
+ {
+ alert = gnutls_alert_get (session);
+ str = gnutls_alert_get_name (alert);
+ if (str == NULL)
+ str = "(unknown)";
+ logprintf (LOG_NOTQUIET, "GnuTLS: received alert [%d]: %s\n", alert, str);
+ }
+ }
+ }
+ while (err == GNUTLS_E_WARNING_ALERT_RECEIVED && gnutls_error_is_fatal (err) == 0);
+
if (err < 0)
{
- logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
gnutls_deinit (session);
return false;
}
--
1.8.4.3

View File

@ -0,0 +1,200 @@
From b97942cd6b496501b396ea3bc2710010f4591542 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 21 May 2012 18:39:59 -0400
Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
available
Newer versions of these packages ship with pkg-config files, so if we can
detect it via those, do so. If that fails, fall back to the old methods.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
configure.ac | 110 ++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 71 insertions(+), 39 deletions(-)
diff --git a/configure.ac b/configure.ac
index 873c3c9..779ff39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
AC_ARG_WITH(zlib,
[[ --without-zlib disable zlib ]])
+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
+ [Disable PCRE style regular expressions]))
+
AC_ARG_ENABLE(opie,
[ --disable-opie disable support for opie or s/key FTP login],
ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
@@ -237,11 +240,25 @@ dnl
dnl Checks for libraries.
dnl
+PKG_PROG_PKG_CONFIG
+
AS_IF([test x"$with_zlib" != xno], [
- AC_CHECK_LIB(z, compress)
+ PKG_CHECK_MODULES([ZLIB], zlib, [
+ LIBS="$ZLIB_LIBS $LIBS"
+ CFLAGS="$ZLIB_CFLAGS $CFLAGS"
+ ], [
+ AC_CHECK_LIB(z, compress)
+ ])
])
AS_IF([test x"$with_ssl" = xopenssl], [
+ PKG_CHECK_MODULES([OPENSSL], [openssl], [
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+ AC_LIBOBJ([openssl])
+ LIBS="$OPENSSL_LIBS $LIBS"
+ CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
+ LIBSSL=" " # ntlm check below wants this
+ ], [
dnl some versions of openssl use zlib compression
AC_CHECK_LIB(z, compress)
@@ -278,29 +295,29 @@ AS_IF([test x"$with_ssl" = xopenssl], [
;;
esac
-AS_IF([test x$ssl_found != xyes],
-[
- dnl Now actually check for -lssl if it wasn't already found
- AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
- #include <openssl/err.h>
- #include <openssl/rand.h>
- #include <openssl/des.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- ], [SSL_library_init ()])
- if test x"$LIBSSL" != x
- then
- ssl_found=yes
- AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
- AC_LIBOBJ([openssl])
- LIBS="$LIBSSL $LIBS"
- elif test x"$with_ssl" != x
- then
- AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
- fi
-])
+ AS_IF([test x$ssl_found != xyes], [
+ dnl Now actually check for -lssl if it wasn't already found
+ AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
+#include <openssl/ssl.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#include <openssl/des.h>
+#include <openssl/md4.h>
+#include <openssl/md5.h>
+ ], [SSL_library_init ()])
+ if test x"$LIBSSL" != x
+ then
+ ssl_found=yes
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+ AC_LIBOBJ([openssl])
+ LIBS="$LIBSSL $LIBS"
+ elif test x"$with_ssl" != x
+ then
+ AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
+ fi
+ ])
+ ])
], [
# --with-ssl is not gnutls: check if it's no
@@ -322,13 +322,20 @@ AS_IF([test x"$with_ssl" = xopenssl], [
], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [
- dnl Now actually check for -lssl
+ dnl Now actually check for gnutls
+ PKG_CHECK_MODULES([GNUTLS], [gnutls], [
+ AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
+ AC_LIBOBJ([gnutls])
+ LIBS="$GNUTLS_LIBS $LIBS"
+ CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
+ ], [
+
+ dnl Now actually check for -lgnutls
AC_CHECK_LIB(z, compress)
AC_CHECK_LIB(gpg-error, gpg_err_init)
AC_CHECK_LIB(gcrypt, gcry_control)
- dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h>
], [gnutls_global_init()])
@@ -342,6 +349,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
fi
+ ])
+
AC_CHECK_FUNCS(gnutls_priority_set_direct)
]) # endif: --with-ssl == no?
]) # endif: --with-ssl == openssl?
@@ -524,26 +541,41 @@ dnl
dnl Check for UUID
dnl
-AC_CHECK_HEADER(uuid/uuid.h,
- AC_CHECK_LIB(uuid, uuid_generate,
- [LIBS="${LIBS} -luuid"
- AC_DEFINE([HAVE_LIBUUID], 1,
- [Define if libuuid is available.])
- ])
-)
+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
+ [Generate UUIDs for WARC files via libuuid]))
+AS_IF([test "X$with_libuuid" != "Xno"],[
+ PKG_CHECK_MODULES([UUID], uuid, [
+ LIBS="$UUID_LIBS $LIBS"
+ CFLAGS="$UUID_CFLAGS $CFLAGS"
+ ], [
+ AC_CHECK_HEADER(uuid/uuid.h,
+ AC_CHECK_LIB(uuid, uuid_generate,
+ [LIBS="${LIBS} -luuid"
+ AC_DEFINE([HAVE_LIBUUID], 1,
+ [Define if libuuid is available.])
+ ])
+ )
+ ])
+])
dnl
dnl Check for PCRE
dnl
-AC_CHECK_HEADER(pcre.h,
- AC_CHECK_LIB(pcre, pcre_compile,
- [LIBS="${LIBS} -lpcre"
- AC_DEFINE([HAVE_LIBPCRE], 1,
- [Define if libpcre is available.])
- ])
-)
-
+AS_IF([test "X$enable_pcre" != "Xno"],[
+ PKG_CHECK_MODULES([PCRE], libpcre, [
+ LIBS="$PCRE_LIBS $LIBS"
+ CFLAGS="$PCRE_CFLAGS $CFLAGS"
+ ], [
+ AC_CHECK_HEADER(pcre.h,
+ AC_CHECK_LIB(pcre, pcre_compile,
+ [LIBS="${LIBS} -lpcre"
+ AC_DEFINE([HAVE_LIBPCRE], 1,
+ [Define if libpcre is available.])
+ ])
+ )
+ ])
+])
dnl Needed by src/Makefile.am
AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
--
1.8.4.3

View File

@ -0,0 +1,32 @@
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
Date: 2013-06-18
Initial Package Version: 1.14
Upstream Status: Submitted
Origin: Arch
Description: Build with perl-5.18.
http://lists.gnu.org/archive/html/bug-wget/2013-06/msg00046.html
From 2ed1707b5d8be66feb80cccfe8e11e719b52b99a Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 17 Jun 2013 23:31:46 +0530
Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18
---
diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
index 86c4b18..9db6de1 100755
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@@ -291,7 +291,7 @@ while(<$inf>) {
if (defined $1) {
my $thing = $1;
if ($ic =~ /\@asis/) {
- $_ = "\n=item $thing\n";
+ $_ = "\n=item C<$thing>\n";
} else {
# Entity escapes prevent munging by the <> processing below.
$_ = "\n=item $ic\&LT;$thing\&GT;\n";
--
1.8.3.1

View File

@ -0,0 +1,31 @@
link to the man manual pages
document user agent issue vs portage fetching
https://bugs.gentoo.org/327229
--- a/doc/sample.wgetrc
+++ b/doc/sample.wgetrc
@@ -5,7 +5,10 @@
## You can use this file to change the default behaviour of wget or to
## avoid having to type many many command-line options. This file does
## not contain a comprehensive list of commands -- look at the manual
-## to find out what you can put into this file.
+## to find out what you can put into this file. You can find this here:
+## $ info wget.info 'Startup File'
+## Or online here:
+## https://www.gnu.org/software/wget/manual/wget.html#Startup-File
##
## Wget initialization file can reside in /usr/local/etc/wgetrc
## (global, for all users) or $HOME/.wgetrc (for a single user).
@@ -14,6 +15,11 @@
## as well as change them, in most cases, as the values on the
## commented-out lines are the default values (e.g. "off").
+## You should not modify user_agent in the global config file. Instead,
+## keep that in your ~/.wgetrc file. If you really want to modify it
+## globally, make sure you set a custom FETCHCOMMAND in your package
+## manager because you will randomly break fetching with some servers.
+
##
## Global settings (useful for setting up in /usr/local/etc/wgetrc).

View File

@ -0,0 +1,190 @@
From 5730efa0804468d342cb82d1ac9d5fc794ff572d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 16 May 2014 11:29:53 +0200
Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
available
Newer versions of these packages ship with pkg-config files, so if we can
detect it via those, do so. If that fails, fall back to the old methods.
Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
(Mon, 21 May 2012 18:39:59 -0400)
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
configure.ac | 107 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 77 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac
index c5437bf..e0e2b25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
AC_ARG_WITH(zlib,
[[ --without-zlib disable zlib ]])
+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
+ [Disable PCRE style regular expressions]))
+
AC_ARG_ENABLE(opie,
[ --disable-opie disable support for opie or s/key FTP login],
ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
@@ -237,12 +240,28 @@ dnl
dnl Checks for libraries.
dnl
+PKG_PROG_PKG_CONFIG
+
AS_IF([test x"$with_zlib" != xno], [
with_zlib=yes
- AC_CHECK_LIB(z, compress)
+ PKG_CHECK_MODULES([ZLIB], zlib, [
+ LIBS="$ZLIB_LIBS $LIBS"
+ CFLAGS="$ZLIB_CFLAGS $CFLAGS"
+ AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
+ ], [
+ AC_CHECK_LIB(z, compress)
+ ])
])
AS_IF([test x"$with_ssl" = xopenssl], [
+ PKG_CHECK_MODULES([OPENSSL], [openssl], [
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+ AC_LIBOBJ([openssl])
+ LIBS="$OPENSSL_LIBS $LIBS"
+ CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
+ LIBSSL=" " # ntlm check below wants this
+ AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
+ ], [
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
dnl doesn't record its dependency on libdl, so we need to make sure
dnl -ldl ends up in LIBS on systems that have it. Most OSes use
@@ -276,9 +295,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
;;
esac
- AS_IF([test x$ssl_found != xyes], [
- dnl Now actually check for -lssl if it wasn't already found
- AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+ AS_IF([test x$ssl_found != xyes], [
+ dnl Now actually check for -lssl if it wasn't already found
+ AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/err.h>
@@ -286,17 +305,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
#include <openssl/des.h>
#include <openssl/md4.h>
#include <openssl/md5.h>
- ], [SSL_library_init ()])
- if test x"$LIBSSL" != x
- then
- ssl_found=yes
- AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
- AC_LIBOBJ([openssl])
- LIBS="$LIBSSL $LIBS"
- elif test x"$with_ssl" != x
- then
- AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
- fi
+ ], [SSL_library_init ()])
+ if test x"$LIBSSL" != x
+ then
+ ssl_found=yes
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+ AC_LIBOBJ([openssl])
+ LIBS="$LIBSSL $LIBS"
+ elif test x"$with_ssl" != x
+ then
+ AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
+ fi
+ ])
])
], [
@@ -305,6 +325,14 @@ AS_IF([test x"$with_ssl" = xopenssl], [
dnl default is -lgnutls
with_ssl=gnutls
+ PKG_CHECK_MODULES([GNUTLS], [gnutls], [
+ AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
+ AC_LIBOBJ([gnutls])
+ LIBS="$GNUTLS_LIBS $LIBS"
+ CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
+ AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
+ ], [
+
dnl Now actually check for -lgnutls
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h>
@@ -319,6 +347,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
fi
+ ])
+
AC_CHECK_FUNCS(gnutls_priority_set_direct)
]) # endif: --with-ssl != no?
]) # endif: --with-ssl == openssl?
@@ -535,26 +565,43 @@ dnl
dnl Check for UUID
dnl
-AC_CHECK_HEADER(uuid/uuid.h,
- AC_CHECK_LIB(uuid, uuid_generate,
- [LIBS="${LIBS} -luuid"
- AC_DEFINE([HAVE_LIBUUID], 1,
- [Define if libuuid is available.])
- ])
-)
+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
+ [Generate UUIDs for WARC files via libuuid]))
+AS_IF([test "X$with_libuuid" != "Xno"],[
+ PKG_CHECK_MODULES([UUID], uuid, [
+ LIBS="$UUID_LIBS $LIBS"
+ CFLAGS="$UUID_CFLAGS $CFLAGS"
+ AC_DEFINE([HAVE_LIBUUID], [1], [Define if using libuuid.])
+ ], [
+ AC_CHECK_HEADER(uuid/uuid.h,
+ AC_CHECK_LIB(uuid, uuid_generate,
+ [LIBS="${LIBS} -luuid"
+ AC_DEFINE([HAVE_LIBUUID], 1,
+ [Define if libuuid is available.])
+ ])
+ )
+ ])
+])
dnl
dnl Check for PCRE
dnl
-AC_CHECK_HEADER(pcre.h,
- AC_CHECK_LIB(pcre, pcre_compile,
- [LIBS="${LIBS} -lpcre"
- AC_DEFINE([HAVE_LIBPCRE], 1,
- [Define if libpcre is available.])
- ])
-)
-
+AS_IF([test "X$enable_pcre" != "Xno"],[
+ PKG_CHECK_MODULES([PCRE], libpcre, [
+ LIBS="$PCRE_LIBS $LIBS"
+ CFLAGS="$PCRE_CFLAGS $CFLAGS"
+ AC_DEFINE([HAVE_LIBPCRE], [1], [Define if using libpcre.])
+ ], [
+ AC_CHECK_HEADER(pcre.h,
+ AC_CHECK_LIB(pcre, pcre_compile,
+ [LIBS="${LIBS} -lpcre"
+ AC_DEFINE([HAVE_LIBPCRE], 1,
+ [Define if libpcre is available.])
+ ])
+ )
+ ])
+])
dnl Needed by src/Makefile.am
AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
--
1.9.3

View File

@ -0,0 +1,26 @@
From 3a47a1a918e9076133c046f8792cf68973f7c585 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 22 Jan 2014 22:07:18 +0100
Subject: [PATCH] Don't use --debug in Test--post-file.px
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
tests/Test--post-file.px | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Test--post-file.px b/tests/Test--post-file.px
index 1c017b7..1212af6 100755
--- a/tests/Test--post-file.px
+++ b/tests/Test--post-file.px
@@ -8,7 +8,7 @@ use HTTPTest;
###############################################################################
-my $cmdline = $WgetTest::WGETPATH . " -d --post-file=nofile http://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " --post-file=nofile http://localhost:{{port}}/";
my $expected_error_code = 3;
--
1.8.5.3

View File

@ -1,3 +0,0 @@
# To try ipv6 addresses first:
#prefer-family = IPv6

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>base-system</herd>
<use>
<flag name='ntlm'>Enable support for NTLM (Windows-based) authorization</flag>
<flag name='uuid'>Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:gnu:wget</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,76 +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/wget/wget-1.12-r2.ebuild,v 1.8 2010/09/19 17:50:58 armin76 Exp $
EAPI="2"
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.bz2"
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 )"
pkg_setup() {
if ! use ssl && use ntlm ; then
elog "USE=ntlm requires USE=ssl, so disabling ntlm support due to USE=-ssl"
fi
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.12-linking.patch
epatch "${FILESDIR}"/${PN}-1.12-sni.patch #301312
epatch "${FILESDIR}"/${P}-debug-tests.patch #286173
epatch "${FILESDIR}"/${P}-CVE-2010-2252.patch #329941
}
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 ssl && use_enable ntlm) \
$(use_enable debug)
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog* MAILING-LIST NEWS README
dodoc doc/sample.wgetrc
use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${D}"/etc/wgetrc
sed -i \
-e 's:/usr/local/etc:/etc:g' \
"${D}"/etc/wgetrc \
"${D}"/usr/share/man/man1/wget.1 \
"${D}"/usr/share/info/wget.info
}
pkg_preinst() {
ewarn "The /etc/wget/wgetrc file has been relocated to /etc/wgetrc"
if [[ -e ${ROOT}/etc/wget/wgetrc ]] ; then
if [[ -e ${ROOT}/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 "${ROOT}"/etc/wget/wgetrc "${ROOT}"/etc/wgetrc
rmdir "${ROOT}"/etc/wget 2>/dev/null
fi
fi
}

View File

@ -0,0 +1,83 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14-r1.ebuild,v 1.3 2014/01/18 05:35:17 vapier Exp $
EAPI="4"
inherit flag-o-matic toolchain-funcs autotools
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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 pcre +ssl static uuid zlib"
LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
pcre? ( dev-libs/libpcre[static-libs(+)] )
ssl? (
gnutls? ( net-libs/gnutls[static-libs(+)] )
!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
)
uuid? ( sys-apps/util-linux[static-libs(+)] )
zlib? ( sys-libs/zlib[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/pkgconfig
static? ( ${LIB_DEPEND} )
nls? ( sys-devel/gettext )"
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.14-pkg-config.patch
epatch "${FILESDIR}"/${P}-texi2pod.patch
epatch "${FILESDIR}"/${PN}-1.14-gnutls-ssl.patch #479948
epatch "${FILESDIR}"/${PN}-1.14-wgetrc.patch #327229
# We patch the wgetrc sample file which goes into the info page.
# Update the info timestamp to avoid regenerating it.
touch doc/sample.wgetrc.munged_for_texi_inclusion doc/wget.info
eautoreconf
}
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
if use static ; then
append-ldflags -static
tc-export PKG_CONFIG
PKG_CONFIG+=" --static"
fi
econf \
--disable-rpath \
$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
$(use_enable ssl opie) \
$(use_enable ssl digest) \
$(use_enable idn iri) \
$(use_enable ipv6) \
$(use_enable nls) \
$(use_enable ntlm) \
$(use_enable pcre) \
$(use_enable debug) \
$(use_with uuid libuuid) \
$(use_with zlib)
}
src_install() {
default
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
}

View File

@ -0,0 +1,80 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14.ebuild,v 1.14 2014/01/18 05:35:17 vapier Exp $
EAPI="4"
inherit flag-o-matic toolchain-funcs autotools
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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 pcre +ssl static uuid zlib"
LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
pcre? ( dev-libs/libpcre[static-libs(+)] )
ssl? (
gnutls? ( net-libs/gnutls[static-libs(+)] )
!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
)
uuid? ( sys-apps/util-linux[static-libs(+)] )
zlib? ( sys-libs/zlib[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/pkgconfig
static? ( ${LIB_DEPEND} )
nls? ( sys-devel/gettext )"
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.13.4-openssl-pkg-config.patch \
"${FILESDIR}"/${P}-texi2pod.patch
eautoreconf
}
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
# some libraries tests lack configure options :( #432468
eval export ac_cv_{header_pcre_h,lib_pcre_pcre_compile}=$(usex pcre)
eval export ac_cv_{header_uuid_uuid_h,lib_uuid_uuid_generate}=$(usex uuid)
if use static ; then
append-ldflags -static
tc-export PKG_CONFIG
PKG_CONFIG+=" --static"
fi
econf \
--disable-rpath \
$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
$(use_enable ssl opie) \
$(use_enable ssl digest) \
$(use_enable idn iri) \
$(use_enable ipv6) \
$(use_enable nls) \
$(use_enable ntlm) \
$(use_enable debug) \
$(use_with zlib)
}
src_install() {
default
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
}

View File

@ -0,0 +1,78 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.15-r1.ebuild,v 1.1 2014/05/16 10:59:20 polynomial-c Exp $
EAPI="4"
inherit flag-o-matic toolchain-funcs autotools
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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 pcre +ssl static uuid zlib"
LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
pcre? ( dev-libs/libpcre[static-libs(+)] )
ssl? (
gnutls? ( net-libs/gnutls[static-libs(+)] )
!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
)
uuid? ( sys-apps/util-linux[static-libs(+)] )
zlib? ( sys-libs/zlib[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/pkgconfig
static? ( ${LIB_DEPEND} )
nls? ( sys-devel/gettext )"
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.15-pkg-config.patch \
"${FILESDIR}"/${PN}-1.15-test_fix.patch
eautoreconf
}
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
if use static ; then
append-ldflags -static
tc-export PKG_CONFIG
PKG_CONFIG+=" --static"
fi
econf \
--disable-rpath \
$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
$(use_enable ssl opie) \
$(use_enable ssl digest) \
$(use_enable idn iri) \
$(use_enable ipv6) \
$(use_enable nls) \
$(use_enable ntlm) \
$(use_enable pcre) \
$(use_enable debug) \
$(use_with uuid libuuid) \
$(use_with zlib)
}
src_install() {
default
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
}