- up to 1.19.2; fixes CVE-2017-13089, CVE-2017-13090

[packages/wget.git] / wget-wgetrc_path.patch

diff --git a/wget-wgetrc_path.patch b/wget-wgetrc_path.patch
index 2550499beaa1415cc1c1871d31bc0ce8467fff84..3c27f4a1d5e3895f45addc4631802e6d65237a31 100644 (file)
--- a/wget-wgetrc_path.patch
+++ b/wget-wgetrc_path.patch
@@ -28,7 +28,7 @@ diff -Nur wget-1.10/doc.orig/sample.wgetrc wget-1.10/doc/sample.wgetrc
 @@ -7,7 +7,7 @@
  ## not contain a comprehensive list of commands -- look at the manual
  ## to find out what you can put into this 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).
@@ -46,13 +46,16 @@ diff -Nur wget-1.10/doc.orig/sample.wgetrc wget-1.10/doc/sample.wgetrc
 diff -Nur wget-1.10/doc.orig/wget.texi wget-1.10/doc/wget.texi
 --- wget-1.10/doc.orig/wget.texi       2005-06-22 09:42:36.000000000 +0200
 +++ wget-1.10/doc/wget.texi    2005-06-22 09:44:02.000000000 +0200
-@@ -204,12 +204,12 @@
+@@ -191,7 +191,7 @@ gauge can be customized to your preferen
  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.
+ To disable the reading of config files, use --no-config.
+ If both --config and --no-config are given, --no-config is ignored.
+@@ -200,7 +200,7 @@ If both --config and --no-config are giv
  @ignore
  @c man begin FILES
  @table @samp