Control: tags -1 patch On 2011-04-25 Andreas Metzler <[email protected]> wrote: > Package: gnome-vfs [...] > This package is using some functions which are marked deprecated in > newer versions of GnuTLS (>=2.12.x). [ and removed in 3.4.0 ] > The gnutls_*_set_priority family of functions has been marked deprecated > in 2.12.x. These functions have been superceded by > gnutls_priority_set_direct(). The replacement function was added in gnutls > stable release 2.2.0 (released 2007-12-14).
Hello, find attached a patch to fix this, originating from Arch Linux. It is a straightforward switch from explicitely setting cipher, protocol, et al. priorities to use GnuTLS default values. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff -Nru gnome-vfs-2.24.4/debian/changelog gnome-vfs-2.24.4/debian/changelog --- gnome-vfs-2.24.4/debian/changelog 2014-07-05 13:15:00.000000000 +0200 +++ gnome-vfs-2.24.4/debian/changelog 2015-05-03 16:45:08.000000000 +0200 @@ -1,3 +1,12 @@ +gnome-vfs (1:2.24.4-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * gnutls_deprecated.diff from Arch Linux' Evangelos Foutras: Use + gnutls_set_default_priority() instead of the deprecated and in GnuTLS + 3.4.0 removed gnutls_*_set_priority functions. Closes: #624042 + + -- Andreas Metzler <[email protected]> Sun, 03 May 2015 16:35:55 +0200 + gnome-vfs (1:2.24.4-6) unstable; urgency=medium * Team upload diff -Nru gnome-vfs-2.24.4/debian/patches/gnutls_deprecated.diff gnome-vfs-2.24.4/debian/patches/gnutls_deprecated.diff --- gnome-vfs-2.24.4/debian/patches/gnutls_deprecated.diff 1970-01-01 01:00:00.000000000 +0100 +++ gnome-vfs-2.24.4/debian/patches/gnutls_deprecated.diff 2015-05-03 16:43:45.000000000 +0200 @@ -0,0 +1,45 @@ +Description: Use gnutls_set_default_priority() instead of the + deprecated and in GnuTLS 3.4.0 removed gnutls_*_set_priority functions. +Author: Evangelos Foutras (foutrelis) +Origin: other, https://projects.archlinux.org/svntogit/packages.git/patch/trunk/gnutls-3.4.0.patch?id=73e9ebb4f632a2f82013861eef6c134035a55422 +Bug-Debian: https://bugs.debian.org/624042 +Forwarded: no +Last-Update: 2015-05-03 + +--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c ++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c +@@ -311,21 +311,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand + #endif + } + +-#ifdef HAVE_GNUTLS +-static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0}; +-static const int cipher_priority[] = +- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC, +- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; +-static const int comp_priority[] = +- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0}; +-static const int kx_priority[] = +- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0}; +-static const int mac_priority[] = +- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0}; +- +-#endif +- +- + /** + * gnome_vfs_ssl_create_from_fd: + * @handle_return: pointer to a #GnomeVFSSSL struct, which will +@@ -434,11 +419,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS + gnutls_transport_set_ptr (ssl->private->tlsstate, + GINT_TO_POINTER (fd)); + +- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority); +- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority); +- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority); +- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority); +- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority); ++ gnutls_set_default_priority (ssl->private->tlsstate); + + gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE, + ssl->private->xcred); diff -Nru gnome-vfs-2.24.4/debian/patches/series gnome-vfs-2.24.4/debian/patches/series --- gnome-vfs-2.24.4/debian/patches/series 2014-07-05 12:08:43.000000000 +0200 +++ gnome-vfs-2.24.4/debian/patches/series 2015-05-03 16:39:31.000000000 +0200 @@ -24,3 +24,4 @@ 40_disable_deprecated.patch 41_test_srcdir.patch gnutls3.patch +gnutls_deprecated.diff
