diff options
Diffstat (limited to 'package/libsoup')
-rw-r--r-- | package/libsoup/0001-Revert-tld-parser-use-Python-3.patch | 27 | ||||
-rw-r--r-- | package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch | 35 | ||||
-rw-r--r-- | package/libsoup/libsoup.hash | 4 | ||||
-rw-r--r-- | package/libsoup/libsoup.mk | 4 |
4 files changed, 31 insertions, 39 deletions
diff --git a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch new file mode 100644 index 0000000000..c27ee986c6 --- /dev/null +++ b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch @@ -0,0 +1,27 @@ +From 015926c80fa3e9704f05cbc1ad17f0a877f8de09 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Date: Sat, 1 Sep 2018 15:39:04 +0200 +Subject: [PATCH] Revert "tld-parser: use Python 3" + +This reverts commit 4b924e573da307436169d5ef7e04c0ab85b36ef9. The +script runs just fine with Python 2.x, there is no reason to enforce +using Python 3.x. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +--- + libsoup/tld-parser.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py +index a743471a..5d9d2ba5 100755 +--- a/libsoup/tld-parser.py ++++ b/libsoup/tld-parser.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/env python + + # Generate tld rules + # Copyright (C) 2012 Red Hat, Inc. +-- +2.14.4 + diff --git a/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch b/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch deleted file mode 100644 index 46c7cb4fd8..0000000000 --- a/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3f5635028bbad44287511fcd3c99f2a2fddf01cd Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@igalia.com> -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 - - -(cherry picked from commit db2b0d5809d5f8226d47312b40992cadbcde439f) -Signed-off-by: Baruch Siach <baruch@tkos.co.il> ---- -Upstream status: commit db2b0d5809d - - 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 d12bc85a8e60..365da6abf9f4 100644 ---- a/libsoup/soup-cookie-jar.c -+++ b/libsoup/soup-cookie-jar.c -@@ -306,7 +306,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_ - - priv = SOUP_COOKIE_JAR_GET_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.18.0 - diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 6e1ff428af..666bbc278b 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.1.sha256sum -sha256 c32a46d77b4da433b51d8fd09a57a44b198e03bdc93e5219afcc687c7948eac3 libsoup-2.56.1.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum +sha256 d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172 libsoup-2.62.3.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index a3ce686aa7..95bd682010 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.56 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 +LIBSOUP_VERSION_MAJOR = 2.62 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ |