Convert patches to use github.com/fedora-python/importpatches
This commit is contained in:
Charalampos Stratakis
parent
a4d152e894
commit
5f55304a07
16 changed files with 69 additions and 91 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 58f42c48820aad45515d216f85c787a47a267f43 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Wed, 13 Jan 2010 21:25:18 +0000
|
||||
Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
|
||||
|
|
@ -28,6 +28,3 @@ index 3f321c28dc..e3a3de32f8 100644
|
|||
def preprocess(self, source, output_file=None, macros=None,
|
||||
include_dirs=None, extra_preargs=None, extra_postargs=None):
|
||||
fixed_args = self._fix_compile_args(None, macros, include_dirs)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From ebc5fe22f601bf88d506e13aa795f90e83075673 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Wed, 13 Jan 2010 21:25:18 +0000
|
||||
Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
|
||||
|
|
@ -250,6 +250,3 @@ index e2c1898253..64d948d79c 100644
|
|||
] )
|
||||
|
||||
if (ssl_incs is not None and
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 6b5abb117f6e665a34e901ba7ee50a1a8decdb34 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Mon, 18 Jan 2010 17:59:07 +0000
|
||||
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
|
||||
|
|
@ -73,6 +73,3 @@ index 9cd482fc38..b074b26039 100644
|
|||
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
||||
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
||||
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 99f5b37ff4e1a98d3672f15afb741bfe12c9361e Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 16:54:05 +0200
|
||||
Subject: [PATCH] 00132: Add rpmbuild hooks to unittest
|
||||
|
|
@ -72,6 +72,3 @@ index 402fa47f28..8329d47882 100644
|
|||
class _AssertRaisesBaseContext(_BaseTestCaseContext):
|
||||
|
||||
def __init__(self, expected, test_case, expected_regex=None):
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 72c7d5be3893e3b77701c77c84247ea0062dd089 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 16:02:24 +0200
|
||||
Subject: [PATCH] 00155: avoid allocating thunks in ctypes unless absolutely
|
||||
|
|
@ -28,6 +28,3 @@ index f8709683fb..2ffe440150 100644
|
|||
|
||||
def create_unicode_buffer(init, size=None):
|
||||
"""create_unicode_buffer(aString) -> character array
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b1a28dd9d73bbf489f49be6c6e2eec530ba489d1 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 16:57:09 +0200
|
||||
Subject: [PATCH] 00160: Disable test_fs_holes in RPM build
|
||||
|
|
@ -23,6 +23,3 @@ index 2dae473327..c893ecbdc6 100644
|
|||
@unittest.skipUnless(hasattr(os, 'SEEK_HOLE'),
|
||||
"test needs an OS that reports file holes")
|
||||
def test_fs_holes(self):
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f211c52df798ffad41477dc30b3de2b6442873b6 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 16:58:24 +0200
|
||||
Subject: [PATCH] 00163: Disable parts of test_socket in RPM build
|
||||
|
|
@ -21,6 +21,3 @@ index 95c3938ac2..abb2356f47 100644
|
|||
def testRecvmsgEOF(self):
|
||||
# Receive end-of-stream indicator (b"", peer socket closed).
|
||||
msg, ancdata, flags, addr = self.doRecvmsg(self.serv_sock, 1024)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f4d25a8fcf43f89fb58e6d288e50d993dd84afb6 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Malcolm <dmalcolm@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 16:05:07 +0200
|
||||
Subject: [PATCH] 00170: In debug builds, try to print repr() when a C-level
|
||||
|
|
@ -333,6 +333,3 @@ index e1a0569ab9..9a28521dc4 100644
|
|||
#ifndef Py_TRACE_REFS
|
||||
/* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
|
||||
Define this here, so we can undefine the macro. */
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e4690ff98ff84195368fbc10ac65b9d03e98c35b Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||
Date: Wed, 15 Aug 2018 15:36:29 +0200
|
||||
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
|
||||
|
|
@ -63,6 +63,3 @@ index 09c572db71..6dc34e6240 100644
|
|||
|
||||
additional_paths.append(os.path.join(tmpdir, wheel_name))
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b001d1d5f19eb2be1c89fdbb46b592200d6042fb Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Cyprian <m.cyprian@gmail.com>
|
||||
Date: Mon, 26 Jun 2017 16:32:56 +0200
|
||||
Subject: [PATCH] 00251: Change user install location
|
||||
|
|
@ -59,6 +59,3 @@ index 58115f1c08..dca42616d8 100644
|
|||
for sitedir in getsitepackages(prefixes):
|
||||
if os.path.isdir(sitedir):
|
||||
addsitedir(sitedir, known_paths)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 0944f5b62e3227e2330312011a5f7ddfa7ad86f9 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Coghlan <ncoghlan@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 17:02:52 +0200
|
||||
Subject: [PATCH] 00262: PEP538 - Coerce legacy C locale
|
||||
|
|
@ -930,6 +930,3 @@ index 7bf4c6fb4c..f764536d65 100644
|
|||
# Check for Valgrind support
|
||||
AC_MSG_CHECKING([for --with-valgrind])
|
||||
AC_ARG_WITH([valgrind],
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 39519cb038959c4c3d021e73b4b74278d022c84f Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Viktorin <pviktori@redhat.com>
|
||||
Date: Mon, 28 Aug 2017 17:16:46 +0200
|
||||
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
|
||||
|
|
@ -81,6 +81,3 @@ index f764536d65..f2c455c8d9 100644
|
|||
# elif defined(__s390x__)
|
||||
s390x-linux-gnu
|
||||
# elif defined(__s390__)
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 350592aecc1c62c4f4ef9f8ebc3394095c974c00 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Charalampos Stratakis <cstratak@redhat.com>
|
||||
Date: Fri, 19 Jun 2020 17:06:08 +0200
|
||||
Subject: [PATCH] 00292: Restore PyExc_RecursionErrorInst symbol
|
||||
|
|
@ -92,6 +92,3 @@ index 4fc4a6814e..ff70718fc3 100644
|
|||
PyExc_ReferenceError=python36.PyExc_ReferenceError DATA
|
||||
PyExc_ResourceWarning=python36.PyExc_ResourceWarning DATA
|
||||
PyExc_RuntimeError=python36.PyExc_RuntimeError DATA
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 8c79d1eeb61fdb3e9bc58be70a8a9050fe83096f Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Heimes <christian@python.org>
|
||||
Date: Fri, 19 Jun 2020 17:13:03 +0200
|
||||
Subject: [PATCH] 00294: Define TLS cipher suite on build time
|
||||
|
|
@ -246,6 +246,3 @@ index f2c455c8d9..619aa215e9 100644
|
|||
# generate output files
|
||||
AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
|
||||
AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 7da16b28ff5817714a565f7f5c51cccee1e25818 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Stinner <vstinner@python.org>
|
||||
Date: Fri, 19 Jun 2020 17:16:05 +0200
|
||||
Subject: [PATCH] 00343: Fix test_faulthandler on GCC 10
|
||||
|
|
@ -57,6 +57,3 @@ index 890c64577c..fac662afc3 100644
|
|||
stack.ss_sp = PyMem_Malloc(stack.ss_size);
|
||||
if (stack.ss_sp != NULL) {
|
||||
err = sigaltstack(&stack, &old_stack);
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -249,26 +249,31 @@ Source10: idle3.desktop
|
|||
# AppData file for idle3
|
||||
Source11: idle3.appdata.xml
|
||||
|
||||
# 00001 #
|
||||
# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
|
||||
# Was Patch0 in ivazquez' python3000 specfile:
|
||||
Patch1: 00001-rpath.patch
|
||||
# (Patches taken from github.com/fedora-python/cpython)
|
||||
|
||||
# 00102 #
|
||||
# Change the various install paths to use /usr/lib64/ instead or /usr/lib
|
||||
# Only used when "%%{_lib}" == "lib64"
|
||||
# Not yet sent upstream.
|
||||
# 00001 # d06a8853cf4bae9e115f45e1d531d2dc152c5cc8
|
||||
# Fixup distutils/unixccompiler.py to remove standard library path from rpath
|
||||
# Was Patch0 in ivazquez' python3000 specfile
|
||||
Patch1: 00001-rpath.patch
|
||||
|
||||
# 00102 # 4a773a6f1c51615333cbae27982904a312777223
|
||||
# Change the various install paths to use /usr/lib64/ instead or /usr/lib/
|
||||
#
|
||||
# Only used when "%%{_lib}" == "lib64".
|
||||
Patch102: 00102-lib64.patch
|
||||
|
||||
# 00111 #
|
||||
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
|
||||
# a libpythonMAJOR.MINOR.a
|
||||
# 00111 # f07cfb42e1868a3bba0890edf4a72beaeeae370c
|
||||
# Don't try to build a libpythonMAJOR.MINOR.a
|
||||
#
|
||||
# Downstream only: not appropriate for upstream.
|
||||
#
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=556092
|
||||
# Downstream only: not appropriate for upstream
|
||||
Patch111: 00111-no-static-lib.patch
|
||||
|
||||
# 00132 #
|
||||
# Add non-standard hooks to unittest for use in the "check" phase below, when
|
||||
# 00132 # 75c270b8641ddff06c0edf7be7cc444e6debb6d7
|
||||
# Add rpmbuild hooks to unittest
|
||||
#
|
||||
# Add non-standard hooks to unittest for use in the "check" phase, when
|
||||
# running selftests within the build:
|
||||
# @unittest._skipInRpmBuild(reason)
|
||||
# for tests that hang or fail intermittently within the build environment, and:
|
||||
|
|
@ -281,28 +286,34 @@ Patch111: 00111-no-static-lib.patch
|
|||
# these unittest hooks in their own "check" phases)
|
||||
Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch
|
||||
|
||||
# 00155 #
|
||||
# 00155 # 0ef7ae83073c1bbe610d4678ed56ae775fd6e174
|
||||
# avoid allocating thunks in ctypes unless absolutely necessary
|
||||
#
|
||||
# Avoid allocating thunks in ctypes unless absolutely necessary, to avoid
|
||||
# generating SELinux denials on "import ctypes" and "import uuid" when
|
||||
# embedding Python within httpd
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=814391
|
||||
Patch155: 00155-avoid-ctypes-thunks.patch
|
||||
|
||||
# 00160 #
|
||||
# 00160 # f69288aba24c43c506c3e90e2aa658e436e76e72
|
||||
# Disable test_fs_holes in RPM build
|
||||
#
|
||||
# Python 3.3 added os.SEEK_DATA and os.SEEK_HOLE, which may be present in the
|
||||
# header files in the build chroot, but may not be supported in the running
|
||||
# kernel, hence we disable this test in an rpm build.
|
||||
# Adding these was upstream issue http://bugs.python.org/issue10142
|
||||
# Not yet sent upstream
|
||||
Patch160: 00160-disable-test_fs_holes-in-rpm-build.patch
|
||||
|
||||
# 00163 #
|
||||
# 00163 # 88e26259f7da12e17adb936815aa421d84c69f09
|
||||
# Disable parts of test_socket in RPM build
|
||||
#
|
||||
# Some tests within test_socket fail intermittently when run inside Koji;
|
||||
# disable them using unittest._skipInRpmBuild
|
||||
# Not yet sent upstream
|
||||
Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.patch
|
||||
|
||||
# 00170 #
|
||||
# 00170 # 5a71e038b7511727657466d7796cf9c11c67334a
|
||||
# In debug builds, try to print repr() when a C-level assert fails
|
||||
#
|
||||
# In debug builds, try to print repr() when a C-level assert fails in the
|
||||
# garbage collector (typically indicating a reference-counting error
|
||||
# somewhere else e.g in an extension module)
|
||||
|
|
@ -312,9 +323,10 @@ Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.patch
|
|||
# See https://bugzilla.redhat.com/show_bug.cgi?id=614680
|
||||
Patch170: 00170-gc-assertions.patch
|
||||
|
||||
# 00189 #
|
||||
# Instead of bundled wheels, use our RPM packaged wheels from
|
||||
# /usr/share/python-wheels
|
||||
# 00189 # dd3bacdeb7a9c0c99ab78229d3f1aa4c9761efb4
|
||||
# Instead of bundled wheels, use our RPM packaged wheels
|
||||
#
|
||||
# We keep them in /usr/share/python-wheels
|
||||
Patch189: 00189-use-rpm-wheels.patch
|
||||
# The following versions of setuptools/pip are bundled when this patch is not applied.
|
||||
# The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
|
||||
|
|
@ -323,31 +335,40 @@ Patch189: 00189-use-rpm-wheels.patch
|
|||
%global pip_version 18.1
|
||||
%global setuptools_version 40.6.2
|
||||
|
||||
# 00251
|
||||
# 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356
|
||||
# Change user install location
|
||||
#
|
||||
# Set values of prefix and exec_prefix in distutils install command
|
||||
# to /usr/local if executable is /usr/bin/python* and RPM build
|
||||
# is not detected to make pip and distutils install into separate location
|
||||
# is not detected to make pip and distutils install into separate location.
|
||||
#
|
||||
# Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
|
||||
Patch251: 00251-change-user-install-location.patch
|
||||
|
||||
# 00262 #
|
||||
# 00262 # eb17e4d0defe4a58be25df5128fda6eab53acbbb
|
||||
# PEP538 - Coerce legacy C locale
|
||||
#
|
||||
# Backport of PEP 538: Coercing the legacy C locale to a UTF-8 based locale
|
||||
# https://www.python.org/dev/peps/pep-0538/
|
||||
# Fedora Change: https://fedoraproject.org/wiki/Changes/python3_c.utf-8_locale
|
||||
# Original proposal: https://bugzilla.redhat.com/show_bug.cgi?id=1404918
|
||||
Patch262: 00262-pep538_coerce_legacy_c_locale.patch
|
||||
|
||||
# 00274 #
|
||||
# Upstream uses Debian-style architecture naming. Change to match Fedora.
|
||||
# 00274 # 4f787db88208be509a31af7505b6118b267e2583
|
||||
# Upstream uses Debian-style architecture naming, change to match Fedora
|
||||
Patch274: 00274-fix-arch-names.patch
|
||||
|
||||
# 00292 #
|
||||
# 00292 # 7bee9c57be78ac9bb512ddc08b1f73271c494e4d
|
||||
# Restore PyExc_RecursionErrorInst symbol
|
||||
#
|
||||
# Restore the public PyExc_RecursionErrorInst symbol that was removed
|
||||
# from the 3.6.4 release upstream.
|
||||
# Reported upstream: https://bugs.python.org/issue30697
|
||||
Patch292: 00292-restore-PyExc_RecursionErrorInst-symbol.patch
|
||||
|
||||
# 00294 #
|
||||
# 00294 # dddeb1c65cb86057d5c44be91e7965e5681c87e0
|
||||
# Define TLS cipher suite on build time
|
||||
#
|
||||
# Define TLS cipher suite on build time depending
|
||||
# on the OpenSSL default cipher suite selection.
|
||||
# Fixed upstream on CPython's 3.7 branch:
|
||||
|
|
@ -355,7 +376,9 @@ Patch292: 00292-restore-PyExc_RecursionErrorInst-symbol.patch
|
|||
# See also: https://bugzilla.redhat.com/show_bug.cgi?id=1489816
|
||||
Patch294: 00294-define-TLS-cipher-suite-on-build-time.patch
|
||||
|
||||
# 00343 #
|
||||
# 00343 # 2f4ec09a1daea8357f6a4a73c9f68d3fed3b1b96
|
||||
# Fix test_faulthandler on GCC 10
|
||||
#
|
||||
# bpo-38965: Fix faulthandler._stack_overflow() on GCC 10
|
||||
# Fixed upstream and backported from the 3.7 branch:
|
||||
# https://bugs.python.org/issue38965
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue