<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a31ece579b805716c0be22ce3b1f64a7f89efe7d">https://github.com/macports/macports-ports/commit/a31ece579b805716c0be22ce3b1f64a7f89efe7d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new a31ece579b8 osc: update to 1.1.1
</span>a31ece579b8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a31ece579b805716c0be22ce3b1f64a7f89efe7d
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Apr 24 22:55:21 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    osc: update to 1.1.1
</span>---
 devel/osc/Portfile                       | 26 ++++++++------------------
 devel/osc/files/patch-build-disable.diff | 15 +++++++++------
 devel/osc/files/patch-config.diff        | 25 +++++++++----------------
 3 files changed, 26 insertions(+), 40 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/osc/Portfile b/devel/osc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a420d4f211..70cfee4f78d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/osc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/osc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 PortGroup           python 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        openSUSE osc 0.182.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        openSUSE osc 1.1.1
</span> categories          devel python
 platforms           {darwin any}
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,34 +22,24 @@ long_description    osc is a subversion-like client written in Python. \
</span> 
 homepage            https://en.opensuse.org/openSUSE:OSC
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  0074bef7fe51e5b2cfded22f6fb2c566dcf72816 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  b7f6e1742da4ac4b663579a0f0b1a488ed23cf9f2384e7ed8bfb77eb796472f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    371822
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  471642abd80a7ad44a50bd63878267de67985cdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  4640e1a237cd8082bbb0f51d8a245e399b0820704d1abc910c6dcb3ce02b021e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    328845
</span> 
 patchfiles          patch-config.diff \
                     patch-build-disable.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# M2Crypto doesn't support python-3.10,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and it was a reason to drop it at 1.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 311
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append  port:py${python.version}-chardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-m2crypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:py${python.version}-cryptography \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-urllib3
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run         path:share/curl/curl-ca-bundle.crt:curl-ca-bundle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:obs-build-helpers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run         port:obs-build-helpers
</span> 
 post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@@CAFILEPATH@@|${prefix}/share/curl/curl-ca-bundle.crt|g" ${worksrcpath}/osc/conf.py
</span>     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/osc/conf.py
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ln -s ${python.prefix}/bin/osc-wrapper.py ${destroot}${prefix}/bin/osc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.link_binaries no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # exclude beta releases from livecheck
 github.livecheck.regex {([0-9\.]+)}
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/osc/files/patch-build-disable.diff b/devel/osc/files/patch-build-disable.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d7f66e0dab..3e34592e3a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/osc/files/patch-build-disable.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/osc/files/patch-build-disable.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- osc/commandline.py.orig        2016-01-31 15:57:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ osc/commandline.py     2016-01-31 16:00:39.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5656,6 +5656,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         import osc.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git osc/commandline.py osc/commandline.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a88e30b3..489a3a06 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- osc/commandline.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ osc/commandline.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7139,6 +7139,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # OSC_BUILD_ROOT overrides the setting of build-root.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # OSC_PACKAGECACHEDIR overrides the setting of packagecachedir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +        print('Error: build command has been disabled for this platform, cannot run local builds', file=sys.stderr)
 +        return 1
 +
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/osc/files/patch-config.diff b/devel/osc/files/patch-config.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4af2a33c030..47f7bfade48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/osc/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/osc/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- osc/conf.py    2017-09-22 09:06:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ osc/conf.py    2017-09-28 17:49:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,18 +180,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git osc/conf.py osc/conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cb65bb37..f47eae89 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- osc/conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ osc/conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,18 +196,12 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
</span>              'maintained_update_project_attribute': 'OBS:UpdateProject',
              'show_download_progress': '0',
              # path to the vc script
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +11,7 @@
</span>  
              # heuristic to speedup Package.status
              'status_mtime_heuristic': '0'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             }
</span>  
 -# some distros like Debian rename and move build to obs-build
 -if not os.path.isfile('/usr/bin/build') and os.path.isfile('/usr/bin/obs-build'):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,15 +19,6 @@
</span> -if not os.path.isfile('/usr/lib/build/vc') and os.path.isfile('/usr/lib/obs-build/vc'):
 -    DEFAULTS['vc-cmd'] = '/usr/lib/obs-build/vc'
 -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # being global to this module, this dict can be accessed from outside
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it will hold the parsed configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config = DEFAULTS.copy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -538,7 +532,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         cafile = options.get('cafile', None)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         capath = options.get('capath', None)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if not cafile and not capath:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            for i in ['/etc/pki/tls/cert.pem', '/etc/ssl/certs']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            for i in ['@@CAFILEPATH@@', '/etc/ssl/certs']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 if os.path.isfile(i):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     cafile = i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realname', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     'downloadurl', 'sshkey', 'disable_hdrmd5_check']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>