Here's a fresh update. http://lists.gnu.org/archive/html/bug-wget/2014-12/msg00036.html
- disable libuuid use via CONFIGURE_ARGS - remove the patch for the TLS regression in wget-1.16 (the patch for RAND_egd will have to wait a bit more) - new patch to use uuid functions from libc (I'll report what changes are needed upstream) - patch for tests/ no longer needed regress tests pass and basic use shows no regressions ok? Index: Makefile =================================================================== RCS file: /cvs/ports/net/wget/Makefile,v retrieving revision 1.65 diff -u -p -r1.65 Makefile --- Makefile 20 Nov 2014 10:38:51 -0000 1.65 +++ Makefile 8 Dec 2014 11:24:11 -0000 @@ -2,8 +2,7 @@ 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,11 @@ TEST_DEPENDS += www/p5-HTTP-Message sec 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 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: Index: distinfo =================================================================== RCS file: /cvs/ports/net/wget/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 5 Nov 2014 22:11:40 -0000 1.14 +++ distinfo 8 Dec 2014 11:04:48 -0000 @@ -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 Index: patches/patch-src_openssl_c =================================================================== RCS file: /cvs/ports/net/wget/patches/patch-src_openssl_c,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_openssl_c --- patches/patch-src_openssl_c 20 Nov 2014 10:38:51 -0000 1.9 +++ patches/patch-src_openssl_c 8 Dec 2014 11:06:18 -0000 @@ -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) +--- 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 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) Index: patches/patch-src_warc_c =================================================================== RCS file: patches/patch-src_warc_c diff -N patches/patch-src_warc_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_warc_c 8 Dec 2014 12:02:25 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +- force use of uuid functions from libc. + +--- src/warc.c.orig Mon Dec 8 12:33:35 2014 ++++ src/warc.c Mon Dec 8 12:33:25 2014 +@@ -48,6 +48,8 @@ as that of the covered work. */ + #include <zlib.h> + #endif + ++#define HAVE_UUID_CREATE 1 ++ + #ifdef HAVE_LIBUUID + #include <uuid/uuid.h> + #elif HAVE_UUID_CREATE Index: patches/patch-tests_Test-stdouterr_px =================================================================== RCS file: patches/patch-tests_Test-stdouterr_px diff -N patches/patch-tests_Test-stdouterr_px --- patches/patch-tests_Test-stdouterr_px 5 Nov 2014 22:11:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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"; -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
