Accepting request 288607 from home:AndreasStieger:branches:network:utilities

GNU wget 1.16.2

OBS-URL: https://build.opensuse.org/request/show/288607
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=51
This commit is contained in:
Andreas Stieger 2015-03-03 07:43:06 +00:00 committed by Git OBS Bridge
parent 79964b366a
commit 5e0ebbfc4b
7 changed files with 15 additions and 32 deletions

View File

@ -1,25 +0,0 @@
---
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. */
+#define OPENSSL_NO_SSL_INTERN
#include "wget.h"
#include <assert.h>
@@ -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);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b96c707ee15fe847f5bc2f872a7a530dca803b927a750419b44f50803e14d33
size 1760120

Binary file not shown.

3
wget-1.16.2.tar.xz Normal file
View File

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

BIN
wget-1.16.2.tar.xz.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Mar 3 07:42:21 UTC 2015 - astieger@suse.com
- GNU wget 1.16.2:
* Allow progress bar on stderr when -o is used.
* Accept 5-digit port numbers in FTP EPSV responses.
* Support older versions of flex.
* Updated translations.
- drop wget-1.14-openssl-no-intern.patch, now upstream
-------------------------------------------------------------------
Wed Dec 24 13:33:29 UTC 2014 - andreas.stieger@gmx.de

View File

@ -1,7 +1,7 @@
#
# spec file for package wget
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%bcond_with regression_tests
Name: wget
Version: 1.16.1
Version: 1.16.2
Release: 0
Summary: A Tool for Mirroring FTP and HTTP Servers
License: GPL-3.0+
@ -30,7 +30,6 @@ 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
Patch1: wget-libproxy.patch
Patch5: wget-1.14-openssl-no-intern.patch
Patch6: wget-1.14-no-ssl-comp.patch
# PATCH-FIX-OPENSUSE fix pod syntax for perl 5.18 coolo@suse.de
Patch7: wget-fix-pod-syntax.diff
@ -62,7 +61,6 @@ This can be done in script files or via the command line.
%if 0%{suse_version} > 1110
%patch1 -p1
%endif
%patch5 -p1
%patch6
%patch7 -p1