# HG changeset patch # User Lukas Rovensky # Date 1452006740 28800 # Node ID aa644d83002b44272f301035734fd85df43acbc5 # Parent f947e0b8b7530339fa09b43ee96c579b3f999d87 22294048 Upgrade wget to version 1.17.1 diff -r f947e0b8b753 -r aa644d83002b components/wget/Makefile --- a/components/wget/Makefile Fri Jan 22 00:45:23 2016 -0800 +++ b/components/wget/Makefile Tue Jan 05 07:12:20 2016 -0800 @@ -18,21 +18,21 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= wget -COMPONENT_VERSION= 1.16.3 +COMPONENT_VERSION= 1.17.1 COMPONENT_PROJECT_URL= http://www.gnu.org/software/wget/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 + sha256:fe559b61eb9cc01635ac6206a14e02cb51591838c35fa83c7a4aacae0bdd97c9 COMPONENT_ARCHIVE_URL= http://ftp.gnu.org/gnu/wget/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/wget -TPNO= 22235 +TPNO= 26307 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk @@ -43,7 +43,6 @@ COMPONENT_TEST_TRANSFORMS += '-ne "/^FAIL/p" ' COMPONENT_TEST_TRANSFORMS += '-ne "/^===/p" ' COMPONENT_TEST_TRANSFORMS += '-ne "/^\# /p" ' -COMPONENT_TEST_TRANSFORMS += '-ne "/^Testsuite/p" ' COMPONENT_TEST_TRANSFORMS += '-ne "/^See/p" ' COMPONENT_TEST_TRANSFORMS += '-ne "/^Please/p" ' diff -r f947e0b8b753 -r aa644d83002b components/wget/patches/hsts.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/wget/patches/hsts.c.patch Tue Jan 05 07:12:20 2016 -0800 @@ -0,0 +1,35 @@ +flock system call is not available on Solaris but it can be +replaced by calling fcntl. This patch will be sent upstream +after being reworked into a format that will be acceptable. + +--- wget-1.17.1/src/hsts.c.orig Tue Jan 12 09:14:54 2016 ++++ wget-1.17.1/src/hsts.c Tue Jan 12 09:16:55 2016 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + struct hsts_store { + struct hash_table *table; +@@ -498,6 +499,7 @@ + struct_stat st; + FILE *fp = NULL; + int fd = 0; ++ struct flock lock_data; + + if (filename && hash_table_count (store->table) > 0) + { +@@ -506,7 +508,11 @@ + { + /* Lock the file to avoid potential race conditions */ + fd = fileno (fp); +- flock (fd, LOCK_EX); ++ lock_data.l_start = 0; ++ lock_data.l_len = 0; ++ lock_data.l_whence = SEEK_SET; ++ lock_data.l_type = F_WRLCK; ++ fcntl(fd, F_SETLKW, &lock_data); + + /* If the file has changed, merge the changes with our in-memory data + before dumping them to the file. diff -r f947e0b8b753 -r aa644d83002b components/wget/patches/wgetrc.patch --- a/components/wget/patches/wgetrc.patch Fri Jan 22 00:45:23 2016 -0800 +++ b/components/wget/patches/wgetrc.patch Tue Jan 05 07:12:20 2016 -0800 @@ -4,8 +4,8 @@ wget.texi shall be updated with this change. As this is Solaris specific patch it will not be pushed upstream. ---- wget-1.16.3/doc/sample.wgetrc.orig Fri Jun 5 07:33:36 2015 -+++ wget-1.16.3/doc/sample.wgetrc Fri Jun 5 07:36:22 2015 +--- wget-1.17.1/doc/sample.wgetrc.orig Mon Nov 30 06:07:56 2015 ++++ wget-1.17.1/doc/sample.wgetrc Tue Jan 5 06:47:25 2016 @@ -10,7 +10,7 @@ ## Or online here: ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File @@ -24,47 +24,8 @@ ## Think well before you change them, since they may reduce wget's ## functionality, and make it behave contrary to the documentation: ## ---- wget-1.16.3/doc/wget.texi.orig Fri Jun 5 08:00:14 2015 -+++ wget-1.16.3/doc/wget.texi Fri Jun 5 08:07:16 2015 -@@ -190,7 +190,7 @@ - Most of the features are fully configurable, either through command line - options, or via the initialization file @file{.wgetrc} (@pxref{Startup - File}). Wget allows you to define @dfn{global} startup files --(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also -+(@file{/etc/wgetrc} by default) for site settings. You can also - specify the location of a startup file with the --config option. - - -@@ -197,7 +197,7 @@ - @ignore - @c man begin FILES - @table @samp --@item /usr/local/etc/wgetrc -+@item /etc/wgetrc - Default location of the @dfn{global} startup file. - - @item .wgetrc -@@ -2872,8 +2872,7 @@ - @cindex location of wgetrc - - When initializing, Wget will look for a @dfn{global} startup file, --@file{/usr/local/etc/wgetrc} by default (or some prefix other than --@file{/usr/local}, if Wget was not installed there) and read commands -+@file{/etc/wgetrc} by default and read commands - from there, if it exists. - - Then it will look for the user's file. If the environmental variable -@@ -2884,7 +2883,7 @@ - - The fact that user's settings are loaded after the system-wide ones - means that in case of collision user's wgetrc @emph{overrides} the --system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). -+system-wide wgetrc (in @file{/etc/wgetrc} by default). - Fascist admins, away! - - @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File ---- wget-1.16.3/doc/sample.wgetrc.munged_for_texi_inclusion.orig Mon Jun 8 07:16:15 2015 -+++ wget-1.16.3/doc/sample.wgetrc.munged_for_texi_inclusion Mon Jun 8 07:18:17 2015 +--- wget-1.17.1/doc/sample.wgetrc.munged_for_texi_inclusion.orig Fri Dec 11 09:42:38 2015 ++++ wget-1.17.1/doc/sample.wgetrc.munged_for_texi_inclusion Tue Jan 5 06:47:25 2016 @@ -10,7 +10,7 @@ ## Or online here: ## https://www.gnu.org/software/wget/manual/wget.html#Startup-File @@ -83,3 +44,42 @@ ## Think well before you change them, since they may reduce wget's ## functionality, and make it behave contrary to the documentation: ## +--- wget-1.17.1/doc/wget.texi.orig Thu Dec 10 14:25:14 2015 ++++ wget-1.17.1/doc/wget.texi Tue Jan 5 06:47:26 2016 +@@ -191,7 +191,7 @@ + Most of the features are fully configurable, either through command line + options, or via the initialization file @file{.wgetrc} (@pxref{Startup + File}). Wget allows you to define @dfn{global} startup files +-(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also ++(@file{/etc/wgetrc} by default) for site settings. You can also + specify the location of a startup file with the --config option. + + +@@ -198,7 +198,7 @@ + @ignore + @c man begin FILES + @table @samp +-@item /usr/local/etc/wgetrc ++@item /etc/wgetrc + Default location of the @dfn{global} startup file. + + @item .wgetrc +@@ -3036,8 +3036,7 @@ + @cindex location of wgetrc + + When initializing, Wget will look for a @dfn{global} startup file, +-@file{/usr/local/etc/wgetrc} by default (or some prefix other than +-@file{/usr/local}, if Wget was not installed there) and read commands ++@file{/etc/wgetrc} by default and read commands + from there, if it exists. + + Then it will look for the user's file. If the environmental variable +@@ -3048,7 +3047,7 @@ + + The fact that user's settings are loaded after the system-wide ones + means that in case of collision user's wgetrc @emph{overrides} the +-system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). ++system-wide wgetrc (in @file{/etc/wgetrc} by default). + Fascist admins, away! + + @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File diff -r f947e0b8b753 -r aa644d83002b components/wget/test/results-64.master --- a/components/wget/test/results-64.master Fri Jan 22 00:45:23 2016 -0800 +++ b/components/wget/test/results-64.master Tue Jan 05 07:12:20 2016 -0800 @@ -82,11 +82,11 @@ FAIL: Test--start-pos--continue.px FAIL: Test--httpsonly-r.px FAIL: Test-204.px +PASS: Test-ftp-pasv-not-supported.px ============================================================================ -Testsuite summary for wget 1.16.3 ============================================================================ -# TOTAL: 84 -# PASS: 17 +# TOTAL: 85 +# PASS: 18 # SKIP: 0 # XFAIL: 0 # FAIL: 67