Accepting request 136240 from home:elvigia:branches:network:utilities

- Build with OPENSSL_NO_SSL_INTERN, which is openssl's poor
 man's version of visibility, to avoid breaking applications
 ABI on library internal changes.

OBS-URL: https://build.opensuse.org/request/show/136240
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=28
This commit is contained in:
Reinhard Max 2012-09-27 13:52:44 +00:00 committed by Git OBS Bridge
parent 94e87e40ce
commit 04eeb023ec
3 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,19 @@
--- src/openssl.c.orig
+++ src/openssl.c
@@ -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>
@@ -429,7 +430,7 @@ ssl_connect_wget (int fd, const char *ho
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)
goto error;
ctx = xnew0 (struct openssl_transport_context);

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 27 13:46:49 UTC 2012 - crrodriguez@opensuse.org
- Build with OPENSSL_NO_SSL_INTERN, which is openssl's poor
man's version of visibility, to avoid breaking applications
ABI on library internal changes.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 27 20:03:31 UTC 2012 - aj@suse.de Fri Jul 27 20:03:31 UTC 2012 - aj@suse.de

View File

@ -30,6 +30,7 @@ Patch0: wgetrc.patch
Patch1: wget-libproxy.patch Patch1: wget-libproxy.patch
Patch3: wget-sni.patch Patch3: wget-sni.patch
Patch4: wget-stdio.h.patch Patch4: wget-stdio.h.patch
Patch5: wget-openssl-no-intern.patch
BuildRequires: libpng-devel BuildRequires: libpng-devel
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
@ -53,6 +54,7 @@ This can be done in script files or via the command line.
%endif %endif
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5
%build %build
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110