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.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

6 files changed, 412 insertions, 15 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index d8fb701fbe69..3b4e25e282c0 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.177 2013/11/04 06:38:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.178 2013/12/23 07:23:59 vapier Exp $
+
+*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:
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 337aa996e1ef..378327c68188 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -9,7 +9,10 @@ AUX wget-1.12-sni.patch 3668 SHA256 6178e1d56f5d86e6915d22247e07d23946cfceea76a9
 AUX wget-1.13-static-link-libz.patch 897 SHA256 ab054e459334f64709e5d2cbf3e7c3251ab4c98a68ceea91c3f56d51e2098251 SHA512 4a22981640072747c1605391735d253798a38d6c0329da778d97bf7a602065c8af1dc832c2a0e82f3d4f153855510beac53f17b0df88d622161be9448b02b6e9 WHIRLPOOL 0203648195ce55dfc2b2b181ddb1c690812acf7e99f828702c7fd4ba1de4269b1add16da2efdf02e7689b508c787968c0f8e8b679f5a5887a4968c1f690f6cc8
 AUX wget-1.13.4-no-gets.patch 734 SHA256 fd08eafc7239247e0eeb24abf964b1c436415e94e47bf701a1121b911cf350a4 SHA512 a74889255aa34c109106807785094277f291b142f18e8c3ab098947c1090e6e3b4853f9621928b8fadcc014a3d63d2b2c680f9348d7618b1a24f69ad8d2355fe WHIRLPOOL 2851e4865ebb7bbeb98d07cd926f51489113e63e3555f9f85ffaf3e76bb9b990483cd866862219a0c724c2b5d61eda0006adf5a72b8e74c20136ea7f2cf91968
 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 wgetrc-ipv6 54 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518 SHA512 e9573a33fe834298db78e83ff1c08b6e0f0f148e9fe6baf7dd43c8b668ea3da2e98c70a9d9e5c6cc0b9cf64aa44b44af749079e232674ef3dbeaf6ee987268d3 WHIRLPOOL 4ed1f3727ddcace8c2413363aa328f05c54b559a4a4a5dc6885fae6b3fe83975c89920de3cf8994d6493561d75da72151f612d8da51cbf9088aa35da5519ad05
 DIST wget-1.12.tar.bz2 1609032 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a SHA512 d2cadfe3049858ffb073e3bbc43b18c93e298143a29b6504c832df1f8145c4f8b0fdf6f80236975d42655358894d1ea757fa9ae3793457783408614d1fc67e0f WHIRLPOOL 678e074966559cadb1504968bf8ab3719c87697987f5fddba7795d5e53fdd179e442913a96a0184c04f3367ef5f9bc83127a6bb36ac6814e4a315eee7319598e
 DIST wget-1.13.3.tar.xz 1448908 SHA256 8d8346caec575a0d4953b5a16dcdf37fedcb739f4d5db85307749996375489ba SHA512 b433c91ee09b3f0252f514575dcefab17dcefcb75bf8b23d3f09b269814a70c18bb52797820fd27d9367404978254b597133d847ca4afd3783cdea729889aa58 WHIRLPOOL 4f6c7373edd3b61d8d03e67d5842521cb729ab14243b8b91264f5316f3d1e8406329e13488fba8157b2ac53565b508c5baa058de404602106c159204f85deb19
@@ -19,23 +22,24 @@ EBUILD wget-1.12-r3.ebuild 2250 SHA256 db1f22e3f8f61d94d7702f7d6788bcd1512b8e11a
 EBUILD wget-1.13.3-r2.ebuild 1967 SHA256 06af5aaa52d01364b8978bf62af02d3a071897445d1bcb8a97ca485c059b7014 SHA512 db829fcf3e699d893f5185aab26ffe79a732fe474af70921649f817c7d1c465e1323610a8cd9591912682537a1f5f9a8525666c9730c27f9c82d68a4b7bb8e08 WHIRLPOOL 2d7522d9abf06145b19c8e628a988fc81fa23cfb8784d8eab61745ae4425490128333a3e91fb6398f3e70b4c74ecc6c579127eb1f9553eb2a265433169cca673
 EBUILD wget-1.13.4-r1.ebuild 2442 SHA256 b6f997227853f3e0859b4042fa0ac83c5ff49aaf345591f30b0d1d2240a30d87 SHA512 393758f65f3763071580056badbff18093088635470c38e03b3d09530ff07d4c26812d5d3c9644bd72a01bc52ca6b63627d4224da8902dad240321f9a5cd722e WHIRLPOOL 709f1150ff7bf6886abf2f31486bb99b644657655f295b8dd483749bbde95986f63e25b8d8a8312e10b6291cef3dc833dcdb688841e7213a741557d15240407c
 EBUILD wget-1.13.4.ebuild 1901 SHA256 05e56751c8c5a74a1fb3a27ad9c6062acc1b4685e7ab2440ea9513cf889a2cb8 SHA512 29d8f383dfea8b209ffe9944bfa4c5e9403c8af64a30ccaa96e7a5a97036ad5ae04cc9d809b6e09acaac3f8934877038fd788d9ac892636ef6ca280a1bdceab4 WHIRLPOOL e2b0b778a9beb5f2b5a54521ca44848a1fa600a1d00f4a77fa06c3322a7a091fb04f227f3045903b24a0292ec272ab2a87dfa8ad07166f3c5f3836fb27643adb
