Sat Jul 27 01:22:29 PDT 2013

5 files changed, 53 insertions, 32 deletions

diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 4a3b83cb6..08e717bd1 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191298 2013-07-23 11:52:23Z andrea $
+# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.10.1
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'postgresql')
 optdepends=('postgresql: PostgreSQL backend')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5b03c46e1e9da439e4ec63bf7b2087c2')
+md5sums=('35eb8f76588b1d111f75bc46e3ac784b')
 
 prepare() {
   mkdir build
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index a06f9d2dc..878bf27c5 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191197 2013-07-19 17:34:12Z andyrtr $
+# $Id: PKGBUILD 191598 2013-07-26 15:46:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL2.1')
@@ -13,12 +13,18 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 makedepends=('valgrind' 'strace' 'datefudge')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}
+        tls_fix.diff)
 md5sums=('9dd691ad1ccdb7386029809afef6b5ea'
-         'SKIP')
+         'SKIP'
+         '1bbf5bfb4e1420fd61c75e14347340fc')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+  
+  # fix broken TLS connections
+  patch -Np1 -i ../tls_fix.diff
+  
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -28,13 +34,13 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   #make -k check
   make -j1 check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   
   # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff
new file mode 100644
index 000000000..8277e2b2d
--- /dev/null
+++ b/extra/gnutls/tls_fix.diff
@@ -0,0 +1,32 @@
+diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
+index 198cb34..3caa5ac 100644
+--- a/lib/gnutls_cipher.c
++++ b/lib/gnutls_cipher.c
+@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session,
+         return gnutls_assert_val(ret);
+ 
+       if (unlikely((unsigned)length_to_decrypt > compressed->size))
+-        return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
++        {
++          _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n",
++                    (unsigned int)length_to_decrypt, (unsigned int)compressed->size);
++          return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
++        }
+ 
+       ret =
+            _gnutls_auth_cipher_decrypt2 (&params->read.cipher_state,
+diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
+index 993ddb9..4795711 100644
+--- a/lib/gnutls_record.c
++++ b/lib/gnutls_record.c
+@@ -1193,8 +1193,8 @@ begin:
+   /* We allocate the maximum possible to allow few compressed bytes to expand to a
+    * full record.
+    */
+-  decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session), 
+-                             MAX_RECORD_RECV_SIZE(session));
++  t.size = _gnutls_get_max_decrypted_data(session);
++  decrypted = _mbuffer_alloc(t.size, t.size);
+   if (decrypted == NULL)
+     return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
+ 
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 19f02fa17..5568e46ff 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,33 +1,28 @@
-# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $
+# $Id: PKGBUILD 191593 2013-07-26 10:24:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgbase=virtuoso
 pkgname=('virtuoso' 'virtuoso-base')
-pkgver=6.1.6
-pkgrel=2
+pkgver=6.1.7
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
 makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz"
-        'automake113.patch')
-md5sums=('3991149c570f3738c3e819ce603e487f'
-         '570043e1b5f4acd9826732f002941c12')
+source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
+md5sums=('88885e84e8f7b61e59516f696b1d3be5')
 
 prepare() {
   cd ${pkgbase}-opensource-${pkgver}
 
   optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png
-
-  patch -p1 -i "${srcdir}"/automake113.patch
 }
 
 build() {
   cd ${pkgbase}-opensource-${pkgver}
 
-  ./autogen.sh
   ./configure --with-layout=debian \
     --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
     --with-readline
diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch
deleted file mode 100644
index 5f84b49bc..000000000
--- a/extra/virtuoso/automake113.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-+++ a/configure.in
---- b/configure.in
-@@ -36,7 +36,7 @@ 
- AC_INIT([Virtuoso Open Source Edition],
- AC_CONFIG_SRCDIR([libsrc/Dk.h])
- AC_CONFIG_AUX_DIR([binsrc/config])
- AC_CONFIG_MACRO_DIR([binsrc/config])
--AM_CONFIG_HEADER([libsrc/Dk/config.h])
-+AC_CONFIG_HEADER([libsrc/Dk/config.h])
- 
- dnl
- dnl You may need to change the next macro for older versions of automake: