[wget] Update to 1.15
Tomas Hozza
thozza at fedoraproject.org
Wed Jan 22 14:51:00 UTC 2014
commit e64a33b1bcc0072b784e8c4e177063ee4c17f025
Author: Tomas Hozza <thozza at redhat.com>
Date: Wed Jan 22 15:37:37 2014 +0100
Update to 1.15
- Drop merged patches
Signed-off-by: Tomas Hozza <thozza at redhat.com>
.gitignore | 1 +
sources | 2 +-
wget-1.14-Fix-deadcode-and-possible-NULL-use.patch | 47 -------
wget-1.14-add_missing_options_doc.patch | 27 ----
...missing-opts-and-fix-preserve-permissions.patch | 61 --------
wget-1.14-document-backups.patch | 60 --------
wget-1.14-fix-backups-to-work-as-documented.patch | 80 -----------
wget-1.14-fix-double-free-of-iri-orig_url.patch | 29 ----
wget-1.14-manpage-tex5.patch | 55 --------
...ove-nv-from-report-speed-in-doc-wget-texi.patch | 26 ----
...1.14-set_sock_to_-1_if_no_persistent_conn.patch | 32 -----
wget-1.14-sslreadtimeout.patch | 105 --------------
wget-1.14-texi2pod_error_perl518.patch | 25 ----
wget-1.12-path.patch => wget-1.15-path.patch | 145 +++++++++-----------
wget-rh-modified.patch | 6 +-
wget.spec | 34 +----
16 files changed, 79 insertions(+), 656 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2f8f7f..c5236c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
wget-1.12.tar.bz2
/wget-1.13.4.tar.bz2
/wget-1.14.tar.xz
+/wget-1.15.tar.xz
diff --git a/sources b/sources
index 5c94c4e..344b562 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-316f6f59292c9098ad81fd54f658c579 wget-1.14.tar.xz
+7a279d5ac5594919124d5526e7143e28 wget-1.15.tar.xz
diff --git a/wget-1.12-path.patch b/wget-1.15-path.patch
similarity index 55%
rename from wget-1.12-path.patch
rename to wget-1.15-path.patch
index 737809a..c20ae3c 100644
--- a/wget-1.12-path.patch
+++ b/wget-1.15-path.patch
@@ -1,16 +1,16 @@
-diff -urN wget-1.12/doc/sample.wgetrc wget-1.12.patched/doc/sample.wgetrc
---- wget-1.12/doc/sample.wgetrc 2009-09-22 04:53:58.000000000 +0200
-+++ wget-1.12.patched/doc/sample.wgetrc 2009-11-17 12:29:18.000000000 +0100
-@@ -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.
+diff -up wget-1.15/doc/sample.wgetrc.munged_for_texi_inclusion.wgetrc1 wget-1.15/doc/sample.wgetrc.munged_for_texi_inclusion
+--- wget-1.15/doc/sample.wgetrc.munged_for_texi_inclusion.wgetrc1 2014-01-19 11:03:06.000000000 +0100
++++ wget-1.15/doc/sample.wgetrc.munged_for_texi_inclusion 2014-01-22 14:27:36.834615751 +0100
+@@ -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,
-@@ -16,7 +16,7 @@
+@@ -19,7 +19,7 @@
##
@@ -19,19 +19,19 @@ diff -urN wget-1.12/doc/sample.wgetrc wget-1.12.patched/doc/sample.wgetrc
## Think well before you change them, since they may reduce wget's
## functionality, and make it behave contrary to the documentation:
##
-diff -urN wget-1.12/doc/sample.wgetrc.munged_for_texi_inclusion wget-1.12.patched/doc/sample.wgetrc.munged_for_texi_inclusion
---- wget-1.12/doc/sample.wgetrc.munged_for_texi_inclusion 2009-09-22 06:08:52.000000000 +0200
-+++ wget-1.12.patched/doc/sample.wgetrc.munged_for_texi_inclusion 2009-11-17 12:29:39.000000000 +0100
-@@ -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.
+diff -up wget-1.15/doc/sample.wgetrc.wgetrc1 wget-1.15/doc/sample.wgetrc
+--- wget-1.15/doc/sample.wgetrc.wgetrc1 2014-01-04 13:49:47.000000000 +0100
++++ wget-1.15/doc/sample.wgetrc 2014-01-22 14:27:13.763590317 +0100
+@@ -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,
-@@ -16,7 +16,7 @@
+@@ -19,7 +19,7 @@
##
@@ -40,51 +40,68 @@ diff -urN wget-1.12/doc/sample.wgetrc.munged_for_texi_inclusion wget-1.12.patche
## Think well before you change them, since they may reduce wget's
## functionality, and make it behave contrary to the documentation:
##
-diff -urN wget-1.12/doc/wget.info wget-1.12.patched/doc/wget.info
---- wget-1.12/doc/wget.info 2009-09-22 18:30:20.000000000 +0200
-+++ wget-1.12.patched/doc/wget.info 2009-11-17 12:28:40.000000000 +0100
-@@ -2351,8 +2351,8 @@
+diff -up wget-1.15/doc/wget.info.wgetrc1 wget-1.15/doc/wget.info
+--- wget-1.15/doc/wget.info.wgetrc1 2014-01-21 17:18:38.395689764 +0100
++++ wget-1.15/doc/wget.info 2014-01-22 14:29:58.514772363 +0100
+@@ -111,7 +111,7 @@ retrieval through HTTP proxies.
+ * Most of the features are fully configurable, either through command
+ line options, or via the initialization file '.wgetrc' (*note
+ Startup File::). Wget allows you to define "global" startup files
+- ('/usr/local/etc/wgetrc' by default) for site settings. You can
++ ('/etc/wgetrc' by default) for site settings. You can
+ also specify the location of a startup file with the -config
+ option.
+
+@@ -2484,8 +2484,8 @@ File: wget.info, Node: Wgetrc Location,
===================
When initializing, Wget will look for a "global" startup file,
--`/usr/local/etc/wgetrc' by default (or some prefix other than
--`/usr/local', if Wget was not installed there) and read commands from
-+`/etc/wgetrc' by default (or some prefix other than
-+`/etc', if Wget was not installed there) and read commands from
+-'/usr/local/etc/wgetrc' by default (or some prefix other than
+-'/usr/local', if Wget was not installed there) and read commands from
++'/etc/wgetrc' by default (or some prefix other than
++'/etc', if Wget was not installed there) and read commands from
there, if it exists.
Then it will look for the user's file. If the environmental variable
-@@ -2363,7 +2363,7 @@
+@@ -2496,7 +2496,7 @@ further attempts will be made.
The fact that user's settings are loaded after the system-wide ones
means that in case of collision user's wgetrc _overrides_ the
--system-wide wgetrc (in `/usr/local/etc/wgetrc' by default). Fascist
-+system-wide wgetrc (in `/etc/wgetrc' by default). Fascist
+-system-wide wgetrc (in '/usr/local/etc/wgetrc' by default). Fascist
++system-wide wgetrc (in '/etc/wgetrc' by default). Fascist
admins, away!
-@@ -2876,7 +2876,7 @@
- ## not contain a comprehensive list of commands -- look at the manual
- ## to find out what you can put into this file.
+@@ -3028,7 +3028,7 @@ its line.
+ ## 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,
-@@ -2885,7 +2885,7 @@
+diff -up wget-1.15/doc/wget.texi.wgetrc1 wget-1.15/doc/wget.texi
+--- wget-1.15/doc/wget.texi.wgetrc1 2014-01-04 13:49:47.000000000 +0100
++++ wget-1.15/doc/wget.texi 2014-01-21 17:18:38.396689766 +0100
+@@ -190,14 +190,14 @@ 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. 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.
+
+ @ignore
+ @c man begin FILES
+ @table @samp
+- at item /usr/local/etc/wgetrc
++ at item /etc/wgetrc
+ Default location of the @dfn{global} startup file.
- ##
-- ## 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:
- ##
-diff -urN wget-1.12/doc/wget.texi wget-1.12.patched/doc/wget.texi
---- wget-1.12/doc/wget.texi 2009-09-04 23:22:04.000000000 +0200
-+++ wget-1.12.patched/doc/wget.texi 2009-11-17 12:29:03.000000000 +0100
-@@ -2670,8 +2670,8 @@
+ @item .wgetrc
+@@ -2817,8 +2817,8 @@ commands.
@cindex location of wgetrc
When initializing, Wget will look for a @dfn{global} startup file,
@@ -95,7 +112,7 @@ diff -urN wget-1.12/doc/wget.texi wget-1.12.patched/doc/wget.texi
from there, if it exists.
Then it will look for the user's file. If the environmental variable
-@@ -2682,7 +2682,7 @@
+@@ -2829,7 +2829,7 @@ If @code{WGETRC} is not set, Wget will t
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
@@ -104,10 +121,10 @@ diff -urN wget-1.12/doc/wget.texi wget-1.12.patched/doc/wget.texi
Fascist admins, away!
@node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
-diff -urN wget-1.12/NEWS wget-1.12.patched/NEWS
---- wget-1.12/NEWS 2009-09-22 04:53:35.000000000 +0200
-+++ wget-1.12.patched/NEWS 2009-11-17 12:30:10.000000000 +0100
-@@ -562,7 +562,7 @@
+diff -up wget-1.15/NEWS.wgetrc1 wget-1.15/NEWS
+--- wget-1.15/NEWS.wgetrc1 2014-01-12 21:31:51.000000000 +0100
++++ wget-1.15/NEWS 2014-01-21 17:18:38.394689763 +0100
+@@ -700,7 +700,7 @@ distributed with Wget.
** Compiles on pre-ANSI compilers.
@@ -116,7 +133,7 @@ diff -urN wget-1.12/NEWS wget-1.12.patched/NEWS
** Lots of bugfixes.
-@@ -625,7 +625,7 @@
+@@ -763,7 +763,7 @@ Emacs, standalone info, or converted to
** Fixed a long-standing bug, so that Wget now works over SLIP
connections.
@@ -125,10 +142,10 @@ diff -urN wget-1.12/NEWS wget-1.12.patched/NEWS
default). Settings in $HOME/.wgetrc override the global ones, of
course :-)
-diff -urN wget-1.12/README wget-1.12.patched/README
---- wget-1.12/README 2009-09-21 00:59:32.000000000 +0200
-+++ wget-1.12.patched/README 2009-11-17 12:30:27.000000000 +0100
-@@ -33,7 +33,7 @@
+diff -up wget-1.15/README.wgetrc1 wget-1.15/README
+--- wget-1.15/README.wgetrc1 2013-10-21 16:50:12.000000000 +0200
++++ wget-1.15/README 2014-01-21 17:18:38.394689763 +0100
+@@ -33,7 +33,7 @@ for socks.
Most of the features are configurable, either through command-line
options, or via initialization file .wgetrc. Wget allows you to
@@ -137,33 +154,3 @@ diff -urN wget-1.12/README wget-1.12.patched/README
site settings.
Wget works under almost all Unix variants in use today and, unlike
---- wget-1.12/doc/wget.info.start 2011-12-19 10:34:29.409272713 -0600
-+++ wget-1.12/doc/wget.info 2011-12-19 10:34:51.760129197 -0600
-@@ -113,7 +113,7 @@
- * Most of the features are fully configurable, either through
- command line options, or via the initialization file `.wgetrc'
- (*note Startup File::). Wget allows you to define "global"
-- startup files (`/usr/local/etc/wgetrc' by default) for site
-+ startup files (`/etc/wgetrc' by default) for site
- settings. You can also specify the location of a startup file with
- the -config option.
-
---- wget-1.12/doc/wget.texi.start 2011-12-19 10:38:18.305730849 -0600
-+++ wget-1.12/doc/wget.texi 2011-12-19 10:38:49.272615753 -0600
-@@ -190,14 +190,14 @@
- 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.
-
-
- @ignore
- @c man begin FILES
- @table @samp
-- at item /usr/local/etc/wgetrc
-+ at item /etc/wgetrc
- Default location of the @dfn{global} startup file.
-
- @item .wgetrc
diff --git a/wget-rh-modified.patch b/wget-rh-modified.patch
index b9d528f..4b1b6e1 100644
--- a/wget-rh-modified.patch
+++ b/wget-rh-modified.patch
@@ -3,9 +3,9 @@
@@ -561,7 +561,7 @@
PACKAGE_NAME='wget'
PACKAGE_TARNAME='wget'
- PACKAGE_VERSION='1.14'
--PACKAGE_STRING='wget 1.14'
-+PACKAGE_STRING='wget 1.14 (Red Hat modified)'
+ PACKAGE_VERSION='1.15'
+-PACKAGE_STRING='wget 1.15'
++PACKAGE_STRING='wget 1.15 (Red Hat modified)'
PACKAGE_BUGREPORT='bug-wget at gnu.org'
PACKAGE_URL=''
diff --git a/wget.spec b/wget.spec
index fef1a27..62a3d49 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,25 +1,14 @@
Summary: A utility for retrieving files using the HTTP or FTP protocols
Name: wget
-Version: 1.14
-Release: 11%{?dist}
+Version: 1.15
+Release: 1%{?dist}
License: GPLv3+
Group: Applications/Internet
Url: http://www.gnu.org/software/wget/
Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.xz
Patch1: wget-rh-modified.patch
-Patch2: wget-1.12-path.patch
-Patch3: wget-1.14-sslreadtimeout.patch
-Patch4: wget-1.14-manpage-tex5.patch
-Patch5: wget-1.14-add_missing_options_doc.patch
-Patch6: wget-1.14-texi2pod_error_perl518.patch
-Patch7: wget-1.14-fix-double-free-of-iri-orig_url.patch
-Patch8: wget-1.14-Fix-deadcode-and-possible-NULL-use.patch
-Patch9: wget-1.14-doc-missing-opts-and-fix-preserve-permissions.patch
-Patch10: wget-1.14-set_sock_to_-1_if_no_persistent_conn.patch
-Patch11: wget-1.14-document-backups.patch
-Patch12: wget-1.14-fix-backups-to-work-as-documented.patch
-Patch13: wget-1.14-remove-nv-from-report-speed-in-doc-wget-texi.patch
+Patch2: wget-1.15-path.patch
Provides: webclient
Provides: bundled(gnulib)
@@ -40,18 +29,7 @@ support for Proxy servers, and configurability.
%prep
%setup -q
%patch1 -p0
-%patch2 -p1
-%patch3 -p1 -b .sslreadtimeout
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+%patch2 -p1 -b .path
%build
if pkg-config openssl ; then
@@ -91,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/*
%changelog
+* Wed Jan 22 2014 Tomas Hozza <thozza at redhat.com> - 1.15-1
+- Update to 1.15
+- Drop merged patches
+
* Mon Oct 21 2013 Tomas Hozza <thozza at redhat.com> - 1.14-11
- run test suite during the build
More information about the scm-commits
mailing list