15807791 SUNBT7188805 wget update wanted for support of Subject Alternative Name - v1.14 s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 03 Apr 2014 02:07:48 -0700
branchs11-update
changeset 3043 7b03c95afcd1
parent 3042 e8d9a292d553
child 3044 6e52dcd9229a
15807791 SUNBT7188805 wget update wanted for support of Subject Alternative Name - v1.14 18075453 Update wget to ASLR + 64b
components/wget/Makefile
components/wget/patches/CVE-2010-2252.patch
components/wget/patches/sysdep.h.patch
components/wget/patches/wgetrc.patch
components/wget/wget.p5m
--- a/components/wget/Makefile	Thu Apr 03 01:16:22 2014 -0700
+++ b/components/wget/Makefile	Thu Apr 03 02:07:48 2014 -0700
@@ -18,17 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wget
-COMPONENT_VERSION=	1.12
+COMPONENT_VERSION=	1.14
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/wget/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
+    sha256:1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/wget/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wget
 
@@ -36,20 +36,42 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# Enforce wget binary to standard path
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+
+# Enforce openssl (--with-ssl=openssl) instead of default gnutls
+# (--with-ssl) as wget doesn't work for secure connections with gnutls. 
 # Set PATH to find /usr/perl5/bin/pod2man, so that the man page wget.1
 # can be automatically generated
-
 CONFIGURE_OPTIONS +=	--sysconfdir=/etc
-CONFIGURE_OPTIONS +=	--with-ssl
+CONFIGURE_OPTIONS +=	--with-ssl=openssl
 CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PATH="$(PATH):/usr/perl5/bin"
 
-build:		$(BUILD_32)
+# 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).
+#URI=URI-1.60
+#WWW=libwww-perl-5.837
+#COMPONENT_TEST_ENV = "http_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; \
+	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; )
 
