diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index b5eec08..d48dd40 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -13,7 +13,7 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.24.4 -Release: 32%{?dist} +Release: 33%{?dist} License: LGPLv2+ and GPLv2+ # the daemon and the library are LGPLv2+ # the modules are LGPLv2+ and GPLv2+ @@ -32,7 +32,7 @@ BuildRequires: autoconf BuildRequires: gtk-doc BuildRequires: perl-XML-Parser BuildRequires: libsmbclient-devel -BuildRequires: compat-openssl10-devel gamin-devel +BuildRequires: openssl-devel gamin-devel BuildRequires: krb5-devel BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib) %if %{with hal} @@ -90,6 +90,7 @@ Patch7: gnome-vfs-2.24.5-file-method-chmod-flags.patch # fix compilation against new glib2 Patch8: gnome-vfs-2.24.4-enable-deprecated.patch +Patch9: openssl.patch %description GNOME VFS is the GNOME virtual file system. It is the foundation of @@ -137,6 +138,7 @@ shares (SMB) to applications using GNOME VFS. %patch6 -p1 -b .mailto-command %patch7 -p1 -b .file-method-chmod-flags %patch8 -p1 -b .enable-deprecated +%patch9 -p0 -b .openssl11 # send to upstream %patch101 -p1 -b .schema_about @@ -254,6 +256,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu Sep 17 2020 Gwyn Ciesla - 2.24.4-33 +- Migrate to modern openssl. + * Sat Aug 01 2020 Fedora Release Engineering - 2.24.4-32 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/openssl.patch b/openssl.patch new file mode 100644 index 0000000..752d728 --- /dev/null +++ b/openssl.patch @@ -0,0 +1,20 @@ +--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 ++++ libgnomevfs/gnome-vfs-ssl.c +@@ -400,9 +400,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); +@@ -705,7 +702,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)