- From 616ba760b78cb3c002d1f7e2a0dfc2902ca9dbb4 Mon Sep 17 00:00:00 2001

- From 16ee9d86a77c8bbca3d41c9926130d37686d3bf3 Mon Sep 17 00:00:00 2001

- index 502317aa0c..4ad3df1122 100644

- From 2559cbe8f0431ba20de8a1c9921013e5e3820967 Mon Sep 17 00:00:00 2001

- index 4ad3df1122..72d202d71b 100644

- From 710cd909297d8e0291d37a4753b8e5a7965dc59f Mon Sep 17 00:00:00 2001

- From 4201bb6bf1f6579d7aa14c05876a412e158a2bb5 Mon Sep 17 00:00:00 2001

- From 6fa351057216fe2ce43ea6f509f40a63050a0684 Mon Sep 17 00:00:00 2001

- From 95f28a4e0417c5749ac228b1d443ec49ccc72e5b Mon Sep 17 00:00:00 2001

- From 812479ed6c2c7854f5fafb2366d005845bfff67a Mon Sep 17 00:00:00 2001

- From: "Miss Islington (bot)"

-  <31488909+miss-islington@users.noreply.github.com>

- Date: Sun, 12 Jan 2020 03:41:07 -0800

- Subject: [PATCH] 00339: bpo-16575: Disabled checks for union types being

-  passed by value

- 

- Although the underlying libffi issue remains open, adding these

- checks have caused problems in third-party projects which are in

- widespread use. See the issue for examples.

- 

- The corresponding tests have also been skipped.

- 

- (cherry picked from commit c12440c371025bea9c3bfb94945f006c486c2c01)

- ---

-  Lib/ctypes/test/test_structures.py |  3 ++-

-  Modules/_ctypes/_ctypes.c          | 18 ++++++++++++++++++

-  2 files changed, 20 insertions(+), 1 deletion(-)

- 

- diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py

- index 19c4430bea..cdbaa7fbd6 100644

- --- a/Lib/ctypes/test/test_structures.py

- +++ b/Lib/ctypes/test/test_structures.py

- @@ -571,6 +571,7 @@ class StructureTestCase(unittest.TestCase):

-              self.assertEqual(f2, [0x4567, 0x0123, 0xcdef, 0x89ab,

-                                    0x3210, 0x7654, 0xba98, 0xfedc])

-  

- +    @unittest.skipIf(True, 'Test disabled for now - see bpo-16575/bpo-16576')

-      def test_union_by_value(self):

-          # See bpo-16575

-  

- @@ -651,7 +652,7 @@ class StructureTestCase(unittest.TestCase):

-          self.assertEqual(test5.nested.an_int, 0)

-          self.assertEqual(test5.another_int, 0)

-  

- -    #@unittest.skipIf('s390' in MACHINE, 'Test causes segfault on S390')

- +    @unittest.skipIf(True, 'Test disabled for now - see bpo-16575/bpo-16576')

-      def test_bitfield_by_value(self):

-          # See bpo-16576

-  

- diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c

- index 347a3656b6..b51fcde364 100644

- --- a/Modules/_ctypes/_ctypes.c

- +++ b/Modules/_ctypes/_ctypes.c

- @@ -2401,6 +2401,23 @@ converters_from_argtypes(PyObject *ob)

