From d286d980d2ff42151e9bc81ec348c864c24f9cc4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 16 Oct 2011 23:14:27 +0000
Subject: Sun Oct 16 23:14:27 UTC 2011

---
 extra/gnutls/PKGBUILD          | 16 +++++++++-------
 extra/gnutls/addGNU-stack.diff | 13 +++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 extra/gnutls/addGNU-stack.diff

(limited to 'extra/gnutls')

diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 45e6987be..221a1c59a 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 138216 2011-09-19 03:13:19Z andyrtr $
+# $Id: PKGBUILD 140493 2011-10-15 19:34:21Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.3
-pkgrel=1
+pkgver=3.0.4
+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' 'p11-kit')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
 makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7b45b99cb6d314c452f8c0f1c7a736dd')
-sha1sums=('0e6c325ae12cf1a4bd7d25125b8d58d51472fc14')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
+	addGNU-stack.diff)
+md5sums=('748d537027978abcb7dd33ec396dc511'
+         '19b92429e8d1639cfc4dfad0883298cb')
 
 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
new file mode 100644
index 000000000..8324b5a58
--- /dev/null
+++ b/extra/gnutls/addGNU-stack.diff
@@ -0,0 +1,13 @@
+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
-- 
cgit v1.2.3-54-g00ecf