From e9e71874a8dde0c8ccaaae0a7fe15da51a86a1cdb7ba902e55428e2806eb1d9b Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 23 Jul 2016 14:34:23 +0000 Subject: [PATCH 1/2] Accepting request 412795 from home:dimstar:Factory - Update wget-libproxy.patch: use libproxy's px_proxy_factory_free instead of regular free in order to ensure the module destructors are correctly running (boo#967601). OBS-URL: https://build.opensuse.org/request/show/412795 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=61 --- wget-libproxy.patch | 2 +- wget.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wget-libproxy.patch b/wget-libproxy.patch index bee5a0b..9ab6014 100644 --- a/wget-libproxy.patch +++ b/wget-libproxy.patch @@ -90,7 +90,7 @@ Index: wget-1.17/src/retr.c + } + for(i=0;proxies[i];i++) free(proxies[i]); + free(proxies); -+ free(pf); ++ px_proxy_factory_free(pf); + + if (!proxy || !*proxy) + return NULL; diff --git a/wget.changes b/wget.changes index 634287a..a4120f0 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 22 12:34:02 UTC 2016 - dimstar@opensuse.org + +- Update wget-libproxy.patch: use libproxy's px_proxy_factory_free + instead of regular free in order to ensure the module destructors + are correctly running (boo#967601). + ------------------------------------------------------------------- Thu Jun 9 20:42:15 UTC 2016 - astieger@suse.com From 93aa9f51131f2b6c100dc67f8bf306bc40dcd6aeefc6fd5cf3bc43ed359082f5 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Fri, 29 Jul 2016 08:22:59 +0000 Subject: [PATCH 2/2] Accepting request 415615 from home:jmoellers:branches:network:utilities - Save/restore errno within CLOSE_FINISH and CLOSE_INVALIDATE. (wget-errno-clobber.patch, boo#983660) OBS-URL: https://build.opensuse.org/request/show/415615 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=62 --- wget-errno-clobber.patch | 30 ++++++++++++++++++++++++++++++ wget.changes | 6 ++++++ wget.spec | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 wget-errno-clobber.patch diff --git a/wget-errno-clobber.patch b/wget-errno-clobber.patch new file mode 100644 index 0000000..be2477e --- /dev/null +++ b/wget-errno-clobber.patch @@ -0,0 +1,30 @@ +Index: wget-1.18/src/http.c +=================================================================== +--- wget-1.18.orig/src/http.c ++++ wget-1.18/src/http.c +@@ -1516,6 +1516,7 @@ persistent_available_p (const char *host + active, registered connection". */ + + #define CLOSE_FINISH(fd) do { \ ++ int errno_sav = errno; \ + if (!keep_alive) \ + { \ + if (pconn_active && (fd) == pconn.socket) \ +@@ -1524,14 +1525,17 @@ persistent_available_p (const char *host + fd_close (fd); \ + fd = -1; \ + } \ ++ errno = errno_sav; \ + } while (0) + + #define CLOSE_INVALIDATE(fd) do { \ ++ int errno_sav = errno; \ + if (pconn_active && (fd) == pconn.socket) \ + invalidate_persistent (); \ + else \ + fd_close (fd); \ + fd = -1; \ ++ errno = errno_sav; \ + } while (0) + + struct http_stat diff --git a/wget.changes b/wget.changes index a4120f0..2e338a3 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 28 15:37:37 UTC 2016 - josef.moellers@suse.com + +- Save/restore errno within CLOSE_FINISH and CLOSE_INVALIDATE. + (wget-errno-clobber.patch, boo#983660) + ------------------------------------------------------------------- Fri Jul 22 12:34:02 UTC 2016 - dimstar@opensuse.org diff --git a/wget.spec b/wget.spec index 900807d..ed5235e 100644 --- a/wget.spec +++ b/wget.spec @@ -32,6 +32,7 @@ Patch1: wget-libproxy.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 +Patch8: wget-errno-clobber.patch BuildRequires: automake BuildRequires: gpgme-devel >= 0.4.2 BuildRequires: libcares-devel @@ -77,6 +78,7 @@ This can be done in script files or via the command line. %endif %patch6 %patch7 -p1 +%patch8 -p1 %build %if 0%{?suse_version} > 1110