rpms/wget/FC-5 wget-1.10.2-218211.patch, NONE, 1.1 wget-1.10.2-CVE-2006-6719.patch, NONE, 1.1 wget-1.10.2-retry186195.patch, NONE, 1.1 wget-1.10.2-to11.patch, NONE, 1.1 wget.spec, 1.44, 1.45
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 10 10:28:21 UTC 2007
Author: karsten
Update of /cvs/dist/rpms/wget/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20409
Modified Files:
wget.spec
Added Files:
wget-1.10.2-218211.patch wget-1.10.2-CVE-2006-6719.patch
wget-1.10.2-retry186195.patch wget-1.10.2-to11.patch
Log Message:
- add disttag
- fix bugzilla #218211
- fix bugzilla #186195
- fix bugzilla #205723
- fix CVE-2006-6719
wget-1.10.2-218211.patch:
ftp.c | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE wget-1.10.2-218211.patch ---
--- wget-1.10.2/src/ftp.c.218211 2006-12-07 13:51:06.000000000 +0100
+++ wget-1.10.2/src/ftp.c 2006-12-07 13:51:25.000000000 +0100
@@ -1315,6 +1315,7 @@
con->target = lf;
err = ftp_loop_internal (u, NULL, con);
+ lf = con->target;
con->target = old_target;
if (err == RETROK)
wget-1.10.2-CVE-2006-6719.patch:
ftp-basic.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE wget-1.10.2-CVE-2006-6719.patch ---
Fixes NULL pointer dereference (CVE-2006-6719) (bz #221483)
--- wget-1.10.2/src/ftp-basic.c.orig 2007-01-04 19:30:31.000000000 +0100
+++ wget-1.10.2/src/ftp-basic.c 2007-01-04 19:31:48.000000000 +0100
@@ -1038,7 +1038,9 @@ ftp_syst (int csock, enum stype *server_
first word of the server response)? */
request = strtok (NULL, " ");
- if (!strcasecmp (request, "VMS"))
+ if (request == NULL)
+ *server_type = ST_OTHER;
+ else if (!strcasecmp (request, "VMS"))
*server_type = ST_VMS;
else if (!strcasecmp (request, "UNIX"))
*server_type = ST_UNIX;
wget-1.10.2-retry186195.patch:
ftp.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE wget-1.10.2-retry186195.patch ---
--- wget-1.10.2/src/ftp.c.186195 2006-12-08 12:15:20.000000000 +0100
+++ wget-1.10.2/src/ftp.c 2006-12-08 12:17:02.000000000 +0100
@@ -1172,7 +1172,7 @@
len = 0;
err = getftp (u, &len, restval, con);
- if (con->csock != -1)
+ if (con->csock == -1)
con->st &= ~DONE_CWD;
else
con->st |= DONE_CWD;
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(-)
--- NEW FILE wget-1.10.2-to11.patch ---
diff -urN wget-1.10.2/configure wget-1.10.2_new/configure
--- wget-1.10.2/configure 2005-10-13 11:22:29.000000000 +0200
+++ wget-1.10.2_new/configure 2006-06-27 12:03:10.000000000 +0200
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION PACKAGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os OPIE_OBJ SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP exeext U ANSI2KNR ALLOCA GETOPT_OBJ HAVE_LIBSSL LIBSSL LTLIBSSL SSL_OBJ NTLM_OBJ MD5_OBJ MSGFMT XGETTEXT GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS POFILES HAVE_NLS USE_NLS MAKEINFO PERL POD2MAN COMMENT_IF_NO_POD2MAN LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION PACKAGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os OPIE_OBJ SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP exeext ALLOCA GETOPT_OBJ HAVE_LIBGNUTLS LIBGNUTLS LTLIBGNUTLS HAVE_LIBSSL LIBSSL LTLIBSSL SSL_OBJ NTLM_OBJ MD5_OBJ MSGFMT XGETTEXT GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS POFILES HAVE_NLS USE_NLS MAKEINFO PERL POD2MAN COMMENT_IF_NO_POD2MAN LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -858,6 +858,8 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-ssl disable SSL autodetection
--with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libgnutls-prefix[=DIR] search for libgnutls in DIR/include and DIR/lib
+ --without-libgnutls-prefix don't search for libgnutls in includedir and libdir
--with-libssl-prefix[=DIR] search for libssl in DIR/include and DIR/lib
--without-libssl-prefix don't search for libssl in includedir and libdir
@@ -961,7 +963,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -1334,27 +1336,6 @@
-# serial 1
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so. This macro tries various
-# options that select ANSI C on some system or another. It considers the
-# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
-# handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-
-
-
@@ -1386,6 +1367,7 @@
# serial 1
+
# lib-ld.m4 serial 3 (gettext-0.13)
@@ -1571,7 +1553,7 @@
wget_need_md5=yes
esac
if test x"$ENABLE_OPIE" = xyes; then
- OPIE_OBJ='ftp-opie$o'
+ OPIE_OBJ='ftp-opie.o'
fi
@@ -2257,8 +2239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2316,8 +2297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2433,8 +2413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2488,8 +2467,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2534,8 +2512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2579,8 +2556,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2900,92 +2876,9 @@
-echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
-if test "${am_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX -Aa -D_HPUX_SOURCE
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
-do
- CC="$ac_save_CC $ac_arg"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if !defined(__STDC__)
-choke me
-#endif
-/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif
-
-int
-main ()
-{
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
[...36713 lines suppressed...]
getopt.h gnu-md5.h hash.h host.h html-parse.h http-ntlm.h \
init.h log.h mswindows.h netrc.h options.h progress.h \
ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h sysdep.h \
diff -urN wget-1.10.2/windows/Makefile.src.mingw wget-1.10.2_new/windows/Makefile.src.mingw
--- wget-1.10.2/windows/Makefile.src.mingw 2005-06-22 01:27:21.000000000 +0200
+++ wget-1.10.2_new/windows/Makefile.src.mingw 2006-06-27 12:20:51.000000000 +0200
@@ -41,7 +41,7 @@
wget.exe: $(OBJS)
${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
-$(OBJS): config-post.h connect.h convert.h cookies.h ftp.h gen-md5.h \
+$(OBJS): config-post.h config.h connect.h convert.h cookies.h ftp.h gen-md5.h \
getopt.h gnu-md5.h hash.h host.h html-parse.h http-ntlm.h \
init.h log.h mswindows.h netrc.h options.h progress.h \
ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h sysdep.h \
diff -urN wget-1.10.2/windows/Makefile.watcom wget-1.10.2_new/windows/Makefile.watcom
--- wget-1.10.2/windows/Makefile.watcom 2005-04-05 20:46:44.000000000 +0200
+++ wget-1.10.2_new/windows/Makefile.watcom 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-## Compiler, linker, and lib stuff
-## Makefile for use with watcom win95/winnt executable.
-#
-# Copy this file to the ..\src directory (maybe rename to Makefile).
-#
-
-CC=wcc386 /zq
-LINK=wlink
-
-#
-# Note: this will wipe anything in the env.var PATH !
-#
-.BEFORE
- @SET INCLUDE=$(%WATCOM)\h;$(%WATCOM)\h\nt;.
-
-LFLAGS=op q sys nt op st=32767 op map op de 'GNU Wget' de dw op symf
-#
-# op q : quiet !
-# sys nt : producing an NT app
-# op st(ack)=32768 : stack size
-# op vers(ion)=1.7 : "Image version" in the EXE header ( major.minor )
-# op map : produce a map file
-# op de : textual description, placed in the executable
-# de dw : debug info on Dwarf format
-# op symf : place debug info in a separate wget.sym
-#
-
-CFLAGS=/zp4 /w4 /fpd /5s /fp5 /bm /mf /bt=nt /I. /DWINDOWS /DHAVE_CONFIG_H
-# ^^^^^^^^ wget will run on NT. We can safely assume a Pentium :-)
-# /zp4= pack structure members with this alignment
-# /d1 = line number debug info
-# /w4 = warning level
-# /fpd= Pentium floatingpoint bug workaround
-# /5s = Pentium stack-based calling
-# /fp5= Pentium floating point
-# /bm = build multi-threaded
-# /mf = flat memory model
-# /bt = "build target" (nt)
-
-#
-# Choose one of the following three:
-# /od /d2 for no optimization, full debug info
-# /os /d2 to optimize for size, full debug info (or /d1 for line number debug info)
-# /othexan for "heavy-duty" optimizations, no debug info
-#
-#CFLAGS+= /od /d2
-CFLAGS+= /os /d2
-#CFLAGS+= /othexan
-# ^^-- mind the gap !!
-
-#CFLAGS+= /DDEBUG_MALLOC
-# ^^-- mind the gap !!
-
-OBJS = cmpt.obj convert.obj connect.obj cookies.obj ftp.obj ftp-basic.obj &
- ftp-ls.obj ftp-opie.obj getopt.obj hash.obj host.obj html-parse.obj html-url.obj &
- http.obj init.obj log.obj main.obj gen-md5.obj gnu-md5.obj netrc.obj progress.obj &
- recur.obj res.obj retr.obj safe-ctype.obj url.obj utils.obj version.obj &
- mswindows.obj xmalloc.obj
-
-LIBFILES =
-#
-# Add extra libs like this :
-#LIBFILES = LIBF lz32.lib,gdi32.lib
-
-BINNAME=wget.exe
-
-all : config.h $(BINNAME) .SYMBOLIC
-
-#
-# We use config.h.ms
-#
-config.h : ..\windows\config.h.ms
- copy $[@ $^@
-
-#
-# Note: this will pass all the OBJ files to wlink,
-# resulting in a very long command line (410 chars, last I counted)
-# This might fail on Win9x (works with NT's cmd.exe)
-#
-$(BINNAME): $(OBJS) Makefile
- $(LINK) $(LFLAGS) NAME $(BINNAME) FILE { $(OBJS) } $(LIBPATH) $(LIBFILES)
-
-
-#
-# Explicit dependencies not needed because Watcom C stores
-# dependency information in the object file. Wmake can read this information
-# if prompted by .AUTODEPEND
-#
-
-.c.obj: .AUTODEPEND
- $(CC) $(CFLAGS) $[@
-
-.c.i: .AUTODEPEND
- $(CC) $(CFLAGS) -fo=$@ /Pc $[@
-
diff -urN wget-1.10.2/windows/README wget-1.10.2_new/windows/README
--- wget-1.10.2/windows/README 2005-04-28 12:11:39.000000000 +0200
+++ wget-1.10.2_new/windows/README 2006-06-27 12:20:51.000000000 +0200
@@ -7,8 +7,10 @@
instructions printed on the screen. The instructions bellow are for
building Wget with Microsoft Visual C++ (MSVC); you may need to make
appropriate substitutions for your compiler and build environment;
-currently wget can be built at least with Visual Studio/.Net, free
-Borland or Watcom compilers, and the free cygnus and mingw environments.
+currently wget can be built at least with Visual Studio/.Net, the free
+Borland compiler, and the free mingw environment. The instructions do
+*not* apply to the Cygwin environment, on which Wget is built with the
+procedure described in the INSTALL file in the top-level directory.
To build Wget with MSVC run configure.bat (in the main Wget directory)
with the argument --msvc, and then run nmake. At a certain point in time
@@ -54,7 +56,7 @@
port;
* Tim Charron <tcharron at interlog.com> -- additional cleanup and
- contribution of the Watcom makefile;
+ contribution of the (now retired) Watcom makefile;
* 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/FC-5/wget.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wget.spec 11 Feb 2006 06:04:14 -0000 1.44
+++ wget.spec 10 Jan 2007 10:28:18 -0000 1.45
@@ -1,7 +1,7 @@
Summary: A utility for retrieving files using the HTTP or FTP protocols.
Name: wget
Version: 1.10.2
-Release: 3.2.1
+Release: 3.3%{?dist}
License: GPL
Group: Applications/Internet
Url: http://wget.sunsite.dk/
@@ -12,6 +12,10 @@
Patch3: wget-1.10-path.patch
Patch4: wget-1.9.1-docsyntax.patch
Patch5: wget-1.10.1-helpfix.patch
+Patch6: wget-1.10.2-to11.patch
+Patch7: wget-1.10.2-218211.patch
+Patch8: wget-1.10.2-retry186195.patch
+Patch9: wget-1.10.2-CVE-2006-6719.patch
Provides: webclient
Prereq: /sbin/install-info
BuildRequires: perl, openssl-devel, pkgconfig, texinfo, gettext, autoconf
@@ -33,6 +37,10 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po
@@ -70,6 +78,13 @@
%{_infodir}/*
%changelog
+* Wed Jan 10 2007 Karsten Hopp <karsten at redhat.com> 1.10.2-3.3
+- add disttag
+- fix bugzilla #218211
+- fix bugzilla #186195
+- fix bugzilla #205723
+- fix CVE-2006-6719
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10.2-3.2.1
- bump again for double-long bug on ppc(64)
More information about the fedora-cvs-commits
mailing list