From 04eeb023ec3478adecfe3031eee25bd953412766b7a2f372bcceb0a3cfddb737 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 27 Sep 2012 13:52:44 +0000 Subject: [PATCH 1/2] 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 --- wget-openssl-no-intern.patch | 19 +++++++++++++++++++ wget.changes | 7 +++++++ wget.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 wget-openssl-no-intern.patch diff --git a/wget-openssl-no-intern.patch b/wget-openssl-no-intern.patch new file mode 100644 index 0000000..85f20f6 --- /dev/null +++ b/wget-openssl-no-intern.patch @@ -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 +@@ -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); diff --git a/wget.changes b/wget.changes index 813ca60..5217d2f 100644 --- a/wget.changes +++ b/wget.changes @@ -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 diff --git a/wget.spec b/wget.spec index f13ad10..d37172a 100644 --- a/wget.spec +++ b/wget.spec @@ -30,6 +30,7 @@ Patch0: wgetrc.patch Patch1: wget-libproxy.patch Patch3: wget-sni.patch Patch4: wget-stdio.h.patch +Patch5: wget-openssl-no-intern.patch BuildRequires: libpng-devel %if 0%{suse_version} > 1110 BuildRequires: libproxy-devel @@ -53,6 +54,7 @@ This can be done in script files or via the command line. %endif %patch3 %patch4 -p1 +%patch5 %build %if 0%{suse_version} > 1110 From bea626af4e226ab280815bded48cab16c3c54df7671a7024488b443c7682f319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 28 Sep 2012 10:38:44 +0000 Subject: [PATCH 2/2] Mention the patch OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=29 --- wget.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wget.changes b/wget.changes index 5217d2f..7d6a7d6 100644 --- a/wget.changes +++ b/wget.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- 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. +- Add wget-openssl-no-intern.patch to 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