+EBUILD wget-1.14-r1.ebuild 2936 SHA256 042b93aa54d0979690467a6732dcb8022e19f6524c39a23c6a390b4f00ce0913 SHA512 d78f0d3f321586f4edee646d8f592d9aade9fa0f57c5eb6a3533bc7627adc25aefc4aeb40881b3c7512e168f0b6c1a3dce714f5c59a282b6878b821d18363865 WHIRLPOOL 96715e794003cafa4af3db01c380135b02817b145817b4eb2604ce7ee023290c1d8e0831ea1601a2efb1c6dc0f5f5fd47c82f2f1ac6b439cc10501c6d195205e
 EBUILD wget-1.14.ebuild 2636 SHA256 ba9ed66d4455a91468daa0a99af7e7af7257bdf1f4e2ca9107038e43488206e6 SHA512 85ba12e3e7dcdf9765d798b11f051fa3a185c07b533f5f52bea0d0a8191399312745ba0491052c613fbcea52c5cdfeb060d50944bf2c9a4bb9ad63a5e0916d26 WHIRLPOOL 9b80a2dfe5929ed94fa7bbd14fe6f82a34913dc06fbc0524379804cb92b89c6c66e533c92898542e8a80b79fbdbee2731736a8e871b7259c21ac8cb67a61b02b
-MISC ChangeLog 26084 SHA256 efafb741aef090fdac9a5cd95dba6f0eb0eae18a071429acb10a5035f1d874f9 SHA512 07fac7039c39cae5665feab835ea4e5c02fadea1297433cbe6a780212054e5389719315b515fe9a68791053378ebb196c53a0838b1587b3b9e39945a7e02c0ff WHIRLPOOL caee8ac7b67fb2bd8bb40876ca0fc6ddd22a5d25ff005e51ce20cec700e1fee5845b749ffb72e78c0538e3be700ad922e2e52536964380380fa9c113ace32912
+MISC ChangeLog 26510 SHA256 09842fea1ee055fe0c52690b7313a3a5879326badbbdbc31c54e802222154ae1 SHA512 73ee4c0afdafdef6ea5c33f77ca99b7f84aef659c6002e082e4fca565ab5061cfce9363e84554f1cd6388e483b2d9b5571e4efb3a6771088c048b924dfaa50a8 WHIRLPOOL d7b6de625ca37a3332e2994af26375a38f81c58b3c855a975fb77137045e18ab051f94971fc48d395ba3c52ead8359cc5d197e1885317211d4190019a5d090a1
 MISC metadata.xml 480 SHA256 623ea871cdd741de1f7b1bdde73f38d222d489ed7496694a3b8f2fff7d49cf44 SHA512 4dae8e65a95c5f03e0434fce20012581fb75e33310598ef6b099b11ad611dfdbc5043b0223b1cd791500b1d4dcd19c52ab94142587508b2ed362b11cc7acddb1 WHIRLPOOL 189bc2a775087a96010a7426b562cf55e9426bad2da13e085d14dcf713631466ee4fe9c3dffe1ee578482d7d5bf0e4cac2510af431a4ef1ec21626770fe284b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSd0D1AAoJEPiazRVxLXTFSWsP/iHKFhghLVbiJr9EYeP0qJ5G
