components/wget/patches/wgetrc.patch
author Lukas Rovensky <Lukas.Rovensky@oracle.com>
Fri, 05 Jun 2015 05:22:16 -0700
changeset 4743 a41b0913b4ea
parent 1164 3485ba7dfe6b
child 5309 aa644d83002b
permissions -rw-r--r--
20849529 Upgrade wget to version 1.16.3 21538059 wget should have some master test results to compare against

Default location of wgetrc is in /usr/local/etc. However, we configure
wget with option --sysconfdir=/etc, so the default location of wgetrc is
in /etc. sample.wgetrc, sample.wgetrc.munged_for_texi_inclusion and 
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
@@ -10,7 +10,7 @@
 ## Or online here:
 ##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
 ##
-## Wget initialization file can reside in /usr/local/etc/wgetrc
+## Wget initialization file can reside in /etc/wgetrc
 ## (global, for all users) or $HOME/.wgetrc (for a single user).
 ##
 ## To use the settings in this file, you will have to uncomment them,
@@ -22,7 +22,7 @@
 
 
 ##
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
+## Global settings (useful for setting up in /etc/wgetrc).
 ## 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
@@ -10,7 +10,7 @@
 ## Or online here:
 ##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
 ##
-## Wget initialization file can reside in /usr/local/etc/wgetrc
+## Wget initialization file can reside in /etc/wgetrc
 ## (global, for all users) or $HOME/.wgetrc (for a single user).
 ##
 ## To use the settings in this file, you will have to uncomment them,
@@ -22,7 +22,7 @@
 
 
 ##
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
+## Global settings (useful for setting up in /etc/wgetrc).
 ## Think well before you change them, since they may reduce wget's
 ## functionality, and make it behave contrary to the documentation:
 ##