summaryrefslogtreecommitdiff
path: root/net-misc/wget
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/wget')
-rw-r--r--net-misc/wget/Manifest4
-rw-r--r--net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch66
-rw-r--r--net-misc/wget/wget-1.19.1-r2.ebuild2
-rw-r--r--net-misc/wget/wget-1.19.2-r1.ebuild109
4 files changed, 179 insertions, 2 deletions
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 3f479ce58ae9..283d390db753 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,10 +3,12 @@ AUX wget-1.19.1-CVE-2017-13089.patch 1093 SHA256 06631755cbd42eb092d4f158a348c0b
AUX wget-1.19.1-CVE-2017-13090.patch 1167 SHA256 25b6fcff6ff926b21d4ced14463521cebaba9e51de28269d69e8761676aeeb81 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36 WHIRLPOOL 6b40cd713357a4ebf47b6012ed23c5049718e572a51ec06ac4d9b941defd494c06aab916d3aa2947f718ca4bee316ff2475a4830b1f02e4af2f8204ad16d45ab
AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 SHA256 d351ada0a6ba3db96c71aee5372b2d21d56a2035192cf46562c28d78f4a4fab5 SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9 WHIRLPOOL e2708491ec1ed57a010b15eccc76c754745c939fde5eb282a7eb0fb322723c8f7cfa79aa06bc882207ded54f8902b5fe71cea018d9719ba2e667d561d9d63cac
AUX wget-1.19.1-fix-Python-test-suite.patch 8721 SHA256 d9549cc04352b5efdd8a44c36644fd86054527394fff965800a7977d9c3d899e SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19 WHIRLPOOL aed5cdf47deffcff06acad56e8700ed74a210951a0e412f1822c2daabeb78bd43aa689f2a6743b3b519172241319d1b209c46207e614a755852ec0de71aeb9f0
+AUX wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch 2148 SHA256 3b7ececb600b9c7caec61c6824a6fbad0ae5526a4aaccc5eb900e39f23236680 SHA512 35d6d3dd10da123b4aeca1888b690439c8e3f20754e44be987e04c3966cacb1663833d8e7ddfe0067ba300ee6393833c2f6a7611bc3518eabb84649216cf4c33 WHIRLPOOL ce49b9009dd4412ea2ab25443fde8625b0423bc2b9bc8d2ede0e8f6b39c2be2849f9ce8e4bd59ca5e5659bcd32beca71934eab9e56be56339332cf43ac724b00
DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
DIST wget-1.19.2.tar.gz 4349267 SHA256 4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd WHIRLPOOL 64398a8fc132a21d81d6fd7c97335739525fb8b31eca4aa4aa7048f251691c05ad1f004c36d6e633abf02d174ffefcb2176213e68fefb76bce505d247940af3a
EBUILD wget-1.19.1-r1.ebuild 3197 SHA256 29fc6002b0afa09b6b8718ba1e1a77e1329d4b8b58cd9d95644d7f2c09e968f2 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc WHIRLPOOL 4a989f7804950fa9b4bf1890f717e46a3dd64591df82b9627349b8a4bab9dbba4c9b83ade854effd5e8fd445a5f4223aa807dd3134583e831fde890f71e36926
-EBUILD wget-1.19.1-r2.ebuild 3377 SHA256 5fdd0894b199510a93d38d0fb7ed3b3a25892ca67272ccdfa3e63cab6a7fe689 SHA512 3696dc7cb093fbcd4dbffe61e981ded608f654a7475ff62e755c8cf3621b66862c6147b689cb779e49ae1ca728a0f501560d2247e1d6c08ff66fcf36c3b7d559 WHIRLPOOL 4c0e670b108bb6f85a9af67af3dc36ef91ddb13c31c0e5fad8b37d5db454ef65aa3b8af871f422d28da5caa9a2c9a3e58d523fff575772bcebd85c4a3248b278
+EBUILD wget-1.19.1-r2.ebuild 3376 SHA256 da536cd4ba7ee36f4499a4b42dbd7124a35db9b08fb49a67db9d526b9a54e862 SHA512 6832a9e562f4a25ea4bd2917643efc5f34e9e7cd9906e6e64a87c7ab45e11573850f5833c0c98c108c3d6f192659b8c56fbcfc969be2d0b53f04249796fd9191 WHIRLPOOL 670249ea0ae38986c189ed33eef0fcca7b4ef893adc2277c1b72198c36eaa40c4c11819faeb71c30fa5a6aeaa09d5f2c997ab4c6d94c6f0f87725169d9d891dd
+EBUILD wget-1.19.2-r1.ebuild 3205 SHA256 eab39a71a01150bd353bc8562ecd6f08bbd07526fc62cf8375b899518dcb2dce SHA512 8f0558e0c3316febfcbc5b8200ebc03ae50582fe129589de98af6d93fe21b251b92b5cfdc587ae173d03e7dadf96227167407d655097e97c9178ba746e349537 WHIRLPOOL 1476c9bb0f88b755bd11be75bf774db00a250b4768b6931709644e9d50fea32356c78d18a0cd7a032a9973baeb7e4507a93a2295ca5d7168408ea27d656c329e
EBUILD wget-1.19.2.ebuild 3118 SHA256 084c69c9ae1e1a242e85fb6d21d8e8c8643fe047162797500cd268b4b91d37fa SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738 WHIRLPOOL eadbe036d1a37bd4a0cc92d15282728d37a9cfd3d01d280a6782df59b714659c27f9b97c5f266f5b922934cae62bc5aa83fc0e2919d64781028db59be5585c09
MISC ChangeLog 11759 SHA256 b0200db8aa9205aa6cf590936f1758619e1b56fdb17c76314175d6031c287ccf SHA512 eb9e6c7b1d5cb9f3e550b3c7d89493da0026492b629d3b76c5f096b9ef7de499addb31fcf43dd4cfd01eaf73253ddd10ceef5937a9a1a8d18142f9e5c22b764b WHIRLPOOL 679e53afbcbdadd297e78cfbbbbbb4406d23f993f44d38388c0f55b74ec888ea1f81b29be95e36b19dcc92fe6f350861d59549b28a77eb884eba6bee3d0844a2
MISC ChangeLog-2015 29939 SHA256 902a2f6576d8c8dd01ee76cad7a689cb260d153139adc04b8d76abe91860d86d SHA512 55c752f56737ab6116057f3c158fcd4ba9b0405d43796e4114076c6fe849f7bdf3f771606c69551d5a1bd8a408ff5099158d461b26c840c6a4fe05824d8ae11e WHIRLPOOL 4b1c46b1c0c25428559442be8e2aef443686e00fd1889c908bf7d28291a5064e2dbe9879f0bd2025a8e0f49e42ed89334198f5dc9ee1122c91e1ba7c317678c7
diff --git a/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch b/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch
new file mode 100644
index 000000000000..8a66e08c3e3b
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch
@@ -0,0 +1,66 @@
+From 973c26ed7d51052a7b6e120ed1b84e47266667e1 Mon Sep 17 00:00:00 2001
+From: Darshit Shah <darnir@gnu.org>
+Date: Mon, 6 Nov 2017 10:09:03 +0100
+Subject: Fix Segfault due to derefencing null ptr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/http.c(gethttp): When Encoding is gzip, ensure that the
+Content-Type Header was actually seen. Without this, the "type" variable
+is null causing a Segfault.
+
+Reported-By: Noël Köthe <noel@debian.org>
+---
+ src/http.c | 30 +++++++++++++++++++-----------
+ 1 file changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/http.c b/src/http.c
+index 9954848..2a5454f 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -3714,22 +3714,30 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs,
+ && opt.compression != compression_none)
+ {
+ /* Make sure the Content-Type is not gzip before decompressing */
+- const char * p = strchr (type, '/');
+- if (p == NULL)
+- {
+- hs->remote_encoding = ENC_GZIP;
+- hs->local_encoding = ENC_NONE;
+- }
+- else
++ if (type)
+ {
+- p++;
+- if (c_tolower(p[0]) == 'x' && p[1] == '-')
+- p += 2;
+- if (0 != c_strcasecmp (p, "gzip"))
++ const char * p = strchr (type, '/');
++ if (p == NULL)
+ {
+ hs->remote_encoding = ENC_GZIP;
+ hs->local_encoding = ENC_NONE;
+ }
++ else
++ {
++ p++;
++ if (c_tolower(p[0]) == 'x' && p[1] == '-')
++ p += 2;
++ if (0 != c_strcasecmp (p, "gzip"))
++ {
++ hs->remote_encoding = ENC_GZIP;
++ hs->local_encoding = ENC_NONE;
++ }
++ }
++ }
++ else
++ {
++ hs->remote_encoding = ENC_GZIP;
++ hs->local_encoding = ENC_NONE;
+ }
+ }
+ #endif
+--
+cgit v1.0-41-gc330
+
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
index 3d5b65590c4f..dcf8b23bf05c 100644
--- a/net-misc/wget/wget-1.19.1-r2.ebuild
+++ b/net-misc/wget/wget-1.19.1-r2.ebuild
@@ -13,7 +13,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 ~amd64-linux ~arm-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 ~amd64-linux ~arm-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 )"
diff --git a/net-misc/wget/wget-1.19.2-r1.ebuild b/net-misc/wget/wget-1.19.2-r1.ebuild
new file mode 100644
index 000000000000..112e811986a8
--- /dev/null
+++ b/net-misc/wget/wget-1.19.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+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.gz"
+
+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 ~amd64-linux ~arm-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 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch )
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[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(+)] )"
+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_prepare() {
+ default
+
+ # revert some hack that breaks linking, bug #585924
+ if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+ sed -i \
+ -e 's/^ LIBICONV=$/:/' \
+ configure || die
+ fi
+}
+
+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
+
+ # There is no flag that controls this. libunistring-prefix only
+ # controls the search path (which is why we turn it off below).
+ # Further, libunistring is only needed w/older libidn2 installs,
+ # and since we force the latest, we can force off libunistring. #612498
+ ac_cv_libunistring=no \
+ econf \
+ --disable-assert \
+ --disable-rpath \
+ --without-included-libunistring \
+ --without-libunistring-prefix \
+ $(use_enable debug) \
+ $(use_enable idn iri) \
+ $(use_enable ipv6) \
+ $(use_enable nls) \
+ $(use_enable ntlm) \
+ $(use_enable pcre) \
+ $(use_enable ssl digest) \
+ $(use_enable ssl opie) \
+ $(use_with idn libidn) \
+ $(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+ $(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 \
+ || die
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 10:43:05 +0000