20095477 Upgrade wget to version 1.16 s11-update
authorJan Noha <jan.noha@oracle.com>
Fri, 14 Nov 2014 01:14:53 -0800
branchs11-update
changeset 3489 1da45854e7ec
parent 3485 22b95ae353c5
child 3501 7838ef31ac9c
20095477 Upgrade wget to version 1.16 19911029 problem in UTILITY/WGET
components/wget/Makefile
components/wget/wget.p5m
--- a/components/wget/Makefile	Fri Nov 21 05:46:39 2014 -0800
+++ b/components/wget/Makefile	Fri Nov 14 01:14:53 2014 -0800
@@ -23,15 +23,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wget
-COMPONENT_VERSION=	1.14
+COMPONENT_VERSION=	1.16
 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:1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b
+    sha256:9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/wget/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wget
 
+TPNO=           19782
+
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
@@ -50,19 +52,28 @@
 CONFIGURE_OPTIONS +=	PATH="$(PATH):/usr/perl5/bin"
 
 # Wget test suite will skip majority of tests with few Perl modules
-# missing on system. By uncommenting following lines it will pass 68
-# tests  out of 70 total tests (2 tests are skipped).
+# missing on system. By uncommenting following lines it will pass 82
+# tests  out of 83 total tests (1 test in which wget tries to output
+# to a non-existing device /dev/full fails with wrong error code).
 #URI=URI-1.60
 #WWW=libwww-perl-5.837
+#SOCK=IO-Socket-SSL-1.62
 #COMPONENT_TEST_ENV = "http_proxy="
+#COMPONENT_TEST_ENV += "https_proxy="
+#COMPONENT_TEST_ENV += "ftp_proxy="
+#COMPONENT_TEST_ENV += "no_proxy="
 #COMPONENT_PRE_TEST_ACTION = ( \
 	cd $(COMPONENT_SRC)/tests; \
 	wget http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$(URI).tar.gz; \
 	wget http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$(WWW).tar.gz; \
+	wget http://cpan.metacpan.org/authors/id/S/SU/SULLR/$(SOCK).tar.gz; \
 	gtar --get $(URI)/URI $(URI)/URI.pm \
 	     --strip-components=1 -f $(URI).tar.gz; \
 	gtar --get $(WWW)/lib/HTTP $(WWW)/lib/LWP $(WWW)/lib/LWP.pm \
-	     --strip-components=2 -f $(WWW).tar.gz; )
+	     --strip-components=2 -f $(WWW).tar.gz; \
+	gtar --get $(SOCK)/SSL.pm \
+	     --strip-components=1 -f $(SOCK).tar.gz; \
+	mkdir -p IO/Socket; mv SSL.pm IO/Socket; )
 
 # Enable ASLR for this component
 ASLR_MODE = $(ASLR_ENABLE)
--- a/components/wget/wget.p5m	Fri Nov 21 05:46:39 2014 -0800
+++ b/components/wget/wget.p5m	Fri Nov 14 01:14:53 2014 -0800
@@ -28,7 +28,7 @@
     value="GNU wget - a utility to retrieve files from the World Wide Web"
 set name=pkg.summary value="wget - GNU wget"
 set name=com.oracle.info.description value="GNU wget"
-set name=com.oracle.info.tpno value=9188
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)