rpms/wget/devel wget-1.10.2-to11.patch,1.1,1.2 wget.spec,1.47,1.48
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 25 15:32:21 UTC 2006
Author: karsten
Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1377
Modified Files:
wget-1.10.2-to11.patch wget.spec
Log Message:
- fix resumed downloads (#205723)
wget-1.10.2-to11.patch:
wget-1.10.2/src/http.c | 17
wget-1.10.2_new/INSTALL | 6
wget-1.10.2_new/Makefile.in | 17
wget-1.10.2_new/NEWS | 34
wget-1.10.2_new/README | 5
wget-1.10.2_new/TODO | 119
wget-1.10.2_new/configure | 6086 +++++++++++++++--------------
wget-1.10.2_new/configure.in | 123
wget-1.10.2_new/doc/Makefile.in | 12
wget-1.10.2_new/doc/texi2pod.pl | 438 ++
wget-1.10.2_new/doc/texi2pod.pl.in | 436 --
wget-1.10.2_new/doc/wget.texi | 106
wget-1.10.2_new/m4/wget.m4 | 60
wget-1.10.2_new/po/hr.po | 1105 ++---
wget-1.10.2_new/po/sl.po | 2
wget-1.10.2_new/po/zh_TW.po | 288 -
wget-1.10.2_new/src/ChangeLog | 750 +++
wget-1.10.2_new/src/Makefile.in | 59
wget-1.10.2_new/src/cmpt.c | 538 --
wget-1.10.2_new/src/config-post.h | 60
wget-1.10.2_new/src/config.h.in | 83
wget-1.10.2_new/src/connect.c | 236 -
wget-1.10.2_new/src/connect.h | 53
wget-1.10.2_new/src/convert.c | 213 -
wget-1.10.2_new/src/convert.h | 26
wget-1.10.2_new/src/cookies.c | 664 +--
wget-1.10.2_new/src/cookies.h | 22
wget-1.10.2_new/src/ftp-basic.c | 189
wget-1.10.2_new/src/ftp-ls.c | 50
wget-1.10.2_new/src/ftp-opie.c | 12
wget-1.10.2_new/src/ftp.c | 166
wget-1.10.2_new/src/ftp.h | 52
wget-1.10.2_new/src/gen-md5.c | 4
wget-1.10.2_new/src/gen-md5.h | 12
wget-1.10.2_new/src/getopt.c | 6
wget-1.10.2_new/src/gnu-md5.c | 16
wget-1.10.2_new/src/gnu-md5.h | 23
wget-1.10.2_new/src/gnutls.c | 303 +
wget-1.10.2_new/src/hash.c | 390 +
wget-1.10.2_new/src/hash.h | 69
wget-1.10.2_new/src/host.c | 241 -
wget-1.10.2_new/src/host.h | 90
wget-1.10.2_new/src/html-parse.c | 51
wget-1.10.2_new/src/html-parse.h | 13
wget-1.10.2_new/src/html-url.c | 38
wget-1.10.2_new/src/http-ntlm.c | 234 -
wget-1.10.2_new/src/http-ntlm.h | 10
wget-1.10.2_new/src/http.c | 2686 ++++++------
wget-1.10.2_new/src/http.h | 48
wget-1.10.2_new/src/init.c | 501 +-
wget-1.10.2_new/src/init.h | 16
wget-1.10.2_new/src/log.c | 118
wget-1.10.2_new/src/log.h | 37
wget-1.10.2_new/src/main.c | 185
wget-1.10.2_new/src/mswindows.c | 127
wget-1.10.2_new/src/mswindows.h | 122
wget-1.10.2_new/src/netrc.c | 23
wget-1.10.2_new/src/netrc.h | 10
wget-1.10.2_new/src/openssl.c | 251 -
wget-1.10.2_new/src/options.h | 121
wget-1.10.2_new/src/progress.c | 452 +-
wget-1.10.2_new/src/progress.h | 24
wget-1.10.2_new/src/ptimer.c | 150
wget-1.10.2_new/src/ptimer.h | 16
wget-1.10.2_new/src/recur.c | 108
wget-1.10.2_new/src/recur.h | 16
wget-1.10.2_new/src/res.c | 98
wget-1.10.2_new/src/res.h | 18
wget-1.10.2_new/src/retr.c | 202
wget-1.10.2_new/src/retr.h | 46
wget-1.10.2_new/src/snprintf.c | 117
wget-1.10.2_new/src/ssl.h | 10
wget-1.10.2_new/src/sysdep.h | 167
wget-1.10.2_new/src/test.c | 81
wget-1.10.2_new/src/test.h | 45
wget-1.10.2_new/src/url.c | 521 +-
wget-1.10.2_new/src/url.h | 40
wget-1.10.2_new/src/utils.c | 852 ++--
wget-1.10.2_new/src/utils.h | 148
wget-1.10.2_new/src/wget.h | 89
wget-1.10.2_new/src/xmalloc.c | 29
wget-1.10.2_new/src/xmalloc.h | 34
wget-1.10.2_new/tests/ChangeLog | 100
wget-1.10.2_new/tests/HTTPServer.pm | 93
wget-1.10.2_new/tests/HTTPTest.pm | 49
wget-1.10.2_new/tests/Makefile.in | 250 +
wget-1.10.2_new/tests/Test.pm | 240 +
wget-1.10.2_new/tests/Test1.px | 46
wget-1.10.2_new/tests/Test10.px | 55
wget-1.10.2_new/tests/Test2.px | 48
wget-1.10.2_new/tests/Test3.px | 43
wget-1.10.2_new/tests/Test4.px | 43
wget-1.10.2_new/tests/Test5.px | 56
wget-1.10.2_new/tests/Test6.px | 76
wget-1.10.2_new/tests/Test7.px | 76
wget-1.10.2_new/tests/Test8.px | 69
wget-1.10.2_new/tests/Test9.px | 55
wget-1.10.2_new/windows/ChangeLog | 80
wget-1.10.2_new/windows/Makefile.src | 2
wget-1.10.2_new/windows/Makefile.src.bor | 2
wget-1.10.2_new/windows/Makefile.src.mingw | 2
wget-1.10.2_new/windows/Makefile.watcom | 95
wget-1.10.2_new/windows/README | 8
wget-1.10.2_new/windows/config-compiler.h | 200
wget-1.10.2_new/windows/config.h | 215 +
wget-1.10.2_new/windows/config.h.bor | 209
wget-1.10.2_new/windows/config.h.mingw | 273 -
wget-1.10.2_new/windows/config.h.ms | 220 -
108 files changed, 13014 insertions(+), 10626 deletions(-)
Index: wget-1.10.2-to11.patch
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget-1.10.2-to11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wget-1.10.2-to11.patch 27 Jun 2006 11:34:48 -0000 1.1
+++ wget-1.10.2-to11.patch 25 Sep 2006 15:32:19 -0000 1.2
@@ -37049,3 +37049,64 @@
* John Burden <john at futuresguide.com> -- cleanup of the VC++ makefile
to get a clean build with VC++ 5.0 on Windows 95;
+--- wget-1.10.2/src/http.c.rh1 2006-09-25 17:11:55.000000000 +0200
++++ wget-1.10.2/src/http.c 2006-09-25 17:11:59.000000000 +0200
+@@ -1762,7 +1762,7 @@
+
+ return RETROK;
+ }
+- else
++ else if (!ALLOW_CLOBBER)
+ {
+ char *unique = unique_name (hs->local_file, true);
+ if (unique != hs->local_file)
+@@ -2231,6 +2231,7 @@
+ {
+ int count;
+ bool got_head = false; /* used for time-stamping */
++ bool got_name = false;
+ char *tms;
+ const char *tmrate;
+ uerr_t err, ret = TRYLIMEXC;
+@@ -2264,7 +2265,10 @@
+ hstat.referer = referer;
+
+ if (opt.output_document)
++ {
+ hstat.local_file = xstrdup (opt.output_document);
++ got_name = true;
++ }
+
+ /* Reset the counter. */
+ count = 0;
+@@ -2309,13 +2313,16 @@
+ /* Default document type is empty. However, if spider mode is
+ on or time-stamping is employed, HEAD_ONLY commands is
+ encoded within *dt. */
+- if ((opt.spider && !opt.recursive) || (opt.timestamping && !got_head))
++ if ((opt.spider && !opt.recursive)
++ || (opt.timestamping && !got_head)
++ || (opt.always_rest && !got_name))
+ *dt |= HEAD_ONLY;
+ else
+ *dt &= ~HEAD_ONLY;
+
+ /* Decide whether or not to restart. */
+ if (opt.always_rest
++ && got_name
+ && stat (hstat.local_file, &st) == 0
+ && S_ISREG (st.st_mode))
+ /* When -c is used, continue from on-disk size. (Can't use
+@@ -2484,6 +2491,12 @@
+ continue;
+ }
+
++ if (opt.always_rest && !got_name)
++ {
++ got_name = true;
++ continue;
++ }
++
+ if ((tmr != (time_t) (-1))
+ && (!opt.spider || opt.recursive)
+ && ((hstat.len == hstat.contlen) ||
Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- wget.spec 12 Jul 2006 08:47:53 -0000 1.47
+++ wget.spec 25 Sep 2006 15:32:19 -0000 1.48
@@ -1,7 +1,7 @@
Summary: A utility for retrieving files using the HTTP or FTP protocols.
Name: wget
Version: 1.10.2
-Release: 5.1
+Release: 6
License: GPL
Group: Applications/Internet
Url: http://wget.sunsite.dk/
@@ -71,6 +71,9 @@
%{_infodir}/*
%changelog
+* Mon Sep 25 2006 Karsten Hopp <karsten at redhat.de> 1.10.2-6
+- fix resumed downloads (#205723)
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.2-5.1
- rebuild
More information about the fedora-cvs-commits
mailing list