From 2005ba1aabd27fa6793c4cbfa41c1291023f0a4d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jul 06 2006 15:43:12 +0000 Subject: - Stop allegro from making applications linked against it claim that they need an executable stack (Patch11). Unfortunatly this requires a rebuild of all applications linked against allegro. --- diff --git a/allegro-4.2.0-noexecstack.patch b/allegro-4.2.0-noexecstack.patch new file mode 100644 index 0000000..2bf10b8 --- /dev/null +++ b/allegro-4.2.0-noexecstack.patch @@ -0,0 +1,207 @@ +--- allegro-4.2.0/src/x/xdga2s.s.noexecstack 2004-08-27 15:54:05.000000000 +0200 ++++ allegro-4.2.0/src/x/xdga2s.s 2006-07-06 17:22:04.000000000 +0200 +@@ -48,6 +48,7 @@ + + ret + ++.section .note.GNU-stack,"",@progbits + #endif + #endif + +--- allegro-4.2.0/src/x/xwins.s.noexecstack 2004-09-03 11:30:45.000000000 +0200 ++++ allegro-4.2.0/src/x/xwins.s 2006-07-06 17:22:04.000000000 +0200 +@@ -49,5 +49,6 @@ + popl %ecx + ret + ++.section .note.GNU-stack,"",@progbits + #endif + +--- allegro-4.2.0/src/i386/iblit16.s.noexecstack 2005-06-22 18:51:16.000000000 +0200 ++++ allegro-4.2.0/src/i386/iblit16.s 2006-07-06 17:22:04.000000000 +0200 +@@ -741,5 +741,5 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR16 */ +--- allegro-4.2.0/src/i386/iblit24.s.noexecstack 2005-06-22 18:51:16.000000000 +0200 ++++ allegro-4.2.0/src/i386/iblit24.s 2006-07-06 17:22:04.000000000 +0200 +@@ -370,5 +370,5 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR24 */ +--- allegro-4.2.0/src/i386/iblit32.s.noexecstack 2005-06-22 18:51:16.000000000 +0200 ++++ allegro-4.2.0/src/i386/iblit32.s 2006-07-06 17:22:04.000000000 +0200 +@@ -355,5 +355,5 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR32 */ +--- allegro-4.2.0/src/i386/iblit8.s.noexecstack 2005-06-22 18:51:16.000000000 +0200 ++++ allegro-4.2.0/src/i386/iblit8.s 2006-07-06 17:22:04.000000000 +0200 +@@ -785,5 +785,5 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR8 */ +--- allegro-4.2.0/src/i386/icpus.s.noexecstack 2005-03-10 19:28:16.000000000 +0100 ++++ allegro-4.2.0/src/i386/icpus.s 2006-07-06 17:22:04.000000000 +0200 +@@ -213,3 +213,4 @@ + popl %ebp + ret + ++.section .note.GNU-stack,"",@progbits +--- allegro-4.2.0/src/i386/igfx15.s.noexecstack 2000-05-14 22:17:13.000000000 +0200 ++++ allegro-4.2.0/src/i386/igfx15.s 2006-07-06 17:22:04.000000000 +0200 +@@ -433,6 +433,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR16 */ + +--- allegro-4.2.0/src/i386/igfx16.s.noexecstack 2000-05-14 22:17:11.000000000 +0200 ++++ allegro-4.2.0/src/i386/igfx16.s 2006-07-06 17:22:04.000000000 +0200 +@@ -484,6 +484,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR16 */ + +--- allegro-4.2.0/src/i386/igfx24.s.noexecstack 2000-05-14 22:17:13.000000000 +0200 ++++ allegro-4.2.0/src/i386/igfx24.s 2006-07-06 17:22:04.000000000 +0200 +@@ -578,6 +578,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR24 */ + +--- allegro-4.2.0/src/i386/igfx32.s.noexecstack 2000-05-14 22:17:11.000000000 +0200 ++++ allegro-4.2.0/src/i386/igfx32.s 2006-07-06 17:22:04.000000000 +0200 +@@ -464,6 +464,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR32 */ + +--- allegro-4.2.0/src/i386/igfx8.s.noexecstack 2001-04-09 06:49:29.000000000 +0200 ++++ allegro-4.2.0/src/i386/igfx8.s 2006-07-06 17:22:04.000000000 +0200 +@@ -527,6 +527,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR8 */ + +--- allegro-4.2.0/src/i386/imisc.s.noexecstack 2002-07-05 12:23:47.000000000 +0200 ++++ allegro-4.2.0/src/i386/imisc.s 2006-07-06 17:22:04.000000000 +0200 +@@ -600,3 +600,4 @@ + popl %ebp + ret /* end of fixhypot() */ + ++.section .note.GNU-stack,"",@progbits +--- allegro-4.2.0/src/i386/iscan.s.noexecstack 2004-09-06 18:06:53.000000000 +0200 ++++ allegro-4.2.0/src/i386/iscan.s 2006-07-06 17:22:04.000000000 +0200 +@@ -2777,3 +2777,5 @@ + ret /* end of _poly_scanline_ptex_mask_trans24() */ + + #endif /* COLOR24 */ ++ ++.section .note.GNU-stack,"",@progbits +--- allegro-4.2.0/src/i386/iscanmmx.s.noexecstack 2003-07-16 21:43:28.000000000 +0200 ++++ allegro-4.2.0/src/i386/iscanmmx.s 2006-07-06 17:22:04.000000000 +0200 +@@ -1670,5 +1670,5 @@ + + #endif /* COLOR24 */ + +- ++.section .note.GNU-stack,"",@progbits + #endif /* MMX */ +--- allegro-4.2.0/src/i386/ispr15.s.noexecstack 2001-11-10 20:31:50.000000000 +0100 ++++ allegro-4.2.0/src/i386/ispr15.s 2006-07-06 17:22:04.000000000 +0200 +@@ -491,6 +491,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR16 */ + +--- allegro-4.2.0/src/i386/ispr16.s.noexecstack 2002-10-02 20:29:57.000000000 +0200 ++++ allegro-4.2.0/src/i386/ispr16.s 2006-07-06 17:22:04.000000000 +0200 +@@ -886,6 +886,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR16 */ + +--- allegro-4.2.0/src/i386/ispr24.s.noexecstack 2002-10-02 20:29:57.000000000 +0200 ++++ allegro-4.2.0/src/i386/ispr24.s 2006-07-06 17:22:04.000000000 +0200 +@@ -910,6 +910,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR24 */ + +--- allegro-4.2.0/src/i386/ispr32.s.noexecstack 2002-10-02 20:29:57.000000000 +0200 ++++ allegro-4.2.0/src/i386/ispr32.s 2006-07-06 17:22:04.000000000 +0200 +@@ -697,6 +697,6 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR32 */ + +--- allegro-4.2.0/src/i386/ispr8.s.noexecstack 2004-10-16 21:44:25.000000000 +0200 ++++ allegro-4.2.0/src/i386/ispr8.s 2006-07-06 17:22:04.000000000 +0200 +@@ -1044,5 +1044,5 @@ + + + +- ++.section .note.GNU-stack,"",@progbits + #endif /* ifdef ALLEGRO_COLOR8 */ +--- allegro-4.2.0/src/i386/izbuf.s.noexecstack 2004-04-08 21:26:20.000000000 +0200 ++++ allegro-4.2.0/src/i386/izbuf.s 2006-07-06 17:22:04.000000000 +0200 +@@ -2328,3 +2328,5 @@ + ret /* end of _poly_zbuf_ptex_mask_trans24() */ + + #endif /* COLOR24 */ ++ ++.section .note.GNU-stack,"",@progbits +--- allegro-4.2.0/src/misc/icolconv.s.noexecstack 2006-07-06 17:32:28.000000000 +0200 ++++ allegro-4.2.0/src/misc/icolconv.s 2006-07-06 17:34:31.000000000 +0200 +@@ -3288,3 +3288,4 @@ + + #endif /* ALLEGRO_NO_COLORCOPY */ + ++.section .note.GNU-stack,"",@progbits +--- allegro-4.2.0/src/amd64/acpus.s.noexecstack 2005-03-07 11:24:38.000000000 +0100 ++++ allegro-4.2.0/src/amd64/acpus.s 2006-07-06 17:22:04.000000000 +0200 +@@ -128,3 +128,4 @@ + popq %rbp + ret + ++.section .note.GNU-stack,"",@progbits diff --git a/allegro.spec b/allegro.spec index 55af3a4..6df7a31 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -22,6 +22,7 @@ Patch7: allegro-4.2.0-fullscreen2.patch Patch8: allegro-4.2.0-mprotect.patch Patch9: allegro-4.2.0-no-execheap.patch Patch10: allegro-4.2.0-nicevsync.patch +Patch11: allegro-4.2.0-noexecstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel, texinfo, perl, arts-devel BuildRequires: xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel @@ -136,6 +137,7 @@ které jsou užitečné pro vývoj Allegro programů. %patch8 -p1 -z .mprotect %patch9 -p1 -z .execheap %patch10 -p1 -z .nicevsync +%patch11 -p1 -z .noexecstack %build @@ -225,6 +227,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 6 2006 Hans de Goede 4.2.0-15 +- Stop allegro from making applications linked against it claim that they + need an executable stack (Patch11). Unfortunatly this requires a rebuild of + all applications linked against allegro. + * Mon Jun 26 2006 Jindrich Novy 4.2.0-14 - compile alld and allp debuging/profiling libraries (#196616) - fix typo in release caused by recent changes