diff --git a/python-ctypes-execstack.patch b/python-ctypes-execstack.patch new file mode 100644 index 0000000..40f716d --- /dev/null +++ b/python-ctypes-execstack.patch @@ -0,0 +1,79 @@ +--- Python-2.5/Modules/_ctypes/libffi/src/x86/unix64.S.ctypes-exec 2006-03-08 20:35:32.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/x86/unix64.S 2007-01-03 12:48:32.000000000 -0500 +@@ -410,3 +410,5 @@ + .LEFDE3: + + #endif /* __x86_64__ */ ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/x86/sysv.S.ctypes-exec 2006-03-08 20:35:32.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/x86/sysv.S 2007-01-03 12:48:32.000000000 -0500 +@@ -376,3 +376,5 @@ + #endif + + #endif /* ifndef __x86_64__ */ ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/s390/sysv.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/s390/sysv.S 2007-01-03 12:51:32.000000000 -0500 +@@ -427,3 +427,4 @@ + + #endif + ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/powerpc/linux64.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/powerpc/linux64.S 2007-01-03 12:51:51.000000000 -0500 +@@ -178,3 +178,5 @@ + .align 3 + .LEFDE1: + #endif ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/powerpc/linux64_closure.S 2007-01-03 12:53:51.000000000 -0500 +@@ -204,3 +204,5 @@ + .align 3 + .LEFDE1: + #endif ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/powerpc/ppc_closure.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/powerpc/ppc_closure.S 2007-01-03 12:52:35.000000000 -0500 +@@ -321,3 +321,5 @@ + .LEFDE1: + + #endif ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/powerpc/sysv.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/powerpc/sysv.S 2007-01-03 12:51:57.000000000 -0500 +@@ -215,3 +215,5 @@ + .align 2 + .LEFDE1: + #endif ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/ia64/unix.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/ia64/unix.S 2007-01-03 12:54:05.000000000 -0500 +@@ -553,3 +553,5 @@ + data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT + data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE + data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/sparc/v8.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/sparc/v8.S 2007-01-03 12:54:24.000000000 -0500 +@@ -265,3 +265,5 @@ + .byte 0x1f ! uleb128 0x1f + .align WS + .LLEFDE2: ++ ++.section .note.GNU-stack,"",@progbits +--- Python-2.5/Modules/_ctypes/libffi/src/sparc/v9.S.ctypes-exec 2007-01-03 12:54:40.000000000 -0500 ++++ Python-2.5/Modules/_ctypes/libffi/src/sparc/v9.S 2007-01-03 12:54:26.000000000 -0500 +@@ -300,3 +300,5 @@ + .align 8 + .LLEFDE2: + #endif ++ ++.section .note.GNU-stack,"",@progbits diff --git a/python.spec b/python.spec index 870a83b..c10de75 100644 --- a/python.spec +++ b/python.spec @@ -21,7 +21,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} #Version: %{pybasever}.3 Version: 2.5 -Release: 6%{?dist} +Release: 7%{?dist} License: Python Software Foundation License v2 Group: Development/Languages Provides: python-abi = %{pybasever} @@ -35,6 +35,7 @@ Patch3: python-2.3.4-pydocnodoc.patch Patch4: python-2.4.1-canonicalize.patch Patch5: python-2.5-cflags.patch Patch6: python-db45.patch +Patch7: python-ctypes-execstack.patch # upstreamed Patch25: python-syslog-fail-noatexittb.patch @@ -47,7 +48,6 @@ Patch50: python-2.5-disable-egginfo.patch Patch101: python-2.3.4-lib64-regex.patch Patch102: python-2.5-lib64.patch - %if %{main_python} Obsoletes: Distutils Provides: Distutils @@ -163,6 +163,7 @@ user interface for Python programming. %patch4 -p1 -b .canonicalize %patch5 -p1 -b .cflags %patch6 -p1 -b .db45 +%patch7 -p1 -b .ctypes-exec %patch25 -p1 -b .syslog-atexit %patch26 -p1 -b .invalid-assert @@ -173,7 +174,6 @@ user interface for Python programming. %patch102 -p1 -b .lib64 %endif - # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -416,6 +416,9 @@ rm -fr $RPM_BUILD_ROOT %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so %changelog +* Wed Jan 3 2007 Jeremy Katz - 2.5.3-7 +- fix ctypes to not require execstack (#220669) + * Fri Dec 15 2006 Jeremy Katz - 2.5.3-6 - don't link against compat-db (Robert Scheck)