-install:	$(INSTALL_32)
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
-test:		$(TEST_32)
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/wget/patches/CVE-2010-2252.patch	Thu Apr 03 01:16:22 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-diff -rcu wget-1.12.orig/doc/wget.texi wget-1.12/doc/wget.texi
---- wget-1.12.orig/doc/wget.texi	Fri Sep  4 14:22:04 2009
-+++ wget-1.12/doc/wget.texi	Tue Feb 15 03:26:00 2011
[email protected]@ -1487,6 +1487,13 @@
- @code{Content-Disposition} headers to describe what the name of a
- downloaded file should be.
- 
[email protected] Trust server names
[email protected] --trust-server-names
-+
-+If this is set to on, on a redirect the last component of the
-+redirection URL will be used as the local file name.  By default it is
-+used the last component in the original URL.
-+
- @cindex authentication
- @item --auth-no-challenge
- 
[email protected]@ -2799,6 +2806,10 @@
- Turn on recognition of the (non-standard) @samp{Content-Disposition}
- HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
- 
[email protected] trust_server_names = on/off
-+If set to on, use the last component of a redirection URL for the local
-+file name.
-+
- @item continue = on/off
- If set to on, force continuation of preexistent partially retrieved
- files.  See @samp{-c} before setting it.
-diff -rcu wget-1.12.orig/src/http.c wget-1.12/src/http.c
---- wget-1.12.orig/src/http.c	Mon Sep 21 20:02:18 2009
-+++ wget-1.12/src/http.c	Tue Feb 15 03:26:00 2011
[email protected]@ -2410,8 +2410,9 @@
- /* The genuine HTTP loop!  This is the part where the retrieval is
-    retried, and retried, and retried, and...  */
- uerr_t
--http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
--           int *dt, struct url *proxy, struct iri *iri)
-+http_loop (struct url *u, struct url *original_url, char **newloc,
-+           char **local_file, const char *referer, int *dt, struct url *proxy,
-+           struct iri *iri)
- {
-   int count;
-   bool got_head = false;         /* used for time-stamping and filename detection */
[email protected]@ -2457,7 +2458,8 @@
-     }
-   else if (!opt.content_disposition)
-     {
--      hstat.local_file = url_file_name (u);
-+      hstat.local_file =
-+        url_file_name (opt.trustservernames ? u : original_url);
-       got_name = true;
-     }
- 
[email protected]@ -2497,7 +2499,7 @@
- 
-   /* Send preliminary HEAD request if -N is given and we have an existing
-    * destination file. */
--  file_name = url_file_name (u);
-+  file_name = url_file_name (opt.trustservernames ? u : original_url);
-   if (opt.timestamping
-       && !opt.content_disposition
-       && file_exists_p (file_name))
-diff -rcu wget-1.12.orig/src/http.h wget-1.12/src/http.h
---- wget-1.12.orig/src/http.h	Fri Sep  4 09:31:54 2009
-+++ wget-1.12/src/http.h	Tue Feb 15 03:26:00 2011
[email protected]@ -33,8 +33,8 @@
- 
- struct url;
- 
--uerr_t http_loop (struct url *, char **, char **, const char *, int *,
--		  struct url *, struct iri *);
-+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *,
-+                  int *, struct url *, struct iri *);
- void save_cookies (void);
- void http_cleanup (void);
- time_t http_atotm (const char *);
-diff -rcu wget-1.12.orig/src/init.c wget-1.12/src/init.c
---- wget-1.12.orig/src/init.c	Mon Sep 21 20:02:41 2009
-+++ wget-1.12/src/init.c	Tue Feb 15 03:26:00 2011
[email protected]@ -243,6 +243,7 @@
-   { "timeout",          NULL,                   cmd_spec_timeout },
-   { "timestamping",     &opt.timestamping,      cmd_boolean },
-   { "tries",            &opt.ntry,              cmd_number_inf },
-+  { "trustservernames", &opt.trustservernames,  cmd_boolean },
-   { "useproxy",         &opt.use_proxy,         cmd_boolean },
-   { "user",             &opt.user,              cmd_string },
-   { "useragent",        NULL,                   cmd_spec_useragent },
-diff -rcu wget-1.12.orig/src/main.c wget-1.12/src/main.c
---- wget-1.12.orig/src/main.c	Mon Sep 21 20:03:11 2009
-+++ wget-1.12/src/main.c	Tue Feb 15 03:26:00 2011
[email protected]@ -266,6 +266,7 @@
-     { "timeout", 'T', OPT_VALUE, "timeout", -1 },
-     { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
-     { "tries", 't', OPT_VALUE, "tries", -1 },
-+    { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
-     { "user", 0, OPT_VALUE, "user", -1 },
-     { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
-     { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
[email protected]@ -675,6 +676,8 @@
-     N_("\
-   -I,  --include-directories=LIST  list of allowed directories.\n"),
-     N_("\
-+  --trust-server-names  use the name specified by the redirection url last component.\n"),
-+    N_("\
-   -X,  --exclude-directories=LIST  list of excluded directories.\n"),
-     N_("\
-   -np, --no-parent                 don't ascend to the parent directory.\n"),
-diff -rcu wget-1.12.orig/src/options.h wget-1.12/src/options.h
---- wget-1.12.orig/src/options.h	Mon Sep 21 20:03:47 2009
-+++ wget-1.12/src/options.h	Tue Feb 15 03:26:00 2011
[email protected]@ -242,6 +242,7 @@
-   char *encoding_remote;
-   char *locale;
- 
-+  bool trustservernames;
- #ifdef __VMS
-   int ftp_stmlf;                /* Force Stream_LF format for binary FTP. */
- #endif /* def __VMS */
-diff -rcu wget-1.12.orig/src/retr.c wget-1.12/src/retr.c
---- wget-1.12.orig/src/retr.c	Fri Sep  4 09:31:54 2009
-+++ wget-1.12/src/retr.c	Tue Feb 15 03:26:00 2011
[email protected]@ -689,7 +689,8 @@
- #endif
-       || (proxy_url && proxy_url->scheme == SCHEME_HTTP))
-     {
--      result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri);
-+      result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt,
-+                          proxy_url, iri);
-     }
-   else if (u->scheme == SCHEME_FTP)
-     {
--- a/components/wget/patches/sysdep.h.patch	Thu Apr 03 01:16:22 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- wget-1.12/src/sysdep.h.orig	Fri Sep  4 09:31:54 2009
-+++ wget-1.12/src/sysdep.h	Fri Oct  2 03:03:22 2009
[email protected]@ -67,8 +67,13 @@
- 
- #ifdef NAMESPACE_TWEAKS
- 
-+#if __STDC_VERSION__ >= 199901L
-+/* Single UNIX Specification, Version 3 */
-+#define _XOPEN_SOURCE 600
-+#else
- /* Request the "Unix 98 compilation environment". */
- #define _XOPEN_SOURCE 500
-+#endif
- 
- /* For Solaris: request everything else that is available and doesn't
-    conflict with the above.  */
--- a/components/wget/patches/wgetrc.patch	Thu Apr 03 01:16:22 2014 -0700
+++ b/components/wget/patches/wgetrc.patch	Thu Apr 03 02:07:48 2014 -0700
@@ -18,15 +18,18 @@
  ## Think well before you change them, since they may reduce wget's
  ## functionality, and make it behave contrary to the documentation:
  ##
---- wget-1.12/doc/wget.texi.orig	Fri Feb  4 07:28:46 2011
-+++ wget-1.12/doc/wget.texi	Fri Feb  4 07:31:24 2011
[email protected]@ -190,12 +190,12 @@
+--- wget-1.14/doc/wget.texi	Sat Aug  4 01:41:52 2012
++++ wget-1.14/doc/wget.texi	Thu Feb  7 02:34:48 2013
[email protected]@ -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.
-+(@file{/etc/wgetrc} by default) for site settings.
+-(@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.
+  
  
[email protected]@ -197,7 +197,7 @@
  @ignore
  @c man begin FILES
  @table @samp
@@ -35,3 +38,23 @@
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
[email protected]@ -2746,8 +2746,8 @@
+ @cindex location of wgetrc
+ 
+ When initializing, Wget will look for a @dfn{global} startup file,
[email protected]{/usr/local/etc/wgetrc} by default (or some prefix other than
[email protected]{/usr/local}, if Wget was not installed there) and read commands
[email protected]{/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
[email protected]@ -2758,7 +2758,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
--- a/components/wget/wget.p5m	Thu Apr 03 01:16:22 2014 -0700
+++ b/components/wget/wget.p5m	Thu Apr 03 02:07:48 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -35,100 +35,6 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=usr
-dir path=usr/bin
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/locale
-dir path=usr/share/locale/be
-dir path=usr/share/locale/be/LC_MESSAGES
-dir path=usr/share/locale/bg
-dir path=usr/share/locale/bg/LC_MESSAGES
-dir path=usr/share/locale/ca
-dir path=usr/share/locale/ca/LC_MESSAGES
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/el
-dir path=usr/share/locale/el/LC_MESSAGES
-dir path=usr/share/locale/[email protected]
-dir path=usr/share/locale/[email protected]/LC_MESSAGES
-dir path=usr/share/locale/[email protected]
-dir path=usr/share/locale/[email protected]/LC_MESSAGES
-dir path=usr/share/locale/en_GB
-dir path=usr/share/locale/en_GB/LC_MESSAGES
-dir path=usr/share/locale/en_US
-dir path=usr/share/locale/en_US/LC_MESSAGES
-dir path=usr/share/locale/eo
-dir path=usr/share/locale/eo/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/et
-dir path=usr/share/locale/et/LC_MESSAGES
-dir path=usr/share/locale/eu
-dir path=usr/share/locale/eu/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/ga
-dir path=usr/share/locale/ga/LC_MESSAGES
-dir path=usr/share/locale/gl
-dir path=usr/share/locale/gl/LC_MESSAGES
-dir path=usr/share/locale/he
-dir path=usr/share/locale/he/LC_MESSAGES
-dir path=usr/share/locale/hr
-dir path=usr/share/locale/hr/LC_MESSAGES
-dir path=usr/share/locale/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
-dir path=usr/share/locale/id
-dir path=usr/share/locale/id/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/lt
-dir path=usr/share/locale/lt/LC_MESSAGES
-dir path=usr/share/locale/nb
-dir path=usr/share/locale/nb/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/pt
-dir path=usr/share/locale/pt/LC_MESSAGES
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/share/locale/ro
-dir path=usr/share/locale/ro/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/sk
-dir path=usr/share/locale/sk/LC_MESSAGES
-dir path=usr/share/locale/sl
-dir path=usr/share/locale/sl/LC_MESSAGES
-dir path=usr/share/locale/sr
-dir path=usr/share/locale/sr/LC_MESSAGES
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
-dir path=usr/share/locale/tr
-dir path=usr/share/locale/tr/LC_MESSAGES
-dir path=usr/share/locale/uk
-dir path=usr/share/locale/uk/LC_MESSAGES
-dir path=usr/share/locale/vi
-dir path=usr/share/locale/vi/LC_MESSAGES
-dir path=usr/share/locale/zh_CN
-dir path=usr/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=etc/wgetrc group=sys mode=0644 original_name=SUNWwget:etc/wgetrc \
     preserve=renamenew
 file path=usr/bin/wget
@@ -140,10 +46,7 @@
 file path=usr/share/locale/da/LC_MESSAGES/wget.mo
 file path=usr/share/locale/de/LC_MESSAGES/wget.mo
 file path=usr/share/locale/el/LC_MESSAGES/wget.mo
-file path=usr/share/locale/[email protected]/LC_MESSAGES/wget.mo
-file path=usr/share/locale/[email protected]/LC_MESSAGES/wget.mo
 file path=usr/share/locale/en_GB/LC_MESSAGES/wget.mo
-file path=usr/share/locale/en_US/LC_MESSAGES/wget.mo
 file path=usr/share/locale/eo/LC_MESSAGES/wget.mo
 file path=usr/share/locale/es/LC_MESSAGES/wget.mo
 file path=usr/share/locale/et/LC_MESSAGES/wget.mo