[arch-commits] Commit in gnutls/trunk (PKGBUILD addGNU-stack.diff)

[andyrtr at archlinux.org]

    Date: Saturday, October 15, 2011 @ 15:33:32
  Author: andyrtr
Revision: 140492

upgpkg: gnutls 3.0.4-2

add executable stack patch; FS#26457

Added:
  gnutls/trunk/addGNU-stack.diff
Modified:
  gnutls/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 ++++++---
 addGNU-stack.diff |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-15 17:53:39 UTC (rev 140491)
+++ PKGBUILD	2011-10-15 19:33:32 UTC (rev 140492)
@@ -3,7 +3,7 @@
 
 pkgname=gnutls
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -12,11 +12,14 @@
 options=('!libtool' '!zipman')
 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=(''748d537027978abcb7dd33ec396dc511'')
+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 \

Added: addGNU-stack.diff
===================================================================
--- addGNU-stack.diff	                        (rev 0)
+++ addGNU-stack.diff	2011-10-15 19:33:32 UTC (rev 140492)
@@ -0,0 +1,13 @@
+Description: Prevent executable stack
+Author: Andreas Metzler <ametzler at 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