components/wget/patches/wgetrc.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 01 Feb 2016 12:51:27 -0800
changeset 5377 36d18b39fc39
parent 5309 aa644d83002b
permissions -rw-r--r--
22634112 Couple minor fixups needed for evince
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4743
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     1
Default location of wgetrc is in /usr/local/etc. However, we configure
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     2
wget with option --sysconfdir=/etc, so the default location of wgetrc is
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     3
in /etc. sample.wgetrc, sample.wgetrc.munged_for_texi_inclusion and 
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     4
wget.texi shall be updated with this change. As this is Solaris specific
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     5
patch it will not be pushed upstream.
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     6
5309
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
     7
--- wget-1.17.1/doc/sample.wgetrc.orig	Mon Nov 30 06:07:56 2015
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
     8
+++ wget-1.17.1/doc/sample.wgetrc	Tue Jan  5 06:47:25 2016
4743
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
     9
@@ -10,7 +10,7 @@
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    10
 ## Or online here:
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    11
 ##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
78
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 ##
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
-## Wget initialization file can reside in /usr/local/etc/wgetrc
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
+## Wget initialization file can reside in /etc/wgetrc
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
 ## (global, for all users) or $HOME/.wgetrc (for a single user).
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
 ##
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
 ## To use the settings in this file, you will have to uncomment them,
4743
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    18
@@ -22,7 +22,7 @@
78
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
 
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
 
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
 ##
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
+## Global settings (useful for setting up in /etc/wgetrc).
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
 ## Think well before you change them, since they may reduce wget's
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
 ## functionality, and make it behave contrary to the documentation:
d47cf5f02201 7017218 move wget to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
 ##
5309
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    27
--- wget-1.17.1/doc/sample.wgetrc.munged_for_texi_inclusion.orig	Fri Dec 11 09:42:38 2015
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    28
+++ wget-1.17.1/doc/sample.wgetrc.munged_for_texi_inclusion	Tue Jan  5 06:47:25 2016
4743
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    29
@@ -10,7 +10,7 @@
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    30
 ## Or online here:
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    31
 ##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    32
 ##
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    33
-## Wget initialization file can reside in /usr/local/etc/wgetrc
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    34
+## Wget initialization file can reside in /etc/wgetrc
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    35
 ## (global, for all users) or $HOME/.wgetrc (for a single user).
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    36
 ##
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    37
 ## To use the settings in this file, you will have to uncomment them,
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    38
@@ -22,7 +22,7 @@
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    39
 
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    40
 
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    41
 ##
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    42
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    43
+## Global settings (useful for setting up in /etc/wgetrc).
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    44
 ## Think well before you change them, since they may reduce wget's
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    45
 ## functionality, and make it behave contrary to the documentation:
a41b0913b4ea 20849529 Upgrade wget to version 1.16.3
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 1164
diff changeset
    46
 ##
5309
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    47
--- wget-1.17.1/doc/wget.texi.orig	Thu Dec 10 14:25:14 2015
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    48
+++ wget-1.17.1/doc/wget.texi	Tue Jan  5 06:47:26 2016
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    49
@@ -191,7 +191,7 @@
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    50
 Most of the features are fully configurable, either through command line
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    51
 options, or via the initialization file @file{.wgetrc} (@pxref{Startup
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    52
 File}).  Wget allows you to define @dfn{global} startup files
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    53
-(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    54
+(@file{/etc/wgetrc} by default) for site settings. You can also
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    55
 specify the location of a startup file with the --config option.
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    56
  
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    57
 
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    58
@@ -198,7 +198,7 @@
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    59
 @ignore
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    60
 @c man begin FILES
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    61
 @table @samp
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    62
-@item /usr/local/etc/wgetrc
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    63
+@item /etc/wgetrc
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    64
 Default location of the @dfn{global} startup file.
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    65
 
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    66
 @item .wgetrc
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    67
@@ -3036,8 +3036,7 @@
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    68
 @cindex location of wgetrc
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    69
 
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    70
 When initializing, Wget will look for a @dfn{global} startup file,
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    71
-@file{/usr/local/etc/wgetrc} by default (or some prefix other than
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    72
-@file{/usr/local}, if Wget was not installed there) and read commands
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    73
+@file{/etc/wgetrc} by default and read commands
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    74
 from there, if it exists.
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    75
 
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    76
 Then it will look for the user's file.  If the environmental variable
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    77
@@ -3048,7 +3047,7 @@
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    78
 
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    79
 The fact that user's settings are loaded after the system-wide ones
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    80
 means that in case of collision user's wgetrc @emph{overrides} the
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    81
-system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default).
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    82
+system-wide wgetrc (in @file{/etc/wgetrc} by default).
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    83
 Fascist admins, away!
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    84
 
aa644d83002b 22294048 Upgrade wget to version 1.17.1
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents: 4743
diff changeset
    85
 @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File