From 0d2f9cf83f59c06433c3147b6de09aaeeb045568b08b9ee71ae88307d2b40be2 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 19 Oct 2011 09:57:52 +0000 Subject: [PATCH 1/4] Version 1.13.4 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=16 --- wget-1.12-nosslv2.patch | 16 ------------- wget-1.12.tar.bz2 | 3 --- wget-1.13.4.tar.xz | 3 +++ wget-libproxy.patch | 36 ++++++++++++++-------------- wget-sni.patch | 53 ++++++++++++++++------------------------- wget.changes | 47 ++++++++++++++++++++++++++++++++++++ wget.spec | 16 +++++-------- 7 files changed, 94 insertions(+), 80 deletions(-) delete mode 100644 wget-1.12-nosslv2.patch delete mode 100644 wget-1.12.tar.bz2 create mode 100644 wget-1.13.4.tar.xz diff --git a/wget-1.12-nosslv2.patch b/wget-1.12-nosslv2.patch deleted file mode 100644 index 6dd6bfd..0000000 --- a/wget-1.12-nosslv2.patch +++ /dev/null @@ -1,16 +0,0 @@ -=== modified file 'src/openssl.c' ---- src/openssl.c 2011-04-04 14:56:51 +0000 -+++ src/openssl.c 2011-04-11 09:08:39 +0000 -@@ -186,9 +186,11 @@ - case secure_protocol_auto: - meth = SSLv23_client_method (); - break; -+#ifndef OPENSSL_NO_SSL2 - case secure_protocol_sslv2: - meth = SSLv2_client_method (); - break; -+#endif - case secure_protocol_sslv3: - meth = SSLv3_client_method (); - break; - diff --git a/wget-1.12.tar.bz2 b/wget-1.12.tar.bz2 deleted file mode 100644 index d5d4d63..0000000 --- a/wget-1.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a -size 1609032 diff --git a/wget-1.13.4.tar.xz b/wget-1.13.4.tar.xz new file mode 100644 index 0000000..198cc21 --- /dev/null +++ b/wget-1.13.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12a839a5f622e82d4f7b4a75ae09ed4b084658468c9f90796480754f5d96d1d6 +size 1453220 diff --git a/wget-libproxy.patch b/wget-libproxy.patch index ecb2efc..95f5a2d 100644 --- a/wget-libproxy.patch +++ b/wget-libproxy.patch @@ -1,9 +1,9 @@ -Index: wget-1.12/configure.ac +Index: configure.ac =================================================================== ---- wget-1.12.orig/configure.ac -+++ wget-1.12/configure.ac -@@ -353,6 +353,22 @@ then - AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.]) +--- configure.ac.orig ++++ configure.ac +@@ -338,6 +338,22 @@ else + fi fi +dnl @@ -25,24 +25,24 @@ Index: wget-1.12/configure.ac dnl ********************************************************************** dnl Checks for IPv6 dnl ********************************************************************** -Index: wget-1.12/src/Makefile.am +Index: src/Makefile.am =================================================================== ---- wget-1.12.orig/src/Makefile.am -+++ wget-1.12/src/Makefile.am -@@ -36,7 +36,7 @@ endif +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -37,7 +37,7 @@ endif # The following line is losing on some versions of make! DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" --LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @LIBS@ -+LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @libproxy_LIBS@ @LIBS@ +-LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) ++LIBS = @LIBICONV@ @LIBINTL@ @libproxy_LIBS@ @LIBS@ $(LIB_CLOCK_GETTIME) - bin_PROGRAMS = wget - wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \ -Index: wget-1.12/src/retr.c + EXTRA_DIST = css.l css.c css_.c build_info.c.in + +Index: src/retr.c =================================================================== ---- wget-1.12.orig/src/retr.c -+++ wget-1.12/src/retr.c -@@ -55,6 +55,10 @@ as that of the covered work. */ +--- src/retr.c.orig ++++ src/retr.c +@@ -54,6 +54,10 @@ as that of the covered work. */ #include "html-url.h" #include "iri.h" @@ -53,7 +53,7 @@ Index: wget-1.12/src/retr.c /* Total size of downloaded files. Used to enforce quota. */ SUM_SIZE_INT total_downloaded_bytes; -@@ -1134,7 +1138,40 @@ getproxy (struct url *u) +@@ -1182,7 +1186,40 @@ getproxy (struct url *u) break; } if (!proxy || !*proxy) diff --git a/wget-sni.patch b/wget-sni.patch index 35e537c..5b7fcf4 100644 --- a/wget-sni.patch +++ b/wget-sni.patch @@ -1,8 +1,6 @@ -https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 -=== modified file 'src/host.c' ---- src/host.c.orig +--- src/host.c +++ src/host.c -@@ -904,3 +904,19 @@ host_cleanup (void) +@@ -914,3 +914,19 @@ host_cleanup (void) host_name_addresses_map = NULL; } } @@ -22,18 +20,18 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 +#endif + return false; +} ---- src/host.h.orig +--- src/host.h +++ src/host.h -@@ -101,5 +101,5 @@ bool accept_domain (struct url *); +@@ -102,5 +102,5 @@ bool accept_domain (struct url *); bool sufmatch (const char **, const char *); void host_cleanup (void); - +bool is_ip_address(const char *); #endif /* HOST_H */ ---- src/http.c.orig +--- src/http.c +++ src/http.c -@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat +@@ -1909,7 +1909,7 @@ gethttp (struct url *u, struct http_stat if (conn->scheme == SCHEME_HTTPS) { @@ -42,10 +40,10 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 { fd_close (sock); return CONSSLERR; ---- src/openssl.c.orig +--- src/openssl.c +++ src/openssl.c -@@ -42,12 +42,12 @@ as that of the covered work. */ - #include +@@ -40,12 +40,12 @@ as that of the covered work. */ + #include #include #include - @@ -56,10 +54,10 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 #include "ssl.h" - +#include "host.h" - /* Application-wide SSL context. This is common to all SSL - connections. */ - static SSL_CTX *ssl_ctx; -@@ -173,11 +173,15 @@ ssl_init () + #ifdef WINDOWS + # include + #endif +@@ -175,11 +175,15 @@ ssl_init () _("Could not seed PRNG; consider using --random-file.\n")); goto error; } @@ -76,7 +74,7 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 switch (opt.secure_protocol) { -@@ -237,7 +241,10 @@ ssl_init () +@@ -239,7 +243,10 @@ ssl_init () /* The OpenSSL library can handle renegotiations automatically, so tell it to do so. */ SSL_CTX_set_mode (ssl_ctx, SSL_MODE_AUTO_RETRY); @@ -88,7 +86,7 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 return true; error: -@@ -392,7 +399,7 @@ static struct transport_implementation o +@@ -393,7 +400,7 @@ static struct transport_implementation o Returns true on success, false on failure. */ bool @@ -97,7 +95,7 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 { SSL *conn; struct openssl_transport_context *ctx; -@@ -403,6 +410,18 @@ ssl_connect_wget (int fd) +@@ -404,6 +411,18 @@ ssl_connect_wget (int fd) conn = SSL_new (ssl_ctx); if (!conn) goto error; @@ -113,10 +111,10 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 + } + } +#endif - if (!SSL_set_fd (conn, fd)) - goto error; - SSL_set_connect_state (conn); ---- src/ssl.h.orig + #ifndef FD_TO_SOCKET + # define FD_TO_SOCKET(X) (X) + #endif +--- src/ssl.h +++ src/ssl.h @@ -33,7 +33,7 @@ as that of the covered work. */ #define GEN_SSLFUNC_H @@ -127,14 +125,3 @@ https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786 bool ssl_check_certificate (int, const char *); #endif /* GEN_SSLFUNC_H */ ---- src/iri.c.orig -+++ src/iri.c -@@ -114,7 +114,7 @@ check_encoding_name (char *encoding) - static bool - open_locale_to_utf8 (void) - { -- -+ return true; - } - - /* Try converting string str from locale to UTF-8. Return a new string diff --git a/wget.changes b/wget.changes index 4a1a768..f2ccffd 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Wed Oct 19 09:34:59 UTC 2011 - max@suse.com + +- New version: 1.13.4: + * Now --timestamping and --continue work well together. + * Return a network failure when FTP downloads fail and + --timestamping is specified. + * Support HTTP/1.1 + * Fix some portability issues. + * Handle properly malformed status line in a HTTP response. + * Ignore zero length domains in $no_proxy. + * Exit with failure if -k is specified and -O is not a regular + file. + * Cope better with unclosed html tags. + * Print diagnostic messages to stderr, not stdout. + * Do not use an additional HEAD request when + --content-disposition is used, but use directly GET. + * Report the average transfer speed correctly when multiple + URLs are specified and -c influences the transferred data + amount. + * By default, on server redirects, use the original URL to get + the local file name. Close CVE-2010-2252. This introduces a + backward-incompatibility; any script that relies on the old + behaviour must use --trust-server-names. + * Fix a problem when -k is used and some URLs are specified + trough CSS. + * Convert correctly URLs that need to be encoded to local files + when following links. + * Use persistent connections with proxies supporting them. + * Print the total download time as part of the summary for + recursive downloads. + * Now it is possible to specify a different startup + configuration file trough the --config option. + * Fix an infinite loop with the error ' has sprung + into existence' on a network error and -nc is used. + * Now --adjust-extension does not modify the file extension if + the file ends in .htm. + * Support HTTP/1.1 307 redirects keep request method. + * Now --no-parent doesn't fetch undesired files if HTTP and + HTTPS are used by the same host on different pages. + * Do not attempt to remove the file if it is not in the accept + rules but it is the output destination file. + * Introduce `show_all_dns_entries' to print all IP addresses + corresponding to a DNS name when it is resolved. +- Adjuct patches to the new version. +- wget-1.12-nosslv2.patch got included upstream. + ------------------------------------------------------------------- Sat Oct 15 18:19:59 UTC 2011 - crrodriguez@opensuse.org diff --git a/wget.spec b/wget.spec index 0e8e7b1..4d53bd1 100644 --- a/wget.spec +++ b/wget.spec @@ -18,24 +18,24 @@ Name: wget -Version: 1.12 +Version: 1.13.4 Release: 5 License: GPLv3+ Summary: A Tool for Mirroring FTP and HTTP Servers Url: http://www.gnu.org/software/wget/ Group: Productivity/Networking/Web/Utilities -Source: %name-%version.tar.bz2 +Source: %name-%version.tar.xz # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: wgetrc.patch # PATCH-FEATURE-UPSTREAM wget-libproxy.patch dimstar@opensuse.org -- Add libproxy support to wget Patch1: wget-libproxy.patch -Patch2: wget-1.12-nosslv2.patch Patch3: wget-sni.patch BuildRequires: libpng-devel BuildRequires: libproxy-devel BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: libidn-devel +BuildRequires: xz PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,22 +46,18 @@ This can be done in script files or via the command line. %prep %setup -q %patch0 -%patch1 -p1 -%patch2 +%patch1 %patch3 %build -./autogen.sh -%configure +autoreconf --force +%configure --with-ssl=openssl make %{?_smp_mflags} %install %makeinstall %find_lang %{name} -%clean -rm -rf %{buildroot}; - %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz From 31f70c31f79ca4b37dd922906af56d6490008be3b8cf47c5944f49df3f1d6910 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 19 Oct 2011 10:40:32 +0000 Subject: [PATCH 2/4] Fix build OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=17 --- wget-1.13.4.tar.bz2 | 3 +++ wget-1.13.4.tar.xz | 3 --- wget.spec | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 wget-1.13.4.tar.bz2 delete mode 100644 wget-1.13.4.tar.xz diff --git a/wget-1.13.4.tar.bz2 b/wget-1.13.4.tar.bz2 new file mode 100644 index 0000000..abbdb87 --- /dev/null +++ b/wget-1.13.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f76518dfd7bcde41b7762df5cc5516bc8a178f122811aba18a64993fb9458881 +size 1931885 diff --git a/wget-1.13.4.tar.xz b/wget-1.13.4.tar.xz deleted file mode 100644 index 198cc21..0000000 --- a/wget-1.13.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12a839a5f622e82d4f7b4a75ae09ed4b084658468c9f90796480754f5d96d1d6 -size 1453220 diff --git a/wget.spec b/wget.spec index 4d53bd1..0a78008 100644 --- a/wget.spec +++ b/wget.spec @@ -24,18 +24,19 @@ License: GPLv3+ Summary: A Tool for Mirroring FTP and HTTP Servers Url: http://www.gnu.org/software/wget/ Group: Productivity/Networking/Web/Utilities -Source: %name-%version.tar.xz +Source: %name-%version.tar.bz2 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: wgetrc.patch # PATCH-FEATURE-UPSTREAM wget-libproxy.patch dimstar@opensuse.org -- Add libproxy support to wget Patch1: wget-libproxy.patch Patch3: wget-sni.patch BuildRequires: libpng-devel +%if 0%{suse_version} >= 1110 BuildRequires: libproxy-devel +%endif BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: libidn-devel -BuildRequires: xz PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build From 2c24bc5f85c692788ced9440d46b04ca790829acea72020fee2f653388a6bde5 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 19 Oct 2011 10:41:55 +0000 Subject: [PATCH 3/4] Fix build OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=18 --- wget.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wget.spec b/wget.spec index 0a78008..dd1f55e 100644 --- a/wget.spec +++ b/wget.spec @@ -31,11 +31,13 @@ Patch0: wgetrc.patch Patch1: wget-libproxy.patch Patch3: wget-sni.patch BuildRequires: libpng-devel -%if 0%{suse_version} >= 1110 +%if 0%{suse_version} > 1110 BuildRequires: libproxy-devel %endif BuildRequires: openssl-devel +%if 0%{suse_version} > 0910 BuildRequires: pkg-config +%endif BuildRequires: libidn-devel PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build From 7378ae3322ba4df673bc8adba15a35af284ea9744f7ca5813450f7dca3b8bd41 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 19 Oct 2011 10:56:00 +0000 Subject: [PATCH 4/4] Fix build OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=19 --- wget.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wget.spec b/wget.spec index dd1f55e..d253665 100644 --- a/wget.spec +++ b/wget.spec @@ -49,11 +49,16 @@ This can be done in script files or via the command line. %prep %setup -q %patch0 +%if 0%{suse_version} > 1110 %patch1 +%endif %patch3 %build +%if 0%{suse_version} > 1110 +# only wget-libproxy.patch needs this autoreconf --force +%endif %configure --with-ssl=openssl make %{?_smp_mflags}