Update to wget-1.16.1

- remove patches for regress tests and the TLSv1.0 only issue, merged
  upstream
- libuuid use can now be prevented with CONFIGURE_ARGS
- add a CONFIGURE_ENV hack to avoid depending on python3 at build time
  (spotted by dcoppa@)

The Web ARChive code doesn't use uuid functions from libc (yet).

ok dcoppa@

net/wget/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.65 2014/11/20 10:38:51 jca Exp $
+# $OpenBSD: Makefile,v 1.66 2014/12/10 20:23:28 jca Exp $
 
 COMMENT =	retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME =	wget-1.16
-REVISION =	0
+DISTNAME =	wget-1.16.1
 CATEGORIES =	net
 
 HOMEPAGE =	https://www.gnu.org/software/wget/
@@ -33,11 +32,14 @@ TEST_DEPENDS +=		www/p5-HTTP-Message security/p5-IO-Socket-SSL
 FAKE_FLAGS =		sysconfdir="${PREFIX}/share/examples/wget"
 
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	--without-libpsl --with-ssl=openssl
+CONFIGURE_ARGS =	--without-libpsl \
+			--without-libuuid \
+			--with-ssl=openssl
+# wget-1.16.1: hack to avoid depending on python3 at build time
+CONFIGURE_ARGS +=	PYTHON="" \
+			am_cv_pathless_PYTHON="${MODPY_BIN}"
 CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-# do not pick up libuuid from sysutils/e2fsprogs
-CONFIGURE_ENV +=	ac_cv_header_uuid_uuid_h=no
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/build-aux
 
 pre-build:

net/wget/distinfo

@@ -1,2 +1,2 @@
-SHA256 (wget-1.16.tar.xz) = kmHdCQoXaHttwGgqJX6QqSbe8VYktlDo95mvV+XIsOc=
-SIZE (wget-1.16.tar.xz) = 1697308
+SHA256 (wget-1.16.1.tar.xz) = K5bHB+4V/oR/W8L4cqelMNyoA7knp1BBm0T1CAPhTTM=
+SIZE (wget-1.16.1.tar.xz) = 1760120

net/wget/patches/patch-src_openssl_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_openssl_c,v 1.9 2014/11/20 10:38:51 jca Exp $
---- src/openssl.c.orig	Mon Oct 27 09:15:33 2014
-+++ src/openssl.c	Wed Nov 19 21:21:07 2014
-@@ -89,9 +89,11 @@ init_prng (void)
+$OpenBSD: patch-src_openssl_c,v 1.10 2014/12/10 20:23:28 jca Exp $
+--- src/openssl.c.orig	Thu Dec  4 09:55:49 2014
++++ src/openssl.c	Mon Dec  8 12:06:14 2014
+@@ -91,9 +91,11 @@ init_prng (void)
    if (RAND_status ())
      return;
  
@@ -13,32 +13,3 @@ $OpenBSD: patch-src_openssl_c,v 1.9 2014/11/20 10:38:51 jca Exp $
  
    if (RAND_status ())
      return;
-@@ -201,6 +203,8 @@ ssl_init (void)
-   SSLeay_add_all_algorithms ();
-   SSLeay_add_ssl_algorithms ();
- 
-+  long ssl_options = 0;
-+
-   switch (opt.secure_protocol)
-     {
- #ifndef OPENSSL_NO_SSL2
-@@ -213,6 +217,9 @@ ssl_init (void)
-       break;
-     case secure_protocol_auto:
-     case secure_protocol_pfs:
-+      meth = SSLv23_client_method ();
-+      ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+      break;
-     case secure_protocol_tlsv1:
-       meth = TLSv1_client_method ();
-       break;
-@@ -233,6 +240,9 @@ ssl_init (void)
-   ssl_ctx = SSL_CTX_new ((SSL_METHOD *)meth);
-   if (!ssl_ctx)
-     goto error;
-+
-+  if (ssl_options)
-+    SSL_CTX_set_options (ssl_ctx, ssl_options);
- 
-   /* 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)

net/wget/patches/patch-tests_Test-stdouterr_px

@@ -1,12 +0,0 @@
-$OpenBSD: patch-tests_Test-stdouterr_px,v 1.1 2014/11/05 22:11:40 naddy Exp $
---- tests/Test-stdouterr.px.orig	Mon Oct 27 09:15:33 2014
-+++ tests/Test-stdouterr.px	Tue Nov  4 23:20:32 2014
-@@ -21,7 +21,7 @@ my %urls = (
- );
- 
- unless(-e "/dev/full") {
--    exit 2; # skip
-+    exit 77; # skip
- }
- 
- my $cmdline = $WgetTest::WGETPATH . " -c http://localhost:{{port}}/somefile.txt -O /dev/full";