diff --git a/.gitignore b/.gitignore index 4240651..755e35f 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ libsoup-2.31.6.tar.bz2 /libsoup-2.61.90.tar.xz /libsoup-2.61.91.tar.xz /libsoup-2.62.0.tar.xz +/libsoup-2.62.1.tar.xz diff --git a/crash-under-soup_socket_new.patch b/crash-under-soup_socket_new.patch deleted file mode 100644 index 8a04a0c..0000000 --- a/crash-under-soup_socket_new.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c -index f7aef68e..cccaef1e 100644 ---- a/libsoup/soup-session.c -+++ b/libsoup/soup-session.c -@@ -355,6 +355,7 @@ soup_session_finalize (GObject *object) - G_OBJECT_CLASS (soup_session_parent_class)->finalize (object); - } - -+/* requires conn_lock */ - static void - ensure_socket_props (SoupSession *session) - { -@@ -770,11 +771,13 @@ soup_session_set_property (GObject *object, guint prop_id, - break; - } - -+ g_mutex_lock (&priv->conn_lock); - if (priv->socket_props && socket_props_changed) { - soup_socket_properties_unref (priv->socket_props); - priv->socket_props = NULL; - ensure_socket_props (session); - } -+ g_mutex_unlock (&priv->conn_lock); - } - - static void -@@ -794,7 +797,9 @@ soup_session_get_property (GObject *object, guint prop_id, - g_value_set_boxed (value, priv->proxy_uri); - break; - case PROP_PROXY_RESOLVER: -+ g_mutex_lock (&priv->conn_lock); - ensure_socket_props (session); -+ g_mutex_unlock (&priv->conn_lock); - g_value_set_object (value, priv->proxy_resolver); - break; - case PROP_MAX_CONNS: -@@ -815,12 +820,16 @@ soup_session_get_property (GObject *object, guint prop_id, - break; - case PROP_SSL_USE_SYSTEM_CA_FILE: - tlsdb = g_tls_backend_get_default_database (g_tls_backend_get_default ()); -+ g_mutex_lock (&priv->conn_lock); - ensure_socket_props (session); -+ g_mutex_unlock (&priv->conn_lock); - g_value_set_boolean (value, priv->tlsdb == tlsdb); - g_clear_object (&tlsdb); - break; - case PROP_TLS_DATABASE: -+ g_mutex_lock (&priv->conn_lock); - ensure_socket_props (session); -+ g_mutex_unlock (&priv->conn_lock); - g_value_set_object (value, priv->tlsdb); - break; - case PROP_TLS_INTERACTION: diff --git a/libsoup.spec b/libsoup.spec index ccfd63e..abd7684 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -1,7 +1,7 @@ %define glib2_version 2.38.0 Name: libsoup -Version: 2.62.0 +Version: 2.62.1 Release: 1%{?dist} Summary: Soup, an HTTP library implementation @@ -9,8 +9,6 @@ License: LGPLv2 URL: https://wiki.gnome.org/Projects/libsoup Source0: https://download.gnome.org/sources/%{name}/2.62/%{name}-%{version}.tar.xz -Patch01: crash-under-soup_socket_new.patch - BuildRequires: chrpath BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib-networking @@ -45,7 +43,6 @@ you to develop applications that use the libsoup library. %prep %setup -q -%patch01 -p1 -b .crash-under-soup_socket_new %build %configure --disable-static @@ -84,6 +81,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so %{_datadir}/vala/vapi/libsoup-2.4.vapi %changelog +* Mon Apr 09 2018 Kalev Lember - 2.62.1-1 +- Update to 2.62.1 + * Mon Mar 12 2018 Kalev Lember - 2.62.0-1 - Update to 2.62.0 diff --git a/sources b/sources index dd11ab6..0c87683 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsoup-2.62.0.tar.xz) = a2bbe360eb29fd325cdb19eac9f53e554bc9a7a682d0e3c88395d5243fe1990e637631cd9f3b0084607e4c6bab61f368423b2b08707224406b6f078c6dc57675 +SHA512 (libsoup-2.62.1.tar.xz) = 0617abdf41ab339496e81da83ff67e507913ed42ab6ce149afc5dedea74d0118dbaac2913d8ff2875b8842546504b6c0a373e2746e5007a5f4e24197f94b30f5