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

[Sergej Pupykin]

    Date: Thursday, April 16, 2015 @ 15:07:29
  Author: spupykin
Revision: 131473

Added:
  mailutils/trunk/gnutls.patch
Modified:
  mailutils/trunk/PKGBUILD
Deleted:
  mailutils/trunk/build-fix.patch

-----------------+
 PKGBUILD        |    8 ++++----
 build-fix.patch |   13 -------------
 gnutls.patch    |   34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-16 13:01:48 UTC (rev 131472)
+++ PKGBUILD	2015-04-16 13:07:29 UTC (rev 131473)
@@ -4,7 +4,7 @@
 
 pkgname=mailutils
 pkgver=2.99.98
-pkgrel=1
+pkgrel=2
 pkgdesc="MUA command line tool (mailx)"
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/mailutils/"
@@ -14,13 +14,13 @@
 install=mailutils.install
 options=(zipman !emptydirs)
 source=(http://alpha.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.xz
-	build-fix.patch)
+	gnutls.patch)
 md5sums=('7d87795ff24afa966ad5d6785f974141'
-         'e83709ffdcdb257dfab443ef77c89574')
+         'd8bded1b6d5f324c6e1588ff573d6db4')
 
 prepare() {
   cd "$srcdir/mailutils-$pkgver"
-#  patch -p1 <$srcdir/build-fix.patch
+  patch -p1 <$srcdir/gnutls.patch
 }
 
 build() {

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2015-04-16 13:01:48 UTC (rev 131472)
+++ build-fix.patch	2015-04-16 13:07:29 UTC (rev 131473)
@@ -1,13 +0,0 @@
-diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in
---- mailutils-2.2/lib/Makefile.in	2010-09-08 13:58:58.000000000 +0400
-+++ mailutils-2.2.q/lib/Makefile.in	2013-05-29 14:51:14.064888989 +0400
-@@ -1861,7 +1861,8 @@
- 	      -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
- 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
--	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-+	      -e 's|_GL_WARN_ON_USE (gets.*||'; \
- 	} > $@-t && \
- 	mv $@-t $@
- 

Added: gnutls.patch
===================================================================
--- gnutls.patch	                        (rev 0)
+++ gnutls.patch	2015-04-16 13:07:29 UTC (rev 131473)
@@ -0,0 +1,34 @@
+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 @@
+   struct _mu_tls_stream *sp = (struct _mu_tls_stream *) stream;
+   int rc;
+   mu_transport_t transport[2];
+-  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};
+-  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);
+-  gnutls_cipher_set_priority (sp->session, cipher_priority);
+-  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_certificate_allocate_credentials (&x509_cred);
+   if (mu_tls_module_config.ssl_cafile)