Architecture specific change in rpms/pypy.git

The package rpms/pypy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pypy.git/commit/?id=04187b89e7974887...
https://src.fedoraproject.org/cgit/rpms/pypy.git/commit/?id=cf369eebbe6bd926....

Change:
+ExcludeArch:    %{ix86}
+%ifarch %{ix86} x86_64 %{arm}

Thanks.

Full change:
============

commit c270c4e5273cde78058bbb6070b396cc5a89003c
Author: Charalampos Stratakis 
Date:   Wed Jun 29 01:46:27 2022 +0200

Security fix for CVE-2015-20107

Fixes: rhbz#2075390

diff --git a/382-cve-2015-20107.patch b/382-cve-2015-20107.patch
new file mode 100644
index 0000000..25ac269
--- /dev/null
+++ b/382-cve-2015-20107.patch
@@ -0,0 +1,407 @@
+From 7ea7122d59e21063b58d5e5a88228041ae6b66c1 Mon Sep 17 00:00:00 2001
+From: Petr Viktorin 
+Date: Fri, 3 Jun 2022 11:43:35 +0200
+Subject: [PATCH] 00382-cve-2015-20107.patch
+
+00382 #
+Make mailcap refuse to match unsafe filenames/types/params (GH-91993)
+
+Upstream: https://github.com/python/cpython/issues/68966
+
+Tracker bug: https://bugzilla.redhat.com/show_bug.cgi?id=2075390
+
+Backported from python3.
+---
+ lib-python/2.7/mailcap.py           |  29 +++-
+ lib-python/2.7/test/mailcap.txt     |  39 +++++
+ lib-python/2.7/test/test_mailcap.py | 259 ++++++++++++++++++++++++++++
+ 3 files changed, 325 insertions(+), 2 deletions(-)
+ create mode 100644 lib-python/2.7/test/mailcap.txt
+ create mode 100644 lib-python/2.7/test/test_mailcap.py
+
+diff --git a/lib-python/2.7/mailcap.py b/lib-python/2.7/mailcap.py
+index 04077ba..1108b44 100644
+--- a/lib-python/2.7/mailcap.py
++++ b/lib-python/2.7/mailcap.py
+@@ -1,9 +1,18 @@
+ """Mailcap file handling.  See RFC 1524."""
+ 
+ import os
++import warnings
++import re
+ 
+ __all__ = ["getcaps","findmatch"]
+ 
++
++_find_unsafe = re.compile(r'[^\xa1-\xff\w@+=:,./-]').search
++
++class UnsafeMailcapInput(Warning):
++    """Warning raised when refusing unsafe input"""
++
++
+ # Part 1: top-level interface.
+ 
+ def getcaps():
+@@ -144,15 +153,22 @@ def findmatch(caps, MIMEtype, key='view', filename="/dev/null", plist=[]):
+     entry to use.
+ 
+     """
++    if _find_unsafe(filename):
++        msg = "Refusing to use mailcap with filename %r. Use a safe temporary filename." % (filename,)
++        warnings.warn(msg, UnsafeMailcapInput)
++        return None, None
+     entries = lookup(caps, MIMEtype, key)
+     # XXX This code should somehow check for the needsterminal flag.
+     for e in entries:
+         if 'test' in e:
+             test = subst(e['test'], filename, plist)
++            if test is None:
++                continue
+             if test and os.system(test) != 0:
+                 continue
+         command = subst(e[key], MIMEtype, filename, plist)
+-        return command, e
++        if command is not None:
++            return command, e
+     return None, None
+ 
+ def lookup(caps, MIMEtype, key=None):
+@@ -184,6 +200,10 @@ def subst(field, MIMEtype, filename, plist=[]):
+             elif c == 's':
+                 res = res + filename
+             elif c == 't':
++                if _find_unsafe(MIMEtype):
++                    msg = "Refusing to substitute MIME type %r into a shell command." % (MIMEtype,)
++                    warnings.warn(msg, UnsafeMailcapInput)
++                    return None
+                 res = res + MIMEtype
+             elif c == '{':
+                 start = i
+@@ -191,7 +211,12 @@ def subst(field, MIMEtype, filename, plist=[]):
+                     i = i+1
+                 name = field[start:i]
+                 i = i+1
+-                res = res + findparam(name, plist)
++                param = findparam(name, plist)
++                if _find_unsafe(param):
++                    msg = "Refusing to substitute parameter %r (%s) into a shell command" % (param, name)
++                    warnings.warn(msg, UnsafeMailcapInput)
++                    return None
++                res = res + param
+             # XXX To do:
+             # %n == number of parts if type is multipart/*
+             # %F == list of alternating type and filename for parts
+diff --git a/lib-python/2.7/test/mailcap.txt b/lib-python/2.7/test/mailcap.txt
+new file mode 100644
+index 0000000..08a76e6
+--- /dev/null
++++ b/lib-python/2.7/test/mailcap.txt
+@@ -0,0 +1,39 @@
++# Mailcap file for test_mailcap; based on RFC 1524
++# Referred to by test_mailcap.py
++
++#
++# This is a comment.
++#
++
++application/frame; showframe %s; print="cat %s | lp"
++application/postscript; ps-to-terminal %s;\
++    needsterminal
++application/postscript; ps-to-terminal %s; \
++    compose=idraw %s
++application/x-dvi; xdvi %s
++application/x-movie; movieplayer %s; compose=moviemaker %s; \
++       description="Movie"; \
++       x11-bitmap="/usr/lib/Zmail/bitmaps/movie.xbm"
++application/*; echo "This is "%t" but \
++       is 50 % Greek to me" ; cat %s; copiousoutput
++
++audio/basic; showaudio %s; compose=audiocompose %s; edit=audiocompose %s;\
++description="An audio fragment"
++audio/* ; /usr/local/bin/showaudio %t
++
++image/rgb; display %s
++#image/gif; display %s
++image/x-xwindowdump; display %s
++
++# The continuation char shouldn't \
++# make a difference in a comment.
++
++message/external-body; showexternal %s %{access-type} %{name} %{site} \
++    %{directory} %{mode} %{server}; needsterminal; composetyped = extcompose %s; \
++    description="A reference to data stored in an external location"
++
++text/richtext; shownonascii iso-8859-8 -e richtext -p %s; test=test "`echo \
++    %{charset} | tr '[A-Z]' '[a-z]'`"  = iso-8859-8; copiousoutput
++
++video/*; animate %s
++video/mpeg; mpeg_play %s
+\ No newline at end of file
+diff --git a/lib-python/2.7/test/test_mailcap.py b/lib-python/2.7/test/test_mailcap.py
+new file mode 100644
+index 0000000..35da7fb
+--- /dev/null
++++ b/lib-python/2.7/test/test_mailcap.py
+@@ -0,0 +1,259 @@
++import copy
++import os
++import sys
++import test.support
++import unittest
++from test import support as os_helper
++from test import support as warnings_helper
++from collections import OrderedDict
++
++import mailcap
++
++
++# Location of mailcap file
++MAILCAPFILE = test.support.findfile("mailcap.txt")
++
++# Dict to act as mock mailcap entry for this test
++# The keys and values should match the contents of MAILCAPFILE
++
++MAILCAPDICT = {
++    'application/x-movie':
++        [{'compose': 'moviemaker %s',
++          'x11-bitmap': '"/usr/lib/Zmail/bitmaps/movie.xbm"',
++          'description': '"Movie"',
++          'view': 'movieplayer %s',
++          'lineno': 4}],
++    'application/*':
++        [{'copiousoutput': '',
++          'view': 'echo "This is \"%t\" but        is 50 \% Greek to me" \; cat %s',
++          'lineno': 5}],
++    'audio/basic':
++        [{'edit': 'audiocompose %s',
++          'compose': 'audiocompose %s',
++          'description': '"An audio fragment"',
++          'view': 'showaudio %s',
++          'lineno': 6}],
++    'video/mpeg':
++        [{'view': 'mpeg_play %s', 'lineno': 13}],
++    'application/postscript':
++        [{'needsterminal': '', 'view': 'ps-to-terminal %s', 'lineno': 1},
++         {'compose': 'idraw %s', 'view': 'ps-to-terminal %s', 'lineno': 2}],
++    'application/x-dvi':
++        [{'view': 'xdvi %s', 'lineno': 3}],
++    'message/external-body':
++        [{'composetyped': 'extcompose %s',
++          'description': '"A reference to data stored in an external location"',
++          'needsterminal': '',
++          'view': 'showexternal %s %{access-type} %{name} %{site}     %{directory} %{mode} %{server}',
++          'lineno': 10}],
++    'text/richtext':
++        [{'test': 'test "`echo     %{charset} | tr '[A-Z]' '[a-z]'`"  = iso-8859-8',
++          'copiousoutput': '',
++          'view': 'shownonascii iso-8859-8 -e richtext -p %s',
++          'lineno': 11}],
++    'image/x-xwindowdump':
++        [{'view': 'display %s', 'lineno': 9}],
++    'audio/*':
++        [{'view': '/usr/local/bin/showaudio %t', 'lineno': 7}],
++    'video/*':
++        [{'view': 'animate %s', 'lineno': 12}],
++    'application/frame':
++        [{'print': '"cat %s | lp"', 'view': 'showframe %s', 'lineno': 0}],
++    'image/rgb':
++        [{'view': 'display %s', 'lineno': 8}]
++}
++
++# In Python 2, mailcap doesn't return line numbers.
++# This test suite is copied from Python 3.11; for easier backporting we keep
++# data from there and remove the lineno.
++# So, for Python 2, MAILCAPDICT_DEPRECATED is the same as MAILCAPDICT
++MAILCAPDICT_DEPRECATED = MAILCAPDICT
++for entry_list in MAILCAPDICT_DEPRECATED.values():
++    for entry in entry_list:
++        entry.pop('lineno')
++
++
++class HelperFunctionTest(unittest.TestCase):
++
++    def test_listmailcapfiles(self):
++        # The return value for listmailcapfiles() will vary by system.
++        # So verify that listmailcapfiles() returns a list of strings that is of
++        # non-zero length.
++        mcfiles = mailcap.listmailcapfiles()
++        self.assertIsInstance(mcfiles, list)
++        for m in mcfiles:
++            self.assertIsInstance(m, str)
++        with os_helper.EnvironmentVarGuard() as env:
++            # According to RFC 1524, if MAILCAPS env variable exists, use that
++            # and only that.
++            if "MAILCAPS" in env:
++                env_mailcaps = env["MAILCAPS"].split(os.pathsep)
++            else:
++                env_mailcaps = ["/testdir1/.mailcap", "/testdir2/mailcap"]
++                env["MAILCAPS"] = os.pathsep.join(env_mailcaps)
++                mcfiles = mailcap.listmailcapfiles()
++        self.assertEqual(env_mailcaps, mcfiles)
++
++    def test_readmailcapfile(self):
++        # Test readmailcapfile() using test file. It should match MAILCAPDICT.
++        with open(MAILCAPFILE, 'r') as mcf:
++                d = mailcap.readmailcapfile(mcf)
++        self.assertDictEqual(d, MAILCAPDICT_DEPRECATED)
++
++    def test_lookup(self):
++        # Test without key
++
++        # In Python 2, 'video/mpeg' is tried before 'video/*'
++        # (unfixed bug: https://github.com/python/cpython/issues/59182 )
++        # So, these are in reverse order:
++        expected = [{'view': 'mpeg_play %s', },
++                    {'view': 'animate %s', }]
++        actual = mailcap.lookup(MAILCAPDICT, 'video/mpeg')
++        self.assertListEqual(expected, actual)
++
++        # Test with key
++        key = 'compose'
++        expected = [{'edit': 'audiocompose %s',
++                     'compose': 'audiocompose %s',
++                     'description': '"An audio fragment"',
++                     'view': 'showaudio %s',
++                     }]
++        actual = mailcap.lookup(MAILCAPDICT, 'audio/basic', key)
++        self.assertListEqual(expected, actual)
++
++        # Test on user-defined dicts without line numbers
++        expected = [{'view': 'mpeg_play %s'}, {'view': 'animate %s'}]
++        actual = mailcap.lookup(MAILCAPDICT_DEPRECATED, 'video/mpeg')
++        self.assertListEqual(expected, actual)
++
++    def test_subst(self):
++        plist = ['id=1', 'number=2', 'total=3']
++        # test case: ([field, MIMEtype, filename, plist=[]], <expected string>)
++        test_cases = [
++            (["", "audio/*", "foo.txt"], ""),
++            (["echo foo", "audio/*", "foo.txt"], "echo foo"),
++            (["echo %s", "audio/*", "foo.txt"], "echo foo.txt"),
++            (["echo %t", "audio/*", "foo.txt"], None),
++            (["echo %t", "audio/wav", "foo.txt"], "echo audio/wav"),
++            (["echo \%t", "audio/*", "foo.txt"], "echo %t"),
++            (["echo foo", "audio/*", "foo.txt", plist], "echo foo"),
++            (["echo %{total}", "audio/*", "foo.txt", plist], "echo 3")
++        ]
++        for tc in test_cases:
++            self.assertEqual(mailcap.subst(*tc[0]), tc[1])
++
++class GetcapsTest(unittest.TestCase):
++
++    def test_mock_getcaps(self):
++        # Test mailcap.getcaps() using mock mailcap file in this dir.
++        # Temporarily override any existing system mailcap file by pointing the
++        # MAILCAPS environment variable to our mock file.
++        with os_helper.EnvironmentVarGuard() as env:
++            env["MAILCAPS"] = MAILCAPFILE
++            caps = mailcap.getcaps()
++            self.assertDictEqual(caps, MAILCAPDICT)
++
++    def test_system_mailcap(self):
++        # Test mailcap.getcaps() with mailcap file(s) on system, if any.
++        caps = mailcap.getcaps()
++        self.assertIsInstance(caps, dict)
++        mailcapfiles = mailcap.listmailcapfiles()
++        existingmcfiles = [mcf for mcf in mailcapfiles if os.path.exists(mcf)]
++        if existingmcfiles:
++            # At least 1 mailcap file exists, so test that.
++            for (k, v) in caps.items():
++                self.assertIsInstance(k, str)
++                self.assertIsInstance(v, list)
++                for e in v:
++                    self.assertIsInstance(e, dict)
++        else:
++            # No mailcap files on system. getcaps() should return empty dict.
++            self.assertEqual({}, caps)
++
++
++class FindmatchTest(unittest.TestCase):
++
++    def test_findmatch(self):
++
++        # default findmatch arguments
++        c = MAILCAPDICT
++        fname = "foo.txt"
++        plist = ["access-type=default", "name=john", "site=python.org",
++                 "directory=/tmp", "mode=foo", "server=bar"]
++        audio_basic_entry = {
++            'edit': 'audiocompose %s',
++            'compose': 'audiocompose %s',
++            'description': '"An audio fragment"',
++            'view': 'showaudio %s',
++        }
++        audio_entry = {"view": "/usr/local/bin/showaudio %t", }
++        video_entry = {'view': 'animate %s', }
++        mpeg_entry = {'view': 'mpeg_play %s', }
++        message_entry = {
++            'composetyped': 'extcompose %s',
++            'description': '"A reference to data stored in an external location"', 'needsterminal': '',
++            'view': 'showexternal %s %{access-type} %{name} %{site}     %{directory} %{mode} %{server}',
++        }
++
++        # test case: (findmatch args, findmatch keyword args, expected output)
++        #   positional args: caps, MIMEtype
++        #   keyword args: key="view", filename="/dev/null", plist=[]
++        #   output: (command line, mailcap entry)
++        cases = [
++            ([{}, "video/mpeg"], {}, (None, None)),
++            ([c, "foo/bar"], {}, (None, None)),
++
++            # In Python 2, 'video/mpeg' is tried before 'video/*'
++            # (unfixed bug: https://github.com/python/cpython/issues/59182 )
++            #([c, "video/mpeg"], {}, ('animate /dev/null', video_entry)),
++            ([c, "video/mpeg"], {}, ('mpeg_play /dev/null', mpeg_entry)),
++
++            ([c, "audio/basic", "edit"], {}, ("audiocompose /dev/null", audio_basic_entry)),
++            ([c, "audio/basic", "compose"], {}, ("audiocompose /dev/null", audio_basic_entry)),
++            ([c, "audio/basic", "description"], {}, ('"An audio fragment"', audio_basic_entry)),
++            ([c, "audio/basic", "foobar"], {}, (None, None)),
++            ([c, "video/*"], {"filename": fname}, ("animate %s" % fname, video_entry)),
++            ([c, "audio/basic", "compose"],
++             {"filename": fname},
++             ("audiocompose %s" % fname, audio_basic_entry)),
++            ([c, "audio/basic"],
++             {"key": "description", "filename": fname},
++             ('"An audio fragment"', audio_basic_entry)),
++            ([c, "audio/*"],
++             {"filename": fname},
++             (None, None)),
++            ([c, "audio/wav"],
++             {"filename": fname},
++             ("/usr/local/bin/showaudio audio/wav", audio_entry)),
++            ([c, "message/external-body"],
++             {"plist": plist},
++             ("showexternal /dev/null default john python.org     /tmp foo bar", message_entry))
++        ]
++        self._run_cases(cases)
++
++    @unittest.skipUnless(os.name == "posix", "Requires 'test' command on system")
++    @unittest.skipIf(sys.platform == "vxworks", "'test' command is not supported on VxWorks")
++    def test_test(self):
++        # findmatch() will automatically check any "test" conditions and skip
++        # the entry if the check fails.
++        caps = {"test/pass": [{"test": "test 1 -eq 1"}],
++                "test/fail": [{"test": "test 1 -eq 0"}]}
++        # test case: (findmatch args, findmatch keyword args, expected output)
++        #   positional args: caps, MIMEtype, key ("test")
++        #   keyword args: N/A
++        #   output: (command line, mailcap entry)
++        cases = [
++            # findmatch will return the mailcap entry for test/pass because it evaluates to true
++            ([caps, "test/pass", "test"], {}, ("test 1 -eq 1", {"test": "test 1 -eq 1"})),
++            # findmatch will return None because test/fail evaluates to false
++            ([caps, "test/fail", "test"], {}, (None, None))
++        ]
++        self._run_cases(cases)
++
++    def _run_cases(self, cases):
++        for c in cases:
++            self.assertEqual(mailcap.findmatch(*c[0], **c[1]), c[2])
++
++
++def test_main():
++    test.support.run_unittest(HelperFunctionTest, GetcapsTest, FindmatchTest)
+-- 
+2.35.3
+
diff --git a/pypy.spec b/pypy.spec
index cac79fb..20c9829 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -6,7 +6,7 @@
 Name:           pypy
 Version:        %{basever}.9
 %global pyversion 2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler

# PyPy is MIT
@@ -182,6 +182,16 @@ Patch2: 009-add-libxcrypt-support.patch
 # We conditionally apply this, but we use autosetup, so we use Source here
 Source189: 189-use-rpm-wheels.patch

+# 00382 #
+# Make mailcap refuse to match unsafe filenames/types/params (GH-91993)
+#
+# Upstream: https://github.com/python/cpython/issues/68966
+#
+# Tracker bug: https://bugzilla.redhat.com/show_bug.cgi?id=2075390
+#
+# Backported from python3.
+Patch382: 382-cve-2015-20107.patch
+
 # Build-time requirements:

# pypy's can be rebuilt using itself, rather than with CPython; doing so
@@ -883,6 +893,10 @@ CheckPyPy %{name}-c-stackless

%changelog
+* Tue Jun 28 2022 Charalampos Stratakis  - 7.3.9-2
+- Security fix for CVE-2015-20107
+- Fixes: rhbz#2075390
+
 * Wed Mar 30 2022 Miro Hrončok  - 7.3.9-1
 - Update to 7.3.9
 - Fixes: rhbz#2069872

commit 8a964f4f562783a8754d9ffce9363db706354e6f
Author: Miro Hrončok 
Date:   Wed Mar 30 19:35:57 2022 +0200

Add a note about renaming and changing %pypyprefix

diff --git a/pypy.spec b/pypy.spec
index f5f3a00..cac79fb 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,3 +1,7 @@
+# Note: When this is updated to 7.4,
+# the installation layout will change in a backwards-incompatible way.
+# That'll be a good time to rename this to pypy2.7 and adapt %%pypyprefix to be
+# %%{_libdir}/pypy%%{pyversion} (see e.g. pypy3.7 or pypy3.8 for inspiration).
 %global basever 7.3
 Name:           pypy
 Version:        %{basever}.9

commit 04187b89e7974887b7bf0fddf4476a30afa3e430
Author: Miro Hrončok 
Date:   Wed Mar 30 19:32:09 2022 +0200

Exclude ix86 on F37+

https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval

See also: https://bugzilla.redhat.com/2046857

diff --git a/pypy.spec b/pypy.spec
index 1c0653d..f5f3a00 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -18,6 +18,11 @@ Summary:        Python implementation with a Just-In-Time compiler
 License:        MIT and Python and UCD and BSD and (ASL 2.0 or BSD)
 URL:            http://pypy.org/

+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
+ExcludeArch:    %{ix86}
+%endif
+
 # High-level configuration of the build:

# Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package

commit 7c97daa250773111b321ca4b8ed06350f128dec7
Author: Miro Hrončok 
Date:   Wed Mar 30 19:31:38 2022 +0200

Update to 7.3.9

diff --git a/pypy.spec b/pypy.spec
index f9ed19f..1c0653d 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,6 +1,6 @@
 %global basever 7.3
 Name:           pypy
-Version:        %{basever}.8
+Version:        %{basever}.9
 %global pyversion 2.7
 Release:        1%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler
@@ -857,7 +857,7 @@ CheckPyPy %{name}-c-stackless
 %{_bindir}/%{name}
 %{_bindir}/%{name}%{pylibver}
 %{_bindir}/%{name}%{pymajorlibver}
-%{pypyprefix}/bin/%{name}
+%{pypyprefix}/bin/

%files devel
 %dir %{pypy_include_dir}
@@ -874,6 +874,10 @@ CheckPyPy %{name}-c-stackless

%changelog
+* Wed Mar 30 2022 Miro Hrončok  - 7.3.9-1
+- Update to 7.3.9
+- Fixes: rhbz#2069872
+
 * Tue Mar 01 2022 Miro Hrončok  - 7.3.8-1
 - Update to 7.3.8
 - Fixes: rhbz#2046555
diff --git a/sources b/sources
index 242e532..cb529a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy2.7-v7.3.8-src.tar.bz2) = 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2
+SHA512 (pypy2.7-v7.3.9-src.tar.bz2) = 8d7513d4efe924f2456dd65a45a82dd16171f7962c81ba90f2a168c332cdad78ceffa3ed1af379c09e61082b39d5c2a8385cd77c89b698c47cc75e9df1bb4d2a

commit 27dd00291e43c62005d7b4e3e160f17860ab664b
Author: Miro Hrončok 
Date:   Tue Mar 1 17:39:59 2022 +0100

Update to 7.3.8

diff --git a/pypy.spec b/pypy.spec
index 9b9a935..f9ed19f 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,8 +1,8 @@
 %global basever 7.3
 Name:           pypy
-Version:        %{basever}.6
+Version:        %{basever}.8
 %global pyversion 2.7
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler

# PyPy is MIT
@@ -874,6 +874,10 @@ CheckPyPy %{name}-c-stackless

%changelog
+* Tue Mar 01 2022 Miro Hrončok  - 7.3.8-1
+- Update to 7.3.8
+- Fixes: rhbz#2046555
+
 * Fri Jan 21 2022 Fedora Release Engineering  - 7.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

diff --git a/sources b/sources
index 5a265ea..242e532 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy2.7-v7.3.6-src.tar.bz2) = df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3
+SHA512 (pypy2.7-v7.3.8-src.tar.bz2) = 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2

commit cf369eebbe6bd926273a08fb5ac9a9243ad47ee7
Author: Zbigniew Jędrzejewski-Szmek 
Date:   Tue Jan 25 21:13:36 2022 +0000

Tell package notes that gold is used

diff --git a/pypy.spec b/pypy.spec
index 3281719..9b9a935 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -139,6 +139,9 @@ URL:            http://pypy.org/
 # We refer to this subdir of the source tree in a few places during the build:
 %global goal_dir pypy/goal

+%ifarch %{ix86} x86_64 %{arm}
+%global _package_note_linker gold
+%endif

# Source and patches:
 Source0: https://downloads.python.org/pypy/pypy%%7Bpyversion%7D-v%%7Bversion%7D-src.t...

commit fb21750dbf915fece4c7d8d5e63f87329ade6261
Author: Fedora Release Engineering 
Date:   Fri Jan 21 09:52:27 2022 +0000

- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering

diff --git a/pypy.spec b/pypy.spec
index 7358ac4..3281719 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -2,7 +2,7 @@
 Name:           pypy
 Version:        %{basever}.6
 %global pyversion 2.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler

# PyPy is MIT
@@ -871,6 +871,9 @@ CheckPyPy %{name}-c-stackless

%changelog
+* Fri Jan 21 2022 Fedora Release Engineering  - 7.3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sat Jan 08 2022 Miro Hrončok  - 7.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34

commit bbd6d9721d73101747d6507eef236a5caa5a78d5
Author: Miro Hrončok 
Date:   Sat Jan 8 20:32:27 2022 +0100

Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34

diff --git a/pypy.spec b/pypy.spec
index 9df84dc..7358ac4 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -2,7 +2,7 @@
 Name:           pypy
 Version:        %{basever}.6
 %global pyversion 2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler

# PyPy is MIT
@@ -871,6 +871,9 @@ CheckPyPy %{name}-c-stackless

%changelog
+* Sat Jan 08 2022 Miro Hrončok  - 7.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
+
 * Tue Oct 26 2021 Tomáš Hrnčiar  - 7.3.6-1
 - Update to 7.3.6
 - Remove windows executable binaries