diff --git a/.cvsignore b/.cvsignore index a086224..6809b58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wget-1.11.1.tar.bz2 +wget-1.11.2.tar.bz2 diff --git a/sources b/sources index ee29e75..9e422eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fda0bab6a883a5f6599d2da58765f93 wget-1.11.1.tar.bz2 +730d2687231934f51e47f6f85260b2d3 wget-1.11.2.tar.bz2 diff --git a/wget-1.10.2-cookies,patch b/wget-1.10.2-cookies,patch deleted file mode 100644 index 5b72759..0000000 --- a/wget-1.10.2-cookies,patch +++ /dev/null @@ -1,26 +0,0 @@ ---- wget-1.10.2/src/cookies.c.cookies 2007-02-12 06:02:04.000000000 -0500 -+++ wget-1.10.2/src/cookies.c 2007-02-12 06:04:06.000000000 -0500 -@@ -398,18 +398,17 @@ - { - cookie->permanent = 1; - cookie->expiry_time = expires; -+ /* According to netscape's specification, expiry time in -+ the past means that discarding of a matching cookie -+ is requested. */ -+ if (cookie->expiry_time < cookies_now) -+ cookie->discard_requested = 1; - } - else - /* Error in expiration spec. Assume default (cookie doesn't - expire, but valid only for this session.) */ - ; - -- /* According to netscape's specification, expiry time in the -- past means that discarding of a matching cookie is -- requested. */ -- if (cookie->expiry_time < cookies_now) -- cookie->discard_requested = 1; -- - return 1; - } - else if (NAME_IS ("max-age")) diff --git a/wget-1.11.1-rh1.patch b/wget-rh-modified.patch similarity index 71% rename from wget-1.11.1-rh1.patch rename to wget-rh-modified.patch index 311d559..9563813 100644 --- a/wget-1.11.1-rh1.patch +++ b/wget-rh-modified.patch @@ -2,5 +2,5 @@ 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.1"; -+char *version_string = "1.11.1 (Red Hat modified)"; +-char *version_string = "1.11.2"; ++char *version_string = "1.11.2 (Red Hat modified)"; diff --git a/wget.spec b/wget.spec index eae9846..b7cc962 100644 --- a/wget.spec +++ b/wget.spec @@ -1,17 +1,16 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols Name: wget -Version: 1.11.1 +Version: 1.11.2 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-%{version}-rh1.patch +Patch1: wget-rh-modified.patch Patch2: wget-1.11-path.patch Patch3: wget-1.10.1-helpfix.patch Patch4: wget-1.10.2-218211.patch -#Patch5: wget-1.10.2-cookies,patch Provides: webclient Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -33,7 +32,6 @@ support for Proxy servers, and configurability. %patch2 -p1 %patch3 -p1 %patch4 -p1 -#patch5 -p1 #cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po #chmod a+x doc/texi2pod.pl @@ -72,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/* %changelog +* Fri May 09 2008 Karsten Hopp 1.11.2-1 +- wget-1.11.2, fixes #179962 + * Mon Mar 31 2008 Karsten Hopp 1.11.1-1 - update to bugfix release 1.11.1, fixes p.e. #433606