From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- net-misc/wget/Manifest | 10 +- ...-fix-segfault-due-to-derefencing-null-ptr.patch | 66 ------------ .../wget/files/wget-1.92.2-openssl-1.1.0-r1.patch | 80 -------------- net-misc/wget/wget-1.19.1-r2.ebuild | 2 +- net-misc/wget/wget-1.19.2-r2.ebuild | 114 -------------------- net-misc/wget/wget-1.19.3.ebuild | 2 +- net-misc/wget/wget-1.19.4.ebuild | 117 +++++++++++++++++++++ 7 files changed, 123 insertions(+), 268 deletions(-) delete mode 100644 net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch delete mode 100644 net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch delete mode 100644 net-misc/wget/wget-1.19.2-r2.ebuild create mode 100644 net-misc/wget/wget-1.19.4.ebuild (limited to 'net-misc/wget') diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 1f3fb8b1f5d5..52202fe74509 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -3,12 +3,10 @@ AUX wget-1.19.1-CVE-2017-13089.patch 1093 BLAKE2B a268a832b13ba6e08c8cf7889e4998 AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7aff9939e13144ce1848753a41dedbf267d50276925b888cf98f4e60f869f4bd6d4fe16dd5a6380bcb212ec828e845e895a4 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36 AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 BLAKE2B ac176a5172f000ab32f62bfb8b6ff9c661b23b4d7525aaa37cf4018a7c1d9fe6b25359d1e46e9d83774a9b27dbf398f4040b9bf0fe0bb89438006a88158541bd SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9 AUX wget-1.19.1-fix-Python-test-suite.patch 8721 BLAKE2B 7109cd205ae2ef07da8954093f8a3b7583944ba1dc965529b702e4db7c11df6c7d0765b8e22e231432f38d04f1d4c6a9b7521b65c050cabf0cff71f44130527d SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19 -AUX wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch 2148 BLAKE2B 0eae4ae98a081764b271f7b4c83f1100d957a77ab48d0eea7b6ce4ffa79ffc1ee88523c801603a8c2eee5c7b33382bcec0c6d6fd48ed1a731af6f2a7ebae8671 SHA512 35d6d3dd10da123b4aeca1888b690439c8e3f20754e44be987e04c3966cacb1663833d8e7ddfe0067ba300ee6393833c2f6a7611bc3518eabb84649216cf4c33 -AUX wget-1.92.2-openssl-1.1.0-r1.patch 2426 BLAKE2B 92f533614e9e01b974b06ea7ffc3c7240dd576161ef84d3ac0dcccc279088fb1e55045668a2d275159618c26de07274e4d4e1857ecdcaf36c745e471b174a0eb SHA512 e8fc99f46b5ea3df12cc3af29e075e52cec7f79b65981d1f0aebdcca02741cff2379290d6781e8380d915c7fb8cb29541d0d0f961bf55785ea4cbc7984cece35 DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 -DIST wget-1.19.2.tar.gz 4349267 BLAKE2B 3622d39ea477d4137bd7f2a443d141d8832e2e1adf4dceb5c396aea782fee31bd69ad2b49771062f25c57e6a21701f844077000dfa175e89eae26cf4c3fdca09 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd DIST wget-1.19.3.tar.gz 4311432 BLAKE2B 7c636465b1fe575531ec6616d27a07d3c4b398dda002eb4199d4c72906f233067a420f1c3a0878b3fe3cb9fae47a12cd50a83098f20f59ca6dd35bc37b1468a6 SHA512 8e1cbad2a31880befaf2c079bb17a357a135f6f2402048d27ac367430dbd932ef1b8197fb1002a64474e5480a8d9e41146b5cfd591d204b2f8b0bb240ecddb2c -EBUILD wget-1.19.1-r2.ebuild 3374 BLAKE2B 3fb70d8ce5acbe8bf3c70f880bce4527e42cdfeb5a0c6cc71b0665526c1e6ed8768ada32eadc1f42e97264390a54d724a66c60c7eee806628bebc73fac98e811 SHA512 463eda01a400073e3b34ac69f3c2ab56901d2143214ad342a054a0fa509c61921574977fefa5631d4df05ad9dd3258d377c26dffc9b9dc4112fb89a67d7c9e66 -EBUILD wget-1.19.2-r2.ebuild 3312 BLAKE2B c1d176288d7b68c46bc611db01d7329c99ffae676cfe8ac54a490a102eb6bf1194ca73600c95b5a0d4a9d92d696e276daf324a943f5d6eb977b88a66cce0e30a SHA512 9522cd93591a914a00c7e0f8f505e0e233464448fad7ae92c159e26b70f9347b3b977d7ad08967fe5cd4c0da8c3ecc96aec31220f6953e2b00896370b0c438e1 -EBUILD wget-1.19.3.ebuild 3196 BLAKE2B dee16405c78aa85f12558a4037e7ac3514dd680dfb42599ac4e8115eac3a7f1d596a05578920e30a0fa8a276fbbb52750141c636ccf150bb272f6d1ce4c81e46 SHA512 f19fcc2c53e21296d2e481feb4179a48e852dae4598ce28c12c711bb7f339553ddcca42164cd633b4c8f51cd87cc6c789d2893205146fc1c155baace05ad35ba +DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b68284230553b03280a6262e60b3d0b5af3bd9fdd334d09cac5ed3417c3a7e8736b1710f3a7402a123b4633b95e4 SHA512 e84b0c40235b160ade69e18f2f139c782eb2387edc97a847c11dbb906c0273daf6d0ef5afe20360ba965c7da8b5e109f5a45e39ea93d20ec945575203235943a +EBUILD wget-1.19.1-r2.ebuild 3362 BLAKE2B 9e0843ac2153d0530b997170a7d3a6b09a1555ee77c45592a0333ebb0ac3d130f743abf3357a227dde7da3ff27ab97ba3d5e5e7e197c3925382098af20aeca9f SHA512 3db627638b306b5cfcda192938ce2272ecce0e9c73c3fe497e2f057421d1d04306e2c1c9bf913d0fc4ae4080d591ef5b4a184e31bcbaaf1471c0500c448e8d8d +EBUILD wget-1.19.3.ebuild 3184 BLAKE2B ebeb8056f889895dee8493d813c7f9140ae3bfcad804396a6c8198becb7586f04900e7199dacfc4d4faafdfcbd818b7203abeb630d9d1b562a1351dd6601ba74 SHA512 348444c652f31edd9ca6e5c8fb8d287c31be04bd510647d240ba75dc419c9f3026621e83821eaef105fa0c1bbd1ac962b25b63bcbb185fefa57f823b57855d7d +EBUILD wget-1.19.4.ebuild 3184 BLAKE2B ebeb8056f889895dee8493d813c7f9140ae3bfcad804396a6c8198becb7586f04900e7199dacfc4d4faafdfcbd818b7203abeb630d9d1b562a1351dd6601ba74 SHA512 348444c652f31edd9ca6e5c8fb8d287c31be04bd510647d240ba75dc419c9f3026621e83821eaef105fa0c1bbd1ac962b25b63bcbb185fefa57f823b57855d7d MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c 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 deleted file mode 100644 index 8a66e08c3e3b..000000000000 --- a/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 973c26ed7d51052a7b6e120ed1b84e47266667e1 Mon Sep 17 00:00:00 2001 -From: Darshit Shah -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 ---- - 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/files/wget-1.92.2-openssl-1.1.0-r1.patch b/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch deleted file mode 100644 index 79f33b157599..000000000000 --- a/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -174,11 +174,16 @@ ssl_init (void) - { - SSL_METHOD const *meth; - long ssl_options = 0; -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ int ssl_proto_version = 0; -+#endif - - #if OPENSSL_VERSION_NUMBER >= 0x00907000 - if (ssl_true_initialized == 0) - { -+#if OPENSSL_API_COMPAT < 0x10100000L - OPENSSL_config (NULL); -+#endif - ssl_true_initialized = 1; - } - #endif -@@ -202,8 +207,12 @@ ssl_init (void) - CONF_modules_load_file(NULL, NULL, - CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); - #endif -+#if OPENSSL_API_COMPAT >= 0x10100000L -+ OPENSSL_init_ssl(0, NULL); -+#else - SSL_library_init (); - SSL_load_error_strings (); -+#endif - #if OPENSSL_VERSION_NUMBER < 0x10100000L - SSLeay_add_all_algorithms (); - SSLeay_add_ssl_algorithms (); -@@ -229,16 +238,31 @@ ssl_init (void) - ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; - break; - case secure_protocol_tlsv1: -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+ ssl_proto_version = TLS1_VERSION; -+#else - meth = TLSv1_client_method (); -+#endif - break; - - #if OPENSSL_VERSION_NUMBER >= 0x10001000 - case secure_protocol_tlsv1_1: -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+ ssl_proto_version = TLS1_1_VERSION; -+#else - meth = TLSv1_1_client_method (); -+#endif - break; - - case secure_protocol_tlsv1_2: -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+ ssl_proto_version = TLS1_2_VERSION; -+#else - meth = TLSv1_2_client_method (); -+#endif - break; - #else - case secure_protocol_tlsv1_1: -@@ -262,8 +286,15 @@ ssl_init (void) - if (!ssl_ctx) - goto error; - -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) - if (ssl_options) - SSL_CTX_set_options (ssl_ctx, ssl_options); -+#endif -+ -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >=0x10100000L) -+ if (ssl_proto_version) -+ SSL_CTX_set_min_proto_version(ssl_ctx, ssl_proto_version); -+#endif - - /* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html - * Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more) diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild index 1bd59b76fe02..47e6bfaa78c0 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 ~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-r2.ebuild b/net-misc/wget/wget-1.19.2-r2.ebuild deleted file mode 100644 index b1bda330b2e4..000000000000 --- a/net-misc/wget/wget-1.19.2-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# 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 ~x64-cygwin ~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 - "${FILESDIR}"/${PN}-1.92.2-openssl-1.1.0-r1.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* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; 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 -} diff --git a/net-misc/wget/wget-1.19.3.ebuild b/net-misc/wget/wget-1.19.3.ebuild index 77b15f3632fc..0405d2bd198a 100644 --- a/net-misc/wget/wget-1.19.3.ebuild +++ b/net-misc/wget/wget-1.19.3.ebuild @@ -13,7 +13,7 @@ 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 ~x64-cygwin ~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 ~x64-cygwin ~amd64-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.4.ebuild b/net-misc/wget/wget-1.19.4.ebuild new file mode 100644 index 000000000000..0405d2bd198a --- /dev/null +++ b/net-misc/wget/wget-1.19.4.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2018 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 ~x64-cygwin ~amd64-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 )" + +# 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* ]] \ + || [[ ${CHOST} == *-cygwin* ]] \ + ; 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 + local myeconfargs=( + --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) + ) + ac_cv_libunistring=no \ + econf "${myeconfargs[@]}" +} + +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 +} -- cgit v1.2.3