Accepting request 214476 from network:utilities
GNU wget 1.15 (forwarded request 214439 from AndreasStieger) OBS-URL: https://build.opensuse.org/request/show/214476 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wget?expand=0&rev=32
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
73b8990a10
@ -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 <assert.h>
|
||||
@@ -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);
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b
|
||||
size 1584060
|
||||
3
wget-1.15.tar.xz
Normal file
3
wget-1.15.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d18a5f4354c9854b1f1b9897353443bceed8e19a391d36d4dbebe85cc9d480fb
|
||||
size 1679908
|
||||
BIN
wget-1.15.tar.xz.sig
Normal file
BIN
wget-1.15.tar.xz.sig
Normal file
Binary file not shown.
@ -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";
|
||||
|
||||
25
wget.changes
25
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
|
||||
|
||||
|
||||
BIN
wget.keyring
Normal file
BIN
wget.keyring
Normal file
Binary file not shown.
12
wget.spec
12
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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user