[arch-commits] Commit in gnome-vfs/trunk (PKGBUILD gnutls-3.4.0.patch)

[Evangelos Foutras]

    Date: Monday, April 13, 2015 @ 23:10:37
  Author: foutrelis
Revision: 236394

upgpkg: gnome-vfs 2.24.4-8

gnutls 3.4.0 rebuild.

Added:
  gnome-vfs/trunk/gnutls-3.4.0.patch
Modified:
  gnome-vfs/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    3 +++
 gnutls-3.4.0.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-13 19:57:26 UTC (rev 236393)
+++ PKGBUILD	2015-04-13 21:10:37 UTC (rev 236394)
@@ -14,10 +14,12 @@
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
         gnutls-config.patch
+        gnutls-3.4.0.patch
         gcrypt-config.patch
         enable-deprecated.patch)
 sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
             '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
+            '5fe5e2e1ad8d8d36deb2d38db621d5b8350aafe3876f722467465c3b3fa304d3'
             'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114'
             'ca2b9dffb1fa202c0d1f0d3648ef37cd8e84657a22d4c6746bb46e9a6cf1ee47')
 
@@ -25,6 +27,7 @@
   cd ${pkgname}-${pkgver}
   #Fix build with new gnutls
   patch -Np1 -i ../gnutls-config.patch
+  patch -Np1 -i ../gnutls-3.4.0.patch
   #fix build with new libgcrypt >= 1.5.0
   patch -Np1 -i ../gcrypt-config.patch
   # remove -DG_DISABLE_DEPRECATED

Added: gnutls-3.4.0.patch
===================================================================
--- gnutls-3.4.0.patch	                        (rev 0)
+++ gnutls-3.4.0.patch	2015-04-13 21:10:37 UTC (rev 236394)
@@ -0,0 +1,38 @@
+diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2010-02-09 14:16:14.000000000 +0200
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2015-04-14 00:01:51.272451668 +0300
+@@ -314,21 +314,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
+@@ -437,11 +422,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);