rpms/dgen-sdl/F-8 dgen-sdl-1.23-execstack.patch, NONE, 1.1 dgen-sdl.spec, 1.1, 1.2

[Andrea Musuruane]

Author: musuruan

Update of /cvs/nonfree/rpms/dgen-sdl/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21422

Modified Files:
	dgen-sdl.spec 
Added Files:
	dgen-sdl-1.23-execstack.patch 
Log Message:
* Wed Aug 06 2008 Andrea Musuruane <musuruan at gmail.com> 1.23-4
- added a patch not to require an executable stack
- new upstream developer - updated URL and Source tags


dgen-sdl-1.23-execstack.patch:

--- NEW FILE dgen-sdl-1.23-execstack.patch ---
diff -dur dgen-sdl-1.23/asm_tiles.asmu dgen-sdl-1.23-execstack/asm_tiles.asmu
--- dgen-sdl-1.23/asm_tiles.asmu	1999-12-22 02:56:08.000000000 +0100
+++ dgen-sdl-1.23-execstack/asm_tiles.asmu	2008-08-05 00:13:34.000000000 +0200
@@ -1088,3 +1088,6 @@
 	__highpal	dd 0
 
 ; ----------------------------------------
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+
diff -dur dgen-sdl-1.23/ctv.asmu dgen-sdl-1.23-execstack/ctv.asmu
--- dgen-sdl-1.23/ctv.asmu	1999-12-20 04:15:55.000000000 +0100
+++ dgen-sdl-1.23-execstack/ctv.asmu	2008-08-05 00:13:34.000000000 +0200
@@ -162,3 +162,6 @@
 pop  edi
 xor eax,eax
 ret
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+
diff -dur dgen-sdl-1.23/mmx_memcpy.asmu dgen-sdl-1.23-execstack/mmx_memcpy.asmu
--- dgen-sdl-1.23/mmx_memcpy.asmu	1999-12-20 04:15:57.000000000 +0100
+++ dgen-sdl-1.23-execstack/mmx_memcpy.asmu	2008-08-05 00:13:34.000000000 +0200
@@ -40,3 +40,6 @@
 ret
 
 ; --------------------------------------
+
+section .note.GNU-stack noalloc noexec nowrite progbits
+
diff -dur dgen-sdl-1.23/mz80/makez80.c dgen-sdl-1.23-execstack/mz80/makez80.c
--- dgen-sdl-1.23/mz80/makez80.c	2000-03-19 02:05:40.000000000 +0100
+++ dgen-sdl-1.23-execstack/mz80/makez80.c	2008-08-05 00:18:27.000000000 +0200
@@ -7104,6 +7104,8 @@
 	if (MZ80_ASSEMBLY_X86 == bWhat)
 	{
 		fprintf(fp, "		end\n");
+                fprintf(fp, "\n");
+                fprintf(fp, "section .note.GNU-stack noalloc noexec nowrite progbits\n");
 	}
 	else
 	if (MZ80_C == bWhat)
diff -dur dgen-sdl-1.23/star/star.c dgen-sdl-1.23-execstack/star/star.c
--- dgen-sdl-1.23/star/star.c	1999-12-20 07:19:04.000000000 +0100
+++ dgen-sdl-1.23-execstack/star/star.c	2008-08-05 00:13:40.000000000 +0200
@@ -2414,6 +2414,8 @@
 */
 static void suffixes(void) {
 	emit("end\n");
+        emit("\n");
+        emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
 }
 
 /****************************************************************************


Index: dgen-sdl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dgen-sdl/F-8/dgen-sdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dgen-sdl.spec	26 Jul 2008 13:08:13 -0000	1.1
+++ dgen-sdl.spec	9 Aug 2008 07:46:27 -0000	1.2
@@ -1,16 +1,17 @@
 Summary: DGen/SDL is a Sega Genesis (MegaDrive outside the US) emulator
 Name: dgen-sdl 
 Version: 1.23
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Emulators
-URL: http://pknet.com/~joe/dgen-sdl.html 
-Source: http://pknet.com/~joe/%{name}-%{version}.tar.gz
+URL: http://tamentis.net/projects/dgen/
+Source: http://tamentis.net/projects/dgen/files/%{name}-%{version}.tar.gz
 Patch0: dgen-sdl-1.23-gcc4.patch
 Patch1: dgen-sdl-1.23-gcc34.patch
 Patch2: dgen-sdl-1.23-man_warning.patch
 Patch3: dgen-sdl-1.23-gzip_security_hole.patch
 Patch4: dgen-sdl-1.23-command_line.patch
+Patch5: dgen-sdl-1.23-execstack.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel >= 1.0.0
 %ifarch %{ix86}
@@ -30,6 +31,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 sed -i 's/\r//' mz80/mz80.txt
 
 %build
@@ -60,6 +62,10 @@
 %doc docs/mz80 docs/star
 
 %changelog
+* Wed Aug 06 2008 Andrea Musuruane <musuruan at gmail.com> 1.23-4
+- added a patch not to require an executable stack
+- new upstream developer - updated URL and Source tags
+
 * Mon Nov 26 2007 Andrea Musuruane <musuruan at gmail.com> 1.23-3
 - removed %%{?dist} tag from changelog
 - removed %%{?_smp_mflags} from make invocation