[SCM] lame packaging branch, karmic, updated. debian/3.98.2+debian-0ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit 3a8a4d8c7449d039d43aa2502cc37c988441921d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 22 22:12:28 2009 +0200

    disable executable stack
    
    From the Marillat package:
    
    lame (3.98.2-0.3) unstable; urgency=low
    
      * New patch from Russell Coker to disable executable stack.
    
     -- Christian Marillat <marillat at debian.org>  Mon, 12 Jan 2009 15:21:07 +0100

diff --git a/debian/patches/04-exec-stac.patch b/debian/patches/04-exec-stac.patch
new file mode 100644
index 0000000..a1ce6a1
--- /dev/null
+++ b/debian/patches/04-exec-stac.patch
@@ -0,0 +1,20 @@
+From: Russell Coker
+Subject: disable executable stack.
+
+Found in the marillat package. Original message:
+
+New patch from Russell Coker to disable executable stack.
+
+Index: lame-3.98.2/libmp3lame/i386/nasm.h
+===================================================================
+--- lame-3.98.2.orig/libmp3lame/i386/nasm.h	2009-01-12 15:20:14.000000000 +0100
++++ lame-3.98.2/libmp3lame/i386/nasm.h	2009-01-12 15:20:32.000000000 +0100
+@@ -18,6 +18,8 @@
+ 
+ BITS 32
+ 
++section .note.GNU-stack noalloc noexec nowrite progbits
++
+ %ifdef YASM
+ 	%define segment_code segment .text align=16 use32
+ 	%define segment_data segment .data align=16 use32
diff --git a/debian/patches/series b/debian/patches/series
index 2584814..28cc3e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-debian-directory.patch
 02-dynamic-frontends.patch
 03-buffer-too-small.patch
+04-exec-stac.patch

-- 
lame packaging