gentoo resync : 04.12.2017

3 files changed, 198 insertions, 2 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index fd32cd8fbaeb..3ed23802a244 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -4,10 +4,12 @@ AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7a
 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
-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
+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
 EBUILD wget-1.19.1-r1.ebuild 3197 BLAKE2B 49b65323072fdc2a08c8bfb38656ce3f207bcb5f3cdc5cb8eda3a189b935561e85129a26f63f7d1762599d8916ad6e8594531e4cb6f7497235704fdc55597829 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc
 EBUILD wget-1.19.1-r2.ebuild 3375 BLAKE2B 2f4a81d38e42f68d269d10700962892c3a68255b445271dcfdd818d18bb83e18621197e23f97fb29c87041c227c96e1a4cfd33437e011df653de2e8a8ae72146 SHA512 a3015289d35284d0290049f2f80ae3835359d6292c4f2c7f486ae3c37d132733a20fda5eaf27e87c6af5d6e4c3d6ff6c7045cb9f6bc1d70ca924c301cee6eb2a
 EBUILD wget-1.19.2-r1.ebuild 3261 BLAKE2B 7ec99a0ac31be122ed386a220c2286f88e67cea3bc22a9ff797681fa62e8f5e756f5be37220f38e1cc660da9967f9f20a61dc90a8e4255ff89bbc5d4f849cc2f SHA512 d073c5925ca2c947702a493d27affae2fd58ff69d70cf95056f011c02e305ee9e4e2829eb65353c059f677b252d379cac2a97f34d5614b8a2ddefecc4fda49b6
+EBUILD wget-1.19.2-r2.ebuild 3312 BLAKE2B c1d176288d7b68c46bc611db01d7329c99ffae676cfe8ac54a490a102eb6bf1194ca73600c95b5a0d4a9d92d696e276daf324a943f5d6eb977b88a66cce0e30a SHA512 9522cd93591a914a00c7e0f8f505e0e233464448fad7ae92c159e26b70f9347b3b977d7ad08967fe5cd4c0da8c3ecc96aec31220f6953e2b00896370b0c438e1
 EBUILD wget-1.19.2.ebuild 3118 BLAKE2B 43f5233b48ae7ace63fd0927938377d4ed7c5a8ca7fbaf94ada87bc0e8c5382f1ae9a4c872f7190c0b3fc090bbf27c71da7362bc5aa239cd5460796fcff5b4de SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
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
new file mode 100644
index 000000000000..79f33b157599
--- /dev/null
+++ b/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch
@@ -0,0 +1,80 @@
+--- 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.2-r2.ebuild b/net-misc/wget/wget-1.19.2-r2.ebuild
new file mode 100644
index 000000000000..b1bda330b2e4
--- /dev/null
+++ b/net-misc/wget/wget-1.19.2-r2.ebuild
@@ -0,0 +1,114 @@
+# 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
+}