diff --git a/pypy.spec b/pypy.spec index 08df66e..739aa95 100644 --- a/pypy.spec +++ b/pypy.spec @@ -4,7 +4,7 @@ # %%{_libdir}/pypy%%{pyversion} (see e.g. pypy3.7 or pypy3.8 for inspiration). %global basever 7.3 Name: pypy -Version: %{basever}.11 +Version: %{basever}.12 %global pyversion 2.7 Release: 2%{?dist} Summary: Python implementation with a Just-In-Time compiler @@ -20,12 +20,10 @@ Summary: Python implementation with a Just-In-Time compiler # before building). If we restore those we'll have to work out the new # licensing terms License: MIT and Python and UCD and BSD and (ASL 2.0 or BSD) -URL: http://pypy.org/ +URL: https://www.pypy.org/ # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} -%endif # High-level configuration of the build: @@ -132,10 +130,6 @@ ExcludeArch: %{ix86} # Easy way to enable/disable verbose logging: %global verbose_logs 0 -# Forcibly use the shadow-stack option for detecting GC roots, rather than -# relying on hacking up generated assembler with regexps: -%global shadow_stack 1 - # Easy way to turn off the selftests: %global run_selftests 1 @@ -371,7 +365,7 @@ Provides: bundled(python2dist(webencodings)) = 0.5.1 %endif # Find the version in lib_pypy/cffi/_pycparser/__init__.py -Provides: bundled(python2dist(pycparser)) = 2.20 +Provides: bundled(python2dist(pycparser)) = 2.21 # Find the version in lib_pypy/cffi/_pycparser/ply/__init__.py Provides: bundled(python2dist(ply)) = 3.9 @@ -514,7 +508,6 @@ BuildPyPy() { # How will we track garbage-collection roots in the generated code? # http://pypy.readthedocs.org/en/latest/config/translation.gcrootfinder.html -%if 0%{shadow_stack} # This is the most portable option, and avoids a reliance on non-guaranteed # behaviors within GCC's code generator: use an explicitly-maintained stack # of root pointers: @@ -522,27 +515,6 @@ BuildPyPy() { export CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-g//') -%else - # Go with the default, which is "asmgcc" - - %global gcrootfinder_options %{nil} - - # https://bugzilla.redhat.com/show_bug.cgi?id=588941#c18 - # The generated Makefile compiles the .c files into assembler (.s), rather - # than direct to .o It then post-processes this assembler to locate - # garbage-collection roots (building .lbl.s and .gcmap files, and a - # "gcmaptable.s"). (The modified .lbl.s files have extra code injected - # within them). - # Unfortunately, the code to do this: - # pypy-1.4/pypy/translator/c/gcc/trackgcroot.py - # doesn't interract well with the results of using our standard build flags. - # For now, filter our CFLAGS of everything that could be conflicting with - # pypy. Need to check these and reenable ones that are okay later. - # Filed as https://bugzilla.redhat.com/show_bug.cgi?id=666966 - export CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fexceptions//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=4//' -e 's/-O2//' -e 's/-fasynchronous-unwind-tables//' -e 's/-march=i686//' -e 's/-mtune=atom//') - -%endif - # The generated C code leads to many thousands of warnings of the form: # warning: variable 'l_v26003' set but not used [-Wunused-but-set-variable] # Suppress them: @@ -905,10 +877,20 @@ CheckPyPy %{name}-c-stackless %changelog -* Mon May 29 2023 Charalampos Stratakis - 7.3.11-2 +* Wed Jul 26 2023 Miro Hrončok - 7.3.12-1 +- Update to 7.3.12 +- Fixes: rhbz#2203422 + +* Fri Jul 21 2023 Fedora Release Engineering - 7.3.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon May 29 2023 Charalampos Stratakis - 7.3.11-3 - Security fix for CVE-2023-24329 Resolves: rhbz#2174018 +* Fri Jan 20 2023 Fedora Release Engineering - 7.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 30 2022 Miro Hrončok - 7.3.11-1 - Update to 7.3.11 - Fixes: rhbz#2147521 diff --git a/sources b/sources index f4e26b4..076cd7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pypy2.7-v7.3.11-src.tar.bz2) = 31fd93fe3e761fd096ff52c2a0afa40f78e4df700deb911e221d1682b35e8374c9deac7ba19b474f7ca7a366d3ae9b36ebaf78e81c4ec8306431fd0873daea55 +SHA512 (pypy2.7-v7.3.12-src.tar.bz2) = 35ec35376f1e7c1a5dea9dc5bce6819a94c2df2645806c83185487587470b47ab529c25ecb8ca200505319f40789859a2919c61902b693421e2001313b46e5f4