[arch-commits] Commit in gnutls/repos/extra-x86_64 (5 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Aug 21 08:10:46 UTC 2011
Date: Sunday, August 21, 2011 @ 04:10:46
Author: andyrtr
Revision: 135996
archrelease: copy trunk to extra-x86_64
Added:
gnutls/repos/extra-x86_64/PKGBUILD
(from rev 135995, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-x86_64/gnutls.install
(from rev 135995, gnutls/trunk/gnutls.install)
Deleted:
gnutls/repos/extra-x86_64/PKGBUILD
gnutls/repos/extra-x86_64/align.patch
gnutls/repos/extra-x86_64/gnutls.install
----------------+
PKGBUILD | 84 ++++++++++++++++++++++++++-----------------------------
align.patch | 64 -----------------------------------------
gnutls.install | 40 +++++++++++++-------------
3 files changed, 61 insertions(+), 127 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-21 08:10:10 UTC (rev 135995)
+++ PKGBUILD 2011-08-21 08:10:46 UTC (rev 135996)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
- align.patch)
-md5sums=('0677a66667f48810ff8df8335a9a9f9b'
- 'bce979498addb45d0fa8d6951f93fab3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # fix AES-NI for i686
- patch -Np1 -i ${srcdir}/align.patch
- ./configure --prefix=/usr \
- --with-zlib \
- --disable-static \
- --disable-guile \
- --without-p11-kit
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check # passes all || /bin/true
-}
-
-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 135995, gnutls/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-08-21 08:10:46 UTC (rev 135996)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/"
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --without-p11-kit \
+ --disable-valgrind-tests # breaks make check. errors have been reported upstream
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check # passes all || /bin/true
+}
+
+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 {} \;
+}
Deleted: align.patch
===================================================================
--- align.patch 2011-08-21 08:10:10 UTC (rev 135995)
+++ align.patch 2011-08-21 08:10:46 UTC (rev 135996)
@@ -1,64 +0,0 @@
-diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
-index 6801e7e..ff5b714 100644
---- a/lib/accelerated/intel/aes-x86.c
-+++ b/lib/accelerated/intel/aes-x86.c
-@@ -40,6 +40,10 @@ struct aes_ctx
- uint8_t iv[16];
- };
-
-+#define AESNI_MIN_ALIGN 16
-+#define AESNI_ALIGN(x) \
-+ ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
-+
- static int
- aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
- {
-@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize)
- struct aes_ctx *ctx = _ctx;
- int ret;
-
-- ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
-+ ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key));
- if (ret != 0)
- return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
-
-- ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
-+ ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec));
- if (ret != 0)
- return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
-
-@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size,
- {
- struct aes_ctx *ctx = _ctx;
-
-- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1);
-+ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1);
- return 0;
- }
-
-@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size,
- {
- struct aes_ctx *ctx = _ctx;
-
-- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0);
-+ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0);
-
- return 0;
- }
-diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h
-index 8f49ff3..20a169e 100644
---- a/lib/accelerated/intel/aes-x86.h
-+++ b/lib/accelerated/intel/aes-x86.h
-@@ -11,10 +11,11 @@ void register_x86_crypto (void);
- # define ALIGN16
- #endif
-
-+#define AES_KEY_ALIGN_SIZE 8
- #define AES_MAXNR 14
- typedef struct
- {
-- uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)];
-+ uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE];
- int rounds;
- } AES_KEY;
-
Deleted: gnutls.install
===================================================================
--- gnutls.install 2011-08-21 08:10:10 UTC (rev 135995)
+++ gnutls.install 2011-08-21 08:10:46 UTC (rev 135996)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.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 135995, gnutls/trunk/gnutls.install)
===================================================================
--- gnutls.install (rev 0)
+++ gnutls.install 2011-08-21 08:10:46 UTC (rev 135996)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.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
+}
More information about the arch-commits
mailing list