[arch-commits] Commit in gnutls/repos (8 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sun Jun 2 14:00:58 UTC 2013
Date: Sunday, June 2, 2013 @ 16:00:58
Author: andyrtr
Revision: 186982
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnutls/repos/testing-i686/
gnutls/repos/testing-i686/PKGBUILD
(from rev 186981, gnutls/trunk/PKGBUILD)
gnutls/repos/testing-i686/check_fix.diff
(from rev 186981, gnutls/trunk/check_fix.diff)
gnutls/repos/testing-i686/gnutls.install
(from rev 186981, gnutls/trunk/gnutls.install)
gnutls/repos/testing-x86_64/
gnutls/repos/testing-x86_64/PKGBUILD
(from rev 186981, gnutls/trunk/PKGBUILD)
gnutls/repos/testing-x86_64/check_fix.diff
(from rev 186981, gnutls/trunk/check_fix.diff)
gnutls/repos/testing-x86_64/gnutls.install
(from rev 186981, gnutls/trunk/gnutls.install)
-------------------------------+
testing-i686/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++++++++
testing-i686/check_fix.diff | 34 +++++++++++++++++++++++++++
testing-i686/gnutls.install | 20 ++++++++++++++++
testing-x86_64/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++++++++
testing-x86_64/check_fix.diff | 34 +++++++++++++++++++++++++++
testing-x86_64/gnutls.install | 20 ++++++++++++++++
6 files changed, 208 insertions(+)
Copied: gnutls/repos/testing-i686/PKGBUILD (from rev 186981, gnutls/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-02 14:00:58 UTC (rev 186982)
@@ -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.1
+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}
+ check_fix.diff)
+md5sums=('c220b50736f61292ed8722d5132b6a3e'
+ 'SKIP'
+ '53ae2a58a401d9e6d052910670da8b07')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # fix i686 test suite failure
+ patch -Np1 -i ${srcdir}/check_fix.diff
+
+ ./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/testing-i686/check_fix.diff (from rev 186981, gnutls/trunk/check_fix.diff)
===================================================================
--- testing-i686/check_fix.diff (rev 0)
+++ testing-i686/check_fix.diff 2013-06-02 14:00:58 UTC (rev 186982)
@@ -0,0 +1,34 @@
+From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sun, 2 Jun 2013 12:10:06 +0200
+Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems.
+
+---
+ tests/cert-tests/pem-decoding | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
+index fe769ec..f8c6372 100755
+--- a/tests/cert-tests/pem-decoding
++++ b/tests/cert-tests/pem-decoding
+@@ -61,7 +61,9 @@ if test "$rc" != "0"; then
+ exit $rc
+ fi
+
+-diff $srcdir/complex-cert.pem tmp-pem.pem
++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2
++diff tmp1 tmp2
+ rc=$?
+
+ if test "$rc" != "0"; then
+@@ -69,6 +71,6 @@ if test "$rc" != "0"; then
+ exit $rc
+ fi
+
+-rm -f tmp-pem.pem
++rm -f tmp-pem.pem tmp1 tmp2
+
+ exit 0
+--
+1.7.1
Copied: gnutls/repos/testing-i686/gnutls.install (from rev 186981, gnutls/trunk/gnutls.install)
===================================================================
--- testing-i686/gnutls.install (rev 0)
+++ testing-i686/gnutls.install 2013-06-02 14:00:58 UTC (rev 186982)
@@ -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/PKGBUILD (from rev 186981, gnutls/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-02 14:00:58 UTC (rev 186982)
@@ -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.1
+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}
+ check_fix.diff)
+md5sums=('c220b50736f61292ed8722d5132b6a3e'
+ 'SKIP'
+ '53ae2a58a401d9e6d052910670da8b07')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # fix i686 test suite failure
+ patch -Np1 -i ${srcdir}/check_fix.diff
+
+ ./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/testing-x86_64/check_fix.diff (from rev 186981, gnutls/trunk/check_fix.diff)
===================================================================
--- testing-x86_64/check_fix.diff (rev 0)
+++ testing-x86_64/check_fix.diff 2013-06-02 14:00:58 UTC (rev 186982)
@@ -0,0 +1,34 @@
+From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sun, 2 Jun 2013 12:10:06 +0200
+Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems.
+
+---
+ tests/cert-tests/pem-decoding | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
+index fe769ec..f8c6372 100755
+--- a/tests/cert-tests/pem-decoding
++++ b/tests/cert-tests/pem-decoding
+@@ -61,7 +61,9 @@ if test "$rc" != "0"; then
+ exit $rc
+ fi
+
+-diff $srcdir/complex-cert.pem tmp-pem.pem
++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2
++diff tmp1 tmp2
+ rc=$?
+
+ if test "$rc" != "0"; then
+@@ -69,6 +71,6 @@ if test "$rc" != "0"; then
+ exit $rc
+ fi
+
+-rm -f tmp-pem.pem
++rm -f tmp-pem.pem tmp1 tmp2
+
+ exit 0
+--
+1.7.1
Copied: gnutls/repos/testing-x86_64/gnutls.install (from rev 186981, gnutls/trunk/gnutls.install)
===================================================================
--- testing-x86_64/gnutls.install (rev 0)
+++ testing-x86_64/gnutls.install 2013-06-02 14:00:58 UTC (rev 186982)
@@ -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
+}
More information about the arch-commits
mailing list