<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/11b2758fc9b36a88b0ad3177cf6c78ecb56604e2">https://github.com/macports/macports-ports/commit/11b2758fc9b36a88b0ad3177cf6c78ecb56604e2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 11b2758fc9b36a88b0ad3177cf6c78ecb56604e2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 21 11:05:53 2021 +1100

<span style='display:block; white-space:pre;color:#404040;'>    py-bootstrap-modules: update flit_core to 3.5.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Including patch for zipfile timestamp error.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/63926
</span>---
 python/py-bootstrap-modules/Portfile                   | 12 ++++++------
 python/py-bootstrap-modules/files/zip-timestamps.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-bootstrap-modules/Portfile b/python/py-bootstrap-modules/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a869bbbafa9..00dbf261b5d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-bootstrap-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-bootstrap-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem          1.0
 
 name                py-bootstrap-modules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2021-11-02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2021-11-21
</span> maintainers         jmr
 categories          python
 license             MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +19,7 @@ long_description    This is a set of Python modules that are needed \
</span> homepage            https://www.macports.org/
 
 set build_vers  0.7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set flit_core_vers 3.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set flit_core_vers 3.5.0
</span> set pep517_vers 0.12.0
 set python-install_vers 0.0.3
 set tomli_vers  1.2.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +44,9 @@ checksums       build-${build_vers}.tar.gz\
</span>                     rmd160 216d1c05311bc392dcb74c9e6f2b358a5892f3fa \
                     sha256 1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f \
                 flit_core-${flit_core_vers}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    md5 a4bb11b54bcf029ec2cd5cb981c07ded \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160 f8c8435049941067c60e6e5d9931e0924b2c3d93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 29468fa2330969167d1f5c23eb9c0661cb6dacfcd46f361a274609a7f4197530 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    md5 120af108a81b9b5c11f4ac24b6c23e7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160 659515152f81aae0e7f71b74eb085b23d8ec3b56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 2db800d33ff41e4c6e7c1b594666cb2a11553024106655272c7245933b1d75bd \
</span>                 pep517-${pep517_vers}.tar.gz \
                     md5 7ed0adb5f737c316e071d48d66329a5d \
                     rmd160 f98bf5793c9337653db51635b9ff356cab65129b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +66,7 @@ checksums       build-${build_vers}.tar.gz\
</span> 
 patch {
     system -W ${workpath}/build-${build_vers} "patch -p0 < ${filespath}/build_env.py.patch"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${workpath}/flit_core-${flit_core_vers} "patch -p0 < ${filespath}/zip-timestamps.patch"
</span>     system -W ${workpath}/pep517-${pep517_vers} "patch -p0 < ${filespath}/no-deps-option.diff"
     system -W ${workpath}/python-install-${python-install_vers} "patch -p0 < ${filespath}/patch-install-__init__.py.diff"
     system -W ${workpath}/python-install-${python-install_vers} "patch -p0 < ${filespath}/installer_scripts.py.patch"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-bootstrap-modules/files/zip-timestamps.patch b/python/py-bootstrap-modules/files/zip-timestamps.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..76d56d5c650
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-bootstrap-modules/files/zip-timestamps.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't error out on file timestamps older than what zip supports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/63926
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- flit_core/wheel.py.orig        2021-11-15 01:34:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ flit_core/wheel.py     2021-11-21 10:53:27.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             rel_path = rel_path.replace(os.sep, '/')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if self.source_time_stamp is None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            zinfo = zipfile.ZipInfo.from_file(full_path, rel_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            zinfo = zipfile.ZipInfo.from_file(full_path, rel_path, strict_timestamps=False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             # Set timestamps in zipfile for reproducible build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             zinfo = zipfile.ZipInfo(rel_path, self.source_time_stamp)
</span></pre><pre style='margin:0'>

</pre>