diff options
Diffstat (limited to 'extra/gnutls')
| -rw-r--r-- | extra/gnutls/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/gnutls/addGNU-stack.diff | 13 |
2 files changed, 5 insertions, 21 deletions
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 388da42fd..13e2761f2 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140493 2011-10-15 19:34:21Z andyrtr $ +# $Id: PKGBUILD 142708 2011-11-13 11:53:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.4 -pkgrel=2 +pkgver=3.0.8 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') @@ -12,14 +12,11 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') [ "$CARCH" = "mips64el" ] || makedepends=('valgrind') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz - addGNU-stack.diff) -md5sums=('748d537027978abcb7dd33ec396dc511' - '19b92429e8d1639cfc4dfad0883298cb') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) +md5sums=('bce40a4e9bec343b266707eb9819132b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/addGNU-stack.diff ./configure --prefix=/usr \ --with-zlib \ --disable-static \ diff --git a/extra/gnutls/addGNU-stack.diff b/extra/gnutls/addGNU-stack.diff deleted file mode 100644 index 8324b5a58..000000000 --- a/extra/gnutls/addGNU-stack.diff +++ /dev/null @@ -1,13 +0,0 @@ -Description: Prevent executable stack -Author: Andreas Metzler <ametzler@debian.org> - ---- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s -+++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s -@@ -38,3 +38,7 @@ is_padlock_nano: - xorl %eax,%eax - ret - .size is_padlock_nano,.-is_padlock_nano -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif |