From 9ecff3ef8df7e0fd0b17b1d5a41e88d2f29177339856fc4bceeebf9d327233e7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 20 Jan 2014 10:14:11 +0000 Subject: [PATCH] Accepting request 214439 from home:AndreasStieger:branches:network:utilities GNU wget 1.15 OBS-URL: https://build.opensuse.org/request/show/214439 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=41 --- wget-1.14-openssl-no-intern.patch | 24 +++++++++++++++--------- wget-1.14.tar.xz | 3 --- wget-1.15.tar.xz | 3 +++ wget-1.15.tar.xz.sig | Bin 0 -> 543 bytes wget-fix-pod-syntax.diff | 18 +++++++++--------- wget.changes | 25 +++++++++++++++++++++++++ wget.keyring | Bin 0 -> 6988 bytes wget.spec | 12 +++++++----- 8 files changed, 59 insertions(+), 26 deletions(-) delete mode 100644 wget-1.14.tar.xz create mode 100644 wget-1.15.tar.xz create mode 100644 wget-1.15.tar.xz.sig create mode 100644 wget.keyring diff --git a/wget-1.14-openssl-no-intern.patch b/wget-1.14-openssl-no-intern.patch index ceb7f58..8801376 100644 --- a/wget-1.14-openssl-no-intern.patch +++ b/wget-1.14-openssl-no-intern.patch @@ -1,6 +1,12 @@ ---- src/openssl.c.orig -+++ src/openssl.c -@@ -29,6 +29,7 @@ +--- + src/openssl.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: wget-1.15/src/openssl.c +=================================================================== +--- wget-1.15.orig/src/openssl.c 2014-01-19 21:35:59.000000000 +0000 ++++ wget-1.15/src/openssl.c 2014-01-19 21:37:27.000000000 +0000 +@@ -29,6 +29,7 @@ Corresponding Source for a non-source fo shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ @@ -8,12 +14,12 @@ #include "wget.h" #include -@@ -425,7 +426,7 @@ - if (!SSL_set_fd (conn, FD_TO_SOCKET (fd))) - goto error; - SSL_set_connect_state (conn); -- if (SSL_connect (conn) <= 0 || conn->state != SSL_ST_OK) -+ if (SSL_connect (conn) <= 0 || SSL_get_state(conn) != SSL_ST_OK) +@@ -479,7 +480,7 @@ ssl_connect_wget (int fd, const char *ho + DEBUGP (("SSL handshake timed out.\n")); + goto timeout; + } +- if (scwt_ctx.result <= 0 || conn->state != SSL_ST_OK) ++ if (scwt_ctx.result <= 0 || SSL_get_state(conn) != SSL_ST_OK) goto error; ctx = xnew0 (struct openssl_transport_context); diff --git a/wget-1.14.tar.xz b/wget-1.14.tar.xz deleted file mode 100644 index 73f4e16..0000000 --- a/wget-1.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b -size 1584060 diff --git a/wget-1.15.tar.xz b/wget-1.15.tar.xz new file mode 100644 index 0000000..1886825 --- /dev/null +++ b/wget-1.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d18a5f4354c9854b1f1b9897353443bceed8e19a391d36d4dbebe85cc9d480fb +size 1679908 diff --git a/wget-1.15.tar.xz.sig b/wget-1.15.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..6e5fa0c8470ebb33a58543619342d0e79652b26f5ace63336c44c402d81cbc54 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-prqksSk2@obdZSvt`;p%f15CD`=;h^*+Z(hX44UeG; z@XG44=O5rKot-VryaWApu!3;rpIfX(l!3DqTEr50?B++;{p_>aaBVkaDyZk>9XJ3d_7jni*Z) z`_}CG#dpm~M2-{Kj|?|E%el~hqfle!L!NJ&P%b`UQkxGo2=RYwV;<;9{vm4Y_@ea* zdShu85nRpUFJnn*uvAs5mrSqBJkY!R;_44jODh=pzrIVV_vp*=Cqq7 zHVrlRwRl3HvD4rLpairnS^?J@iEwu0(ZzUX2L1DHLhp@lK#sOoe&%7t;SZho>oq8{ zbTUyPgSxh^i5vm5Jo6WU2c&06LTiTvU1uS-xpsIs&$bgUS(K|XnH_)RL<{ zUk6W+F=~|JZ93lHou6bJyc^cgL>Byz>2Rlj(08Y)mdCkJem{p~%ZA6tl7=?nzHEKQ zxdW_Ri;tZN#E^7;s7dFkl$LLtXXlF!y($Q(eJp>LwV@BR8cYr?NXy2QmMV!3wTb5L zj_c@b-<%8Rw{?fn{-eRH9D|{5!L%o*d8cjxM^COpHf1`A!xv|WpxHSR<)4q0Mnbdv hQ1*rcTwMVzZf90{=W*hy4lk~^@juik)7@3}d*!P%4GI7N literal 0 HcmV?d00001 diff --git a/wget-fix-pod-syntax.diff b/wget-fix-pod-syntax.diff index ee37a61..a38a1fb 100644 --- a/wget-fix-pod-syntax.diff +++ b/wget-fix-pod-syntax.diff @@ -1,13 +1,13 @@ -Index: wget-1.14/doc/texi2pod.pl +--- + doc/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: wget-1.15/doc/texi2pod.pl =================================================================== ---- wget-1.14.orig/doc/texi2pod.pl -+++ wget-1.14/doc/texi2pod.pl -@@ -291,10 +291,10 @@ while(<$inf>) { - if (defined $1) { - my $thing = $1; - if ($ic =~ /\@asis/) { -- $_ = "\n=item $thing\n"; -+ $_ = "\n=item Z<>$thing\n"; +--- wget-1.15.orig/doc/texi2pod.pl 2014-01-19 21:41:04.000000000 +0000 ++++ wget-1.15/doc/texi2pod.pl 2014-01-19 21:41:31.000000000 +0000 +@@ -294,7 +294,7 @@ while(<$inf>) { + $_ = "\n=item C<$thing>\n"; } else { # Entity escapes prevent munging by the <> processing below. - $_ = "\n=item $ic\<$thing\>\n"; diff --git a/wget.changes b/wget.changes index b8906fb..df70e03 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sun Jan 19 22:02:25 UTC 2014 - andreas.stieger@gmx.de + +- GNU wget 1.15 + * Add support for --method. + * Add support for file names longer than MAX_FILE. + * Support FTP listing for the FTP Server on Windows Server 2008 R2. + * Fix a regression when -c and --content-disposition are used together. + * Support shorthand URLs in an input file. + * Fix -c with servers that don't specify a content-length. + * Add support for MD5-SESS + * Do not fail on non fatal GNU TLS alerts during handshake. + * Add support for --https-only. When used wget will follow only + * HTTPS links in recursive mode. + * Support Perfect-Forward Secrecy in --secure-protocol. + * Fix a problem with some IRI links that are not followed when contained in a + * HTML document. + * Support some FTP servers that return an empty list with "LIST -a". + * Specify Host with the HTTP CONNECT method. + * Use the correct HTTP method on a redirection. +- verify source tarball signatures +- modified patches: + * wget-1.14-openssl-no-intern.patch for upstream changes + * wget-fix-pod-syntax.diff for upstream changes + ------------------------------------------------------------------- Thu Jun 20 13:29:01 UTC 2013 - coolo@suse.com diff --git a/wget.keyring b/wget.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..401061bb9daea44fa89ede9e7bc303d8a56f21a1dd5c072fa9de34de9ada7b8c GIT binary patch literal 6988 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 T$aeQwgnwm8Jy?3Z^X&ft1h;if literal 0 HcmV?d00001 diff --git a/wget.spec b/wget.spec index b2e1b2f..5fc6232 100644 --- a/wget.spec +++ b/wget.spec @@ -1,7 +1,7 @@ # # spec file for package wget # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: wget -Version: 1.14 +Version: 1.15 Release: 0 Summary: A Tool for Mirroring FTP and HTTP Servers License: GPL-3.0+ Group: Productivity/Networking/Web/Utilities -Url: http://www.gnu.org/software/wget/ -Source: http://ftp.gnu.org/gnu/wget/%name-%version.tar.xz +Url: https://www.gnu.org/software/wget/ +Source: https://ftp.gnu.org/gnu/wget/%name-%version.tar.xz +Source1: https://ftp.gnu.org/gnu/wget/%name-%version.tar.xz.sig +Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=wget&download=1#/wget.keyring Patch0: wgetrc.patch # PATCH-FEATURE-UPSTREAM wget-libproxy.patch dimstar@opensuse.org -- Add libproxy support to wget Patch1: wget-libproxy.patch @@ -54,7 +56,7 @@ This can be done in script files or via the command line. %if 0%{suse_version} > 1110 %patch1 %endif -%patch5 +%patch5 -p1 %patch6 %patch7 -p1