components/wget/patches/wgetrc.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 18 Apr 2017 09:10:22 -0700
changeset 7898 b6036d22c840
parent 5309 aa644d83002b
permissions -rw-r--r--
25757790 Update squid to version 3.5.24

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.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
 ##
-## 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.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
 ##
-## 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.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