pool/wget
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wget?expand=0&rev=4

Browse Source
This commit is contained in:
OBS User unknown 2008-04-25 14:47:58 +00:00 committed by Git OBS Bridge
parent 19b238a74a
commit 554efdaf20
13 changed files with 60 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nops_doc.diff
View File

@ -1,11 +0,0 @@
--- doc/Makefile.in
+++ doc/Makefile.in
@@ -60,7 +60,7 @@
all: wget.info @COMMENT_IF_NO_POD2MAN@$(MAN)
-everything: all wget_us.ps wget_a4.ps wget_toc.html
+everything: all wget_toc.html
$(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
sed s/@/@@/g $? > $@

24
toplev_destdir.diff
View File

@ -1,24 +0,0 @@
Pass on DESTDIR
================================================================================
--- Makefile.in
+++ Makefile.in
@@ -53,6 +53,8 @@
manext = 1
localedir = $(prefix)/share/locale
+DESTDIR =
+
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
@@ -79,7 +81,8 @@
MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
-infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
+infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)' \
+DESTDIR='$(DESTDIR)'
# subdirectories in the distribution
SUBDIRS = src doc po util windows

11
wget-1.10-fnmatch.diff
View File

@ -1,11 +0,0 @@
--- wget-1.10/src/utils.c
+++ wget-1.10/src/utils.c
@@ -703,7 +703,7 @@
char *p = *x + ((flags & ALLABS) && (**x == '/'));
if (has_wildcards_p (p))
{
- if (fnmatch (p, s, FNM_PATHNAME) == 0)
+ if (fnmatch (p, s, 0) == 0)
break;
}
else

11
wget-1.10.1-strict-aliasing.diff
View File

@ -1,11 +0,0 @@
--- wget-1.10.1/src/init.c
+++ wget-1.10.1/src/init.c
@@ -1190,7 +1190,7 @@
{ "none", prefer_none },
};
int ok = decode_string (val, choices, countof (choices),
- (int *) &opt.prefer_family);
+ &opt.prefer_family);
if (!ok)
fprintf (stderr, _("%s: %s: Invalid value `%s'.\n"), exec_name, com, val);
return ok;

3
wget-1.10.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12401afcab626c23273321fa9305944b5d6159d7c107db157dcfa42777f187ed
size 852816

3
wget-1.11.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:486e2d6be920ceed44602b2f4c08e57d815b8097b4474615f4cd4b463e2b18ca
size 929618

13
wget-1.9.1-brokentime.patch
View File

@ -1,13 +0,0 @@
--- wget-1.9.1/src/retr.c
+++ wget-1.9.1/src/retr.c
@@ -288,7 +288,9 @@
{
double dlrate;
- assert (msecs >= 0);
+ if (msecs < 0)
+ msecs = 0; /* XXX: sometimes X86_64 goes backwards in time */
+
assert (bytes >= 0);
if (msecs == 0)

30
wget-CAN-2004-1488.patch
View File

@ -1,30 +0,0 @@
From: Petr Tesarik <ptesarik@suse.de>
Subject: wget: CAN-2004-1488
Patch-mainline: no
References: 185265
Escape non-printing characters when dumping all HTTP headers.
--- src/http.c
+++ src/http.c
@@ -754,14 +754,17 @@
{
const char *b = resp->headers[i];
const char *e = resp->headers[i + 1];
+ char *str;
/* Skip CRLF */
if (b < e && e[-1] == '\n')
--e;
if (b < e && e[-1] == '\r')
--e;
- /* This is safe even on printfs with broken handling of "%.<n>s"
- because resp->headers ends with \0. */
- logprintf (LOG_VERBOSE, "%s%.*s\n", prefix, e - b, b);
+ str = xmalloc (e - b + 1);
+ memcpy (str, b, e - b);
+ str[e - b] = 0;
+ logprintf (LOG_VERBOSE, "%s%s\n", prefix, escnonprint (str));
+ xfree (str);
}
}

16
wget-CVE-2006-6719.patch
View File

@ -1,16 +0,0 @@
Fixes NULL pointer dereference (CVE-2006-6719)
================================================================================
--- src/ftp-basic.c
+++ src/ftp-basic.c
@@ -1039,7 +1039,9 @@
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;

20
wget-ftp-restart.patch
View File

