From 12430496572637b6d0a889ff3214fd4e96853b5f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 10 Aug 2018 20:48:09 +0200 Subject: [PATCH] Update to 2.62.3 --- .gitignore | 1 + ...-bail-if-hostname-is-an-empty-string.patch | 29 ------------------- libsoup.spec | 9 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch diff --git a/.gitignore b/.gitignore index 5cb1ea1..56312c2 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ libsoup-2.31.6.tar.bz2 /libsoup-2.62.0.tar.xz /libsoup-2.62.1.tar.xz /libsoup-2.62.2.tar.xz +/libsoup-2.62.3.tar.xz diff --git a/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch b/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch deleted file mode 100644 index 843b2e6..0000000 --- a/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch +++ /dev/null @@ -1,29 +0,0 @@ -From db2b0d5809d5f8226d47312b40992cadbcde439f Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sun, 24 Jun 2018 19:46:19 -0500 -Subject: [PATCH] cookie-jar: bail if hostname is an empty string - -There are several other ways to fix the problem with this function, but -skipping over all of the code is probably the simplest. - -Fixes #3 ---- - libsoup/soup-cookie-jar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c -index 2369c8a..b2b7890 100644 ---- a/libsoup/soup-cookie-jar.c -+++ b/libsoup/soup-cookie-jar.c -@@ -307,7 +307,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_ - - priv = soup_cookie_jar_get_instance_private (jar); - -- if (!uri->host) -+ if (!uri->host || !uri->host[0]) - return NULL; - - /* The logic here is a little weird, but the plan is that if --- -2.17.1 - diff --git a/libsoup.spec b/libsoup.spec index 9f7cd24..8f24c95 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -1,15 +1,13 @@ %define glib2_version 2.38.0 Name: libsoup -Version: 2.62.2 -Release: 3%{?dist} +Version: 2.62.3 +Release: 1%{?dist} Summary: Soup, an HTTP library implementation License: LGPLv2 URL: https://wiki.gnome.org/Projects/libsoup Source0: https://download.gnome.org/sources/%{name}/2.62/%{name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch BuildRequires: chrpath BuildRequires: glib2-devel >= %{glib2_version} @@ -83,6 +81,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so %{_datadir}/vala/vapi/libsoup-2.4.vapi %changelog +* Fri Aug 10 2018 Kalev Lember - 2.62.3-1 +- Update to 2.62.3 + * Fri Jul 13 2018 Fedora Release Engineering - 2.62.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 46de9b8..ae3f6c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsoup-2.62.2.tar.xz) = fbb3f2bc35cf11c7ecf47aada8d92344a15e351ace4133686512b3e2d619e831d9f80781387252a2652625cc0ba21cf4775bf5c1ca8bec5f5ccf0af15ef23850 +SHA512 (libsoup-2.62.3.tar.xz) = 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b