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

[andyrtr at archlinux.org]

    Date: Friday, October 28, 2011 @ 09:41:02
  Author: andyrtr
Revision: 141299

upgpkg: gnutls 3.0.5-1

upstream update 3.0.5; sovles FS#26560

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

-------------------+
 PKGBUILD          |   11 ++++-------
 addGNU-stack.diff |   13 -------------
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-28 12:53:34 UTC (rev 141298)
+++ PKGBUILD	2011-10-28 13:41:02 UTC (rev 141299)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.0.5
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -12,14 +12,11 @@
 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
-	addGNU-stack.diff)
-md5sums=('748d537027978abcb7dd33ec396dc511'
-         '19b92429e8d1639cfc4dfad0883298cb')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('c2d4e6344974545c228a1df2147bf334')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/addGNU-stack.diff
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \

Deleted: addGNU-stack.diff
===================================================================
--- addGNU-stack.diff	2011-10-28 12:53:34 UTC (rev 141298)
+++ addGNU-stack.diff	2011-10-28 13:41:02 UTC (rev 141299)
@@ -1,13 +0,0 @@
-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