[arch-commits] Commit in gnutls/repos (10 files)

Andreas Radke andyrtr at nymeria.archlinux.org
Fri Jul 26 15:46:24 UTC 2013


    Date: Friday, July 26, 2013 @ 17:46:23
  Author: andyrtr
Revision: 191598

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnutls/repos/extra-i686/PKGBUILD
    (from rev 191597, gnutls/trunk/PKGBUILD)
  gnutls/repos/extra-i686/gnutls.install
    (from rev 191597, gnutls/trunk/gnutls.install)
  gnutls/repos/extra-i686/tls_fix.diff
    (from rev 191597, gnutls/trunk/tls_fix.diff)
  gnutls/repos/extra-x86_64/PKGBUILD
    (from rev 191597, gnutls/trunk/PKGBUILD)
  gnutls/repos/extra-x86_64/gnutls.install
    (from rev 191597, gnutls/trunk/gnutls.install)
  gnutls/repos/extra-x86_64/tls_fix.diff
    (from rev 191597, gnutls/trunk/tls_fix.diff)
Deleted:
  gnutls/repos/extra-i686/PKGBUILD
  gnutls/repos/extra-i686/gnutls.install
  gnutls/repos/extra-x86_64/PKGBUILD
  gnutls/repos/extra-x86_64/gnutls.install

-----------------------------+
 /PKGBUILD                   |  100 ++++++++++++++++++++++++++++++++++++++++++
 /gnutls.install             |   40 ++++++++++++++++
 extra-i686/PKGBUILD         |   44 ------------------
 extra-i686/gnutls.install   |   20 --------
 extra-i686/tls_fix.diff     |   32 +++++++++++++
 extra-x86_64/PKGBUILD       |   44 ------------------
 extra-x86_64/gnutls.install |   20 --------
 extra-x86_64/tls_fix.diff   |   32 +++++++++++++
 8 files changed, 204 insertions(+), 128 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-07-26 15:45:07 UTC (rev 191597)
+++ extra-i686/PKGBUILD	2013-07-26 15:46:23 UTC (rev 191598)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL2.1')
-url="http://www.gnutls.org/"
-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})
-md5sums=('9dd691ad1ccdb7386029809afef6b5ea'
-         'SKIP')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--disable-valgrind-tests
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #make -k check
-  make -j1 check
-}
-
-package() {
-  cd "${srcdir}/${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
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}

Copied: gnutls/repos/extra-i686/PKGBUILD (from rev 191597, gnutls/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-07-26 15:46:23 UTC (rev 191598)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.2.2
+pkgrel=2
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL2.1')
+url="http://www.gnutls.org/"
+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}
+        tls_fix.diff)
+md5sums=('9dd691ad1ccdb7386029809afef6b5ea'
+         'SKIP'
+         '1bbf5bfb4e1420fd61c75e14347340fc')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  
+  # fix broken TLS connections
+  patch -Np1 -i ../tls_fix.diff
+  
+  ./configure --prefix=/usr \
+	--with-zlib \
+	--disable-static \
+	--disable-guile \
+	--disable-valgrind-tests
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  #make -k check
+  make -j1 check
+}
+
+package() {
+  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
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}

Deleted: extra-i686/gnutls.install
===================================================================
--- extra-i686/gnutls.install	2013-07-26 15:45:07 UTC (rev 191597)
+++ extra-i686/gnutls.install	2013-07-26 15:46:23 UTC (rev 191598)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: gnutls/repos/extra-i686/gnutls.install (from rev 191597, gnutls/trunk/gnutls.install)
===================================================================
--- extra-i686/gnutls.install	                        (rev 0)
+++ extra-i686/gnutls.install	2013-07-26 15:46:23 UTC (rev 191598)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

Copied: gnutls/repos/extra-i686/tls_fix.diff (from rev 191597, gnutls/trunk/tls_fix.diff)
===================================================================
--- extra-i686/tls_fix.diff	                        (rev 0)
+++ extra-i686/tls_fix.diff	2013-07-26 15:46:23 UTC (rev 191598)
@@ -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);
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-07-26 15:45:07 UTC (rev 191597)
+++ extra-x86_64/PKGBUILD	2013-07-26 15:46:23 UTC (rev 191598)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL2.1')
-url="http://www.gnutls.org/"
-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})
-md5sums=('9dd691ad1ccdb7386029809afef6b5ea'
-         'SKIP')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--disable-valgrind-tests
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #make -k check
-  make -j1 check
-}
-
-package() {
-  cd "${srcdir}/${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
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}

Copied: gnutls/repos/extra-x86_64/PKGBUILD (from rev 191597, gnutls/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-07-26 15:46:23 UTC (rev 191598)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.2.2
+pkgrel=2
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL2.1')
+url="http://www.gnutls.org/"
+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}
+        tls_fix.diff)
+md5sums=('9dd691ad1ccdb7386029809afef6b5ea'
+         'SKIP'
+         '1bbf5bfb4e1420fd61c75e14347340fc')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  
+  # fix broken TLS connections
+  patch -Np1 -i ../tls_fix.diff
+  
+  ./configure --prefix=/usr \
+	--with-zlib \
+	--disable-static \
+	--disable-guile \
+	--disable-valgrind-tests
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  #make -k check
+  make -j1 check
+}
+
+package() {
+  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
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}

Deleted: extra-x86_64/gnutls.install
===================================================================
--- extra-x86_64/gnutls.install	2013-07-26 15:45:07 UTC (rev 191597)
+++ extra-x86_64/gnutls.install	2013-07-26 15:46:23 UTC (rev 191598)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: gnutls/repos/extra-x86_64/gnutls.install (from rev 191597, gnutls/trunk/gnutls.install)
===================================================================
--- extra-x86_64/gnutls.install	                        (rev 0)
+++ extra-x86_64/gnutls.install	2013-07-26 15:46:23 UTC (rev 191598)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

Copied: gnutls/repos/extra-x86_64/tls_fix.diff (from rev 191597, gnutls/trunk/tls_fix.diff)
===================================================================
--- extra-x86_64/tls_fix.diff	                        (rev 0)
+++ extra-x86_64/tls_fix.diff	2013-07-26 15:46:23 UTC (rev 191598)
@@ -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);
+ 




More information about the arch-commits mailing list