-XblpWI7E4Pe+4p5EIk4pPDoj0dyEnEiTEM8Dgkl6DqkRYPm5i08k60nYH69ol96Y
-eaoRjLuMp41k68fhgb3F6j7zvTp48GOnFIHfWUw2cxPfiOPWJejmkpG6j+ntACJY
-3vxJQVIKXKOvNw7yiQDWQA9s9q4yHInTVGXPT0GqsgBb4PaDDgApUU7WzBb+dFRu
-EC89dkmJUJQ6s/8vGryPE/NNbkQZNlwbPy9XZ8syqoXLB+Niz4n0V3LwhGJMDRVW
-wPZU/pVW/BDMoB4E/UqlRwgSq92uh8Hr/ethlpjBK11PL9Ssw8prnxgHt3jy/nfB
-yVMw29f++serb+mBTd7yYqXgqABisI2RPs96TbtFr1SW4jbHAreRMrCXOWooy+di
-bHRAY3j50YJJbN9lSqB//F6INz6PKG7RV3a2RHOTncS8KChyXOX4lJfDUt8QSxQR
-OiPoZfpa6RF+5c1sXoDMcS7iy5f2762gWib26ZFm3mQV6fZJm3H59Fkfg8ZwhP3/
-QQtgJlthQXRxpgp5oFmpMRh5hi3ynuCuvRSGUbj2a5qxuy4B3VkU2ZspMsrJGxrL
-GMpOX4khlm1FSsEqXN98RhbPA9c1KvsYhDHe+D4rKDPSGWXgAl0NFQz8mMXc6QkX
-D06QeefoxD+QS+64cPaU
-=D/Vb
+iQIcBAEBCAAGBQJSt+UYAAoJELEHsLL7fEFWUlQP/1iVJx6cTr/miqevbQaOXrRg
+9nshhgPRxzlqTjfx/w6/0ffc9Bde0idWeLIGqVmnT/H7xyMHRA0KGhc8PZp7ULdq
+Oagcno3X1/EnrScSHQd/Fz8TKUMKg5tMJDzTfSXtT54JkMnJqzJEI6goReaPpE16
+xXXMml/9K0kL/jkCNc+Cu5cdjFgiRzDGSpVi517kDDeqI7udCNJd/pif4C6XCZt6
+aonVZ4CO4eBSpLPKluuh9ifdUxMZgo7YWQS/SO3dwM2Z3gWHtulLgmtmcKmZg6K8
+pLK7DAUAE+1KCAp3qJmq/pOwa7aFbvVhoonvt0Za+8GjDsbRq/0zfP0ZC5KVqFxL
+JNN+XRIdxfZ23KclSXhbQ7ZbspDZ+dUfsUqagymzzblRg/++HpBNHvOLqwiWFdYh
+/L3cTSEUDUpPft/IrIWGUryJvRKv1tp4PU8t2zbLtIpTo+Tx5cea1ocl1YrvAEIz
+mEJsaKSNlpeIdn3+RQ+e9Zh9qG+mvl5vnG8bqhPQoU+/6a2wEI1By5Fyn6pTNgqY
+eRPlfsr27Cclazkshpq8XPIvAeYj0kDF2Ml1aN5iWYWl9SnT92iw0lnpfOhDk4e/
++kCDrgHbwRDGT+Y3y13JPzRsKLQL/MJGB5KAQjnL9pGB6sP643xrgEn/Dki89vZG
+n+FuTdKbrl67iQMYt/r+
+=mj8G
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.14-gnutls-ssl.patch b/net-misc/wget/files/wget-1.14-gnutls-ssl.patch
new file mode 100644
index 000000000000..8d5fe81e1b55
--- /dev/null
+++ b/net-misc/wget/files/wget-1.14-gnutls-ssl.patch
@@ -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
+
diff --git a/net-misc/wget/files/wget-1.14-pkg-config.patch b/net-misc/wget/files/wget-1.14-pkg-config.patch
new file mode 100644
index 000000000000..ea6364bf3ae1
--- /dev/null
+++ b/net-misc/wget/files/wget-1.14-pkg-config.patch
@@ -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
+
diff --git a/net-misc/wget/files/wget-1.14-wgetrc.patch b/net-misc/wget/files/wget-1.14-wgetrc.patch
new file mode 100644
index 000000000000..8252aca4273c
--- /dev/null
+++ b/net-misc/wget/files/wget-1.14-wgetrc.patch
@@ -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).
diff --git a/net-misc/wget/wget-1.14-r1.ebuild b/net-misc/wget/wget-1.14-r1.ebuild
new file mode 100644
index 000000000000..284d25dca107
--- /dev/null
+++ b/net-misc/wget/wget-1.14-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 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.1 2013/12/23 07:23:59 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 ~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
+
+	# 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
+}