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

[Sergej Pupykin]

    Date: Thursday, April 16, 2015 @ 15:54:46
  Author: spupykin
Revision: 131478

Modified:
  mailutils/trunk/PKGBUILD
  mailutils/trunk/gnutls.patch

--------------+
 PKGBUILD     |    2 +-
 gnutls.patch |   17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-16 13:50:30 UTC (rev 131477)
+++ PKGBUILD	2015-04-16 13:54:46 UTC (rev 131478)
@@ -16,7 +16,7 @@
 source=(http://alpha.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.xz
 	gnutls.patch)
 md5sums=('7d87795ff24afa966ad5d6785f974141'
-         'd8bded1b6d5f324c6e1588ff573d6db4')
+         'd9491cbf1aad93fccb058cf56e9063a9')
 
 prepare() {
   cd "$srcdir/mailutils-$pkgver"

Modified: gnutls.patch
===================================================================
--- gnutls.patch	2015-04-16 13:50:30 UTC (rev 131477)
+++ gnutls.patch	2015-04-16 13:54:46 UTC (rev 131478)
@@ -1,7 +1,7 @@
 diff -wbBur mailutils-2.99.98.org/libmu_auth/tls.c mailutils-2.99.98/libmu_auth/tls.c
 --- mailutils-2.99.98.org/libmu_auth/tls.c	2012-01-05 22:21:42.000000000 +0400
 +++ mailutils-2.99.98/libmu_auth/tls.c	2015-04-16 16:00:39.803642048 +0300
-@@ -428,20 +428,20 @@
+@@ -428,20 +428,9 @@
    struct _mu_tls_stream *sp = (struct _mu_tls_stream *) stream;
    int rc;
    mu_transport_t transport[2];
@@ -8,15 +8,10 @@
 -  static int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
 -  static int kx_priority[] = {GNUTLS_KX_RSA, 0};
 -  static int cipher_priority[] = {GNUTLS_CIPHER_3DES_CBC,
-+  static char protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
-+  static char kx_priority[] = {GNUTLS_KX_RSA, 0};
-+  static char cipher_priority[] = {GNUTLS_CIPHER_3DES_CBC,
- 				  GNUTLS_CIPHER_ARCFOUR_128,
- 				  0};
+-				  GNUTLS_CIPHER_ARCFOUR_128,
+-				  0};
 -  static int comp_priority[] = {GNUTLS_COMP_NULL, 0};
 -  static int mac_priority[] = {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
-+  static char comp_priority[] = {GNUTLS_COMP_NULL, 0};
-+  static char mac_priority[] = {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
  
    gnutls_init (&sp->session, GNUTLS_CLIENT);
 -  gnutls_protocol_set_priority (sp->session, protocol_priority);
@@ -24,11 +19,7 @@
 -  gnutls_compression_set_priority (sp->session, comp_priority);
 -  gnutls_kx_set_priority (sp->session, kx_priority);
 -  gnutls_mac_set_priority (sp->session, mac_priority);
-+  gnutls_priority_set_direct (sp->session, protocol_priority, NULL);
-+  gnutls_priority_set_direct (sp->session, cipher_priority, NULL);
-+  gnutls_priority_set_direct (sp->session, comp_priority, NULL);
-+  gnutls_priority_set_direct (sp->session, kx_priority, NULL);
-+  gnutls_priority_set_direct (sp->session, mac_priority, NULL);
++  gnutls_set_default_priority (sp->session);
  
    gnutls_certificate_allocate_credentials (&x509_cred);
    if (mu_tls_module_config.ssl_cafile)