Date: Thursday, May 7, 2015 @ 21:01:08 Author: andyrtr Revision: 238604
archrelease: copy trunk to testing-i686, testing-x86_64 Added: gnutls/repos/testing-i686/ gnutls/repos/testing-i686/PKGBUILD (from rev 238603, gnutls/trunk/PKGBUILD) gnutls/repos/testing-i686/gnutls.install (from rev 238603, gnutls/trunk/gnutls.install) gnutls/repos/testing-i686/test_do_not_perform_internationalized_name_checks_without_libidn.diff (from rev 238603, gnutls/trunk/test_do_not_perform_internationalized_name_checks_without_libidn.diff) gnutls/repos/testing-x86_64/ gnutls/repos/testing-x86_64/PKGBUILD (from rev 238603, gnutls/trunk/PKGBUILD) gnutls/repos/testing-x86_64/gnutls.install (from rev 238603, gnutls/trunk/gnutls.install) gnutls/repos/testing-x86_64/test_do_not_perform_internationalized_name_checks_without_libidn.diff (from rev 238603, gnutls/trunk/test_do_not_perform_internationalized_name_checks_without_libidn.diff) --------------------------------------------------------------------------------------+ testing-i686/PKGBUILD | 61 ++++++++++ testing-i686/gnutls.install | 20 +++ testing-i686/test_do_not_perform_internationalized_name_checks_without_libidn.diff | 21 +++ testing-x86_64/PKGBUILD | 61 ++++++++++ testing-x86_64/gnutls.install | 20 +++ testing-x86_64/test_do_not_perform_internationalized_name_checks_without_libidn.diff | 21 +++ 6 files changed, 204 insertions(+) Copied: gnutls/repos/testing-i686/PKGBUILD (from rev 238603, gnutls/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-05-07 19:01:08 UTC (rev 238604) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=gnutls +pkgver=3.4.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=('!zipman') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') +optdepends=('guile: for use with Guile bindings') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig} + test_do_not_perform_internationalized_name_checks_without_libidn.diff) +md5sums=('2d04f34fa25b45f9dcb9104c0394e12e' + 'SKIP' + 'cc584698a4558642129b6398d1e666d6') +validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' + '1F42418905D8206AA754CCDC29EE58B996865171') + # "Simon Josefsson <si...@josefsson.org>" + # "Nikos Mavrogiannopoulos <n...@gnutls.org> + +prepare() { + cd ${pkgname}-${pkgver} + # fix build in testsuite without libidn + # https://gitlab.com/gnutls/gnutls/commit/78fcb17c74e1e625f89e71e0641083c85a268414 + patch -Np1 -i $srcdir/test_do_not_perform_internationalized_name_checks_without_libidn.diff +} + +build() { + cd ${pkgname}-${pkgver} + + # disable libidn for security reasons: + # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html + + ./configure --prefix=/usr \ + --with-zlib \ + --disable-static \ + --without-idn \ + --enable-guile --with-guile-site-dir=no \ + --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # lots of .png files are put into infodir and are gzipped by makepkg! this needs 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 238603, gnutls/trunk/gnutls.install) =================================================================== --- testing-i686/gnutls.install (rev 0) +++ testing-i686/gnutls.install 2015-05-07 19:01:08 UTC (rev 238604) @@ -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-6.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/test_do_not_perform_internationalized_name_checks_without_libidn.diff (from rev 238603, gnutls/trunk/test_do_not_perform_internationalized_name_checks_without_libidn.diff) =================================================================== --- testing-i686/test_do_not_perform_internationalized_name_checks_without_libidn.diff (rev 0) +++ testing-i686/test_do_not_perform_internationalized_name_checks_without_libidn.diff 2015-05-07 19:01:08 UTC (rev 238604) @@ -0,0 +1,21 @@ +diff --git a/tests/hostname-check.c b/tests/hostname-check.c +index 120f3b9..670248a 100644 +--- a/tests/hostname-check.c ++++ b/tests/hostname-check.c +@@ -1147,6 +1147,7 @@ void doit(void) + if (ret) + fail("%d: Hostname incorrectly matches (%d)\n", __LINE__, ret); + ++#ifdef HAVE_LIBIDN + ret = gnutls_x509_crt_check_hostname(x509, "www.teχ.gr"); + if (!ret) + fail("%d: Hostname incorrectly does not match (%d)\n", __LINE__, ret); +@@ -1166,6 +1167,7 @@ void doit(void) + ret = gnutls_x509_crt_check_hostname(x509, "ΤΈΣΤ.gr"); + if (!ret) + fail("%d: Hostname incorrectly does not match (%d)\n", __LINE__, ret); ++#endif + + #ifdef ENABLE_OPENPGP + if (debug) + Copied: gnutls/repos/testing-x86_64/PKGBUILD (from rev 238603, gnutls/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-05-07 19:01:08 UTC (rev 238604) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=gnutls +pkgver=3.4.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=('!zipman') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') +optdepends=('guile: for use with Guile bindings') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig} + test_do_not_perform_internationalized_name_checks_without_libidn.diff) +md5sums=('2d04f34fa25b45f9dcb9104c0394e12e' + 'SKIP' + 'cc584698a4558642129b6398d1e666d6') +validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' + '1F42418905D8206AA754CCDC29EE58B996865171') + # "Simon Josefsson <si...@josefsson.org>" + # "Nikos Mavrogiannopoulos <n...@gnutls.org> + +prepare() { + cd ${pkgname}-${pkgver} + # fix build in testsuite without libidn + # https://gitlab.com/gnutls/gnutls/commit/78fcb17c74e1e625f89e71e0641083c85a268414 + patch -Np1 -i $srcdir/test_do_not_perform_internationalized_name_checks_without_libidn.diff +} + +build() { + cd ${pkgname}-${pkgver} + + # disable libidn for security reasons: + # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html + + ./configure --prefix=/usr \ + --with-zlib \ + --disable-static \ + --without-idn \ + --enable-guile --with-guile-site-dir=no \ + --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # lots of .png files are put into infodir and are gzipped by makepkg! this needs 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 238603, gnutls/trunk/gnutls.install) =================================================================== --- testing-x86_64/gnutls.install (rev 0) +++ testing-x86_64/gnutls.install 2015-05-07 19:01:08 UTC (rev 238604) @@ -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-6.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/test_do_not_perform_internationalized_name_checks_without_libidn.diff (from rev 238603, gnutls/trunk/test_do_not_perform_internationalized_name_checks_without_libidn.diff) =================================================================== --- testing-x86_64/test_do_not_perform_internationalized_name_checks_without_libidn.diff (rev 0) +++ testing-x86_64/test_do_not_perform_internationalized_name_checks_without_libidn.diff 2015-05-07 19:01:08 UTC (rev 238604) @@ -0,0 +1,21 @@ +diff --git a/tests/hostname-check.c b/tests/hostname-check.c +index 120f3b9..670248a 100644 +--- a/tests/hostname-check.c ++++ b/tests/hostname-check.c +@@ -1147,6 +1147,7 @@ void doit(void) + if (ret) + fail("%d: Hostname incorrectly matches (%d)\n", __LINE__, ret); + ++#ifdef HAVE_LIBIDN + ret = gnutls_x509_crt_check_hostname(x509, "www.teχ.gr"); + if (!ret) + fail("%d: Hostname incorrectly does not match (%d)\n", __LINE__, ret); +@@ -1166,6 +1167,7 @@ void doit(void) + ret = gnutls_x509_crt_check_hostname(x509, "ΤΈΣΤ.gr"); + if (!ret) + fail("%d: Hostname incorrectly does not match (%d)\n", __LINE__, ret); ++#endif + + #ifdef ENABLE_OPENPGP + if (debug) +