[arch-commits] Commit in gnutls/repos (8 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sun Sep 1 09:23:14 UTC 2013
Date: Sunday, September 1, 2013 @ 11:23:14
Author: andyrtr
Revision: 193799
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnutls/repos/testing-i686/
gnutls/repos/testing-i686/PKGBUILD
(from rev 193798, gnutls/trunk/PKGBUILD)
gnutls/repos/testing-i686/gnutls.install
(from rev 193798, gnutls/trunk/gnutls.install)
gnutls/repos/testing-i686/tls_fix.diff
(from rev 193798, gnutls/trunk/tls_fix.diff)
gnutls/repos/testing-x86_64/
gnutls/repos/testing-x86_64/PKGBUILD
(from rev 193798, gnutls/trunk/PKGBUILD)
gnutls/repos/testing-x86_64/gnutls.install
(from rev 193798, gnutls/trunk/gnutls.install)
gnutls/repos/testing-x86_64/tls_fix.diff
(from rev 193798, gnutls/trunk/tls_fix.diff)
-------------------------------+
testing-i686/PKGBUILD | 43 ++++++++++++++++++++++++++++++++++++++++
testing-i686/gnutls.install | 20 ++++++++++++++++++
testing-i686/tls_fix.diff | 32 +++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 43 ++++++++++++++++++++++++++++++++++++++++
testing-x86_64/gnutls.install | 20 ++++++++++++++++++
testing-x86_64/tls_fix.diff | 32 +++++++++++++++++++++++++++++
6 files changed, 190 insertions(+)
Copied: gnutls/repos/testing-i686/PKGBUILD (from rev 193798, gnutls/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-09-01 09:23:14 UTC (rev 193799)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.2.4
+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=('79ef8538d65128b7ed47046649b98c27'
+ 'SKIP')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --disable-valgrind-tests
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make -k 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 {} \;
+}
Copied: gnutls/repos/testing-i686/gnutls.install (from rev 193798, gnutls/trunk/gnutls.install)
===================================================================
--- testing-i686/gnutls.install (rev 0)
+++ testing-i686/gnutls.install 2013-09-01 09:23:14 UTC (rev 193799)
@@ -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/testing-i686/tls_fix.diff (from rev 193798, gnutls/trunk/tls_fix.diff)
===================================================================
--- testing-i686/tls_fix.diff (rev 0)
+++ testing-i686/tls_fix.diff 2013-09-01 09:23:14 UTC (rev 193799)
@@ -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 (¶ms->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);
+
Copied: gnutls/repos/testing-x86_64/PKGBUILD (from rev 193798, gnutls/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-09-01 09:23:14 UTC (rev 193799)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.2.4
+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=('79ef8538d65128b7ed47046649b98c27'
+ 'SKIP')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --disable-valgrind-tests
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make -k 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 {} \;
+}
Copied: gnutls/repos/testing-x86_64/gnutls.install (from rev 193798, gnutls/trunk/gnutls.install)
===================================================================
--- testing-x86_64/gnutls.install (rev 0)
+++ testing-x86_64/gnutls.install 2013-09-01 09:23:14 UTC (rev 193799)
@@ -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/testing-x86_64/tls_fix.diff (from rev 193798, gnutls/trunk/tls_fix.diff)
===================================================================
--- testing-x86_64/tls_fix.diff (rev 0)
+++ testing-x86_64/tls_fix.diff 2013-09-01 09:23:14 UTC (rev 193799)
@@ -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 (¶ms->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