From 28e3f2514a3ec7333ef465961b91b27bc8e69fd7 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Nov 06 2017 16:16:47 +0000 Subject: Update to 3.3.7 Dropped patches 204 and 212 as they have been upstreamed. Rebased patch 55. Added patch 273 to skip test_float due to rhbz#1484497. --- diff --git a/00055-systemtap.patch b/00055-systemtap.patch index 90b876b..db899a3 100644 --- a/00055-systemtap.patch +++ b/00055-systemtap.patch @@ -674,21 +674,6 @@ diff -up Python-3.3.0rc2/Makefile.pre.in.systemtap Python-3.3.0rc2/Makefile.pre. profile-removal: find . -name '*.gc??' -exec rm -f {} ';' -diff -up Python-3.3.0rc2/Misc/NEWS.systemtap Python-3.3.0rc2/Misc/NEWS ---- Python-3.3.0rc2/Misc/NEWS.systemtap 2012-09-09 05:11:05.000000000 -0400 -+++ Python-3.3.0rc2/Misc/NEWS 2012-09-10 09:17:21.120511781 -0400 -@@ -619,6 +619,11 @@ Core and Builtins - - - Issue #15038: Optimize python Locks on Windows. - -+- Issue #14776: Added a new --with-systemtap configure-time option, which adds -+ static markers for SystemTap so that SystemTap scripts can observe bytecode -+ frames being entered and exited and so generate reports on what Python code -+ is being exectuted. -+ - Library - ------- - diff -up Python-3.3.0rc2/pyconfig.h.in.systemtap Python-3.3.0rc2/pyconfig.h.in --- Python-3.3.0rc2/pyconfig.h.in.systemtap 2012-09-09 05:11:14.000000000 -0400 +++ Python-3.3.0rc2/pyconfig.h.in 2012-09-10 09:17:21.120511781 -0400 diff --git a/00204-increase-dh-keys-size.patch b/00204-increase-dh-keys-size.patch deleted file mode 100644 index 99943a5..0000000 --- a/00204-increase-dh-keys-size.patch +++ /dev/null @@ -1,57 +0,0 @@ -From dc9f73b64b10c1d55d5443df8bbad10e911e240b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 25 Aug 2016 23:10:33 +0200 -Subject: [PATCH] Increase key size - ---- - Lib/test/dh1024.pem | 7 +++++++ - Lib/test/dh512.pem | 9 --------- - Lib/test/test_ssl.py | 2 +- - 3 files changed, 8 insertions(+), 10 deletions(-) - create mode 100644 Lib/test/dh1024.pem - delete mode 100644 Lib/test/dh512.pem - -diff --git a/Lib/test/dh1024.pem b/Lib/test/dh1024.pem -new file mode 100644 -index 0000000..a391176 ---- /dev/null -+++ b/Lib/test/dh1024.pem -@@ -0,0 +1,7 @@ -+-----BEGIN DH PARAMETERS----- -+MIGHAoGBAIbzw1s9CT8SV5yv6L7esdAdZYZjPi3qWFs61CYTFFQnf2s/d09NYaJt -+rrvJhIzWavqnue71qXCf83/J3nz3FEwUU/L0mGyheVbsSHiI64wUo3u50wK5Igo0 -+RNs/LD0irs7m0icZ//hijafTU+JOBiuA8zMI+oZfU7BGuc9XrUprAgEC -+-----END DH PARAMETERS----- -+ -+Generated with: openssl dhparam -out dh1024.pem 1024 -diff --git a/Lib/test/dh512.pem b/Lib/test/dh512.pem -deleted file mode 100644 -index 200d16c..0000000 ---- a/Lib/test/dh512.pem -+++ /dev/null -@@ -1,9 +0,0 @@ -------BEGIN DH PARAMETERS----- --MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak --XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC -------END DH PARAMETERS----- -- --These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols" --(http://www.skip-vpn.org/spec/numbers.html). --See there for how they were generated. --Note that g is not a generator, but this is not a problem since p is a safe prime. -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py -index 8fd4d1d..807a985 100644 ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -57,7 +57,7 @@ BADKEY = data_file("badkey.pem") - NOKIACERT = data_file("nokia.pem") - NULLBYTECERT = data_file("nullbytecert.pem") - --DHFILE = data_file("dh512.pem") -+DHFILE = data_file("dh1024.pem") - BYTES_DHFILE = os.fsencode(DHFILE) - - def handle_error(prefix): --- -2.9.0 - diff --git a/00212-fix-test-pyexpat-failure.patch b/00212-fix-test-pyexpat-failure.patch deleted file mode 100644 index 7b40280..0000000 --- a/00212-fix-test-pyexpat-failure.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r 682a8e36dd18 Lib/test/test_pyexpat.py ---- a/Lib/test/test_pyexpat.py Tue Jul 05 17:08:52 2016 +0300 -+++ b/Lib/test/test_pyexpat.py Thu Jul 07 17:04:35 2016 +0800 -@@ -656,11 +656,9 @@ - # \xc2\x85 is UTF-8 encoded U+0085 (NEXT LINE) - xml = b"\r\n" - parser = expat.ParserCreate() -- try: -+ err_pattern = r'XML declaration not well-formed: line 1, column \d+' -+ with self.assertRaisesRegex(expat.ExpatError, err_pattern): - parser.Parse(xml, True) -- self.fail() -- except expat.ExpatError as e: -- self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14') - - class ErrorMessageTest(unittest.TestCase): - def test_codes(self): diff --git a/00273-skip-float-test.patch b/00273-skip-float-test.patch new file mode 100644 index 0000000..4658731 --- /dev/null +++ b/00273-skip-float-test.patch @@ -0,0 +1,13 @@ +diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py +index 24fe128..d7dd939 100644 +--- a/Lib/test/test_float.py ++++ b/Lib/test/test_float.py +@@ -107,7 +107,7 @@ class GeneralFloatCases(unittest.TestCase): + else: + self.fail("Expected int(%r) to raise a ValueError", s) + +- ++ @unittest.skip('Fails in Koji: https://bugzilla.redhat.com/show_bug.cgi?id=1484497') + @support.run_with_locale('LC_NUMERIC', 'fr_FR', 'de_DE') + def test_float_with_comma(self): + # set locale to something that doesn't use '.' for the decimal point diff --git a/python33.spec b/python33.spec index 3bdbbb2..f019261 100644 --- a/python33.spec +++ b/python33.spec @@ -125,8 +125,8 @@ # ================== Summary: Version %{pybasever} of the Python programming language Name: python%{pyshortver} -Version: %{pybasever}.6 -Release: 7%{?dist} +Version: %{pybasever}.7 +Release: 1%{?dist} License: Python Group: Development/Languages @@ -691,17 +691,6 @@ Patch194: 00194-json-add-boundary-check.patch # Upstream as Python 3.3.6 # Patch199: 00199-fix-CVE-2014-2667.patch -# 00204 -# -# openssl requires DH keys to be > 768bits -Patch204: 00204-increase-dh-keys-size.patch - -# 00212 # -# Fix test breakage with version 2.2.0 of Expat -# rhbz#1353918: https://bugzilla.redhat.com/show_bug.cgi?id=1353918 -# NOT YET FIXED UPSTREAM: http://bugs.python.org/issue27369 -Patch212: 00212-fix-test-pyexpat-failure.patch - # 00244 # # Skip some SSL related tests, SSL is just broken in 3.3 # python33 will not try to fix that @@ -712,6 +701,11 @@ Patch244: 00244-skip-ssl-tests.patch # python33 will not try to fix that Patch245: 00245-skip-stack-overflow-test.patch +# 00273 # +# Skip test_float_with_comma, which fails in Koji with UnicodeDecodeError +# See https://bugzilla.redhat.com/show_bug.cgi?id=1484497 +Patch273: 00273-skip-float-test.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora 17 onwards, @@ -893,8 +887,6 @@ done # 00197: upstream as of Python 3.3.6 # 00198: upstream as of Python 3.3.6 # 00199: upstream as of Python 3.3.6 -%patch204 -p1 -%patch212 -p1 %patch244 -p1 %ifnarch %{ix86} @@ -902,6 +894,8 @@ done %patch245 -p1 %endif +%patch273 -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. # @@ -1442,6 +1436,9 @@ CheckPython optimized # ====================================================== %changelog +* Mon Nov 06 2017 Charalampos Stratakis - 3.3.7-1 +- Update to 3.3.7 + * Mon Aug 14 2017 David "Sanqui" Labský - 3.3.6-7 - Drop unused db4-devel dependency diff --git a/sources b/sources index 2cf45ae..5328976 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67b8ddd9ee600d636423ada321b8da86 Python-3.3.6.tar.xz +SHA512 (Python-3.3.7.tar.xz) = 018cc7dbdceeec5bd074fdad90faa544e86f9ab7e43f91a809ad78511b64cb7741b0f99808d6b27fc4c87d2a770b4da1f6383ce831c44c9e574407922dff8437