devel/python python-2.5.1-ctypes-exec-stack.patch, NONE, 1.1 python.spec, 1.111, 1.112

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30028

Modified Files:
	python.spec 
Added Files:
	python-2.5.1-ctypes-exec-stack.patch 
Log Message:
* Fri Aug 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-6
- fix ctypes again on some arches (Hans de Goede, #251637)


python-2.5.1-ctypes-exec-stack.patch:

--- NEW FILE python-2.5.1-ctypes-exec-stack.patch ---
diff -up Python-2.5.1/Modules/_ctypes/libffi/src/x86/unix64.S.execstack Python-2.5.1/Modules/_ctypes/libffi/src/x86/unix64.S
--- Python-2.5.1/Modules/_ctypes/libffi/src/x86/unix64.S.execstack	2007-08-10 10:34:06.000000000 +0200
+++ Python-2.5.1/Modules/_ctypes/libffi/src/x86/unix64.S	2007-08-10 10:34:06.000000000 +0200
@@ -410,3 +410,7 @@ ffi_closure_unix64:
 .LEFDE3:
 
 #endif /* __x86_64__ */
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -up Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/sysv.S.execstack Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/sysv.S
--- Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/sysv.S.execstack	2007-08-10 10:39:03.000000000 +0200
+++ Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/sysv.S	2007-08-10 10:39:59.000000000 +0200
@@ -215,3 +215,7 @@ END(ffi_call_SYSV)
       .align 2
 .LEFDE1:
 #endif
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -up Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S.execstack Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S
--- Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S.execstack	2007-08-10 10:39:23.000000000 +0200
+++ Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S	2007-08-10 10:39:58.000000000 +0200
@@ -204,3 +204,7 @@ ffi_closure_LINUX64:
 	.align 3
 .LEFDE1:
 #endif
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -up Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64.S.execstack Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64.S
--- Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64.S.execstack	2007-08-10 10:39:13.000000000 +0200
+++ Python-2.5.1/Modules/_ctypes/libffi/src/powerpc/linux64.S	2007-08-10 10:40:01.000000000 +0200
@@ -178,3 +178,7 @@ ffi_call_LINUX64:
 	.align 3
 .LEFDE1:
 #endif
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- python.spec	6 Jul 2007 20:32:38 -0000	1.111
+++ python.spec	10 Aug 2007 14:13:15 -0000	1.112
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -32,6 +32,7 @@
 Patch2: python-2.3.4-pydocnodoc.patch
 Patch3: python-2.4.1-canonicalize.patch
 Patch4: python-2.5-cflags.patch
+Patch5: python-2.5-ctypes-exec-stack.patch
 
 # upstreamed
 
@@ -155,6 +156,7 @@
 %patch2 -p1 -b .no-doc
 %patch3 -p1 -b .canonicalize
 %patch4 -p1 -b .cflags
+%patch5 -p1 -b .ctypesexec
 
 %patch50 -p1 -b .egginfo
 
@@ -414,6 +416,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Fri Aug 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-6
+- fix ctypes again on some arches (Hans de Goede, #251637)
+
 * Fri Jul  6 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-5
 - link curses modules with ncursesw (#246385)