@ -1,20 +0,0 @@
--- src/ftp.c
+++ src/ftp.c
@@ -1196,7 +1196,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;
@@ -1220,6 +1220,8 @@
con->target = url_file_name (u);
locf = con->target;
}
+ /* len hasn't been touched by getftp */
+ len = restval;
continue;
case FTPRETRINT:
/* If the control connection was closed, the retrieval

0
wget-1.9.1-passive_ftp.diff → wget-passive-ftp.patch
View File

24
wget.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Wed Apr 23 16:39:30 CEST 2008 - max@suse.de
- New version 1.11.1:
* Migration to the GPLv3+ license.
* Improvements to the HTTP password authentication code, bringing
it a little closer to RFC compliance (more is needed).
* Basic support for respecting filenames specified via
`Content-Disposition' headers (turned on with --content-disposition,
but please read the documentation).
* An --ignore-case option to make wildcard- and suffix-matching
case-sensitive.
* Progress bar now displays correctly in non-English locales (and a
related assertion failure was fixed).
* Added option --auth-no-challenge, to support broken pre-1.11
authentication-before-server-challenge, which turns out to still
be useful for some limited cases.
* Documentation of accept/reject lists in the manual's "Types of
Files" section now explains various aspects of their behavior that
may be surprising, and notes that they may change in the future.
* Documentation of --no-parents now explains how a trailing slash,
or lack thereof, in the specified URL, will affect behavior.
- Purged lots of obsolete patches and cleaned up the spec file.
-------------------------------------------------------------------
Sun Feb 24 06:02:11 CET 2008 - crrodriguez@suse.de

68
wget.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package wget (Version 1.10.2)
# spec file for package wget (Version 1.11.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -14,22 +14,14 @@
Name: wget
BuildRequires: libpng-devel openssl-devel
Url: http://wget.sunsite.dk/
License: GPL v2 or later
License: GPL v3 or later
Group: Productivity/Networking/Web/Utilities
AutoReqProv: on
Version: 1.10.2
Release: 103
Version: 1.11.1
Release: 1
Summary: A Tool for Mirroring FTP and HTTP Servers
Source: %name-%version.tar.bz2
Patch: nops_doc.diff
Patch1: toplev_destdir.diff
Patch2: wget-1.9.1-brokentime.patch
Patch3: wget-1.9.1-passive_ftp.diff
Patch6: wget-1.10-fnmatch.diff
Patch7: wget-1.10.1-strict-aliasing.diff
Patch8: wget-ftp-restart.patch
Patch9: wget-CAN-2004-1488.patch
Patch10: wget-CVE-2006-6719.patch
Patch1: wget-passive-ftp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %install_info_prereq
@ -45,27 +37,12 @@ Authors:
%prep
%setup -q
%patch
%patch1
%patch2 -p1
%patch3
%patch6 -p1
%patch7 -p1
%patch8
%patch9
%patch10
rename no nb $RPM_BUILD_DIR/wget*/po/no.*
%build
./autogen.sh
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -W -Wall -Wpointer-arith -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fstack-protector" \
%configure \
--with-ssl \
--with-ipv4-default \
--enable-ipv6 \
--enable-LFS
make localedir=%{_datadir}/locale
make -C doc everything
%configure
make
%install
make DESTDIR=$RPM_BUILD_ROOT install
@ -82,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT;
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README MAILING-LIST PATCHES TODO
%doc AUTHORS COPYING NEWS README MAILING-LIST
%doc doc/sample.wgetrc util/rmold.pl
%{_mandir}/*/wget*
%{_infodir}/wget*
@ -90,6 +67,27 @@ rm -rf $RPM_BUILD_ROOT;
%{_bindir}/*
%changelog
* Wed Apr 23 2008 max@suse.de
- New version 1.11.1:
* Migration to the GPLv3+ license.
* Improvements to the HTTP password authentication code, bringing
it a little closer to RFC compliance (more is needed).
* Basic support for respecting filenames specified via
`Content-Disposition' headers (turned on with --content-disposition,
but please read the documentation).
* An --ignore-case option to make wildcard- and suffix-matching
case-sensitive.
* Progress bar now displays correctly in non-English locales (and a
related assertion failure was fixed).
* Added option --auth-no-challenge, to support broken pre-1.11
authentication-before-server-challenge, which turns out to still
be useful for some limited cases.
* Documentation of accept/reject lists in the manual's "Types of
Files" section now explains various aspects of their behavior that
may be surprising, and notes that they may change in the future.
* Documentation of --no-parents now explains how a trailing slash,
or lack thereof, in the specified URL, will affect behavior.
- Purged lots of obsolete patches and cleaned up the spec file.
* Sun Feb 24 2008 crrodriguez@suse.de
- make use of find_lang macro
* Wed Mar 28 2007 max@suse.de
@ -133,7 +131,7 @@ rm -rf $RPM_BUILD_ROOT;
- Use another version of the fix below
* Sun Nov 14 2004 mmj@suse.de
- Add fix for using proxies [#47965]
* Mon Oct 18 2004 mmj@suse.de
* Tue Oct 19 2004 mmj@suse.de
- locale no should correctly be nb so rename po/no* to po/nb*
* Mon Sep 27 2004 mmj@suse.de
- Use LFS patch from Leonid Petrov [#37967] [#45084]
@ -209,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT;
- replaced assert msecs>=0 by if (msecs<0) msecs=0. (stupid assert)
* Fri Feb 01 2002 ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Mon Jan 14 2002 bk@suse.de
* Tue Jan 15 2002 bk@suse.de
- marked wgetrc as noreplace, format is compatible to older versions
* Mon Jan 07 2002 pthomas@suse.de
- Upgrade to 1.8.1
@ -237,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT;
taken from libiberty. This makes setting LC_CTYPE safe.
* Thu Mar 08 2001 ke@suse.de
- Build and install a printable manual (PDF).
* Thu Mar 01 2001 pthomas@suse.de
* Fri Mar 02 2001 pthomas@suse.de
- Set LC_CTYPE along with LC_MESSAGES to correctly display
messages in locales other then C/POSIX.
* Wed Feb 14 2001 schwab@suse.de
@ -268,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT;
- fix BuildRoot.
* Thu Sep 24 1998 ke@suse.de
- Update: wget-1.5.3 (bug fix release).
* Fri Jun 26 1998 ke@suse.de
* Sat Jun 27 1998 ke@suse.de
- Update: wget-1.5.2 (bug fix release).
- Make BuildRoot work.
* Tue May 12 1998 ke@suse.de