The package rpms/python34.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/python34.git/commit/?id=ab52cf7b6....
Change:
+%ifarch %{valgrind_arches}
Thanks.
Full change:
============
commit 5b5f8e590fb92fccd1162f0578e0decb167a6a99
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Sun Aug 5 14:22:27 2018 +0200
Remove obsolete conditional
diff --git a/python34.spec b/python34.spec
index 8544c78..fa2559c 100644
--- a/python34.spec
+++ b/python34.spec
@@ -146,12 +146,7 @@ BuildRequires: net-tools
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: sqlite-devel
-
-%if 0%{?fedora} >= 26
BuildRequires: compat-openssl10-devel
-%else
-BuildRequires: openssl-devel
-%endif
%if 0%{?with_systemtap}
BuildRequires: systemtap-sdt-devel
commit ab52cf7b640d6f3a895d7ab7c3f6c5c198a67f12
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Sun Aug 5 14:21:58 2018 +0200
Use the %{valgrind_arches} macro instead of hardcoding unsupported arches
diff --git a/python34.spec b/python34.spec
index 28550fb..8544c78 100644
--- a/python34.spec
+++ b/python34.spec
@@ -57,7 +57,7 @@
%global with_systemtap 1
# some arches don't have valgrind so we need to disable its support on them
-%ifnarch s390
+%ifarch %{valgrind_arches}
%global with_valgrind 1
%else
%global with_valgrind 0
commit 25d559a8787090cf015f637835af680fc5ca1f55
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Sun Aug 5 14:21:43 2018 +0200
Rebased to 3.4.9
diff --git a/.gitignore b/.gitignore
index f67c885..b2013bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/Python-3.4.5.tar.xz
/Python-3.4.7.tar.xz
/Python-3.4.8.tar.xz
+/Python-3.4.9.tar.xz
diff --git a/python34.spec b/python34.spec
index 799c5da..28550fb 100644
--- a/python34.spec
+++ b/python34.spec
@@ -109,8 +109,8 @@
# ==================
Summary: Version 3.4 of the Python programming language
Name: python%{pyshortver}
-Version: %{pybasever}.8
-Release: 4%{?dist}
+Version: %{pybasever}.9
+Release: 1%{?dist}
License: Python
Group: Development/Languages
@@ -1189,6 +1189,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Sun Aug 05 2018 Miro Hronok <mhroncok(a)redhat.com> - 3.4.9-1
+- Rebased to 3.4.9
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.8-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 27f889d..f6f2f09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Python-3.4.8.tar.xz) =
478552c72efe606cb1993024b81839c51d01f1c949564c007ab2b76016f110e1f7bd418e5de3f4f93b466ce7dbe6583d3c150830d1f28f75e0809625b568a7ec
+SHA512 (Python-3.4.9.tar.xz) =
4ca37abfb99d04ed360002dbba18cc9fbecc6c02b14e3796c353800a2982ad2d18dd73150c29f37f57a02f60a7b3b34364b95f454e3cda68bd174fce2341bd3f
commit 52a4d452489aef42034883d7c0b691925aa8d883
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 02:53:56 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python34.spec b/python34.spec
index 1cd3ba1..799c5da 100644
--- a/python34.spec
+++ b/python34.spec
@@ -110,7 +110,7 @@
Summary: Version 3.4 of the Python programming language
Name: python%{pyshortver}
Version: %{pybasever}.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: Python
Group: Development/Languages
@@ -1189,6 +1189,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.8-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Apr 24 2018 Miro Hronok <mhroncok(a)redhat.com> - 3.4.8-3
- Fix multiprocessing regression on newer glibcs
- Enable test_multiprocessing_fork(server) and _spawn again
commit b560c17d7dc0a5fa8e561f415218c7c6d5ab8368
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jul 10 01:55:09 2018 -0500
Remove needless use of %defattr
diff --git a/python34.spec b/python34.spec
index 726d70c..1cd3ba1 100644
--- a/python34.spec
+++ b/python34.spec
@@ -1124,7 +1124,6 @@ CheckPython optimized
%files
-%defattr(-, root, root)
%doc LICENSE README
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
commit 1fdfc7975ecc6e26c394bddac79e6cb3964c13ef
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Jun 29 12:24:41 2018 +0200
Remove ldconfig scriptlets
diff --git a/python34.spec b/python34.spec
index 77c32b4..726d70c 100644
--- a/python34.spec
+++ b/python34.spec
@@ -1123,16 +1123,6 @@ CheckPython optimized
%endif # run_selftest_suite
-# ======================================================
-# Scriptlets
-# ======================================================
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-
%files
%defattr(-, root, root)
%doc LICENSE README
commit baa9bad5eb1894b82e303890f8466e174f835920
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Apr 27 22:20:32 2018 +0200
Fix shebangs of the GDB hooks
Also, use -p (preserve timestamp) with pathfix.py.
Resolves
https://bugzilla.redhat.com/show_bug.cgi?id=1560295
diff --git a/python34.spec b/python34.spec
index 695fd6d..77c32b4 100644
--- a/python34.spec
+++ b/python34.spec
@@ -921,8 +921,9 @@ sed -i -e "s/'pyconfig.h'/'%{_pyconfig_h}'/"
\
# Switch all shebangs to refer to the specific Python version.
LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
Tools/scripts/pathfix.py \
- -i "%{_bindir}/python%{pybasever}" \
- %{buildroot}
+ -i "%{_bindir}/python%{pybasever}" -p \
+ %{buildroot} \
+ %{?with_gdb_hooks:%{buildroot}$DirHoldingGdbPy/*.py}
# Remove shebang lines from .py files that aren't executable, and
# remove executability from .py files that don't have a shebang line:
commit 0d6025608fe2a74e49a255ac09a2050b90a06b94
Author: Petr Viktorin <pviktori(a)redhat.com>
Date: Tue Aug 22 14:24:22 2017 +0200
Use configuration macro instead of workaround to disable byte-compilation
diff --git a/python34.spec b/python34.spec
index 1c7b1aa..695fd6d 100644
--- a/python34.spec
+++ b/python34.spec
@@ -71,26 +71,10 @@
# Turn this to 0 to turn off the "check" phase:
%global run_selftest_suite 1
-# We want to byte-compile the .py files within the packages using the new
-# python3 binary.
-#
-# Unfortunately, rpmbuild's infrastructure requires us to jump through some
-# hoops to avoid byte-compiling with the system python 2 version:
-# /usr/lib/rpm/redhat/macros sets up build policy that (amongst other things)
-# defines __os_install_post. In particular, "brp-python-bytecompile" is
-# invoked without an argument thus using the wrong version of python
-# (/usr/bin/python, rather than the freshly built python), thus leading to
-# numerous syntax errors, and incorrect magic numbers in the .pyc files. We
-# thus override __os_install_post to avoid invoking this script:
-%global __os_install_post /usr/lib/rpm/brp-compress \
- %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} \
- /usr/lib/rpm/brp-strip-static-archive %{__strip} \
- /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
- /usr/lib/rpm/brp-python-hardlink
-# to remove the invocation of brp-python-bytecompile, whilst keeping the
-# invocation of brp-python-hardlink (since this should still work for python3
-# pyc/pyo files)
-
+# Disable automatic bytecompilation. The python3 binary is not yet be
+# available in /usr/bin when Python is built. Also, the bytecompilation fails
+# on files that test invalid syntax.
+%undefine py_auto_byte_compile
# We need to get a newer configure generated out of configure.in for the following
# patches:
commit 246bfef0fbb49e890de75226ccd53b7a0a4dda92
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Apr 24 09:44:04 2018 +0200
Fix multiprocessing regression on newer glibcs
Enable test_multiprocessing_fork(server) and _spawn again
Resolves: rhbz#1569933
diff --git a/00302-fix-multiprocessing-regression-on-newer-glibcs.patch
b/00302-fix-multiprocessing-regression-on-newer-glibcs.patch
new file mode 100644
index 0000000..965792a
--- /dev/null
+++ b/00302-fix-multiprocessing-regression-on-newer-glibcs.patch
@@ -0,0 +1,55 @@
+From a3febe3cba14b89885f42ca2f0224096a52885f6 Mon Sep 17 00:00:00 2001
+From: Antoine Pitrou <antoine(a)python.org>
+Date: Mon, 23 Apr 2018 13:19:42 +0200
+Subject: [PATCH] bpo-33329: Fix multiprocessing regression on newer glibcs
+
+Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some
+reserved signal numbers between 1 and NSIG. The `range(1, NSIG)` idiom
+is commonly used to select all signals for blocking with `pthread_sigmask`.
+So we ignore the sigaddset() return value until we expose sigfillset()
+to provide a better idiom.
+---
+ .../next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst | 1 +
+ Modules/signalmodule.c | 14 ++++++++------
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
+
+diff --git a/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
+new file mode 100644
+index 000000000000..d1a4e56d04b9
+--- /dev/null
++++ b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
+@@ -0,0 +1 @@
++Fix multiprocessing regression on newer glibcs
+diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
+index 791616014384..35fd87e2d1e7 100644
+--- a/Modules/signalmodule.c
++++ b/Modules/signalmodule.c
+@@ -819,7 +819,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
+ int result = -1;
+ PyObject *iterator, *item;
+ long signum;
+- int err;
+
+ sigemptyset(mask);
+
+@@ -841,11 +840,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
+ Py_DECREF(item);
+ if (signum == -1 && PyErr_Occurred())
+ goto error;
+- if (0 < signum && signum < NSIG)
+- err = sigaddset(mask, (int)signum);
+- else
+- err = 1;
+- if (err) {
++ if (0 < signum && signum < NSIG) {
++ /* bpo-33329: ignore sigaddset() return value as it can fail
++ * for some reserved signals, but we want the `range(1, NSIG)`
++ * idiom to allow selecting all valid signals.
++ */
++ (void) sigaddset(mask, (int)signum);
++ }
++ else {
+ PyErr_Format(PyExc_ValueError,
+ "signal number %ld out of range", signum);
+ goto error;
diff --git a/python34.spec b/python34.spec
index 0aee6fc..1c7b1aa 100644
--- a/python34.spec
+++ b/python34.spec
@@ -126,7 +126,7 @@
Summary: Version 3.4 of the Python programming language
Name: python%{pyshortver}
Version: %{pybasever}.8
-Release: 2%{?dist}
+Release: 3%{?dist}
License: Python
Group: Development/Languages
@@ -507,6 +507,12 @@ Patch273: 00273-skip-float-test.patch
# Fixed upstream:
https://bugs.python.org/issue32635
Patch290: 00290-cryptmodule-Include-crypt.h-for-declaration-of-crypt.patch
+# 00302 #
+# Fix multiprocessing regression on newer glibcs
+# See:
https://bugzilla.redhat.com/show_bug.cgi?id=1569933
+# and:
https://bugs.python.org/issue33329
+Patch302: 00302-fix-multiprocessing-regression-on-newer-glibcs.patch
+
# (New patches go here ^^^)
#
# When adding new patches to "python" and "python3" in Fedora 17
onwards,
@@ -660,6 +666,7 @@ done
%patch250 -p1
%patch273 -p1
%patch290 -p1
+%patch302 -p1
# Currently (2010-01-15),
http://docs.python.org/library is for 2.6, and there
# are many differences between 2.6 and the Python 3 library.
@@ -1115,9 +1122,6 @@ CheckPython() {
%ifarch %{power64} s390 s390x armv7hl aarch64
-x test_gdb \
%endif
- -x test_multiprocessing_fork \
- -x test_multiprocessing_forkserver \
- -x test_multiprocessing_spawn \
echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
@@ -1211,6 +1215,11 @@ CheckPython optimized
# ======================================================
%changelog
+* Tue Apr 24 2018 Miro Hronok <mhroncok(a)redhat.com> - 3.4.8-3
+- Fix multiprocessing regression on newer glibcs
+- Enable test_multiprocessing_fork(server) and _spawn again
+Resolves: rhbz#1569933
+
* Fri Apr 20 2018 Miro Hronok <mhroncok(a)redhat.com> - 3.4.8-2
- Do not ship the Tools directory
- Skip test_multiprocessing_fork(server) and _spawn for now
commit daebc6225d86017835fef343aa610038ec4be94a
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Apr 20 12:42:18 2018 +0200
Skip test_multiprocessing_fork(server) and _spawn for now
diff --git a/python34.spec b/python34.spec
index 3dc05e1..0aee6fc 100644
--- a/python34.spec
+++ b/python34.spec
@@ -1113,8 +1113,11 @@ CheckPython() {
-x test_buffer \
%endif
%ifarch %{power64} s390 s390x armv7hl aarch64
- -x test_gdb
+ -x test_gdb \
%endif
+ -x test_multiprocessing_fork \
+ -x test_multiprocessing_forkserver \
+ -x test_multiprocessing_spawn \
echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
@@ -1208,8 +1211,9 @@ CheckPython optimized
# ======================================================
%changelog
-* Sat Mar 31 2018 Miro Hronok <mhroncok(a)redhat.com> - 3.4.8-2
+* Fri Apr 20 2018 Miro Hronok <mhroncok(a)redhat.com> - 3.4.8-2
- Do not ship the Tools directory
+- Skip test_multiprocessing_fork(server) and _spawn for now
* Tue Feb 13 2018 Petr Viktorin <pviktori(a)redhat.com> - 3.4.8-1
- Update to 3.4.8 bugfix release