From 1cadb4f25599b9b96fdbb24e0aca890ae8f01a01 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@marmotte.net>
Date: Tue, 26 Jul 2011 17:46:45 +0200
Subject: [PATCH] Execstack patch to fix yasm code

---
 p7zip.spec                   |  7 ++++++-
 p7zip_9.20.1-execstack.patch | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 p7zip_9.20.1-execstack.patch

diff --git a/p7zip.spec b/p7zip.spec
index 5671b2e..57be1d6 100644
--- a/p7zip.spec
+++ b/p7zip.spec
@@ -1,7 +1,7 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
 Version: 9.20.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 License: LGPLv2 and (LGPLv2+ or CPL)
 Group: Applications/Archiving
@@ -18,6 +18,7 @@ Source: p7zip_%{version}_src_all-norar.tar.bz2
 Patch0: p7zip_9.20.1-norar.patch
 Patch1: p7zip_9.20.1-install.patch
 Patch2: p7zip_9.20.1-nostrip.patch
+Patch3: p7zip_9.20.1-execstack.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %ifarch %{ix86}
 BuildRequires: nasm
@@ -45,6 +46,7 @@ This package contains also a virtual file system for Midnight Commander.
 %patch0 -p1 -b .norar
 %patch1 -p1 -b .install
 %patch2 -p1 -b .nostrip
+%patch3 -p1 -b .execstack
 # Move docs early so that they don't get installed by "make install" and we
 # can include them in %%doc
 mv DOCS docs
@@ -109,6 +111,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 26 2011 Matthias Saou <matthias@saou.eu> 9.20.1-2
+- Execstack patch to fix what's wanted by the yasm code (#718778).
+
 * Tue Jul 26 2011 Matthias Saou <matthias@saou.eu> 9.20.1-1
 - Update to 9.20.1 (#688564).
 - Update norar, nostrip and install patches.
diff --git a/p7zip_9.20.1-execstack.patch b/p7zip_9.20.1-execstack.patch
new file mode 100644
index 0000000..1fdff48
--- /dev/null
+++ b/p7zip_9.20.1-execstack.patch
@@ -0,0 +1,24 @@
+diff -Naupr p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm p7zip_9.20.1/Asm/x64/7zCrcT8U.asm
+--- p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm	2008-08-14 11:18:07.000000000 +0200
++++ p7zip_9.20.1/Asm/x64/7zCrcT8U.asm	2011-07-26 17:43:57.727910278 +0200
+@@ -101,3 +101,8 @@ _CrcUpdateT8:
+     ret
+ 
+ end
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++
+diff -Naupr p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm p7zip_9.20.1/Asm/x86/7zCrcT8U.asm
+--- p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm	2009-07-14 12:44:15.000000000 +0200
++++ p7zip_9.20.1/Asm/x86/7zCrcT8U.asm	2011-07-26 17:44:23.938864508 +0200
+@@ -99,3 +99,8 @@ _CrcUpdateT8:
+ 
+ 
+ ; end
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++