From 388eba103db001422cb16de9e176d0fda085e2d6207626e3a103cb4a9c4b4d06 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 7 Nov 2021 18:24:30 +0000 Subject: [PATCH 1/2] - update to 0.3.3: * Removed splituser() function which wasn't used and is deprecated. * Handle version comparisons correctly in environment markers. * Handle a single trailing comma following a version. * Fix incorrect handling of epochs. * Reverted handling of tags for Python >= 3.10 (use 310 rather than 3_10). This is because PEP 641 was rejected. * removed unused regular expression * allowed "Obsoletes" in more scenarios, to better handle faulty metadata already on PyPI. * added entry for SourcelessFileLoader to the finder registry. * allowed a trailing comma in constraints, to better handle faulty metadata already on PyP - drop python-distlib-2048-bit-key.patch (obsolete) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-distlib?expand=0&rev=18 --- distlib-0.3.1.zip | 3 - distlib-0.3.3.zip | 3 + python-distlib-2048-bit-key.patch | 99 ------------------------------- python-distlib.changes | 19 ++++++ python-distlib.spec | 4 +- remove-backports.patch | 52 +++++++--------- 6 files changed, 45 insertions(+), 135 deletions(-) delete mode 100644 distlib-0.3.1.zip create mode 100644 distlib-0.3.3.zip delete mode 100644 python-distlib-2048-bit-key.patch diff --git a/distlib-0.3.1.zip b/distlib-0.3.1.zip deleted file mode 100644 index 02c0153..0000000 --- a/distlib-0.3.1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1 -size 578925 diff --git a/distlib-0.3.3.zip b/distlib-0.3.3.zip new file mode 100644 index 0000000..fa1d61d --- /dev/null +++ b/distlib-0.3.3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05 +size 743791 diff --git a/python-distlib-2048-bit-key.patch b/python-distlib-2048-bit-key.patch deleted file mode 100644 index 6ee6f01..0000000 --- a/python-distlib-2048-bit-key.patch +++ /dev/null @@ -1,99 +0,0 @@ -From edc7c63a4496026a5583df0fb842962d85a37df8 Mon Sep 17 00:00:00 2001 -From: Vinay Sajip -Date: Tue, 12 Jan 2021 14:20:05 +0000 -Subject: [PATCH] Update self-signed certificate to use 2048-bit key. - ---- - tests/keycert.pem | 78 ++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 48 insertions(+), 30 deletions(-) - -diff --git a/tests/keycert.pem b/tests/keycert.pem -index 0283549..87d2c88 100644 ---- a/tests/keycert.pem -+++ b/tests/keycert.pem -@@ -1,34 +1,52 @@ - -----BEGIN PRIVATE KEY----- --MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMl3Bj4QBMUiTi3N --pPJICB1HJoxsIqF8xZ4vrw5THNpsUkLFrV76vymm+qNcNRB8F9DBcoR9GcBe6Bxm --P0bTnn5cA+2qeOShhibHskD0V1uHfi3A9zYd/qj0Eg9Se7nFs73sXNF9FY6VKXEm --HQtbIqK/28M9zbnYe3RwvP6pUKPTAgMBAAECgYEApWZnpJpoICSrBKW5zwPeTZM1 --jcHVqLkUUWuaj+siXBzkaFd8n+bC/QJO8cFo+3C16Lh5OVavxqTkcTRsrMxeaK9H --Ajqd9x4td+25Gu5YWDi742lRTvvWy4trpVH1KfS/LqOOssljswcXXvk008pEpMQB --IH0TpC42LsQm90LnbNECQQD1SMTDyq5U4GyEPPn12VIKorcTHWe+3IID8ctHxLav --iaA3q/m2s6lTULIXUeInaP8AV7Vn3eOPpy/UYY6DYLCbAkEA0kQvfhrvyBRQwqun --CkbBv1WeJ5QtYcGOEJ8qYl9fHV9CnAicUcv2P64O1MRVVgmHnb6fKSNV6CzNtDW9 --NUdBKQJARRUbpfE9rFYQ+iWaWO2+N5Sgb1fG0nCUhbvh/vKeaU4fu85J5HUxaW++ --2OaNBYCC4XvScdCCuQDjbbOUSdg/pQJALq9S+CXU7VCNadug1+hD5k6FMfZ1aQoH --l+svBu5z+NqIuIo04vhtMVBdHKKG6/ZrtPt47TJaRZWFCqkP3H94mQJAJC/B+gIk --xnBkHW4o2UEzxrwhAaeNpjODooCQqOeHH/uDXVyjJb19NCt5ba6eZn+PlR0EHdPe --TLV9gZKEUEYQ3A== -+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDGUhdmHWnkXwoU -+5YTgGyiWx4hOke/le19wxJvvzD0jheljVyD3b44dhuSh35SjL2F1WACspNWLwZxS -+I2svD/jUgc8cM8W4LvOaNzGuBNad/wV7ZdZr5WNPqAXxRMEbbwiO/vGthnQ2MkuH -+aCVB7/jqdKHeWSwOG1A2xDezZrVtMr4fkcdZ0GQwWqawlnKWmqPBfSumz1SCj2zP -+O8jNIP8BBDUCnDxxfmi6yscxRxg7/GbgL0hfSPfuWdJ4ZXxc9htfppin9iTYjFRP -+TT0SYjKx+ZbK5PkKMVxi0EeA5Af1zH2UeydWckAbUbkf/Pun4UjFuS1SvsR8MZWx -++33vGqzrAgMBAAECggEAKHfF2It1+Si/iOYQyB4imSncEZRL7HrRTdSAsVzuuNnx -+dtjnnDYCPNoyuylBTk8zxtsPQCtee+ck+8nIbFEJCGv4lBuoY94IzVYn6AeKt7C7 -+MKPmLhwfuLhjhgjukqeEipFRRYRjIFABA39n4t2R4F2uTg3KJJLEOnitmQkDSmWt -+IBJUd2sOktx7yw2FYAHSS37awhGtDXOnuK6ZVQW643F4uPuZa9oMx+bFACI87Frs -+UhlpMD3OOSMyQAMdyRg1TfITptFP4P3opW4Uaxa7hpoSD4mtJ+163bT+g7/ZrO7w -+iucQZQoWzQfz4cuqp0wkUiS8qDUn3hwMMcShVEQkeQKBgQDx3G41UZXWbLeY1Igt -+L/6Y0wiQcYwXbYUkUssJpsgIjj3J8ksWphla78pXZ8M+cqGifSy7+fw3LbJeryT3 -+1NQEPsrgzkKmlkUbadgKLvKPn0WVHcFxOJ9kYKQK780F5z1OpcS59hR7RNEzbbmp -+ttFSUavSFM0iHDJt4A5hAgct/wKBgQDR6g7Aa6q2ilwd2liTg3RQqdzzP5dyUQpC -+vJoOnq31pBmNpYMB7lJglmyik1Xs6xGDTMo+QquPP+2fj/MqHXfc2p15AXspODtv -+40fe9koCV3QdDvIXBCcxW4QeOtzS/P5Ms/NzGSUW4fkzook4zrlAgyeprA7r9K6x -+BZPY2voZFQKBgQCaskETfXF3SuZLrHTFYlNX8HMj4FyYh4aHayVOsQx03HYM+xqo -+C+lfzsv/B/FLugpEYggA265EpMfX4/KjSc+qP3eIPqVG5AqjtBlougqPbnIVJIkc -+H/ljPKTwEd1zDyqZaVHhF9KV3bhpSp9cPAC6xF4/6uoiDSL8QDkyNxfchQKBgEnt -+nb5k7N2XAvQ8lt90930FJdzBc6v+IJf6ZmNpvSh638kEFoySi46ay63CKAvlieht -+Hfkpb9RmlmCQyPn3IOS2ValtPRv6QuyX5hL/OHd0p18oiVhTzR3T9kbTQjxIf6Mx -+6TaLD4XsleB6iMtp+tJenpRiFWtCZFfR+Azyqgw1AoGBAJr2EFizv80cgIiusQWv -+g5uNE3RHIAE8b60nJxlHcVkjmDbaj2wjjXF6BIlslvFrDtyTee1gB5WgLiKZv1iJ -+znlejykUn+c9eCf21T+LnIXDjVRoFpBJI0dv2IfW9vv1UI58XW8ktn5TYZ3Kq+8h -+WkSluWfFv8GlfsJSHzdpvqEX - -----END PRIVATE KEY----- - -----BEGIN CERTIFICATE----- --MIIC3jCCAkegAwIBAgIJANqYE3TB7bYrMA0GCSqGSIb3DQEBCwUAMIGHMQswCQYD --VQQGEwJHQjEWMBQGA1UECAwNSGVydGZvcmRzaGlyZTEPMA0GA1UEBwwGQnVzaGV5 --MSUwIwYDVQQKDBxSZWQgRG92ZSBDb25zdWx0YW50cyBMaW1pdGVkMRQwEgYDVQQL --DAtEZXZlbG9wbWVudDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTE5MTAwODEyMzQz --MVoXDTQ5MTIzMTEyMzQzM1owgYcxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1IZXJ0 --Zm9yZHNoaXJlMQ8wDQYDVQQHDAZCdXNoZXkxJTAjBgNVBAoMHFJlZCBEb3ZlIENv --bnN1bHRhbnRzIExpbWl0ZWQxFDASBgNVBAsMC0RldmVsb3BtZW50MRIwEAYDVQQD --DAlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMl3Bj4QBMUi --Ti3NpPJICB1HJoxsIqF8xZ4vrw5THNpsUkLFrV76vymm+qNcNRB8F9DBcoR9GcBe --6BxmP0bTnn5cA+2qeOShhibHskD0V1uHfi3A9zYd/qj0Eg9Se7nFs73sXNF9FY6V --KXEmHQtbIqK/28M9zbnYe3RwvP6pUKPTAgMBAAGjUDBOMB0GA1UdDgQWBBSbSzkK --ZeuiK5I9alwtw0hyENEvWjAfBgNVHSMEGDAWgBSbSzkKZeuiK5I9alwtw0hyENEv --WjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBADNwagk2TYfa47hNbH1X --Xn0TeeMrklUOiMYua3PH5PqRS5FMrK6JwxEFWsVPAc1t7X3cUfaoDjdf5sybwQhS --PcKchyVZ39r/l17JBn6ULoZZeEsUJ97YdMwRpHlwTH9P0+QKty8lLfGUIiKyZGmo --h+kCTdchZkzSde35BKY02FHr -+MIID8zCCAtugAwIBAgIUZSPfUxQx4kYyAz1paKBL0AcLOw0wDQYJKoZIhvcNAQEL -+BQAwgYcxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1IZXJ0Zm9yZHNoaXJlMQ8wDQYD -+VQQHDAZCdXNoZXkxJTAjBgNVBAoMHFJlZCBEb3ZlIENvbnN1bHRhbnRzIExpbWl0 -+ZWQxFDASBgNVBAsMC0RldmVsb3BtZW50MRIwEAYDVQQDDAlsb2NhbGhvc3QwIBcN -+MjEwMTEyMTQxNTAwWhgPMjA1MTAxMDUxNDE1MDBaMIGHMQswCQYDVQQGEwJHQjEW -+MBQGA1UECAwNSGVydGZvcmRzaGlyZTEPMA0GA1UEBwwGQnVzaGV5MSUwIwYDVQQK -+DBxSZWQgRG92ZSBDb25zdWx0YW50cyBMaW1pdGVkMRQwEgYDVQQLDAtEZXZlbG9w -+bWVudDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -+MIIBCgKCAQEAxlIXZh1p5F8KFOWE4BsolseITpHv5XtfcMSb78w9I4XpY1cg92+O -+HYbkod+Uoy9hdVgArKTVi8GcUiNrLw/41IHPHDPFuC7zmjcxrgTWnf8Fe2XWa+Vj -+T6gF8UTBG28Ijv7xrYZ0NjJLh2glQe/46nSh3lksDhtQNsQ3s2a1bTK+H5HHWdBk -+MFqmsJZylpqjwX0rps9Ugo9szzvIzSD/AQQ1Apw8cX5ousrHMUcYO/xm4C9IX0j3 -+7lnSeGV8XPYbX6aYp/Yk2IxUT009EmIysfmWyuT5CjFcYtBHgOQH9cx9lHsnVnJA -+G1G5H/z7p+FIxbktUr7EfDGVsft97xqs6wIDAQABo1MwUTAdBgNVHQ4EFgQU0qCl -+lcwuGbZLN7Ew54ERZa46thUwHwYDVR0jBBgwFoAU0qCllcwuGbZLN7Ew54ERZa46 -+thUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEALOo0STI7LaMl -+oAjCuJ7OBaZ0PCtSpjBawZTXdB6fP9LJRGspIk5VvpnFa6FblkjRMMOqQWLRjMCJ -+wFjKFGkyFDqTr+57e4kTPAGanOa+yhXZZBRFojoPw34gWAQ3E1NWSR3GUUVKmrl3 -+ZfL7fAc3BSGre0Bt0MokZ1G4CrjkA9cp+Nss4aD3YVdmJzC6gmN5v7yUG/yyfJaG -+fPNNkJ5zVhuzPiSSnt8yfLiL+e59UTTeOMZI1Ptk2UcEkiNftDG++c384S61YaAH -+HTUKkLFtUegSQbjWo5XmyaMnfusKpG7BAvdmZcgdf4UmPYpOvUNMEtZCRqsmCzjq -+UzGvelZfPA== - -----END CERTIFICATE----- --- -2.10.5 - diff --git a/python-distlib.changes b/python-distlib.changes index 48cce3e..f293eb4 100644 --- a/python-distlib.changes +++ b/python-distlib.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Nov 7 18:22:20 UTC 2021 - Dirk Müller + +- update to 0.3.3: + * Removed splituser() function which wasn't used and is deprecated. + * Handle version comparisons correctly in environment markers. + * Handle a single trailing comma following a version. + * Fix incorrect handling of epochs. + * Reverted handling of tags for Python >= 3.10 + (use 310 rather than 3_10). This is because PEP 641 was rejected. + * removed unused regular expression + * allowed "Obsoletes" in more scenarios, to better handle faulty metadata + already on PyPI. + * added entry for SourcelessFileLoader to the finder registry. + * allowed a trailing comma in constraints, to better handle faulty metadata already on PyP + + +- drop python-distlib-2048-bit-key.patch (obsolete) + ------------------------------------------------------------------- Wed Feb 10 19:44:20 UTC 2021 - Pedro Monreal diff --git a/python-distlib.spec b/python-distlib.spec index 3dff2e6..4633c15 100644 --- a/python-distlib.spec +++ b/python-distlib.spec @@ -18,15 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-distlib -Version: 0.3.1 +Version: 0.3.3 Release: 0 Summary: Distribution utilities License: Python-2.0 URL: https://bitbucket.org/pypa/distlib Source: https://files.pythonhosted.org/packages/source/d/distlib/distlib-%{version}.zip Patch0: remove-backports.patch -#PATCH-FIX-UPSTREAM Update self-signed certificate to use 2048-bit key. -Patch1: python-distlib-2048-bit-key.patch BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes diff --git a/remove-backports.patch b/remove-backports.patch index 503c9bf..c2c1ef0 100644 --- a/remove-backports.patch +++ b/remove-backports.patch @@ -1,7 +1,7 @@ -Index: distlib-0.3.1/distlib/_backport/shutil.py +Index: distlib-0.3.3/distlib/_backport/shutil.py =================================================================== ---- distlib-0.3.1.orig/distlib/_backport/shutil.py -+++ distlib-0.3.1/distlib/_backport/shutil.py +--- distlib-0.3.3.orig/distlib/_backport/shutil.py ++++ distlib-0.3.3/distlib/_backport/shutil.py @@ -19,7 +19,7 @@ try: except ImportError: from collections import Callable @@ -11,11 +11,11 @@ Index: distlib-0.3.1/distlib/_backport/shutil.py try: import bz2 -Index: distlib-0.3.1/distlib/compat.py +Index: distlib-0.3.3/distlib/compat.py =================================================================== ---- distlib-0.3.1.orig/distlib/compat.py -+++ distlib-0.3.1/distlib/compat.py -@@ -311,10 +311,7 @@ except ImportError: # pragma: no cover +--- distlib-0.3.3.orig/distlib/compat.py ++++ distlib-0.3.3/distlib/compat.py +@@ -313,10 +313,7 @@ except ImportError: # pragma: no cover return 'IronPython' return 'CPython' @@ -27,30 +27,22 @@ Index: distlib-0.3.1/distlib/compat.py try: callable = callable -Index: distlib-0.3.1/setup.py +Index: distlib-0.3.3/setup.py =================================================================== ---- distlib-0.3.1.orig/setup.py -+++ distlib-0.3.1/setup.py -@@ -6,7 +6,6 @@ - # - - import distutils.core --from distutils.sysconfig import get_python_lib - from os.path import join, dirname, abspath - import re - import sys -@@ -69,7 +68,6 @@ distutils.core.setup( +--- distlib-0.3.3.orig/setup.py ++++ distlib-0.3.3/setup.py +@@ -63,7 +63,6 @@ distutils.core.setup( 'distlib._backport', ], package_data={ - 'distlib._backport': ['sysconfig.cfg'], - 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'], + 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe', + 't64-arm.exe', 'w64-arm.exe'], }, - cmdclass={ -Index: distlib-0.3.1/tests/distlib_tests.py +Index: distlib-0.3.3/tests/distlib_tests.py =================================================================== ---- distlib-0.3.1.orig/tests/distlib_tests.py -+++ distlib-0.3.1/tests/distlib_tests.py +--- distlib-0.3.3.orig/tests/distlib_tests.py ++++ distlib-0.3.3/tests/distlib_tests.py @@ -10,7 +10,6 @@ _ver = sys.version_info[:2] from test_database import (DataFilesTestCase, TestDatabase, TestDistribution, TestEggInfoDistribution, DepGraphTestCase) @@ -66,13 +58,13 @@ Index: distlib-0.3.1/tests/distlib_tests.py - from test_sysconfig import TestSysConfig, MakefileTests from test_util import (UtilTestCase, ProgressTestCase, FileOpsTestCase, GlobTestCase) -Index: distlib-0.3.1/tests/test_shutil.py +Index: distlib-0.3.3/tests/test_shutil.py =================================================================== ---- distlib-0.3.1.orig/tests/test_shutil.py -+++ distlib-0.3.1/tests/test_shutil.py -@@ -20,7 +20,7 @@ import tempfile - from compat import unittest - +--- distlib-0.3.3.orig/tests/test_shutil.py ++++ distlib-0.3.3/tests/test_shutil.py +@@ -19,7 +19,7 @@ import tempfile + from compat import unittest, find_executable, spawn + from support import DistlibTestCase -from distlib._backport import shutil, tarfile +from distlib._backport import shutil; import tarfile From 88543c0f00032e4907b0ed06db0188dfed24d791aadc2a6e2fcfc5d551cc7f4d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 7 Nov 2021 18:24:44 +0000 Subject: [PATCH 2/2] * allowed a trailing comma in constraints, to better handle faulty metadata already on PyPI OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-distlib?expand=0&rev=19 --- python-distlib.changes | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-distlib.changes b/python-distlib.changes index f293eb4..df53981 100644 --- a/python-distlib.changes +++ b/python-distlib.changes @@ -12,9 +12,8 @@ Sun Nov 7 18:22:20 UTC 2021 - Dirk Müller * allowed "Obsoletes" in more scenarios, to better handle faulty metadata already on PyPI. * added entry for SourcelessFileLoader to the finder registry. - * allowed a trailing comma in constraints, to better handle faulty metadata already on PyP - - + * allowed a trailing comma in constraints, to better handle faulty metadata + already on PyPI - drop python-distlib-2048-bit-key.patch (obsolete) -------------------------------------------------------------------