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

[Andreas Radke]

    Date: Friday, April 17, 2015 @ 19:10:12
  Author: andyrtr
Revision: 237282

upgpkg: abiword 3.0.1-2

gnutls rebuild

Added:
  abiword/trunk/gnutls-3.4.0.patch
Modified:
  abiword/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   12 ++++++++----
 gnutls-3.4.0.patch |   21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-17 14:59:47 UTC (rev 237281)
+++ PKGBUILD	2015-04-17 17:10:12 UTC (rev 237282)
@@ -5,7 +5,7 @@
 
 pkgname=abiword
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Fully-featured word processor'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -23,13 +23,15 @@
         abiword-3.0.0-link-grammar-5.patch
         abiword-3.0.0-link-grammar-5-second.patch
         link-grammar-panic.patch
-        aiksaurus-plugin.m4)
+        aiksaurus-plugin.m4
+        gnutls-3.4.0.patch)
 sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6'
             '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f'
             '6d88800f1e16becd69ed93d5f070793a56b9f162f7d886c71756643bcaed7ef5'
             'd2c80da81a339634a7a4ee4cef12f7ee968f2c2a8c2f75533b6713b71f0d61fd'
             '94d1e638f7b85123dc2282d2e59b982bde6ad0dbbe1b6b54351e610c5a0ea578'
-            '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1')
+            '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
+            'b393e26c19f92901f64d2bae54c86708ea7dd0b647572088a8ac0cd2eec89100')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -41,7 +43,9 @@
   patch -Np1 -i ../abiword-3.0.0-link-grammar-5.patch
   patch -Np1 -i ../abiword-3.0.0-link-grammar-5-second.patch
   patch -Np0 -i ../link-grammar-panic.patch
-
+  # Fix build with new gnutls 3.4.x
+  patch -Np0 -i ../gnutls-3.4.0.patch
+  
   # Install missing m4 file
   install -m644 ../aiksaurus-plugin.m4 plugins/aiksaurus/plugin.m4
 

Added: gnutls-3.4.0.patch
===================================================================
--- gnutls-3.4.0.patch	                        (rev 0)
+++ gnutls-3.4.0.patch	2015-04-17 17:10:12 UTC (rev 237282)
@@ -0,0 +1,21 @@
+--- plugins/collab/backends/service/xp/tls_tunnel.cpp	2014-11-04 02:12:14.000000000 +0100
++++ plugins/collab/backends/service/xp/tls_tunnel.cpp.new	2015-04-17 17:23:16.297151397 +0200
+@@ -306,9 +306,6 @@
+ 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
+ }
+ 
+-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
+-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
+-
+ // FIXME: this clientproxy can only handle 1 SSL connection at the same time
+ ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
+ 		const std::string& ca_file, bool check_hostname)
+@@ -400,8 +397,6 @@
+ 	// setup session
+ 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
+ 	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
+-	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
+-	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
+ 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
+ 
+ 	// setup transport