diff --git a/Replace-old-openssl-which-an-advanced-strategy.patch b/Replace-old-openssl-which-an-advanced-strategy.patch new file mode 100644 index 0000000..fadf796 --- /dev/null +++ b/Replace-old-openssl-which-an-advanced-strategy.patch @@ -0,0 +1,43 @@ +From 514a354504bb3788d6b07ed5284d9633cd22d0b8 Mon Sep 17 00:00:00 2001 +From: guoxiaoqi2 +Date: Mon, 28 Oct 2019 16:14:43 -0400 +Subject: [PATCH] replace old openssl which an advanced strategy + +Signed-off-by: guoxiaoqi2 +--- + libgnomevfs/gnome-vfs-ssl.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/libgnomevfs/gnome-vfs-ssl.c b/libgnomevfs/gnome-vfs-ssl.c +index 076a9e8..fd9e9e5 100644 +--- a/libgnomevfs/gnome-vfs-ssl.c ++++ b/libgnomevfs/gnome-vfs-ssl.c +@@ -368,6 +368,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_return, + /* FIXME: SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, &ssl_verify);*/ + ssl->private->ssl = SSL_new (ssl_ctx); + ++ SSL_CTX_free (ssl_ctx); + if (ssl->private->ssl == NULL) { + return GNOME_VFS_ERROR_IO; + } +@@ -400,9 +401,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_return, + } + } + +- if (ssl->private->ssl->ctx) +- SSL_CTX_free (ssl->private->ssl->ctx); +- + SSL_free (ssl->private->ssl); + g_free (ssl->private); + g_free (ssl); +@@ -705,7 +703,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) +-- +1.8.3.1 + diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 2815b8b..cbce7e0 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -1,6 +1,6 @@ Name: gnome-vfs2 Version: 2.24.4 -Release: 28 +Release: 30 Summary: GNOME virtual File System License: LGPLv2+ and GPLv2+ URL: http://www.gnome.org/ @@ -8,7 +8,7 @@ Source0: http://download.gnome.org/sources/gnome-vfs/2.24/gnome-vfs-%{vers BuildRequires: GConf2-devel libxml2-devel zlib-devel glib2-devel bzip2-devel ORBit2-devel BuildRequires: popt openjade pkgconfig automake libtool autoconf gtk-doc perl-XML-Parser -BuildRequires: libsmbclient-devel compat-openssl10-devel gamin-devel krb5-devel +BuildRequires: libsmbclient-devel openssl-devel gamin-devel krb5-devel BuildRequires: dbus-devel dbus-glib-devel libacl-devel libselinux-devel keyutils-libs-devel BuildRequires: gettext intltool pkgconfig(avahi-client) pkgconfig(avahi-glib) Requires: gvfs GConf2 @@ -27,6 +27,8 @@ Patch0009: 0001-Add-default-media-application-schema.patch Patch0010: gnome-vfs-2.24.5-file-method-chmod-flags.patch Patch0011: gnome-vfs-2.24.4-enable-deprecated.patch +Patch9000: Replace-old-openssl-which-an-advanced-strategy.patch + %description The GNOME Virtual File System provides an abstraction to common file system operations like reading, writing and copying files, listing directories and @@ -112,6 +114,12 @@ make test %{_datadir}/gtk-doc/html/gnome-vfs-2.0/ %changelog +* Tue Oct 29 2019 openEuler Buildteam - 2.24.4.30 +- Adjust buildrequires + +* Mon Oct 28 2019 openEuler Buildteam - 2.24.4.29 +- Replace old openssl which an advanced strategy + * Tue Sep 17 2019 Huiming Xie - 2.24.4.28 - Package init