[SCM] xvidcore/master: Update no-exec-stack-elf32.patch according to upstream discussion.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Fri Feb 25 11:39:42 UTC 2011


The following commit has been merged in the master branch:
commit b8e6b0464c547cb06240c8e2efde21e17ca870f1
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Feb 25 12:43:15 2011 +0100

    Update no-exec-stack-elf32.patch according to upstream discussion.

diff --git a/debian/patches/no-exec-stack-elf32.patch b/debian/patches/no-exec-stack-elf32.patch
index ee636e4..83c3eb4 100644
--- a/debian/patches/no-exec-stack-elf32.patch
+++ b/debian/patches/no-exec-stack-elf32.patch
@@ -4,12 +4,13 @@ Forwarded: http://list.xvid.org/pipermail/xvid-devel/2011-February/006256.html
 
 --- xvidcore.orig/src/nasm.inc
 +++ xvidcore/src/nasm.inc
-@@ -209,7 +209,7 @@ BITS 32
- %endmacro
- 
- %macro NON_EXEC_STACK 0
--%ifidn __OUTPUT_FORMAT__,elf
-+%ifidn __OUTPUT_FORMAT__,elf32
+@@ -212,6 +212,9 @@ BITS 32
+ %ifidn __OUTPUT_FORMAT__,elf
  section .note.GNU-stack noalloc noexec nowrite progbits
  %endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
  %ifidn __OUTPUT_FORMAT__,elf64
+ section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif

-- 
xvidcore packaging



More information about the pkg-multimedia-commits mailing list