-      for (i = 0; i < nArgs; ++i) {

-          PyObject *cnv;

-          PyObject *tp = PyTuple_GET_ITEM(ob, i);

- +/*

- + *      The following checks, relating to bpo-16575 and bpo-16576, have been

- + *      disabled. The reason is that, although there is a definite problem with

- + *      how libffi handles unions (https://github.com/libffi/libffi/issues/33),

- + *      there are numerous libraries which pass structures containing unions

- + *      by values - especially on Windows but examples also exist on Linux

- + *      (https://bugs.python.org/msg359834).

- + *

- + *      It may not be possible to get proper support for unions and bitfields

- + *      until support is forthcoming in libffi, but for now, adding the checks

- + *      has caused problems in otherwise-working software, which suggests it

- + *      is better to disable the checks.

- + *

- + *      Although specific examples reported relate specifically to unions and

- + *      not bitfields, the bitfields check is also being disabled as a

- + *      precaution.

- +

-          StgDictObject *stgdict = PyType_stgdict(tp);

-  

-          if (stgdict != NULL) {

- @@ -2428,6 +2445,7 @@ converters_from_argtypes(PyObject *ob)

-                  return NULL;

-              }

-          }

- + */

-  

-          if (_PyObject_LookupAttrId(tp, &PyId_from_param, &cnv) <= 0) {

-              Py_DECREF(converters);

- -- 

- 2.24.1

- 

- From c6af8adc44bf6b53ac3b875fe1f644c05a990d2a Mon Sep 17 00:00:00 2001

- From: Victor Stinner <vstinner@python.org>

- Date: Wed, 29 Jan 2020 15:23:29 +0100

- Subject: [PATCH] 00341: bpo-39460: Fix test_zipfile.test_add_file_after_2107()

- 

- XFS filesystem is limited to 32-bit timestamp, but the utimensat()

- syscall doesn't fail. Moreover, there is a VFS bug which returns

- a cached timestamp which is different than the value on disk.

- 

- https://bugzilla.redhat.com/show_bug.cgi?id=1795576

- https://bugs.python.org/issue39460#msg360952

- ---

-  Lib/test/test_zipfile.py | 12 ++++++++++++

-  1 file changed, 12 insertions(+)

- 

- diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py

- index f03c044eae..0737c343cb 100644

- --- a/Lib/test/test_zipfile.py

- +++ b/Lib/test/test_zipfile.py

- @@ -602,6 +602,18 @@ class StoredTestsWithSourceFile(AbstractTestsWithSourceFile,

-          except OverflowError:

-              self.skipTest('Host fs cannot set timestamp to required value.')

-  

- +        mtime_ns = os.stat(TESTFN).st_mtime_ns

- +        if mtime_ns != (4386268800 * 10**9):

- +            # XFS filesystem is limited to 32-bit timestamp, but the syscall

- +            # didn't fail. Moreover, there is a VFS bug which returns

- +            # a cached timestamp which is different than the value on disk.

- +            #

- +            # Test st_mtime_ns rather than st_mtime to avoid rounding issues.

- +            #

- +            # https://bugzilla.redhat.com/show_bug.cgi?id=1795576

- +            # https://bugs.python.org/issue39460#msg360952

- +            self.skipTest(f"Linux VFS/XFS kernel bug detected: {mtime_ns=}")

- +

-          with zipfile.ZipFile(TESTFN2, "w") as zipfp:

-              self.assertRaises(struct.error, zipfp.write, TESTFN)

-  

- -- 

- 2.24.1

- 

- %global general_version %{pybasever}.1

- #global prerel ...

- Release: 2%{?dist}

- # 00339 #

- # Disabled checks for union types being passed by value

- # Although the underlying libffi issue remains open, adding these

- # checks have caused problems in third-party projects which are in

- # widespread use. See the issue for examples.

- # Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1794572

- # Fixed upstream: https://bugs.python.org/issue16575

- Patch339: 00339-bpo-16575.patch

- 

- # 00341 #

- # Fix test_zipfile.test_add_file_after_2107()

- # XFS filesystem is limited to 32-bit timestamp, but the utimensat()

- # syscall doesn't fail. Moreover, there is a VFS bug which returns

- # a cached timestamp which is different than the value on disk.

- # Workarounds https://bugzilla.redhat.com/show_bug.cgi?id=1795576

- # Workarounded upstream: https://bugs.python.org/issue39460

- Patch341: 00341-bpo-39460.patch

- 

- %patch339 -p1

- %patch341 -p1

- SHA512 (Python-3.8.1.tar.xz) = d41381848cc1ec8009643b71875f395a9ac2c8e12a5b1efef33caf8a9e99a337c790d4354695c85352d11b62092ae372b5af62f78724363fcbf3504ff9a6ddca

- SHA512 (Python-3.8.1.tar.xz.asc) = 10472ee0061c38a87e9e28905db4f43d51ddfa67704dbe4835299321a8858ddc4f1a5730433747b207a129f9e8294772f1d27c7f75b8245d98a857da3ea9d565