From f45b37d89af7291bd9c918c889a904a64e35f8a3 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 5 Jul 2016 05:24:56 -0700 Subject: [PATCH] bump(net-misc/wget): sync with upstream --- .../md5-cache/net-misc/wget-1.16.3-r1 | 14 --- .../md5-cache/net-misc/wget-1.16.3-r2 | 14 --- .../metadata/md5-cache/net-misc/wget-1.17.1 | 14 --- .../md5-cache/net-misc/wget-1.17.1-r1 | 4 +- .../metadata/md5-cache/net-misc/wget-1.18 | 14 +++ .../portage-stable/net-misc/wget/ChangeLog | 94 +++++++++++++++++++ .../portage-stable/net-misc/wget/Manifest | 12 +-- .../wget/files/wget-1.16.3-ftp-pasv-ip.patch | 76 --------------- ...wget-1.17.1-gnulib-cygwin-sys_select.patch | 22 +++++ .../net-misc/wget/wget-1.16.3-r1.ebuild | 91 ------------------ .../net-misc/wget/wget-1.17.1-r1.ebuild | 3 +- .../net-misc/wget/wget-1.17.1.ebuild | 89 ------------------ ...wget-1.16.3-r2.ebuild => wget-1.18.ebuild} | 22 +++-- 13 files changed, 153 insertions(+), 316 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.18 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16.3-ftp-pasv-ip.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/wget/{wget-1.16.3-r2.ebuild => wget-1.18.ebuild} (70%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r1 deleted file mode 100644 index 817fb0c8af..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare setup test -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(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) -DESCRIPTION=Network utility to retrieve files from the WWW -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/wget/ -IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static test 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.16.3.tar.xz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=41e791d6416fc430057f1707809dedc8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r2 deleted file mode 100644 index 1100c3185a..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16.3-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare setup test -DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) 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? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) -DESCRIPTION=Network utility to retrieve files from the WWW -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/wget/ -IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) 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.16.3.tar.xz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=bb9020565404107926c94c282d584f3c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1 deleted file mode 100644 index 868e85cbf6..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install setup test -DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) 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? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) -DESCRIPTION=Network utility to retrieve files from the WWW -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/wget/ -IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) 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.17.1.tar.xz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=cb40e9155d8ee8bf4f08da0cada17e03 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1-r1 index ceeb9d064b..4d1fe967c1 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.17.1-r1 @@ -4,11 +4,11 @@ DESCRIPTION=Network utility to retrieve files from the WWW EAPI=5 HOMEPAGE=https://www.gnu.org/software/wget/ IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test 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 +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:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) 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.17.1.tar.xz _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=bb105c3380c0fe20a210c33d02a75162 +_md5_=b4fe549c18c0883f8667188e75ab93a5 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.18 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.18 new file mode 100644 index 0000000000..bb1dc621f4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.18 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare setup test +DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) 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:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) +DESCRIPTION=Network utility to retrieve files from the WWW +EAPI=5 +HOMEPAGE=https://www.gnu.org/software/wget/ +IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test 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:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) 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.18.tar.xz +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=0eaa3ce1e0c6f33d00ee6720bab36eca diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/ChangeLog b/sdk_container/src/third_party/portage-stable/net-misc/wget/ChangeLog index 16767c843d..27b15820c9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/ChangeLog @@ -203,3 +203,97 @@ add upstream fix for progress bar #410529 and use subslots w/openssl #576128 and w/gnutls #573936 + 25 May 2016; Matt Turner wget-1.17.1-r1.ebuild: + alpha stable, bug 583972. + + 25 May 2016; Jeroen Roovers wget-1.17.1-r1.ebuild: + Stable for HPPA PPC64 (bug #583972). + + Package-Manager: portage-2.3.0_rc1 + RepoMan-Options: --ignore-arches + + 26 May 2016; Lars Wendler wget-1.17.1-r1.ebuild: + x86 stable (bug #583972). + + Package-Manager: portage-2.2.28 + RepoMan-Options: --include-arches="x86" + Signed-off-by: Lars Wendler + + 27 May 2016; Lars Wendler wget-1.17.1-r1.ebuild: + amd64 stable (bug #583972). + + Package-Manager: portage-2.2.28 + Signed-off-by: Lars Wendler + + 30 May 2016; Michael Haubenwallner + +files/wget-1.17.1-gnulib-cygwin-sys_select.patch, wget-1.17.1-r1.ebuild: + add gnulib cygwin patch (#584312) + + Package-Manager: portage-2.2.26 + + 04 Jun 2016; Markus Meier wget-1.17.1-r1.ebuild: + arm stable, bug #583972 + + Package-Manager: portage-2.3.0_rc1 + RepoMan-Options: --include-arches="arm" + + 10 Jun 2016; Mike Frysinger wget-1.17.1-r1.ebuild: + mark 1.17.1-r1 arm64/ia64/m68k/ppc/s390/sh/sparc stable #583972 + +*wget-1.18 (10 Jun 2016) + + 10 Jun 2016; Mike Frysinger +wget-1.18.ebuild: + version bump to 1.18 + + 10 Jun 2016; Lars Wendler + -files/wget-1.16.3-ftp-pasv-ip.patch, -wget-1.16.3-r1.ebuild, + -wget-1.16.3-r2.ebuild, -wget-1.17.1.ebuild: + Removed old. + + Package-Manager: portage-2.2.28 + Signed-off-by: Lars Wendler + + 14 Jun 2016; Tobias Klausmann wget-1.18.ebuild: + 1.18-r0: add alpha keyword + + Gentoo-Bug: 585926 + + Package-Manager: portage-2.3.0_rc1 + + 15 Jun 2016; Jeroen Roovers wget-1.18.ebuild: + Stable for PPC64 (bug #585926). + + Package-Manager: portage-2.3.0_rc1 + RepoMan-Options: --ignore-arches + + 21 Jun 2016; Jeroen Roovers wget-1.18.ebuild: + Stable for HPPA (bug #585926). + + Package-Manager: portage-2.3.0_rc1 + RepoMan-Options: --ignore-arches + + 21 Jun 2016; Markus Meier wget-1.18.ebuild: + arm stable, bug #585926 + + Package-Manager: portage-2.3.0_rc1 + RepoMan-Options: --include-arches="arm" + + 22 Jun 2016; Fabian Groffen wget-1.18.ebuild: + fix linking wrt iconv on Darwin/Solaris, bug #585924 + + Package-Manager: portage-2.2.28 + + 27 Jun 2016; Agostino Sarubbo wget-1.18.ebuild: + amd64 stable wrt bug #585926 + + Package-Manager: portage-2.2.28 + RepoMan-Options: --include-arches="amd64" + Signed-off-by: Agostino Sarubbo + + 27 Jun 2016; Agostino Sarubbo wget-1.18.ebuild: + x86 stable wrt bug #585926 + + Package-Manager: portage-2.2.28 + RepoMan-Options: --include-arches="x86" + Signed-off-by: Agostino Sarubbo + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest index c79b833d90..5d451b7a01 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/Manifest @@ -1,11 +1,9 @@ -AUX wget-1.16.3-ftp-pasv-ip.patch 2886 SHA256 1600945a5a9a70d05ef7962b199dbbf7398df2082c8ebc35718c2177aa7992d3 SHA512 cab15345af859a85ce1b33273f7c52fb34e26ffc378f202e924970b477a404c59e15e082f7db2a9bc18ca8bbfb394c62a92829fc840ab5dcfc64ebb283eefafc WHIRLPOOL 1a1a226bb7dcd252978062e71871afbdcd0002060d9d556df616a658f47fdf63f1471c7154ef7caf9e8e464f29ffe50b8a05eabc8deb36fa9c31c98684ce8012 +AUX wget-1.17.1-gnulib-cygwin-sys_select.patch 850 SHA256 122a069e24ed07bab7a65ea31f10e14f755a1a464acb9568dc610f171b94b0a8 SHA512 1aaac731af050193a67a45aae7c100e8a6c4e5328b60b2e6f89ef774f66b6d997a1558b104157f65183191c9940c9d4a904f8b32666021ae20dff6b3e5726990 WHIRLPOOL befcfb16d080bcce5247705a32b82cca6af4ad5b1a6bd7e143b1eb6d901e4b3c625088f9b741abf2bd4785f37eb1a710f4897ce8f12053abdb84939d84c1658a AUX wget-1.17.1-progress-bar-segv.patch 1257 SHA256 2327403964970736d5ea1423d30017fa864f8a0e06d899acde2b62c61137c688 SHA512 7e7e463b1cf186dc6f1700dd923948497ed978ba66c0fe52be9a68ada9e8f0e953f97859bc134c2e91a7abbe57a464399181fd5397cc6c4392d1ad35bafd5943 WHIRLPOOL 5d34263fb8ff653eb829b618f7295d6121a9355c5a2418bc89bf2392752df75b4d1a6fdd6427df2ef51d1579f1d23f9e3d73bfdbadb350c7b464398c44b5bda0 -DIST wget-1.16.3.tar.xz 1794148 SHA256 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 SHA512 2d1fe632bcd116a68ae333278e368cb810081b51d2259ddade602bebf3dd08dee1f51f67c9c7d79d2410e19fe0d48a0b9a1b1a7c7c6eeb47e2840ce6c1a3471c WHIRLPOOL b8fe9880523fc295b092c3b9ff4f9af58c071f55d516903ded66df67722cd27955ad651f6f2f6032b611e5445dd89b8ff97878443abc04d095c29e76f0564490 DIST wget-1.17.1.tar.xz 1894140 SHA256 fe559b61eb9cc01635ac6206a14e02cb51591838c35fa83c7a4aacae0bdd97c9 SHA512 aa13584c94d0911268aeee9d6c7b1a7de259e0ec0f9daebe767e1f45afba097a6e9de09f370e55ead7acc9faa68f189063ac9e3d2d4a8d490f0b4edb6adc19ba WHIRLPOOL 3efbac1862cb6537ea08eeb95dea2f34ca29f6a170c80961ef3037d411458ac343dfd13f2ff056b528e6591fb282eaf4bf1c2113939b25764c39630510b35cf0 -EBUILD wget-1.16.3-r1.ebuild 2482 SHA256 6667b0ba4c9efc013a29d1728831d5a3cbbd9c9e1ccf98f8a7cb53efacf70905 SHA512 8da2c6fb341b7c656e4aae3c312790870735bafc863dabbd616636d14b8f0c60efe78af00be200e094790d4c6e9553612599594a99672c25be02c7080a72812b WHIRLPOOL eb0bf8ebb0c8dec157450d4d7f469d12c173a23e2a1e459e5be145c19a80d21b5bfc2d8fc45a15a9ea79c5d60f4fcfc767358cd518e1c1005866c9ecd7016fdc -EBUILD wget-1.16.3-r2.ebuild 2575 SHA256 0b77fb68cfdc7e813b86bd3a9e0cb469c471a5930e964e7aa074c544a9548d0f SHA512 f0188f115ef2d674511bfa668a44f0edf345be0479e5ca527c223674d3127c02028b607126538d5afa5ef96498538a3e462a507b3082d94fcf59bd4e885c304e WHIRLPOOL 7da3cc68eb3952fa7c0d9901677c642cab1a8efa15afc23c3b270ada266135a0085a4b36b8006b66e33f6be360382891d44138573c00602013beb3f514628cbe -EBUILD wget-1.17.1-r1.ebuild 2585 SHA256 7320eba6ec5e79180b04000d9baad7f04cc311468a431ba52ee509da5faff377 SHA512 4df031feee55dad4cd8e5987112d2382a1cfe0e17b267ba00a6c6e22323e1052ec6f114063e7c8a5919373060d07f6e80b76faab490934e632d43e85206e5250 WHIRLPOOL df80fcd3d6370f2a6ab8b085ec33bc28185e7051b539b7e4eacbebba8df412aba2b0572c64bf4c877346d57e797d25b57f19aa12dd4602bc251dc6dd16af661d -EBUILD wget-1.17.1.ebuild 2503 SHA256 4ea3ef77517df3195e9a09a93d58ef4c388b4da9ce5421434db665571a4003ad SHA512 1aaaabd196631a57d5639014c49cfa224ccd3ac757258267962c08fedf6f9744c2a3803a06198c382857da2648aa989f761335638ae540cc30aa9c21b8b5a431 WHIRLPOOL 678ea7645f936b36cb2b1bd342a729552e87be08db89b151447baeffc6f67d814ce0eefddb41ffe465cf1a6c48c203907a2299b5578d98b54ee65874d82fc283 -MISC ChangeLog 7521 SHA256 729672dcb38749f8dd5c4780c8c22b2e562d4e2470ffd5c9b557d13f156bf76c SHA512 08c14d930993b5729dde1b16fc616a2b6fe76a15d10af5f8f167de4bf6915e21277bc89465332c335e579c0c384ac4b875ddb6b05350f5c5a0408f58b58f2cc2 WHIRLPOOL 0c7a316ab06c21c842687fbeeea474b69d845f0caaf95a185617410da3ffad2a1045162989acd11ed684647df97ec32b95cd2a9eca6086547c0cfb9539847f46 +DIST wget-1.18.tar.xz 1922376 SHA256 b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1 SHA512 a3f6fe2f44a8d797659d55cffaf81eb82b770c96222a0ee29bc4931b13846f8d8b9a07806f2197723c873a1248922d59cca5a81869661d9c6c3107447c184338 WHIRLPOOL a9e467f8bd17909485329103c17a27da345421257ce82fdf77ff2e00bdae50b13570506a1887300868e99b608c71598596ee260d86879aaeddad14cbb5ec634d +EBUILD wget-1.17.1-r1.ebuild 2630 SHA256 36623ecfdbf9b460add020684acb26921c277ab0d1e9e3e1939a7ae4313e7793 SHA512 c7d10acd7271ed39e66e4119c2eda4b76b7d38547710f7c67ebc7ef9ac01b385d0e857ae871f0dd63b15fb4d9bb809b19fb68312b2e9a0b4b11dc5912173abec WHIRLPOOL 375f16faf20b35339097d8e931010e4c07f0ce96d17b6d54ded46714ca0583ec28b97fe951ca6715b379d87cc193863859dce7359da7c01025c3696077cc16bb +EBUILD wget-1.18.ebuild 2775 SHA256 b3a9e400ef47d70dea1dba51d75806d51bafb1982a3ace829d66d56984963330 SHA512 01ae3c60ca2d9e68deda801235ea19d757514621ee93a179f10aa56ede941af9d30998e0b52961d4400327d88628fa1a69b07ded19eb7cb590a04a829092a109 WHIRLPOOL 463ce87fc153ede7ea38215bb80069d6460137d536c943e6aa2d5f9703a214beb3e5b057e74bd73dd7affca2b5e3e209d4e47449e6bc47c4694e0e6b0b125191 +MISC ChangeLog 10450 SHA256 b18b5f97fa284bffe5c2e15038ecb70e081a3cd022ccd816bc75f80590e4f858 SHA512 74bebf8e5bf4737fbb650f818db35f6904f3371094a92c86cd5706d40ffa656ad138d74779c8b9a6ca789cff797025fca7e4f19cea76a0a5df6bf1b2ada8b10d WHIRLPOOL 17d0a2152778169c423670d40f581ca4bd506687ab9abbc8ab41b2a2659b16185b3bee4c8c9785781647c68db4ef21c1b12eeff3778ef6e48e9c376ebcd7f1be MISC ChangeLog-2015 29939 SHA256 902a2f6576d8c8dd01ee76cad7a689cb260d153139adc04b8d76abe91860d86d SHA512 55c752f56737ab6116057f3c158fcd4ba9b0405d43796e4114076c6fe849f7bdf3f771606c69551d5a1bd8a408ff5099158d461b26c840c6a4fe05824d8ae11e WHIRLPOOL 4b1c46b1c0c25428559442be8e2aef443686e00fd1889c908bf7d28291a5064e2dbe9879f0bd2025a8e0f49e42ed89334198f5dc9ee1122c91e1ba7c317678c7 MISC metadata.xml 570 SHA256 82fb121ee11ecf4d5b5a20e885a9773b301061d7a2b19755c01322aef615e1ae SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c WHIRLPOOL 08ddfe93af78d6f213e2a08f2414e2ae7e1442ec0eddf34ea29e1383a694f342c1dc72df8370b61828e7ef7914f2863519afc83e83a3cbd783a1be015703bcfb diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16.3-ftp-pasv-ip.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16.3-ftp-pasv-ip.patch deleted file mode 100644 index 9936f1ee19..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16.3-ftp-pasv-ip.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://bugs.gentoo.org/560418 - -fix from upstream - -From 075d7556964f5a871a73c22ac4b69f5361295099 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Tue, 11 Aug 2015 16:48:08 +0200 -Subject: [PATCH] Fix IP address exposure in FTP code - -* src/ftp.c (getftp): Do not use PORT when PASV fails. -* tests/FTPServer.px: Add pasv_not_supported server flag. -* tests/Makefile.am: Add Test-ftp-pasv-not-supported.px -* tests/Test-ftp-pasv-not-supported.px: New test - -Fix IP address exposure when automatically falling back from -passive mode to active mode (using the PORT command). A behavior that -may be used to expose a client's privacy even when using a proxy. ---- - NEWS | 2 ++ - src/ftp.c | 19 +++++++----- - tests/FTPServer.pm | 8 +++++ - tests/Makefile.am | 3 +- - tests/Test-ftp-pasv-not-supported.px | 60 ++++++++++++++++++++++++++++++++++++ - 5 files changed, 84 insertions(+), 8 deletions(-) - create mode 100755 tests/Test-ftp-pasv-not-supported.px - -diff --git a/src/ftp.c b/src/ftp.c -index 68f1a33..9dab99c 100644 ---- a/src/ftp.c -+++ b/src/ftp.c -@@ -252,7 +252,6 @@ getftp (struct url *u, wgint passed_expected_bytes, wgint *qtyread, - char *respline, *tms; - const char *user, *passwd, *tmrate; - int cmd = con->cmd; -- bool pasv_mode_open = false; - wgint expected_bytes = 0; - bool got_expected_bytes = false; - bool rest_failed = false; -@@ -883,13 +882,19 @@ Error in server response, closing control connection.\n")); - ? CONERROR : CONIMPOSSIBLE); - } - -- pasv_mode_open = true; /* Flag to avoid accept port */ - if (!opt.server_response) - logputs (LOG_VERBOSE, _("done. ")); -- } /* err==FTP_OK */ -- } -+ } -+ else -+ return err; - -- if (!pasv_mode_open) /* Try to use a port command if PASV failed */ -+ /* -+ * We do not want to fall back from PASSIVE mode to ACTIVE mode ! -+ * The reason is the PORT command exposes the client's real IP address -+ * to the server. Bad for someone who relies on privacy via a ftp proxy. -+ */ -+ } -+ else - { - err = ftp_do_port (csock, &local_sock); - /* FTPRERR, WRITEFAILED, bindport (FTPSYSERR), HOSTERR, -@@ -1148,8 +1153,8 @@ Error in server response, closing control connection.\n")); - } - - /* If no transmission was required, then everything is OK. */ -- if (!pasv_mode_open) /* we are not using pasive mode so we need -- to accept */ -+ if (!opt.ftp_pasv) /* we are not using passive mode so we need -+ to accept */ - { - /* Wait for the server to connect to the address we're waiting - at. */ --- -2.5.1 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch new file mode 100644 index 0000000000..0755136179 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch @@ -0,0 +1,22 @@ +https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00065.html + +--- gnulib/lib/sys_select.in.h.orig 2014-08-03 15:31:22.000000000 +0200 ++++ gnulib/lib/sys_select.in.h 2016-05-19 12:57:51.243064700 +0200 +@@ -81,7 +81,7 @@ + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + in . + But avoid namespace pollution on glibc systems. */ +-# ifndef __GLIBC__ ++# if !(defined __GLIBC__ || defined __NEWLIB__) + # include + # endif + +@@ -102,7 +102,7 @@ + But avoid namespace pollution on glibc systems. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) ++#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) + # include + #endif + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r1.ebuild deleted file mode 100644 index 03924089ac..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -PYTHON_COMPAT=( python{3_3,3_4} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://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 test 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} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext )" - -REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-ftp-pasv-ip.patch #560418 -} - -src_configure() { - # 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-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - econf \ - --disable-assert \ - --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_test() { - emake check -} - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1-r1.ebuild index 795931461a..056582ac78 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1-r1.ebuild @@ -14,7 +14,7 @@ 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" +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 libressl nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" @@ -51,6 +51,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-progress-bar-segv.patch + epatch "${FILESDIR}"/${P}-gnulib-cygwin-sys_select.patch } src_configure() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1.ebuild deleted file mode 100644 index 86a006c0bb..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.17.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -PYTHON_COMPAT=( python{3_3,3_4} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://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 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls[static-libs(+)] ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0[static-libs(+)] ) - libressl? ( dev-libs/libressl[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} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - # 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-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - econf \ - --disable-assert \ - --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_test() { - emake check -} - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.18.ebuild similarity index 70% rename from sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r2.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.18.ebuild index a44cd52ff3..f9605eea9f 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.18.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="4" +EAPI="5" + PYTHON_COMPAT=( python{3_3,3_4} ) -inherit flag-o-matic python-any-r1 toolchain-funcs +inherit flag-o-matic python-any-r1 toolchain-funcs eutils DESCRIPTION="Network utility to retrieve files from the WWW" HOMEPAGE="https://www.gnu.org/software/wget/" @@ -13,16 +13,16 @@ 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" +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 libressl nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( - gnutls? ( net-libs/gnutls[static-libs(+)] ) + gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( - !libressl? ( dev-libs/openssl:0[static-libs(+)] ) + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) @@ -49,7 +49,13 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-ftp-pasv-ip.patch #560418 + epatch "${FILESDIR}"/${PN}-1.17.1-gnulib-cygwin-sys_select.patch + # revert some hack that breaks linking, bug #585924 + if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] ; then + sed -i \ + -e 's/^ LIBICONV=$/:/' \ + configure || die + fi } src_configure() {