rpms/wget/F-11 wget-1.12-path.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 wget-rh-modified.patch, 1.3, 1.4 wget.spec, 1.69, 1.70 wget-1.10.1-helpfix.patch, 1.1, NONE wget-1.11-path.patch, 1.1, NONE
Karsten Hopp
karsten at fedoraproject.org
Tue Nov 17 11:45:54 UTC 2009
Author: karsten
Update of /cvs/extras/rpms/wget/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8143
Modified Files:
.cvsignore sources wget-rh-modified.patch wget.spec
Added Files:
wget-1.12-path.patch
Removed Files:
wget-1.10.1-helpfix.patch wget-1.11-path.patch
Log Message:
- update to wget-1.12
- fixes CVE-2009-3490 wget: incorrect verification of SSL certificate
with NUL in name
wget-1.12-path.patch:
NEWS | 4 ++--
README | 2 +-
doc/sample.wgetrc | 4 ++--
doc/sample.wgetrc.munged_for_texi_inclusion | 4 ++--
doc/wget.info | 12 ++++++------
doc/wget.texi | 10 +++++-----
6 files changed, 18 insertions(+), 18 deletions(-)
--- NEW FILE wget-1.12-path.patch ---
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.
##
-## 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 @@
##
-## 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/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.
##
-## 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 @@
##
-## 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.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
@@ -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.
* Finally, GNU Wget is free software. This means that everyone may
@@ -2351,8 +2351,8 @@
===================
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
there, if it exists.
Then it will look for the user's file. If the environmental variable
@@ -2363,7 +2363,7 @@
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
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.
##
- ## 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 @@
##
- ## 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
@@ -190,12 +190,12 @@
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.
@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
@@ -2670,8 +2670,8 @@
@cindex location of wgetrc
When initializing, Wget will look for a @dfn{global} startup file,
- at file{/usr/local/etc/wgetrc} by default (or some prefix other than
- at file{/usr/local}, if Wget was not installed there) and read commands
+ at file{/etc/wgetrc} by default (or some prefix other than
+ at file{/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
@@ -2682,7 +2682,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
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 @@
** Compiles on pre-ANSI compilers.
-** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir).
+** Global wgetrc now goes to /etc (i.e. $sysconfdir).
** Lots of bugfixes.
@@ -625,7 +625,7 @@
** Fixed a long-standing bug, so that Wget now works over SLIP
connections.
-** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by
+** You can have a system-wide wgetrc (/etc/wgetrc by
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 @@
Most of the features are configurable, either through command-line
options, or via initialization file .wgetrc. Wget allows you to
-install a global startup file (/usr/local/etc/wgetrc by default) for
+install a global startup file (/etc/wgetrc by default) for
site settings.
Wget works under almost all Unix variants in use today and, unlike
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wget/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore 13 Aug 2008 12:46:12 -0000 1.15
+++ .cvsignore 17 Nov 2009 11:45:54 -0000 1.16
@@ -1 +1 @@
-wget-1.11.4.tar.bz2
+wget-1.12.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wget/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 13 Aug 2008 12:46:12 -0000 1.15
+++ sources 17 Nov 2009 11:45:54 -0000 1.16
@@ -1 +1 @@
-f5076a8c2ec2b7f334cb6e3059820f9c wget-1.11.4.tar.bz2
+308a5476fc096a8a525d07279a6f6aa3 wget-1.12.tar.bz2
wget-rh-modified.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: wget-rh-modified.patch
===================================================================
RCS file: /cvs/extras/rpms/wget/F-11/wget-rh-modified.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wget-rh-modified.patch 13 Aug 2008 12:46:12 -0000 1.3
+++ wget-rh-modified.patch 17 Nov 2009 11:45:54 -0000 1.4
@@ -1,6 +1,12 @@
-diff -up wget-1.11.1/src/version.c.rh1 wget-1.11.1/src/version.c
---- wget-1.11.1/src/version.c.rh1 2008-03-31 11:27:06.000000000 +0200
-+++ wget-1.11.1/src/version.c 2008-03-31 11:27:22.000000000 +0200
-@@ -1 +1 @@
--char *version_string = "1.11.4";
-+char *version_string = "1.11.4 (Red Hat modified)";
+diff -urN wget-1.12/configure wget-1.12.patched/configure
+--- wget-1.12/configure 2009-11-17 12:36:23.000000000 +0100
++++ wget-1.12.patched/configure 2009-09-22 18:40:13.000000000 +0200
+@@ -597,7 +597,7 @@
+ PACKAGE_NAME='wget'
+ PACKAGE_TARNAME='wget'
+ PACKAGE_VERSION='1.12'
+-PACKAGE_STRING='wget 1.12'
++PACKAGE_STRING='wget 1.12 (Red Hat modified)'
+ PACKAGE_BUGREPORT='bug-wget at gnu.org'
+
+ # Factoring default headers for most tests.
Index: wget.spec
===================================================================
RCS file: /cvs/extras/rpms/wget/F-11/wget.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- wget.spec 25 Feb 2009 18:28:41 -0000 1.69
+++ wget.spec 17 Nov 2009 11:45:54 -0000 1.70
@@ -1,15 +1,13 @@
Summary: A utility for retrieving files using the HTTP or FTP protocols
Name: wget
-Version: 1.11.4
-Release: 3%{?dist}
+Version: 1.12
+Release: 1%{?dist}
License: GPLv3+
Group: Applications/Internet
Url: http://wget.sunsite.dk/
Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.bz2
-#Source2: http://people.fedora.de/rsc/wget-1.11-de.po
Patch1: wget-rh-modified.patch
-Patch2: wget-1.11-path.patch
-Patch3: wget-1.10.1-helpfix.patch
+Patch2: wget-1.12-path.patch
Provides: webclient
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -29,10 +27,6 @@ support for Proxy servers, and configura
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-
-#cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po
-#chmod a+x doc/texi2pod.pl
%build
if pkg-config openssl ; then
@@ -68,6 +62,17 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/*
%changelog
+* Tue Nov 17 2009 Karsten Hopp <karsten at redhat.com> 1.12-1
+- update to wget-1.12
+- fixes CVE-2009-3490 wget: incorrect verification of SSL certificate
+ with NUL in name
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.11.4-5
+- rebuilt with new openssl
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--- wget-1.10.1-helpfix.patch DELETED ---
--- wget-1.11-path.patch DELETED ---
More information about the fedora-extras-commits
mailing list