[Pkg-gnutls-commits] r1273 - in /packages/gnutls28/trunk/debian: changelog patches/20_addGNU-stack.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Oct 15 08:07:19 2011
New Revision: 1273

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1273
Log:
[20_addGNU-stack.diff] Add GNU-stack note to newly added padlock-common.s.

Added:
    packages/gnutls28/trunk/debian/patches/20_addGNU-stack.diff
Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/patches/series

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1273&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Oct 15 08:07:19 2011
@@ -4,6 +4,8 @@
   * New upstream version.
     + bump shlibs.
   * Add libp11-kit-dev to libgnutls-dev dependencies. Closes: #643811
+  * [20_addGNU-stack.diff] Add GNU-stack note to newly added
+    padlock-common.s.
 
  -- Andreas Metzler <ametzler at debian.org>  Tue, 20 Sep 2011 19:44:22 +0200
 

Added: packages/gnutls28/trunk/debian/patches/20_addGNU-stack.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/20_addGNU-stack.diff?rev=1273&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/20_addGNU-stack.diff (added)
+++ packages/gnutls28/trunk/debian/patches/20_addGNU-stack.diff Sat Oct 15 08:07:19 2011
@@ -1,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

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1273&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Sat Oct 15 08:07:19 2011
@@ -1,1 +1,2 @@
 14_version_gettextcat.diff
+20_addGNU-stack.diff