Date: Wednesday, January 13, 2016 @ 19:37:41 Author: spupykin Revision: 156331
upgpkg: mailutils 2.99.99-1 upd Modified: mailutils/trunk/PKGBUILD Deleted: mailutils/trunk/gnutls.patch --------------+ PKGBUILD | 32 ++++++++++++++------------------ gnutls.patch | 25 ------------------------- 2 files changed, 14 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-13 18:29:54 UTC (rev 156330) +++ PKGBUILD 2016-01-13 18:37:41 UTC (rev 156331) @@ -3,33 +3,29 @@ # Contributor: Sergej Pupykin <[email protected]> pkgname=mailutils -pkgver=2.99.98 -pkgrel=3 +pkgver=2.99.99 +pkgrel=1 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64) url="http://www.gnu.org/software/mailutils/"; license=('GPL') -depends=('libldap' 'pam' 'gnutls') +depends=('libldap' 'pam' 'gnutls' 'gsasl' 'guile') makedepends=('emacs') install=mailutils.install -options=(zipman !emptydirs) -source=(http://alpha.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.xz - gnutls.patch) -md5sums=('7d87795ff24afa966ad5d6785f974141' - 'd9491cbf1aad93fccb058cf56e9063a9') +options=(!emptydirs) +source=(http://alpha.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.xz) +md5sums=('dbc9ea6d18bf8187a08bff3007af1ad7') -prepare() { - cd "$srcdir/mailutils-$pkgver" - patch -p1 <$srcdir/gnutls.patch -} - build() { cd "$srcdir/mailutils-$pkgver" - ./configure --prefix=/usr --with-gdbm --with-gnutls \ - --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers --sbindir=/usr/bin \ - --without-python --without-guile - make + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/$pkgname \ + --with-gdbm \ + --with-gnutls \ + --disable-python + make CFLAGS="$CFLAGS -O2" || make CFLAGS="$CFLAGS -O2" LDFLAGS="-L`pwd`/lib -lmutcpwrap" } package() { Deleted: gnutls.patch =================================================================== --- gnutls.patch 2016-01-13 18:29:54 UTC (rev 156330) +++ gnutls.patch 2016-01-13 18:37:41 UTC (rev 156331) @@ -1,25 +0,0 @@ -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,9 @@ - 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, -- GNUTLS_CIPHER_ARCFOUR_128, -- 0}; -- static int comp_priority[] = {GNUTLS_COMP_NULL, 0}; -- static int 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_set_default_priority (sp->session); - - gnutls_certificate_allocate_credentials (&x509_cred); - if (mu_tls_module_config.ssl_cafile)
