Date: Tuesday, November 5, 2013 @ 21:43:13
Author: bluewind
Revision: 100558
archrelease: copy trunk to multilib-x86_64
Added:
lib32-gnutls/repos/multilib-x86_64/PKGBUILD
(from rev 100557, lib32-gnutls/trunk/PKGBUILD)
lib32-gnutls/repos/multilib-x86_64/tls_fix.diff
(from rev 100557, lib32-gnutls/trunk/tls_fix.diff)
Deleted:
lib32-gnutls/repos/multilib-x86_64/PKGBUILD
lib32-gnutls/repos/multilib-x86_64/tls_fix.diff
--------------+
PKGBUILD | 99 ++++++++++++++++++++++++++++-----------------------------
tls_fix.diff | 64 ++++++++++++++++++------------------
2 files changed, 81 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-11-05 20:43:10 UTC (rev 100557)
+++ PKGBUILD 2013-11-05 20:43:13 UTC (rev 100558)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluew...@xinu.at>
-# Contributor: Christoph Vigano <mail at cvigano dot de>
-# Contributor: Biru Ionut <io...@archlinux.ro>
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-...@mbnet.fi>
-
-_pkgbasename=gnutls
-pkgname=lib32-$_pkgbasename
-pkgver=3.2.5
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport
layer (32-bit)"
-arch=('x86_64')
-license=('GPL3' 'LGPL2.1')
-url="http://gnutls.org/";
-options=('!libtool')
-depends=('lib32-zlib' 'lib32-nettle' 'lib32-p11-kit' 'lib32-libtasn1'
$_pkgbasename)
-makedepends=('gcc-multilib' 'lib32-libidn')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${_pkgbasename}-${pkgver}.tar.xz{,.sig})
-md5sums=('c7c367ee06f7f05ddb1e36a444a142ed'
- 'SKIP')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- # build fails without --disable-hardware-acceleration because of assembler
errors
- ./configure --prefix=/usr --libdir=/usr/lib32 \
- --with-zlib \
- --disable-static \
- --disable-guile \
- --disable-valgrind-tests --disable-hardware-acceleration
- make
-}
-
-check() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
- #make -k check
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- find $pkgdir
-
- rm -rf "${pkgdir}"/usr/{bin,include,share}
-}
Copied: lib32-gnutls/repos/multilib-x86_64/PKGBUILD (from rev 100557,
lib32-gnutls/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-11-05 20:43:13 UTC (rev 100558)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Florian Pritz <bluew...@xinu.at>
+# Contributor: Christoph Vigano <mail at cvigano dot de>
+# Contributor: Biru Ionut <io...@archlinux.ro>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+# Contributor: Mikko Seppälä <t-r-...@mbnet.fi>
+
+_pkgbasename=gnutls
+pkgname=lib32-$_pkgbasename
+pkgver=3.2.6
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport
layer (32-bit)"
+arch=('x86_64')
+license=('GPL3' 'LGPL2.1')
+url="http://gnutls.org/";
+depends=('lib32-zlib' 'lib32-nettle' 'lib32-p11-kit' 'lib32-libtasn1'
$_pkgbasename)
+makedepends=('gcc-multilib' 'lib32-libidn')
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${_pkgbasename}-${pkgver}.tar.xz{,.sig})
+md5sums=('1dfe5188df1641754056d853725ef785'
+ 'SKIP')
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+ # build fails without --disable-hardware-acceleration because of assembler
errors
+ ./configure --prefix=/usr --libdir=/usr/lib32 \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --disable-valgrind-tests --disable-hardware-acceleration
+ make
+}
+
+check() {
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+ #make -k check
+}
+
+package() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ find $pkgdir
+
+ rm -rf "${pkgdir}"/usr/{bin,include,share}
+}
Deleted: tls_fix.diff
===================================================================
--- tls_fix.diff 2013-11-05 20:43:10 UTC (rev 100557)
+++ tls_fix.diff 2013-11-05 20:43:13 UTC (rev 100558)
@@ -1,32 +0,0 @@
-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: lib32-gnutls/repos/multilib-x86_64/tls_fix.diff (from rev 100557,
lib32-gnutls/trunk/tls_fix.diff)
===================================================================
--- tls_fix.diff (rev 0)
+++ tls_fix.diff 2013-11-05 20:43:13 UTC (rev 100558)
@@ -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);
+
