r45602 - in /attic/gnome-vfs/debian: changelog control patches/gnutls_deprecated.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 25 12:04:26 2015
New Revision: 45602

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45602
Log:
Acknowledge NMU

Added:
    attic/gnome-vfs/debian/patches/gnutls_deprecated.patch
Modified:
    attic/gnome-vfs/debian/changelog
    attic/gnome-vfs/debian/control
    attic/gnome-vfs/debian/patches/series

Modified: attic/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/changelog?rev=45602&op=diff
==============================================================================
--- attic/gnome-vfs/debian/changelog	[utf-8] (original)
+++ attic/gnome-vfs/debian/changelog	[utf-8] Sat Jul 25 12:04:26 2015
@@ -1,3 +1,12 @@
+gnome-vfs (1:2.24.4-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * gnutls_deprecated.patch 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 <ametzler at debian.org>  Sat, 25 Jul 2015 11:55:05 +0200
+
 gnome-vfs (1:2.24.4-6) unstable; urgency=medium
 
   * Team upload

Modified: attic/gnome-vfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control?rev=45602&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control	[utf-8] (original)
+++ attic/gnome-vfs/debian/control	[utf-8] Sat Jul 25 12:04:26 2015
@@ -2,12 +2,11 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gnome-vfs
 Section: oldlibs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs,
                dh-autoreconf,
                gtk-doc-tools (>= 1.0),

Added: attic/gnome-vfs/debian/patches/gnutls_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/patches/gnutls_deprecated.patch?rev=45602&op=file
==============================================================================
--- attic/gnome-vfs/debian/patches/gnutls_deprecated.patch	(added)
+++ attic/gnome-vfs/debian/patches/gnutls_deprecated.patch	[utf-8] Sat Jul 25 12:04:26 2015
@@ -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);

Modified: attic/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/patches/series?rev=45602&op=diff
==============================================================================
--- attic/gnome-vfs/debian/patches/series	[utf-8] (original)
+++ attic/gnome-vfs/debian/patches/series	[utf-8] Sat Jul 25 12:04:26 2015
@@ -24,3 +24,4 @@
 40_disable_deprecated.patch
 41_test_srcdir.patch
 gnutls3.patch
+gnutls_deprecated.patch