diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-04-20 12:03:56 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-04-20 12:03:56 -0300 |
| commit | 9bbbe6730c54a82bdd17b21344d346d953e7c7c7 (patch) | |
| tree | 0667be6fb61b0c49aabb5a54eafcb9c50b364243 /libre/abiword | |
| parent | bff3f1ca0cd485968bcf51af06ff1e91c881d4f1 (diff) | |
abiword-3.0.1-2.parabola1: rebuild against gnutls 3.4.0
Diffstat (limited to 'libre/abiword')
| -rw-r--r-- | libre/abiword/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/abiword/gnutls-3.4.0.patch | 21 |
2 files changed, 27 insertions, 2 deletions
diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index cf7aff513..12881cd8a 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 231659 2015-02-17 13:12:32Z jgc $ +# $Id: PKGBUILD 237282 2015-04-17 17:10:12Z andyrtr $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> # Contributor (Arch): Maël Lavault <moimael@neuf.fr> @@ -6,7 +6,7 @@ pkgname=abiword pkgver=3.0.1 -pkgrel=1.parabola1 +pkgrel=2.parabola1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Fully-featured word processor, without nonfree fonts support' license=('GPL') @@ -25,6 +25,7 @@ source=(http://abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver. abiword-3.0.0-link-grammar-5-second.patch link-grammar-panic.patch aiksaurus-plugin.m4 + gnutls-3.4.0.patch liberation-fonts.patch) sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6' '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f' @@ -32,6 +33,7 @@ sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6' 'd2c80da81a339634a7a4ee4cef12f7ee968f2c2a8c2f75533b6713b71f0d61fd' '94d1e638f7b85123dc2282d2e59b982bde6ad0dbbe1b6b54351e610c5a0ea578' '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1' + 'b393e26c19f92901f64d2bae54c86708ea7dd0b647572088a8ac0cd2eec89100' '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079') prepare() { @@ -44,6 +46,8 @@ prepare() { 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 # Replace nonfree fonts support to liberation fonts patch -Np1 -i ../liberation-fonts.patch diff --git a/libre/abiword/gnutls-3.4.0.patch b/libre/abiword/gnutls-3.4.0.patch new file mode 100644 index 000000000..301576aca --- /dev/null +++ b/libre/abiword/gnutls-3.4.0.patch @@ -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 |