rpms/mesa/devel mesa-6.5-noexecstack.patch, NONE, 1.1 mesa.spec, 1.54, 1.55
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 10 21:51:59 UTC 2006
Author: krh
Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29404
Modified Files:
mesa.spec
Added Files:
mesa-6.5-noexecstack.patch
Log Message:
* Mon Apr 10 2006 Kristian Høgsberg <krh at redhat.com> 6.5-3
- Add mesa-6.5-noexecstack.patch to prevent assembly files from making
libGL.so have executable stack.
mesa-6.5-noexecstack.patch:
drivers/dri/r200/r200_vtxtmp_x86.S | 4 ++++
drivers/dri/radeon/radeon_vtxtmp_x86.S | 4 ++++
tnl/t_vtx_x86_gcc.S | 4 ++++
x86-64/glapi_x86-64.S | 4 ++++
x86-64/xform4.S | 4 ++++
x86/3dnow_normal.S | 4 ++++
x86/3dnow_xform1.S | 4 ++++
x86/3dnow_xform2.S | 4 ++++
x86/3dnow_xform3.S | 4 ++++
x86/3dnow_xform4.S | 4 ++++
x86/common_x86_asm.S | 4 ++++
x86/glapi_x86.S | 4 ++++
x86/mmx_blend.S | 4 ++++
x86/read_rgba_span_x86.S | 4 ++++
x86/sse_normal.S | 4 ++++
x86/sse_xform1.S | 4 ++++
x86/sse_xform2.S | 4 ++++
x86/sse_xform3.S | 4 ++++
x86/sse_xform4.S | 4 ++++
x86/x86_cliptest.S | 4 ++++
x86/x86_xform2.S | 4 ++++
x86/x86_xform3.S | 4 ++++
x86/x86_xform4.S | 4 ++++
23 files changed, 92 insertions(+)
--- NEW FILE mesa-6.5-noexecstack.patch ---
Index: src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S,v
retrieving revision 1.5
diff -u -p -r1.5 r200_vtxtmp_x86.S
--- src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S 2 Jun 2004 22:09:11 -0000 1.5
+++ src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S 10 Apr 2006 21:48:16 -0000
@@ -493,3 +493,7 @@ GLOBL( _sse_MultiTexCoord2f_2 )
ret
GLOBL( _sse_MultiTexCoord2f_2_end )
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S,v
retrieving revision 1.3
diff -u -p -r1.3 radeon_vtxtmp_x86.S
--- src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S 13 Oct 2005 14:30:20 -0000 1.3
+++ src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S 10 Apr 2006 21:48:16 -0000
@@ -492,3 +492,7 @@ GLOBL( _sse_MultiTexCoord2f_2 )
ret
GLOBL( _sse_MultiTexCoord2f_2_end )
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/tnl/t_vtx_x86_gcc.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S,v
retrieving revision 1.13
diff -u -p -r1.13 t_vtx_x86_gcc.S
--- src/mesa/tnl/t_vtx_x86_gcc.S 17 Sep 2004 05:10:33 -0000 1.13
+++ src/mesa/tnl/t_vtx_x86_gcc.S 10 Apr 2006 21:48:19 -0000
@@ -555,3 +555,7 @@ GLOBL( _tnl_x86_dispatch_vertexattribfv
ret $8 /* return */
GLOBL( _tnl_x86_dispatch_vertexattribfv_end )
#endif /* defined (STDCALL_API) */
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_normal.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_normal.S,v
retrieving revision 1.9
diff -u -p -r1.9 3dnow_normal.S
--- src/mesa/x86/3dnow_normal.S 4 Jan 2005 14:33:47 -0000 1.9
+++ src/mesa/x86/3dnow_normal.S 10 Apr 2006 21:48:20 -0000
@@ -846,3 +846,7 @@ LLBL (G3R_end):
RET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform1.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform1.S,v
retrieving revision 1.3
diff -u -p -r1.3 3dnow_xform1.S
--- src/mesa/x86/3dnow_xform1.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/3dnow_xform1.S 10 Apr 2006 21:48:20 -0000
@@ -431,3 +431,7 @@ LLBL( G3TP3R_3 ):
RET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 3dnow_xform2.S
--- src/mesa/x86/3dnow_xform2.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/3dnow_xform2.S 10 Apr 2006 21:48:20 -0000
@@ -471,3 +471,7 @@ LLBL( G3TPIR_4 ):
POP_L ( ESI )
RET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform3.S,v
retrieving revision 1.4
diff -u -p -r1.4 3dnow_xform3.S
--- src/mesa/x86/3dnow_xform3.S 4 Jan 2005 14:33:47 -0000 1.4
+++ src/mesa/x86/3dnow_xform3.S 10 Apr 2006 21:48:20 -0000
@@ -555,3 +555,7 @@ LLBL( G3TPIR_2 ):
POP_L ( ESI )
RET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/3dnow_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform4.S,v
retrieving revision 1.4
diff -u -p -r1.4 3dnow_xform4.S
--- src/mesa/x86/3dnow_xform4.S 4 Jan 2005 14:33:47 -0000 1.4
+++ src/mesa/x86/3dnow_xform4.S 10 Apr 2006 21:48:20 -0000
@@ -564,3 +564,7 @@ LLBL( G3TPIR_2 ):
POP_L ( ESI )
RET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/common_x86_asm.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/common_x86_asm.S,v
retrieving revision 1.19
diff -u -p -r1.19 common_x86_asm.S
--- src/mesa/x86/common_x86_asm.S 4 Jan 2005 14:33:47 -0000 1.19
+++ src/mesa/x86/common_x86_asm.S 10 Apr 2006 21:48:20 -0000
@@ -213,3 +213,7 @@ GLNAME( _mesa_test_os_sse_exception_supp
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/glapi_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/glapi_x86.S,v
retrieving revision 1.59
diff -u -p -r1.59 glapi_x86.S
--- src/mesa/x86/glapi_x86.S 1 Mar 2006 02:07:50 -0000 1.59
+++ src/mesa/x86/glapi_x86.S 10 Apr 2006 21:48:21 -0000
@@ -1156,3 +1156,7 @@ GLNAME(gl_dispatch_functions_end):
.long 2,4,20 /* Minimum kernel version w/TLS */
3: .p2align 2 /* pad out section */
#endif /* GLX_USE_TLS */
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/mmx_blend.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/mmx_blend.S,v
retrieving revision 1.18
diff -u -p -r1.18 mmx_blend.S
--- src/mesa/x86/mmx_blend.S 26 Apr 2004 10:10:25 -0000 1.18
+++ src/mesa/x86/mmx_blend.S 10 Apr 2006 21:48:21 -0000
@@ -364,3 +364,7 @@ TWO(MOVQ ( MM1, REGIND(rgba) ))
#include "mmx_blendtmp.h"
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/read_rgba_span_x86.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/read_rgba_span_x86.S,v
retrieving revision 1.5
diff -u -p -r1.5 read_rgba_span_x86.S
--- src/mesa/x86/read_rgba_span_x86.S 30 Jun 2005 11:42:56 -0000 1.5
+++ src/mesa/x86/read_rgba_span_x86.S 10 Apr 2006 21:48:21 -0000
@@ -687,3 +687,7 @@ _generic_read_RGBA_span_RGB565_MMX:
#endif
ret
#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_normal.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_normal.S,v
retrieving revision 1.5
diff -u -p -r1.5 sse_normal.S
--- src/mesa/x86/sse_normal.S 4 Jan 2005 14:33:47 -0000 1.5
+++ src/mesa/x86/sse_normal.S 10 Apr 2006 21:48:21 -0000
@@ -255,3 +255,7 @@ LLBL(K_G3TNNRR_finish):
RET
#undef FRAME_OFFSET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform1.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform1.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform1.S
--- src/mesa/x86/sse_xform1.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/sse_xform1.S 10 Apr 2006 21:48:22 -0000
@@ -440,3 +440,7 @@ LLBL(K_GTP13P3DR_finish):
RET
#undef FRAME_OFFSET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform2.S
--- src/mesa/x86/sse_xform2.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/sse_xform2.S 10 Apr 2006 21:48:22 -0000
@@ -459,3 +459,7 @@ LLBL(K_GTP23P3DR_finish):
RET
#undef FRAME_OFFSET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform3.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform3.S
--- src/mesa/x86/sse_xform3.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/sse_xform3.S 10 Apr 2006 21:48:22 -0000
@@ -505,3 +505,7 @@ LLBL(K_GTP3P3DR_finish):
RET
#undef FRAME_OFFSET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/sse_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse_xform4.S,v
retrieving revision 1.3
diff -u -p -r1.3 sse_xform4.S
--- src/mesa/x86/sse_xform4.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/sse_xform4.S 10 Apr 2006 21:48:22 -0000
@@ -229,3 +229,7 @@ LLBL( sse_identity_done ):
POP_L( ESI )
RET
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_cliptest.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_cliptest.S,v
retrieving revision 1.11
diff -u -p -r1.11 x86_cliptest.S
--- src/mesa/x86/x86_cliptest.S 4 Jan 2005 14:33:47 -0000 1.11
+++ src/mesa/x86/x86_cliptest.S 10 Apr 2006 21:48:22 -0000
@@ -401,3 +401,7 @@ LLBL(ctp4_np_finish):
POP_L( ESI )
RET
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform2.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform2.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform2.S
--- src/mesa/x86/x86_xform2.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/x86_xform2.S 10 Apr 2006 21:48:22 -0000
@@ -568,3 +568,7 @@ LLBL(x86_p2_ir_done):
POP_L( ESI )
RET
#undef FRAME_OFFSET
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform3.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform3.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform3.S
--- src/mesa/x86/x86_xform3.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/x86_xform3.S 10 Apr 2006 21:48:22 -0000
@@ -638,3 +638,7 @@ LLBL(x86_p3_ir_done):
POP_L( EDI )
POP_L( ESI )
RET
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86/x86_xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86_xform4.S,v
retrieving revision 1.3
diff -u -p -r1.3 x86_xform4.S
--- src/mesa/x86/x86_xform4.S 4 Jan 2005 14:33:47 -0000 1.3
+++ src/mesa/x86/x86_xform4.S 10 Apr 2006 21:48:23 -0000
@@ -671,3 +671,7 @@ LLBL(x86_p4_ir_done):
POP_L( EDI )
POP_L( ESI )
RET
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86-64/glapi_x86-64.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S,v
retrieving revision 1.8
diff -u -p -r1.8 glapi_x86-64.S
--- src/mesa/x86-64/glapi_x86-64.S 1 Mar 2006 02:07:50 -0000 1.8
+++ src/mesa/x86-64/glapi_x86-64.S 10 Apr 2006 21:48:26 -0000
@@ -31127,3 +31127,7 @@ GL_PREFIX(BlitFramebufferEXT):
.long 2,4,20 /* Minimum kernel version w/TLS */
3: .p2align 2 /* pad out section */
#endif /* GLX_USE_TLS */
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: src/mesa/x86-64/xform4.S
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/xform4.S,v
retrieving revision 1.1
diff -u -p -r1.1 xform4.S
--- src/mesa/x86-64/xform4.S 7 May 2005 16:59:59 -0000 1.1
+++ src/mesa/x86-64/xform4.S 10 Apr 2006 21:48:27 -0000
@@ -456,3 +456,7 @@ p4_2d_done:
ret
#endif
+
+#ifdef __ELF__
+ .section .note.GNU-stack,"",%progbits
+#endif
Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mesa.spec 10 Apr 2006 19:05:07 -0000 1.54
+++ mesa.spec 10 Apr 2006 21:51:56 -0000 1.55
@@ -53,7 +53,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 6.5
-Release: 2
+Release: 3
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -73,6 +73,7 @@
Patch3: mesa-modular-dri-dir.patch
Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
Patch5: mesa-6.5-drop-static-inline.patch
+Patch6: mesa-6.5-noexecstack.patch
# General patches from upstream go here:
@@ -239,6 +240,7 @@
%patch4 -p0 -b .libGLw-enable-motif-support
%endif
%patch5 -p0 -b .drop-static-inline
+%patch6 -p0 -b .noexecstack
# According to Adam, this patch makes metacity's compositing
# manager noticeably faster, but also may be a little too big of
@@ -430,6 +432,10 @@
%{_bindir}/glxinfo
%changelog
+* Mon Apr 10 2006 Kristian Høgsberg <krh at redhat.com> 6.5-3
+- Add mesa-6.5-noexecstack.patch to prevent assembly files from making
+ libGL.so have executable stack.
+
* Mon Apr 10 2006 Kristian Høgsberg <krh at redhat.com> 6.5-2
- Bump for fc5 build.
- Bump libdrm requires to 2.0.1.
More information about the fedora-cvs-commits
mailing list