[svn] r5720 - trunk/rpms/lzo2

[packagers at lists.rpmforge.net]

Author: dries
Date: 2007-08-12 20:57:01 +0200 (Sun, 12 Aug 2007)
New Revision: 5720

Added:
   trunk/rpms/lzo2/lzo-2.02-exec-stack.patch
Modified:
   trunk/rpms/lzo2/lzo2.spec
Log:
patch added, thanks to Kenneth Porter

Added: trunk/rpms/lzo2/lzo-2.02-exec-stack.patch
===================================================================
--- trunk/rpms/lzo2/lzo-2.02-exec-stack.patch	                        (rev 0)
+++ trunk/rpms/lzo2/lzo-2.02-exec-stack.patch	2007-08-12 18:57:01 UTC (rev 5720)
@@ -0,0 +1,25 @@
+--- asm/i386/src_nasm/asminit.def.orig	2005-12-29 22:51:45.000000000 +1100
++++ asm/i386/src_nasm/asminit.def	2005-12-29 22:54:11.000000000 +1100
+@@ -32,6 +32,9 @@
+ ;  <markus at oberhumer.com>
+ ;  http://www.oberhumer.com/opensource/lzo/
+ ;
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+ 
+ %define F(name) name
+ %ifidni __OUTPUT_FORMAT__,elf
+--- asm/i386/src_gas/asminit.def.orig	2005-12-29 22:51:58.000000000 +1100
++++ asm/i386/src_gas/asminit.def	2005-12-29 22:55:29.000000000 +1100
+@@ -32,6 +32,10 @@
+    <markus at oberhumer.com>
+    http://www.oberhumer.com/opensource/lzo/
+ */
++#ifdef __ELF__
++.section .note.GNU-stack,"", at progbits
++#endif
++
+ 
+ #ifndef F
+ #  define F(name)       name

Modified: trunk/rpms/lzo2/lzo2.spec
===================================================================
--- trunk/rpms/lzo2/lzo2.spec	2007-08-12 18:44:59 UTC (rev 5719)
+++ trunk/rpms/lzo2/lzo2.spec	2007-08-12 18:57:01 UTC (rev 5720)
@@ -7,12 +7,13 @@
 Summary: Portable lossless data compression library
 Name: lzo2
 Version: 2.02
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.oberhumer.com/opensource/lzo/
 
 Source: http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz
+Patch: lzo-2.02-exec-stack.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: zlib-devel, autoconf, gcc-c++
@@ -37,6 +38,7 @@
 
 %prep
 %setup -n %{real_name}-%{version}
+%patch
 
 %build
 %configure \
@@ -67,6 +69,9 @@
 %{_libdir}/liblzo2.so
 
 %changelog
+* Sun Aug 12 2007 Dries Verachtert <dries at ulyssis.org> - 2.02-3
+- Patch added so it doesn't use an executable stack, thanks to Kenneth Porter.
+
 * Sun Mar 19 2006 Dries Verachtert <dries at ulyssis.org> - 2.02-2
 - gcc-c++ buildrequirement added.