Hello community,

here is the log from the commit of package gnome-vfs2 for openSUSE:Factory 
checked in at 2017-10-21 20:17:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-vfs2 (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-vfs2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-vfs2"

Sat Oct 21 20:17:07 2017 rev:69 rq:535499 version:2.24.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-vfs2/gnome-vfs2.changes    2017-06-28 
11:14:57.483197735 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-vfs2.new/gnome-vfs2.changes       
2017-10-21 20:17:10.291936807 +0200
@@ -1,0 +2,7 @@
+Fri Oct 20 14:14:17 UTC 2017 - [email protected]
+
+- Add gnome-vfs2-openssl11.patch: Fixed the openssl build by
+  replacing the private->ctx usage with a one working for all
+  openssl (bsc#1042650).
+
+-------------------------------------------------------------------

New:
----
  gnome-vfs2-openssl11.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-vfs2.spec ++++++
--- /var/tmp/diff_new_pack.qlQI8y/_old  2017-10-21 20:17:11.115898223 +0200
+++ /var/tmp/diff_new_pack.qlQI8y/_new  2017-10-21 20:17:11.115898223 +0200
@@ -35,7 +35,7 @@
 BuildRequires:  libavahi-glib-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  libopenssl-1_0_0-devel
+BuildRequires:  libopenssl-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libxml2-devel
@@ -72,6 +72,8 @@
 Patch45:        gnome-vfs2-2.12.2-smb-method-fixes.patch
 # PATCH-FIX-SLE gnome-vfs2-bug338168-cannot-access-from-location-input.patch 
bnc#832381 [email protected] -- porting some missing patches from SLE to openSUSE
 Patch46:        gnome-vfs2-bug338168-cannot-access-from-location-input.patch
+# PATCH-FIX-OPENSUSE gnome-vfs2-openssl11.patch bsc#1042650 [email protected] 
-- openssl 1.1 enablement: replacing old openssl construct by a better strategy
+Patch50:        gnome-vfs2-openssl11.patch
 # bug437293
 %ifarch ppc64
 Obsoletes:      gnome-vfs2-64bit
@@ -129,6 +131,7 @@
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch50 -p1
 
 # ^ Place for your patches is here
 #

++++++ gnome-vfs2-openssl11.patch ++++++
Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
===================================================================
--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c
+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
@@ -375,6 +375,8 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
         /* FIXME: SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, &ssl_verify);*/
         ssl->private->ssl = SSL_new (ssl_ctx);
 
+       SSL_CTX_free (ssl_ctx); /* actually drops the reference count only, 
SSL_new will have incremented the ctx refcount. */
+
        if (ssl->private->ssl == NULL) {
                return GNOME_VFS_ERROR_IO;
        }
@@ -407,9 +409,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
                        }
                }
 
-                if (ssl->private->ssl->ctx)
-                        SSL_CTX_free (ssl->private->ssl->ctx);
-
                 SSL_free (ssl->private->ssl);
                g_free (ssl->private);
                g_free (ssl);
@@ -712,7 +711,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
                }
        }
        
-       SSL_CTX_free (ssl->private->ssl->ctx);
        SSL_free (ssl->private->ssl);
        close (ssl->private->sockfd);
        if (ssl->private->timeout)

Reply via email to