[Pkg-gnutls-commits] r1169 - in /packages/gnutls28/trunk/debian: changelog patches/20_executablestack.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Tue Aug  9 17:11:05 2011
New Revision: 1169

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1169
Log:
[20_executablestack] pulled from upstream GIT. Adds GNU-stack note to assembly files.

Added:
    packages/gnutls28/trunk/debian/patches/20_executablestack.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=1169&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Tue Aug  9 17:11:05 2011
@@ -12,6 +12,8 @@
     libgnutls28.
   * Drop libgnutls Breaks, they are superfluous after the soname change.
   * Delete config.log on clean.
+  * [20_executablestack] pulled from upstream GIT. Adds GNU-stack note to
+    assembly files.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 07 Aug 2011 10:26:44 +0200
 

Added: packages/gnutls28/trunk/debian/patches/20_executablestack.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/20_executablestack.diff?rev=1169&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/20_executablestack.diff (added)
+++ packages/gnutls28/trunk/debian/patches/20_executablestack.diff Tue Aug  9 17:11:05 2011
@@ -1,0 +1,52 @@
+From bcf3283949d72641abd0e58de6ac58c56b6dd72d Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Mon, 8 Aug 2011 20:02:47 +0200
+Subject: [PATCH 1/2] Added note.GNU-stack to prevent marking the library as using an executable stack. Reported by Andreas Metzler.
+
+---
+ lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s |    4 ++++
+ lib/accelerated/intel/asm/appro-aes-x86-64.s     |    5 +++++
+ lib/accelerated/intel/asm/appro-aes-x86.s        |    5 +++++
+ 3 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s b/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s
+index 009ec3d..7e3c407 100644
+--- a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s
++++ b/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s
+@@ -1062,3 +1062,7 @@ gcm_ghash_clmul:
+ 
+ .byte	71,72,65,83,72,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+ .align	64
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/lib/accelerated/intel/asm/appro-aes-x86-64.s b/lib/accelerated/intel/asm/appro-aes-x86-64.s
+index f286fb1..675e112 100644
+--- a/lib/accelerated/intel/asm/appro-aes-x86-64.s
++++ b/lib/accelerated/intel/asm/appro-aes-x86-64.s
+@@ -2571,3 +2571,8 @@ __aesni_set_encrypt_key:
+ 
+ .byte	65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69,83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+ .align	64
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
+diff --git a/lib/accelerated/intel/asm/appro-aes-x86.s b/lib/accelerated/intel/asm/appro-aes-x86.s
+index 2084749..f095a63 100644
+--- a/lib/accelerated/intel/asm/appro-aes-x86.s
++++ b/lib/accelerated/intel/asm/appro-aes-x86.s
+@@ -2179,3 +2179,8 @@ aesni_set_decrypt_key:
+ .byte	83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83
+ .byte	32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115
+ .byte	115,108,46,111,114,103,62,0
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
+-- 
+1.7.2.5
+

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1169&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Tue Aug  9 17:11:05 2011
@@ -1,1 +1,2 @@
 14_version_gettextcat.diff
+20_executablestack.diff