Re: a batch of py2+3 to py3 switches
On Fri, Oct 22, 2021 at 10:26:31PM +0100, Stuart Henderson wrote: > I'm doing a bulk build with this in to check that things are ok and I > haven't missed anything that still needs them as py2 deps (pretty sure I > went through everything in sqlports but it's easier to test in a bulk).. > While it's running, any objections or OKs? > Maintainers of those ports which have maintainers are BCC'd. > rpointelpy-redis > semarie py-cached-property > kmospy-fields py-cookies > jungpy-icalendar py-xmltodict > job py-radix > martin py-affine > benoit py-IP > juanfra py-ftpdlib > jasper py-pf > edd py-prettytable > vsele...@cs.msu.ru py-feedgenerator > bcallah py-requests-mock > The diff is large-ish so it's gzipped, here's a plaintext list of ports > in it. Assuming the bulk comes out alright, ok kmos. The diff is large but straightforward. --Kurt > converters/py-num2words > databases/py-redis > devel/py-cached-property > devel/py-country > devel/py-coveralls > devel/py-fasteners > devel/py-fields > devel/py-html5lib > devel/py-icalendar > devel/py-objgraph > devel/py-parsedatetime > devel/py-path.py > devel/py-radix > devel/py-zc-lockfile > math/py-affine > math/py-graphviz > math/py-mpmath > math/py-pysmt > net/py-IP > net/py-curl > net/py-eapi > net/py-ftpdlib > net/py-netaddr > net/py-netifaces > net/py-paho-mqtt > net/py-pcapy > net/py-pf > net/py-portend > net/py-rrdtool > net/py-simplesoap > security/py-aes > security/py-pgpdump > security/py-potr > security/py-requests-aws4auth > security/py-scrypt > textproc/py-mistune > textproc/py-polib > textproc/py-prettytable > textproc/py-pyaml > textproc/py-pykwalify > textproc/py-ruamel.yaml > textproc/py-spdx > textproc/py-spdx-lookup > textproc/py-unidecode > textproc/py-vobject > textproc/py-webencodings > textproc/py-xmltodict > www/py-CherryPy > www/py-beaker > www/py-betamax > www/py-bleach > www/py-bottle > www/py-cheroot > www/py-cookies > www/py-feedgenerator > www/py-formencode > www/py-httplib2 > www/py-jinja2 > www/py-mako > www/py-repoze-lru > www/py-repoze-profile > www/py-repoze-who > www/py-requests-futures > www/py-requests-mock > www/py-requests-toolbelt > www/py-selenium > www/py-soupsieve > www/py-tempita > www/py-uritemplate > www/py-waitress >
is ports lldb working ?
Hi, I am currently looking at learning lldb debugger a bit. lldb from base is working fine, but it is a bit spartiate for learning: no completion, no readline. it could be workaround with rlwrap but proper completion will be still missing. lldb from ports comes with glitters, but I failed to properly start live debugging (tested on amd64). $ /usr/bin/lldb /usr/bin/id (lldb) target create "/usr/bin/id" Current executable set to '/usr/bin/id' (x86_64). (lldb) r Process 41122 launched: '/usr/bin/id' (x86_64) uid=1000(semarie) gid=1000(semarie) groups=1000(semarie), 9(wsrc) Process 41122 exited with status = 0 (0x) $ /usr/local/bin/lldb /usr/bin/id (lldb) target create "/usr/bin/id" Current executable set to '/usr/bin/id' (x86_64). (lldb) r error: failed to launch or debug process I would like to know if someone have a working ports lldb or if it is just me ? Thanks. -- Sebastien Marie
Re: a batch of py2+3 to py3 switches
On Fri, Oct 22, 2021 at 10:26:31PM +0100, Stuart Henderson wrote: > I'm doing a bulk build with this in to check that things are ok and I > haven't missed anything that still needs them as py2 deps (pretty sure I > went through everything in sqlports but it's easier to test in a bulk).. > While it's running, any objections or OKs? > > Maintainers of those ports which have maintainers are BCC'd. > > rpointelpy-redis > semarie py-cached-property ok semarie@ for py-cached-property. No problem with py3-only. and I am fine with the direction for others ports too. > kmospy-fields py-cookies > jungpy-icalendar py-xmltodict > job py-radix > martin py-affine > benoit py-IP > juanfra py-ftpdlib > jasper py-pf > edd py-prettytable > vsele...@cs.msu.ru py-feedgenerator > bcallah py-requests-mock > > The diff is large-ish so it's gzipped, here's a plaintext list of ports > in it. > > converters/py-num2words > databases/py-redis > devel/py-cached-property > devel/py-country > devel/py-coveralls > devel/py-fasteners > devel/py-fields > devel/py-html5lib > devel/py-icalendar > devel/py-objgraph > devel/py-parsedatetime > devel/py-path.py > devel/py-radix > devel/py-zc-lockfile > math/py-affine > math/py-graphviz > math/py-mpmath > math/py-pysmt > net/py-IP > net/py-curl > net/py-eapi > net/py-ftpdlib > net/py-netaddr > net/py-netifaces > net/py-paho-mqtt > net/py-pcapy > net/py-pf > net/py-portend > net/py-rrdtool > net/py-simplesoap > security/py-aes > security/py-pgpdump > security/py-potr > security/py-requests-aws4auth > security/py-scrypt > textproc/py-mistune > textproc/py-polib > textproc/py-prettytable > textproc/py-pyaml > textproc/py-pykwalify > textproc/py-ruamel.yaml > textproc/py-spdx > textproc/py-spdx-lookup > textproc/py-unidecode > textproc/py-vobject > textproc/py-webencodings > textproc/py-xmltodict > www/py-CherryPy > www/py-beaker > www/py-betamax > www/py-bleach > www/py-bottle > www/py-cheroot > www/py-cookies > www/py-feedgenerator > www/py-formencode > www/py-httplib2 > www/py-jinja2 > www/py-mako > www/py-repoze-lru > www/py-repoze-profile > www/py-repoze-who > www/py-requests-futures > www/py-requests-mock > www/py-requests-toolbelt > www/py-selenium > www/py-soupsieve > www/py-tempita > www/py-uritemplate > www/py-waitress > -- Sebastien Marie
Re: a batch of py2+3 to py3 switches
On Fri 22/10/2021 22:26, Stuart Henderson wrote: > I'm doing a bulk build with this in to check that things are ok and I > haven't missed anything that still needs them as py2 deps (pretty sure I > went through everything in sqlports but it's easier to test in a bulk).. > While it's running, any objections or OKs? Assuming that your bulk test succeeds, OK bket@
Re: UPDATE math/py-numpy-1.17.5
On Fri 22/10/2021 22:04, Martin Reindl wrote: > On Fri, Oct 22, 2021 at 04:09:07PM +0200, Bjorn Ketelaars wrote: > > On Fri 22/10/2021 13:23, Bjorn Ketelaars wrote: > > > On Fri 22/10/2021 09:55, Martin Reindl wrote: > > > > Am 22.10.2021 um 09:49 schrieb Stuart Henderson: > > > > > Only issue in the i386 build was math/py-h5py which specifically > > > > > wants 1.16.5. > > > > > > > > > > > > > Yes, this is one patch which can go away with newer numpy. > > > > > > That is not entirely true. When building, py-h5py checks for a specific > > > version of py-numpy. Diff below fixes this by checking for a minimum > > > version similar to RUN_REQUIRES in setup.py. > > > > > > BTW 'make test' fails because of a py-numpy related issue. This happens > > > with both py-numpy-1.16.5 and py-numpy-1.19.5. Have you seen this > > > before? Both test logs attached. > > > > Correction, failing tests is not because of numpy. It seems it is > > because of py-h5py: > > > > Found a core file in py-h5py's $WRKDIR. Interesting bits: > > This one should fly with both old numpy (tested on amd64) and new numpy > (tested on arm64). Diff looks good, and builds with py-numpy-1.19.5. This newer version of py-h5py adds another test that requires the mpi_file_name fixture. With the diff below on top of your diff all tests pass. Please commit. OK bket@ diff --git patches/patch-h5py_tests_test_file_py patches/patch-h5py_tests_test_file_py index d4db14d84aa..28bf37d7983 100644 --- patches/patch-h5py_tests_test_file_py +++ patches/patch-h5py_tests_test_file_py @@ -11,7 +11,15 @@ Index: h5py/tests/test_file.py def test_mpio(self, mpi_file_name): """ MPIO driver and options """ from mpi4py import MPI -@@ -841,6 +842,7 @@ class TestMPI(object): +@@ -833,6 +834,7 @@ class TestMPI(object): + assert f + assert f.driver == 'mpio' + ++@pytest.mark.skip(reason="fixture 'mpi_file_name' not present") + def test_mpio_append(self, mpi_file_name): + """ Testing creation of file with append """ + from mpi4py import MPI +@@ -841,6 +843,7 @@ class TestMPI(object): assert f assert f.driver == 'mpio' @@ -19,7 +27,7 @@ Index: h5py/tests/test_file.py @pytest.mark.skipif(h5py.version.hdf5_version_tuple < (1, 8, 9), reason="mpio atomic file operations were added in HDF5 1.8.9+") def test_mpi_atomic(self, mpi_file_name): -@@ -852,6 +854,7 @@ class TestMPI(object): +@@ -852,6 +855,7 @@ class TestMPI(object): f.atomic = True assert f.atomic
Re: [PATCH] add njs module to www/nginx
Here's the updated version of the patch with pkg/PLIST-njs and
pkg/DESCR-njs files.
On Sat, Oct 23, 2021 at 02:52:35AM +, Sergey A. Osokin wrote:
> Hi,
>
> here the patch to add NGINX Javascript (njs) module to www/nginx port.
> Please let me know if you have any questions.
>
> Thank you.
>
> --
> Sergey Osokin
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.156
> diff -u -p -r1.156 Makefile
> --- Makefile 10 Sep 2021 15:19:00 - 1.156
> +++ Makefile 23 Oct 2021 02:48:39 -
> @@ -13,6 +13,7 @@ COMMENT-ldap_auth= nginx LDAP authentica
> COMMENT-lua= nginx lua scripting module
> COMMENT-headers_more=nginx module for setting/adding/clearing headers
> COMMENT-perl=nginx perl scripting module
> +COMMENT-njs= nginx javascript scripting module
> COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
> COMMENT-rtmp=nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
> @@ -24,6 +25,7 @@ CATEGORIES= www
> REVISION-lua=0
> REVISION-passenger= 0
>
> +VERSION-njs= 0.7.0
> VERSION-rtmp=1.2.1
>
> PKGNAME-main=${DISTNAME}
> @@ -37,6 +39,7 @@ PKGNAME-ldap_auth= nginx-ldap_auth-${VER
> PKGNAME-lua= nginx-lua-${VERSION}
> PKGNAME-headers_more=nginx-headers-more-${VERSION}
> PKGNAME-perl=nginx-perl-${VERSION}
> +PKGNAME-njs= nginx-njs-${VERSION}
> PKGNAME-passenger= nginx-passenger-${VERSION}
> PKGNAME-rtmp=nginx-rtmp-${VERSION}
> PKGNAME-securelink= nginx-securelink-${VERSION}
> @@ -58,6 +61,7 @@ _GH_MODS= \
> nbs-system naxsi 1.3 \
> kvspb nginx-auth-ldap
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> arutnginx-rtmp-module v${VERSION-rtmp} \
> + nginx njs ${VERSION-njs} \
> simpl ngx_devel_kit v0.3.0 \
> leevngx_http_geoip2_module 3.3 \
> nginx-modules ngx_http_hmac_secure_link_module
> 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> @@ -76,8 +80,8 @@ PERMIT_PACKAGE= Yes
> MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
>
> MODULE_PACKAGES =-image_filter -geoip2 -xslt -mailproxy -stream \
> - -passenger -headers_more -ldap_auth -lua -rtmp \
> - -securelink
> + -passenger -headers_more -ldap_auth -lua -njs \
> + -rtmp -securelink
>
> FLAVOR ?=
> PSEUDO_FLAVORS = no_lua no_passenger
> @@ -92,6 +96,7 @@ WANTLIB-stream=
> WANTLIB-image_filter=gd
> WANTLIB-geoip2= maxminddb
> WANTLIB-rtmp=
> +WANTLIB-njs=
> WANTLIB-xslt=exslt xml2 xslt
> WANTLIB-naxsi=
> WANTLIB-ldap_auth= ldap
> @@ -109,6 +114,7 @@ LIB_DEPENDS-geoip2= net/libmaxminddb
> LIB_DEPENDS-ldap_auth= databases/openldap
> LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
> LIB_DEPENDS-rtmp=
> +LIB_DEPENDS-njs=
> LIB_DEPENDS-securelink=
>
> MODLUA_RUNDEP= No
> @@ -158,6 +164,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
>
> .if ${BUILD_PACKAGES:M-rtmp}
> CONFIGURE_ARGS+=
> --add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
> +.endif
> +
> +.if ${BUILD_PACKAGES:M-njs}
> +CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/njs-${VERSION-njs}/nginx
> .endif
>
> CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.77
> diff -u -p -r1.77 distinfo
> --- distinfo 25 May 2021 19:43:55 - 1.77
> +++ distinfo 23 Oct 2021 02:48:39 -
> @@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> SHA256
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> +SHA256 (njs-0.7.0.tar.gz) = Pw/n13YAqcVAAM4QHdUfRIEZZFAmQa5QXjjBu/WV5vE=
> SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> SIZE (naxsi-1.3.tar.gz) = 235626
> @@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
> SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
> SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
> SIZE
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = 6159
> +SIZE (njs-0.7.0.tar.gz) = 575477
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrievi
[PATCH] add njs module to www/nginx
Hi,
here the patch to add NGINX Javascript (njs) module to www/nginx port.
Please let me know if you have any questions.
Thank you.
--
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile10 Sep 2021 15:19:00 - 1.156
+++ Makefile23 Oct 2021 02:48:39 -
@@ -13,6 +13,7 @@ COMMENT-ldap_auth=nginx LDAP authentica
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
COMMENT-perl= nginx perl scripting module
+COMMENT-njs= nginx javascript scripting module
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink=nginx HMAC secure link module
@@ -24,6 +25,7 @@ CATEGORIES= www
REVISION-lua= 0
REVISION-passenger=0
+VERSION-njs= 0.7.0
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -37,6 +39,7 @@ PKGNAME-ldap_auth=nginx-ldap_auth-${VER
PKGNAME-lua= nginx-lua-${VERSION}
PKGNAME-headers_more= nginx-headers-more-${VERSION}
PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink=nginx-securelink-${VERSION}
@@ -58,6 +61,7 @@ _GH_MODS= \
nbs-system naxsi 1.3 \
kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module v${VERSION-rtmp} \
+ nginx njs ${VERSION-njs} \
simpl ngx_devel_kit v0.3.0 \
leevngx_http_geoip2_module 3.3 \
nginx-modules ngx_http_hmac_secure_link_module
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
@@ -76,8 +80,8 @@ PERMIT_PACKAGE= Yes
MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
- -passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -passenger -headers_more -ldap_auth -lua -njs \
+ -rtmp -securelink
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -92,6 +96,7 @@ WANTLIB-stream=
WANTLIB-image_filter= gd
WANTLIB-geoip2=maxminddb
WANTLIB-rtmp=
+WANTLIB-njs=
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-ldap_auth= ldap
@@ -109,6 +114,7 @@ LIB_DEPENDS-geoip2= net/libmaxminddb
LIB_DEPENDS-ldap_auth= databases/openldap
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
+LIB_DEPENDS-njs=
LIB_DEPENDS-securelink=
MODLUA_RUNDEP= No
@@ -158,6 +164,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
.if ${BUILD_PACKAGES:M-rtmp}
CONFIGURE_ARGS+=
--add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
+.endif
+
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/njs-${VERSION-njs}/nginx
.endif
CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo25 May 2021 19:43:55 - 1.77
+++ distinfo23 Oct 2021 02:48:39 -
@@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (njs-0.7.0.tar.gz) = Pw/n13YAqcVAAM4QHdUfRIEZZFAmQa5QXjjBu/WV5vE=
SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-1.3.tar.gz) = 235626
@@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= 6159
+SIZE (njs-0.7.0.tar.gz) = 575477
signature.asc
Description: PGP signature
Re: a batch of py2+3 to py3 switches
On Fri, 22 Oct 2021 22:26:31 +0100 Stuart Henderson wrote: > I'm doing a bulk build with this in to check that things are ok and I > haven't missed anything that still needs them as py2 deps (pretty > sure I went through everything in sqlports but it's easier to test in > a bulk).. While it's running, any objections or OKs? > > Maintainers of those ports which have maintainers are BCC'd. > > rpointelpy-redis > semarie py-cached-property > kmospy-fields py-cookies > jungpy-icalendar py-xmltodict > job py-radix > martin py-affine > benoit py-IP > juanfra py-ftpdlib OK for ftpd. I use the package as standalone FTP server for the LAN, so the python2 version is not really needed. > jasper py-pf > edd py-prettytable > vsele...@cs.msu.ru py-feedgenerator > bcallah py-requests-mock > > The diff is large-ish so it's gzipped, here's a plaintext list of > ports in it. > > converters/py-num2words > databases/py-redis > devel/py-cached-property > devel/py-country > devel/py-coveralls > devel/py-fasteners > devel/py-fields > devel/py-html5lib > devel/py-icalendar > devel/py-objgraph > devel/py-parsedatetime > devel/py-path.py > devel/py-radix > devel/py-zc-lockfile > math/py-affine > math/py-graphviz > math/py-mpmath > math/py-pysmt > net/py-IP > net/py-curl > net/py-eapi > net/py-ftpdlib > net/py-netaddr > net/py-netifaces > net/py-paho-mqtt > net/py-pcapy > net/py-pf > net/py-portend > net/py-rrdtool > net/py-simplesoap > security/py-aes > security/py-pgpdump > security/py-potr > security/py-requests-aws4auth > security/py-scrypt > textproc/py-mistune > textproc/py-polib > textproc/py-prettytable > textproc/py-pyaml > textproc/py-pykwalify > textproc/py-ruamel.yaml > textproc/py-spdx > textproc/py-spdx-lookup > textproc/py-unidecode > textproc/py-vobject > textproc/py-webencodings > textproc/py-xmltodict > www/py-CherryPy > www/py-beaker > www/py-betamax > www/py-bleach > www/py-bottle > www/py-cheroot > www/py-cookies > www/py-feedgenerator > www/py-formencode > www/py-httplib2 > www/py-jinja2 > www/py-mako > www/py-repoze-lru > www/py-repoze-profile > www/py-repoze-who > www/py-requests-futures > www/py-requests-mock > www/py-requests-toolbelt > www/py-selenium > www/py-soupsieve > www/py-tempita > www/py-uritemplate > www/py-waitress > -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: remove: devel/py-SOAPpy, devel/py-fpconst
On Fri, Oct 22, 2021 at 08:37:19PM +0100, Stuart Henderson wrote: > On 2021/10/22 20:16, Stuart Henderson wrote: > > py-SOAPpy: py2 only, no updates since 2014, not used in the tree > > py-fpconst: py2 only, no updates since 2005, only used in the tree for > > SOAPpy > > > > ok to drop them? > > > > and net/py-zsi 2008-vintage OK kn for all three.
Re: [update] net/py-cares 3.1.1 -> 4.1.2
On Fri, Oct 22, 2021 at 08:08:54PM +0100, Stuart Henderson wrote:
> > > > +TESTLIBDIR = lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
> > > > +TEST_ENV +=PYTHONPATH=${TESTLIBDIR}
> > > Do you think we might be able to do this by default in python.port.mk
> > > (at least for ports setting MODPY_PYTEST)?
> > Probably. I mainly haven't since not all ports put things in such a
> > directory. Many just use "lib" without the decorations.
> hmm, maybe lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}:lib would
> make sense, it would be pretty handy if we could automate this,
> the temptation to just self-depends is high if extra steps are
> needed!
That is an excellent point. I'll come up with something.
--Kurt
a batch of py2+3 to py3 switches
I'm doing a bulk build with this in to check that things are ok and I haven't missed anything that still needs them as py2 deps (pretty sure I went through everything in sqlports but it's easier to test in a bulk).. While it's running, any objections or OKs? Maintainers of those ports which have maintainers are BCC'd. rpointelpy-redis semarie py-cached-property kmospy-fields py-cookies jungpy-icalendar py-xmltodict job py-radix martin py-affine benoit py-IP juanfra py-ftpdlib jasper py-pf edd py-prettytable vsele...@cs.msu.ru py-feedgenerator bcallah py-requests-mock The diff is large-ish so it's gzipped, here's a plaintext list of ports in it. converters/py-num2words databases/py-redis devel/py-cached-property devel/py-country devel/py-coveralls devel/py-fasteners devel/py-fields devel/py-html5lib devel/py-icalendar devel/py-objgraph devel/py-parsedatetime devel/py-path.py devel/py-radix devel/py-zc-lockfile math/py-affine math/py-graphviz math/py-mpmath math/py-pysmt net/py-IP net/py-curl net/py-eapi net/py-ftpdlib net/py-netaddr net/py-netifaces net/py-paho-mqtt net/py-pcapy net/py-pf net/py-portend net/py-rrdtool net/py-simplesoap security/py-aes security/py-pgpdump security/py-potr security/py-requests-aws4auth security/py-scrypt textproc/py-mistune textproc/py-polib textproc/py-prettytable textproc/py-pyaml textproc/py-pykwalify textproc/py-ruamel.yaml textproc/py-spdx textproc/py-spdx-lookup textproc/py-unidecode textproc/py-vobject textproc/py-webencodings textproc/py-xmltodict www/py-CherryPy www/py-beaker www/py-betamax www/py-bleach www/py-bottle www/py-cheroot www/py-cookies www/py-feedgenerator www/py-formencode www/py-httplib2 www/py-jinja2 www/py-mako www/py-repoze-lru www/py-repoze-profile www/py-repoze-who www/py-requests-futures www/py-requests-mock www/py-requests-toolbelt www/py-selenium www/py-soupsieve www/py-tempita www/py-uritemplate www/py-waitress py2to3.diff.gz Description: application/gunzip
Re: UPDATE math/py-numpy-1.17.5
On Fri, Oct 22, 2021 at 04:09:07PM +0200, Bjorn Ketelaars wrote:
> On Fri 22/10/2021 13:23, Bjorn Ketelaars wrote:
> > On Fri 22/10/2021 09:55, Martin Reindl wrote:
> > > Am 22.10.2021 um 09:49 schrieb Stuart Henderson:
> > > > Only issue in the i386 build was math/py-h5py which specifically wants
> > > > 1.16.5.
> > > >
> > >
> > > Yes, this is one patch which can go away with newer numpy.
> >
> > That is not entirely true. When building, py-h5py checks for a specific
> > version of py-numpy. Diff below fixes this by checking for a minimum
> > version similar to RUN_REQUIRES in setup.py.
> >
> > BTW 'make test' fails because of a py-numpy related issue. This happens
> > with both py-numpy-1.16.5 and py-numpy-1.19.5. Have you seen this
> > before? Both test logs attached.
>
> Correction, failing tests is not because of numpy. It seems it is
> because of py-h5py:
>
> Found a core file in py-h5py's $WRKDIR. Interesting bits:
This one should fly with both old numpy (tested on amd64) and new numpy (tested
on arm64).
Index: Makefile
===
RCS file: /cvs/ports/math/py-h5py/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile24 Jun 2021 10:52:02 - 1.7
+++ Makefile22 Oct 2021 19:31:56 -
@@ -2,7 +2,7 @@
COMMENT = pythonic interface to the HDF5 binary data format
-MODPY_EGG_VERSION =3.3.0
+MODPY_EGG_VERSION =3.5.0
DISTNAME = h5py-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = math
@@ -37,7 +37,7 @@ LIB_DEPENDS = math/hdf5
TEST_DEPENDS = devel/py-coveralls${MODPY_FLAVOR} \
devel/py-test-cov${MODPY_FLAVOR}
-do-test:
+do-test: fake
cd ${WRKDIR} && ${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
${MODPY_BIN} -c 'import h5py; h5py.run_tests()'
Index: distinfo
===
RCS file: /cvs/ports/math/py-h5py/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo24 Jun 2021 10:52:02 - 1.4
+++ distinfo22 Oct 2021 19:31:56 -
@@ -1,2 +1,2 @@
-SHA256 (h5py-3.3.0.tar.gz) = 4NrIh9d5kpd4s8/RMwmpOTWcyedHVvwJr3xSeoJ5cYY=
-SIZE (h5py-3.3.0.tar.gz) = 380221
+SHA256 (h5py-3.5.0.tar.gz) = d8e+QAGsfT7YBHfeW2lCUB14LeG75Ihll73+wqergh8=
+SIZE (h5py-3.5.0.tar.gz) = 384643
Index: patches/patch-h5py_tests_test_file_py
===
RCS file: patches/patch-h5py_tests_test_file_py
diff -N patches/patch-h5py_tests_test_file_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-h5py_tests_test_file_py 22 Oct 2021 19:31:56 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: h5py/tests/test_file.py
+--- h5py/tests/test_file.py.orig
h5py/tests/test_file.py
+@@ -825,6 +825,7 @@ class TestPickle(TestCase):
+ # hence no subclassing TestCase
+ @pytest.mark.mpi
+ class TestMPI(object):
++@pytest.mark.skip(reason="fixture 'mpi_file_name' not present")
+ def test_mpio(self, mpi_file_name):
+ """ MPIO driver and options """
+ from mpi4py import MPI
+@@ -841,6 +842,7 @@ class TestMPI(object):
+ assert f
+ assert f.driver == 'mpio'
+
++@pytest.mark.skip(reason="fixture 'mpi_file_name' not present")
+ @pytest.mark.skipif(h5py.version.hdf5_version_tuple < (1, 8, 9),
+ reason="mpio atomic file operations were added in
HDF5 1.8.9+")
+ def test_mpi_atomic(self, mpi_file_name):
+@@ -852,6 +854,7 @@ class TestMPI(object):
+ f.atomic = True
+ assert f.atomic
+
++@pytest.mark.skip(reason="fixture 'mpi_file_name' not present")
+ def test_close_multiple_mpio_driver(self, mpi_file_name):
+ """ MPIO driver and options """
+ from mpi4py import MPI
Index: patches/patch-lzf_lzf_filter_c
===
RCS file: patches/patch-lzf_lzf_filter_c
diff -N patches/patch-lzf_lzf_filter_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lzf_lzf_filter_c 22 Oct 2021 19:31:56 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix segfault.
+
+Index: lzf/lzf_filter.c
+--- lzf/lzf_filter.c.orig
lzf/lzf_filter.c
+@@ -249,7 +249,7 @@ size_t lzf_filter(unsigned flags, size_t cd_nelmts,
+
+ if(status != 0){
+
+-free(*buf);
++H5free_memory(*buf);
+ *buf = outbuf;
+ *buf_size = outbuf_size;
+
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/math/py-h5py/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 24 Jun 2021 10:52:02 - 1.2
+++ patches/patch-setup_py 22 Oct 2021 19:31:56 -
@@ -5,7 +5,7 @@ Relax Numpy and Python requirements.
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -28,8 +28,7 @@ VERSION = '3.3.0'
Re: [NEW] www/unit
Since www/nginx has now changed the rc-script regarding SIGQUIT I've dropped the rc_stop from unit's rc-script. And I don't think the ruby30 "extra" in port-lib-depends-check is really a big problem as anybody doing a sweep of these (which is well overdue actually..) should be able to figure out that it shouldn't really be removed. So: any OKs to import? On 2021/10/11 22:25, Stuart Henderson wrote: > On 2021/10/11 19:24, Sergey A. Osokin wrote: > > On Wed, Oct 06, 2021 at 03:30:08AM +, Sergey A. Osokin wrote: > > > On Wed, Sep 22, 2021 at 08:49:06PM +0100, Stuart Henderson wrote: > > > > On 2021/09/22 13:34, Sergey A. Osokin wrote: > > > > > On Fri, Sep 17, 2021 at 03:20:16PM +, Sergey A. Osokin wrote: > > > > > > > > > > P.S. Yes, I know you're busy with a preparation to the upcoming 7.0 > > > > > and it's good time for fixes and probably not a best time for new > > > > > ports, but I want to let you know that www/unit builds very well > > > > > with new and shiny 7.0 yesterday snapshot. > > > > > > > > yes, it's been no new imports for a week already. > > > > I will have a look again when I have time. > > > > > > Seems like a liveness probe returns a positive signal after the > > > ports change freeze for the upcoming 7.0. > > > Is there any update? > > > > Could you please provide an update. > > Thank you. > > > > -- > > Sergey Osokin > > > Hi Sergey. Updated version attached, A few notes on my changes, there > are probably some others too but this is what I remember: > > - reduce unnecessary variables, the UNIT_xxx were only used to pass > to configure and create directories in fake-install. The directory > creation is pointless, so I dropped the variables and passed directly > to configure. > > - move libexec to lib. openbsd standard use for libexec is for > executables invoked by some software. other similar ports use lib for > plugin modules. > > - /var/run and tmp are cleared at boot so must be created by the rc > script, I added rc_pre. there is no point including them in the package > because it gives a false sense that things will work after boot. > > - tidy dependencies > > - use a valid uid for @newuser/@newgroup lines > > - enable tests > > A couple of issues remain: > > - ruby linkage looks a bit wrong, but I think that's on the ruby side > not the unit side. the NEEDED ELF header in unit's ruby module is set to > just "libruby30.so" and not "libruby30.so.0.0", I think this is probably > due to the symlink in /usr/local/lib/libruby30.so -> libruby30.so.0.0 > and/or lack of SONAME in libruby30. Maybe another porter has an idea > what to do with this though I think it's probably not a show-stopper.. > > - rc script nearly duplicates the standard rc_stop section but adds > -QUIT instead of using the default (-TERM). currently the two singals > do the same in unit anyway but comments suggest it is intended for a > graceful shutdown (not yet implemented). I don't think that will work > very well with rc.d anyway (rcctl restart will wait for shutdown, > so you either use 'fast shutdown' and kill active connections, or > use 'graceful' and have a gap while you stop accepting new connections > while draining old). So I think it might be better to drop the rc_stop > function. > > Other than those, it builds and starts ok, I have run out of patience > trying to figure out how to configure to test runtime myself though > (I was looking for a simple static-file config but there is nothing > obvious). However the tests that I've enabled look promising (a couple > of F/E in test_perl_application.py and test_respawn.py, and a couple > of TLS-related ones, looks fairly minor). > unit.tgz Description: application/tar-gz
Re: remove: devel/py-SOAPpy, devel/py-fpconst
On 2021/10/22 20:16, Stuart Henderson wrote: > py-SOAPpy: py2 only, no updates since 2014, not used in the tree > py-fpconst: py2 only, no updates since 2005, only used in the tree for SOAPpy > > ok to drop them? > and net/py-zsi 2008-vintage
remove: devel/py-SOAPpy, devel/py-fpconst
py-SOAPpy: py2 only, no updates since 2014, not used in the tree py-fpconst: py2 only, no updates since 2005, only used in the tree for SOAPpy ok to drop them?
Re: [update] mail/exim -> 4.95
If you pipeline to yahoo, you will almost always have issues. They somewhat greylist all servers sending to them using pipelining. To be honest, enabling pipelining will very often lead to unexpected issues. IMHO, they should just remove that feature. That's of course no excuse for breaking it ;) Thanks for keeping me informed. 22 oct. 2021 17:10:03 Stuart Henderson : > Only a minor one in that they've broken something with pipelining resulting > in multiple copies of mail getting delivered in some cases, see the open > ticket about yahoo.co.jp[http://yahoo.co.jp], and I was waiting to see if > they were going to do anything with it before I committed the update.. > > -- > Sent from a phone, apologies for poor formatting. > > > On 22 October 2021 08:46:42 Renaud Allard wrote: > >> Is there a major problem with that diff? >> >> On 10/6/21 8:49 AM, Renaud Allard wrote: >>> ping >>> >>> >>> Forwarded Message >>> Subject: [update] mail/exim -> 4.95 >>> Date: Wed, 29 Sep 2021 08:40:40 +0200 >>> From: Renaud Allard >>> To: ports >>> >>> Hi, >>> >>> This is an update for mail/exim to version 4.95. >>> >>> It includes the patch from sthen@ to disable the printf %n checks (by >>> default in 4.95 source). >>> It also includes a patch to be able to compile properly with libressl >>> 3.4.0, therefore removing the hack in the Makefile >>> The specific OpenBSD os.h patch can also be removed as this has been >>> included in exim by default too. >>> >>> Best Regards >>> > smime.p7s Description: S/MIME cryptographic signature
Re: [update] net/py-cares 3.1.1 -> 4.1.2
On 2021/10/22 09:49, Kurt Mosiejczuk wrote:
> On Fri, Oct 22, 2021 at 08:18:52AM +0100, Stuart Henderson wrote:
>
> > > +TESTLIBDIR = lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
> > > +TEST_ENV += PYTHONPATH=${TESTLIBDIR}
>
> > Do you think we might be able to do this by default in python.port.mk
> > (at least for ports setting MODPY_PYTEST)?
>
> Probably. I mainly haven't since not all ports put things in such a
> directory. Many just use "lib" without the decorations.
hmm, maybe lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}:lib would
make sense, it would be pretty handy if we could automate this,
the temptation to just self-depends is high if extra steps are
needed!
> I did consider a flag to make it do this little dance though.
>
> --Kurt
>
Re: UPDATE math/py-numpy-1.17.5
Am 22.10.21 um 16:09 schrieb Bjorn Ketelaars: > On Fri 22/10/2021 13:23, Bjorn Ketelaars wrote: >> On Fri 22/10/2021 09:55, Martin Reindl wrote: >>> Am 22.10.2021 um 09:49 schrieb Stuart Henderson: Only issue in the i386 build was math/py-h5py which specifically wants 1.16.5. >>> >>> Yes, this is one patch which can go away with newer numpy. >> >> That is not entirely true. When building, py-h5py checks for a specific >> version of py-numpy. Diff below fixes this by checking for a minimum >> version similar to RUN_REQUIRES in setup.py. >> >> BTW 'make test' fails because of a py-numpy related issue. This happens >> with both py-numpy-1.16.5 and py-numpy-1.19.5. Have you seen this >> before? Both test logs attached. > > Correction, failing tests is not because of numpy. It seems it is > because of py-h5py: > > Found a core file in py-h5py's $WRKDIR. Interesting bits: > > (gdb) bt > #0 thrkill () at /tmp/-:3 > #1 0x048b929f323e in _libc_abort () at > /usr/src/lib/libc/stdlib/abort.c:51 > #2 0x048b92a1f2e6 in wrterror (d=0x48af111a1b0, msg=0x48b929c405f > "modified chunk-pointer %p") at /usr/src/lib/libc/stdlib/malloc.c:307 > #3 0x048b92a22c8c in find_chunknum (d=0x0, info= Unhandled dwarf expression opcode 0xa3>, ptr=0x0, check=-183984) > at /usr/src/lib/libc/stdlib/malloc.c:1063 > #4 0x048b92a1f849 in ofree (argpool=0x7f7d3490, p=0x48b1ec42c30, > clear=0, check=, argsz=0) at > /usr/src/lib/libc/stdlib/malloc.c:1409 > #5 0x048b92a1f52b in free (ptr=0x48b1ec42c30) at > /usr/src/lib/libc/stdlib/malloc.c:1470 > #6 0x048b07115638 in lzf_filter (flags= Unhandled dwarf expression opcode 0xa3>, > cd_nelmts= 0xa3>, cd_values= 0xa3>, nbytes=800, > buf_size=, buf=) at lzf/lzf_filter.c:252 > #7 0x048b5e082a0d in H5Z_pipeline () from /usr/local/lib/libhdf5.so.3.0 > ... > ... > (gdb) f 6 > #6 0x048b07115638 in lzf_filter ( > flags=, > cd_nelmts= 0xa3>, > cd_values= 0xa3>, > nbytes=800, buf_size=, buf=) > at lzf/lzf_filter.c:252 > 252 free(*buf); > I will try to look into this but can you try the latest h5py-3.5.0 in the meantime?
Re: dhcpcd update
On Fri 22/10/2021 19:00, Stuart Henderson wrote: > I moved my pppoe router to a routeros box, can anyone teat this please? Diff looks good, all tests pass. Run tested on amd64, successfully retrieved an IPv6 subnet from my ISP. OK bket@
Re: [new] x11/alacritty
Thanks for addressing the suggsted changes so quickly, Eric. I've installed alacritty from the latest tar.gz and the alacritty terminfo is now available in /usr/local/share/terminfo/a. Great patch to change the shell program to ksh in example config. ok from me
dhcpcd update
I moved my pppoe router to a routeros box, can anyone teat this please?
Index: Makefile
===
RCS file: /cvs/ports/net/dhcpcd/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile30 Aug 2021 12:56:05 - 1.95
+++ Makefile22 Oct 2021 17:55:57 -
@@ -6,10 +6,9 @@ PORTROACH= site:https://github.com/Netwo
GH_ACCOUNT=NetworkConfiguration
GH_PROJECT=dhcpcd
-GH_COMMIT= 01748b315d7093f458b9379bc77f19762c721314
+GH_TAGNAME=dhcpcd-9.4.1
+DISTNAME= ${GH_TAGNAME}
-DISTNAME= dhcpcd-9.4.0pl1
-REVISION= 1
EPOCH= 0
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/dhcpcd/distinfo,v
retrieving revision 1.56
diff -u -p -r1.56 distinfo
--- distinfo2 Jul 2021 10:33:30 - 1.56
+++ distinfo22 Oct 2021 17:55:57 -
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-9.4.0pl1-01748b31.tar.gz) =
EQYIVnD5rxeboHb13G2RorQnU5NmaisamP8N9PWuW2w=
-SIZE (dhcpcd-9.4.0pl1-01748b31.tar.gz) = 352274
+SHA256 (dhcpcd-9.4.1.tar.gz) = 0e5pDcCA5Py6fLvQ8NB7tfYjFoF4ESyZxPp/6p0i2vQ=
+SIZE (dhcpcd-9.4.1.tar.gz) = 347261
Index: patches/patch-src_route_c
===
RCS file: patches/patch-src_route_c
diff -N patches/patch-src_route_c
--- patches/patch-src_route_c 30 Aug 2021 12:56:05 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-$OpenBSD: patch-src_route_c,v 1.6 2021/08/30 12:56:05 stsp Exp $
-Fix wrong RB tree lookup in case overlapping prefixes with
-different netmasks exist.
-See https://github.com/NetworkConfiguration/dhcpcd/pull/52
-Index: src/route.c
src/route.c.orig
-+++ src/route.c
-@@ -96,17 +96,6 @@ rt_maskedaddr(struct sockaddr *dst,
- memset(dstp, 0, (size_t)(addre - dstp));
- }
-
--int
--rt_cmp_dest(const struct rt *rt1, const struct rt *rt2)
--{
-- union sa_ss ma1 = { .sa.sa_family = AF_UNSPEC };
-- union sa_ss ma2 = { .sa.sa_family = AF_UNSPEC };
--
-- rt_maskedaddr(&ma1.sa, &rt1->rt_dest, &rt1->rt_netmask);
-- rt_maskedaddr(&ma2.sa, &rt2->rt_dest, &rt2->rt_netmask);
-- return sa_cmp(&ma1.sa, &ma2.sa);
--}
--
- /*
- * On some systems, host routes have no need for a netmask.
- * However DHCP specifies host routes using an all-ones netmask.
-@@ -120,6 +109,22 @@ rt_cmp_netmask(const struct rt *rt1, const struct rt *
- if (rt1->rt_flags & RTF_HOST && rt2->rt_flags & RTF_HOST)
- return 0;
- return sa_cmp(&rt1->rt_netmask, &rt2->rt_netmask);
-+}
-+
-+int
-+rt_cmp_dest(const struct rt *rt1, const struct rt *rt2)
-+{
-+ union sa_ss ma1 = { .sa.sa_family = AF_UNSPEC };
-+ union sa_ss ma2 = { .sa.sa_family = AF_UNSPEC };
-+ int c;
-+
-+ rt_maskedaddr(&ma1.sa, &rt1->rt_dest, &rt1->rt_netmask);
-+ rt_maskedaddr(&ma2.sa, &rt2->rt_dest, &rt2->rt_netmask);
-+ c = sa_cmp(&ma1.sa, &ma2.sa);
-+ if (c != 0)
-+ return c;
-+
-+ return rt_cmp_netmask(rt1, rt2);
- }
-
- static int
nextcloud: problems after upgrading to 7.0 / 22.2.0
I ran into two issues after upgrading my OpenBSD server to 7.0 and Nextcloud to 22.2.0 First, I had some troubles (internal server error in the browser) giving me the following error message on the console, using ./occ: 4047 InnoDB refuses to write tables with ROW_FORMAT=COMPRESSED or KEY_BLOCK_SIZE This seems to be resolved by specifying --skip-innodb-read-only-compressed in rc.conf.local for mysqld_flags. Second, the sort_butter_size of /etc/my.cnf seems to be too small (default is 512K), I had to increase it to 2M to get things running again. I saw "1038 Out of sort memory, consider increasing server sort buffer size" in the nextcloud log. Anyone else having these troubles? If so, should we mention those caveats in the readme? Clemens
Re: [new] x11/alacritty
On 2021/10/22 18:20, Frederic Cambus wrote:
> On Fri, Oct 22, 2021 at 04:16:53PM +0100, Stuart Henderson wrote:
> > Please remove MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}, it is the default
> >
> > crates.inc is missing license info (modcargo-gen-crates-licenses)
> >
> > README underlining with === has the wrong number of chars
> >
> > ${PKGSTEM}(1) makes no sense, just use alacritty(1). Maybe "read through"
> > instead of "go through".
>
> Makes sense. Here is an updated tarball with the mentioned changes.
>
> Comments? OK?
ok
Re: [new] x11/alacritty
On Fri, Oct 22, 2021 at 04:16:53PM +0100, Stuart Henderson wrote:
> Please remove MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}, it is the default
>
> crates.inc is missing license info (modcargo-gen-crates-licenses)
>
> README underlining with === has the wrong number of chars
>
> ${PKGSTEM}(1) makes no sense, just use alacritty(1). Maybe "read through"
> instead of "go through".
Makes sense. Here is an updated tarball with the mentioned changes.
Comments? OK?
alacritty.tar.gz
Description: application/tar-gz
Re: [new] x11/alacritty
Please remove MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}, it is the default
crates.inc is missing license info (modcargo-gen-crates-licenses)
README underlining with === has the wrong number of chars
${PKGSTEM}(1) makes no sense, just use alacritty(1). Maybe "read through"
instead of "go through".
--
Sent from a phone, apologies for poor formatting.
On 22 October 2021 11:54:26 Frederic Cambus wrote:
On Mon, Oct 18, 2021 at 12:03:32PM +, Eric Auge wrote:
An update after some useful comments from a person (Alexis
Hildebrandt) off list, as diff:
+ tic -s -x -o ${PREFIX}/share/terminfo ${EXTRA_DIR}/alacritty.info
Thanks! I updated the PLIST so the generated files are installed.
Here is an updated tarball with the following changes, discussed
with tb@:
- Some pkg/README tweaks and fixes
- Patch the default shell to /bin/ksh and switch argument from --login
to -l, so users can simply uncomment those lines and get a working
configuration
- Add missing $OpenBSD$ RCS ID marker for patches
- Add missing terminfo entries in PLIST
Comments? OK to import?
Re: [update] mail/exim -> 4.95
Only a minor one in that they've broken something with pipelining resulting in multiple copies of mail getting delivered in some cases, see the open ticket about yahoo.co.jp, and I was waiting to see if they were going to do anything with it before I committed the update.. -- Sent from a phone, apologies for poor formatting. On 22 October 2021 08:46:42 Renaud Allard wrote: Is there a major problem with that diff? On 10/6/21 8:49 AM, Renaud Allard wrote: ping Forwarded Message Subject: [update] mail/exim -> 4.95 Date: Wed, 29 Sep 2021 08:40:40 +0200 From: Renaud Allard To: ports Hi, This is an update for mail/exim to version 4.95. It includes the patch from sthen@ to disable the printf %n checks (by default in 4.95 source). It also includes a patch to be able to compile properly with libressl 3.4.0, therefore removing the hack in the Makefile The specific OpenBSD os.h patch can also be removed as this has been included in exim by default too. Best Regards
Re: UPDATE math/py-numpy-1.17.5
On Fri 22/10/2021 13:23, Bjorn Ketelaars wrote: > On Fri 22/10/2021 09:55, Martin Reindl wrote: > > Am 22.10.2021 um 09:49 schrieb Stuart Henderson: > > > Only issue in the i386 build was math/py-h5py which specifically wants > > > 1.16.5. > > > > > > > Yes, this is one patch which can go away with newer numpy. > > That is not entirely true. When building, py-h5py checks for a specific > version of py-numpy. Diff below fixes this by checking for a minimum > version similar to RUN_REQUIRES in setup.py. > > BTW 'make test' fails because of a py-numpy related issue. This happens > with both py-numpy-1.16.5 and py-numpy-1.19.5. Have you seen this > before? Both test logs attached. Correction, failing tests is not because of numpy. It seems it is because of py-h5py: Found a core file in py-h5py's $WRKDIR. Interesting bits: (gdb) bt #0 thrkill () at /tmp/-:3 #1 0x048b929f323e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51 #2 0x048b92a1f2e6 in wrterror (d=0x48af111a1b0, msg=0x48b929c405f "modified chunk-pointer %p") at /usr/src/lib/libc/stdlib/malloc.c:307 #3 0x048b92a22c8c in find_chunknum (d=0x0, info=, ptr=0x0, check=-183984) at /usr/src/lib/libc/stdlib/malloc.c:1063 #4 0x048b92a1f849 in ofree (argpool=0x7f7d3490, p=0x48b1ec42c30, clear=0, check=, argsz=0) at /usr/src/lib/libc/stdlib/malloc.c:1409 #5 0x048b92a1f52b in free (ptr=0x48b1ec42c30) at /usr/src/lib/libc/stdlib/malloc.c:1470 #6 0x048b07115638 in lzf_filter (flags=, cd_nelmts=, cd_values=, nbytes=800, buf_size=, buf=) at lzf/lzf_filter.c:252 #7 0x048b5e082a0d in H5Z_pipeline () from /usr/local/lib/libhdf5.so.3.0 ... ... (gdb) f 6 #6 0x048b07115638 in lzf_filter ( flags=, cd_nelmts=, cd_values=, nbytes=800, buf_size=, buf=) at lzf/lzf_filter.c:252 252 free(*buf);
Re: [update] net/py-cares 3.1.1 -> 4.1.2
On Fri, Oct 22, 2021 at 08:18:52AM +0100, Stuart Henderson wrote:
> > +TESTLIBDIR = lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
> > +TEST_ENV +=PYTHONPATH=${TESTLIBDIR}
> Do you think we might be able to do this by default in python.port.mk
> (at least for ports setting MODPY_PYTEST)?
Probably. I mainly haven't since not all ports put things in such a
directory. Many just use "lib" without the decorations.
I did consider a flag to make it do this little dance though.
--Kurt
Re: UPDATE math/py-numpy-1.17.5
On Fri 22/10/2021 12:16, Dima Pasechnik wrote: > On Fri, Oct 22, 2021 at 09:55:19AM +0200, Martin Reindl wrote: > > Am 22.10.2021 um 09:49 schrieb Stuart Henderson: > > > Only issue in the i386 build was math/py-h5py which specifically wants > > > 1.16.5. > > > > > > > Yes, this is one patch which can go away with newer numpy. > > numpy by itself doesn't really use Fortran - it only sets up a configuration, > used by other Python packages, > mainly SciPy. So a good test of this being ready is to build and test SciPy > using the NumPy. I ran scipy's regression tests using both numpy-1.16.5 and numpy-1.19.5. No new failing tests. logs attached. Using numpy-1.16.5: = 5 failed, 36305 passed, 2226 skipped, 102 xfailed, 7 xpassed, 2 warnings in 2787.49 seconds = Using numpy-1.16.5: = 5 failed, 36319 passed, 2212 skipped, 102 xfailed, 7 xpassed, 12 warnings in 3222.45 seconds = test.log-numpy-1.16.5.log.gz Description: application/gunzip test.log-numpy-1.19.5.log.gz Description: application/gunzip
Re: [update] mail/exim -> 4.95
Is there a major problem with that diff?
On 10/6/21 8:49 AM, Renaud Allard wrote:
ping
Forwarded Message
Subject: [update] mail/exim -> 4.95
Date: Wed, 29 Sep 2021 08:40:40 +0200
From: Renaud Allard
To: ports
Hi,
This is an update for mail/exim to version 4.95.
It includes the patch from sthen@ to disable the printf %n checks (by
default in 4.95 source).
It also includes a patch to be able to compile properly with libressl
3.4.0, therefore removing the hack in the Makefile
The specific OpenBSD os.h patch can also be removed as this has been
included in exim by default too.
Best Regards
Index: Makefile
===
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile
--- Makefile 5 May 2021 15:08:15 - 1.136
+++ Makefile 29 Sep 2021 06:19:48 -
@@ -3,12 +3,11 @@
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
-VERSION = 4.94.2
+VERSION = 4.95
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
FULLPKGPATH-eximon = ${PKGPATH},-eximon
-REVISION-main = 1
CATEGORIES = mail
@@ -90,8 +89,6 @@ EXIM_EXTRA_LIBS += -L${LOCALBASE}/lib -l
LIB_DEPENDS-main += security/cyrus-sasl2
WANTLIB-main += sasl2
.endif
-
-CFLAGS += -DEXIM_HAVE_OPENSSL_CIPHER_GET_ID
# Needed to build with base-gcc
.if !${PROPERTIES:Mclang}
Index: distinfo
===
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo 4 May 2021 13:49:04 - 1.42
+++ distinfo 29 Sep 2021 06:19:48 -
@@ -1,2 +1,2 @@
-SHA256 (exim-4.94.2.tar.gz) = OpHNalQTyICEKlhIOW00wu5/l+XDONmOXV+xO2r/KjA=
-SIZE (exim-4.94.2.tar.gz) = 2528512
+SHA256 (exim-4.95.tar.gz) = b92D7de/U73AoggYdkOqDEGGGrqaCaAm94NRrI52i5w=
+SIZE (exim-4.95.tar.gz) = 2566707
Index: patches/patch-Local_Makefile
===
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Local_Makefile
--- patches/patch-Local_Makefile 19 Mar 2021 15:59:50 - 1.5
+++ patches/patch-Local_Makefile 29 Sep 2021 06:19:48 -
@@ -31,7 +31,7 @@ Index: Local/Makefile
# If you specify EXIM_USER as a name, this is looked up at build time, and the
# uid number is built into the binary. However, you can specify that this
@@ -210,11 +210,11 @@ SPOOL_DIRECTORY=/var/spool/exim
- # If you are buliding with TLS, the library configuration must be done:
+ # If you are building with TLS, the library configuration must be done:
# Uncomment this if you are using OpenSSL
-# USE_OPENSSL=yes
@@ -44,7 +44,7 @@ Index: Local/Makefile
# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
# Uncomment this if you are using GnuTLS
-@@ -337,7 +337,7 @@ TRANSPORT_SMTP=yes
+@@ -340,7 +340,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
@@ -53,7 +53,7 @@ Index: Local/Makefile
#--
-@@ -346,9 +346,9 @@ TRANSPORT_SMTP=yes
+@@ -349,9 +349,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
@@ -66,7 +66,7 @@ Index: Local/Makefile
#--
-@@ -406,17 +406,17 @@ LOOKUP_DBM=yes
+@@ -409,8 +409,8 @@ LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
@@ -77,6 +77,8 @@ Index: Local/Makefile
# LOOKUP_IBASE=yes
# LOOKUP_JSON=yes
# LOOKUP_LDAP=yes
+@@ -418,10 +418,10 @@ LOOKUP_DNSDB=yes
+
# LOOKUP_MYSQL=yes
# LOOKUP_MYSQL_PC=mariadb
-# LOOKUP_NIS=yes
@@ -88,7 +90,7 @@ Index: Local/Makefile
# LOOKUP_PGSQL=yes
# LOOKUP_REDIS=yes
# LOOKUP_SQLITE=yes
-@@ -508,7 +508,7 @@ SUPPORT_DANE=yes
+@@ -514,7 +514,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@@ -97,19 +99,20 @@ Index: Local/Makefile
# If you have content scanning you may wish to only include some of the scanner
# interfaces. Uncomment any of these lines to remove that code.
-@@ -595,9 +595,9 @@ DISABLE_MAL_MKS=yes
-
- # Uncomment the following line to add DMARC checking capability, implemented
+@@ -607,9 +607,9 @@ DISABLE_MAL_MKS=yes
# using libopendmarc libraries. You must have SPF and DKIM support enabled also.
+ # Library version libopendmarc-1.4.1-1.fc33.x86_64 (on Fedora 33) is known broken;
+ # 1.3.2-3 works. I seems that the OpenDMARC project broke their API.
-# SUPPORT_DMARC=yes
-+SUPPORT_DMARC=yes
- # CFLAGS += -I/usr/local/include
+-# CFLAGS += -I/usr/local/include
-# LDFLAGS += -lopendmarc
++SUPPORT_DMARC=yes
++# CFLAGS += -I/usr/local/include
+LDFLAGS += -lopendmarc
Re: UPDATE math/py-numpy-1.17.5
On Fri 22/10/2021 13:23, Bjorn Ketelaars wrote: > On Fri 22/10/2021 09:55, Martin Reindl wrote: > > Am 22.10.2021 um 09:49 schrieb Stuart Henderson: > > > Only issue in the i386 build was math/py-h5py which specifically wants > > > 1.16.5. > > > > > > > Yes, this is one patch which can go away with newer numpy. > > That is not entirely true. When building, py-h5py checks for a specific > version of py-numpy. Diff below fixes this by checking for a minimum > version similar to RUN_REQUIRES in setup.py. > > BTW 'make test' fails because of a py-numpy related issue. This happens > with both py-numpy-1.16.5 and py-numpy-1.19.5. Have you seen this > before? Both test logs attached. Oops, forgot to include the logs. test.log-numpy-1.16.5.gz Description: application/gunzip test.log-numpy-1.19.5.gz Description: application/gunzip
Re: UPDATE math/py-numpy-1.17.5
On Fri 22/10/2021 09:55, Martin Reindl wrote:
> Am 22.10.2021 um 09:49 schrieb Stuart Henderson:
> > Only issue in the i386 build was math/py-h5py which specifically wants
> > 1.16.5.
> >
>
> Yes, this is one patch which can go away with newer numpy.
That is not entirely true. When building, py-h5py checks for a specific
version of py-numpy. Diff below fixes this by checking for a minimum
version similar to RUN_REQUIRES in setup.py.
BTW 'make test' fails because of a py-numpy related issue. This happens
with both py-numpy-1.16.5 and py-numpy-1.19.5. Have you seen this
before? Both test logs attached.
OK for the diff below?
diff --git Makefile Makefile
index c80e7dc901c..2446dbf6527 100644
--- Makefile
+++ Makefile
@@ -3,6 +3,7 @@
COMMENT = pythonic interface to the HDF5 binary data format
MODPY_EGG_VERSION =3.3.0
+REVISION = 0
DISTNAME = h5py-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = math
diff --git patches/patch-setup_py patches/patch-setup_py
index 2f72bbaee14..f7c2ac16529 100644
--- patches/patch-setup_py
+++ patches/patch-setup_py
@@ -15,3 +15,12 @@ Index: setup.py
]
# these are required to use h5py
+@@ -49,7 +48,7 @@ SETUP_REQUIRES = [
+ "Cython >=0.29.14; python_version=='3.8'",
+ "Cython >=0.29.15; python_version>='3.9'",
+ ] + [
+-f"numpy =={np_min}; python_version{py_condition}"
++f"numpy >={np_min}; python_version{py_condition}"
+ for np_min, py_condition in NUMPY_MIN_VERSIONS
+ ]
+
Re: [new] x11/alacritty
On Mon, Oct 18, 2021 at 12:03:32PM +, Eric Auge wrote:
> An update after some useful comments from a person (Alexis
> Hildebrandt) off list, as diff:
> + tic -s -x -o ${PREFIX}/share/terminfo ${EXTRA_DIR}/alacritty.info
Thanks! I updated the PLIST so the generated files are installed.
Here is an updated tarball with the following changes, discussed
with tb@:
- Some pkg/README tweaks and fixes
- Patch the default shell to /bin/ksh and switch argument from --login
to -l, so users can simply uncomment those lines and get a working
configuration
- Add missing $OpenBSD$ RCS ID marker for patches
- Add missing terminfo entries in PLIST
Comments? OK to import?
alacritty.tar.gz
Description: application/tar-gz
Re: UPDATE math/py-numpy-1.17.5
On Fri, Oct 22, 2021 at 09:55:19AM +0200, Martin Reindl wrote: > Am 22.10.2021 um 09:49 schrieb Stuart Henderson: > > Only issue in the i386 build was math/py-h5py which specifically wants > > 1.16.5. > > > > Yes, this is one patch which can go away with newer numpy. numpy by itself doesn't really use Fortran - it only sets up a configuration, used by other Python packages, mainly SciPy. So a good test of this being ready is to build and test SciPy using the NumPy. Cf. https://github.com/numpy/numpy/issues/19437 - something I tried to get working on OpenBSD. (some of this is being fixed - there is a related Clang issue). Dima >
Re: [new] x11/alacritty
Hello all, I'd like to show my full support for this port as it would be great to be able to install alacritty on OpenBSD using: pkg_add alacritty Thank you, Eric, for considering the feedback. I've tried the latest version of alacritty.tar.gz attached to your previous post and and installed it via: make fake; make package; make install It seems that the alacritty.info isn't properly installed, possibly to due to /usr/local/share/terminfo not existing. Best Alexis
Re: UPDATE math/py-numpy-1.17.5
Am 22.10.2021 um 09:49 schrieb Stuart Henderson: Only issue in the i386 build was math/py-h5py which specifically wants 1.16.5. Yes, this is one patch which can go away with newer numpy.
Re: UPDATE math/py-numpy-1.17.5
Only issue in the i386 build was math/py-h5py which specifically wants 1.16.5.
Re: [update] net/py-cares 3.1.1 -> 4.1.2
On 2021/10/22 08:18, Stuart Henderson wrote:
> On 2021/10/21 21:15, Kurt Mosiejczuk wrote:
> > This updates py-cares to 4.1.2. >= 4.0.0 is requires for the py-aiodns
> > update I'm sending right after this.
> >
> > I tweaked the testing to not require actual installation of the package
> > for testing.
> >
> > All consumers (www/py-tornado and net/py-aiodns) pass tests the same
> > as before the update on amd64.
> >
> > ok?
>
> ok.
>
> > RUN_DEPENDS = devel/py-cffi${MODPY_FLAVOR}
> > BUILD_DEPENDS =${RUN_DEPENDS}
> > -TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
> > +
> > +TESTLIBDIR = lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
> > +TEST_ENV +=PYTHONPATH=${TESTLIBDIR}
>
> Do you think we might be able to do this by default in python.port.mk
> (at least for ports setting MODPY_PYTEST)?
>
Like this (bonus change since I thought of it anyway, for separate
commit if it's wanted: if MODPY_PYTEST_ARGS is set we can assume that
MODPY_PYTEST should be set to Yes to reduce some typing in makefiles).
Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.132
diff -u -p -r1.132 python.port.mk
--- python.port.mk 21 May 2021 19:50:21 - 1.132
+++ python.port.mk 22 Oct 2021 07:35:41 -
@@ -90,7 +90,12 @@ MODPY_ABI3SO = ".abi3"
MODPY_PYOEXTENSION ?= opt-1.pyc
.endif
+MODPY_PYTEST_ARGS ?=
+.if empty(MODPY_PYTEST_ARGS)
MODPY_PYTEST ?=No
+.else
+MODPY_PYTEST ?=Yes
+.endif
MODPY_WANTLIB =python${MODPY_VERSION}
@@ -208,18 +213,23 @@ MODPY_CMD = cd ${WRKSRC} && ${SETENV} ${
${MODPY_SETUP_ARGS}
MODPY_TEST_DIR ?= ${WRKSRC}
+MODPY_TEST_LIBDIR ?=
MODPY_TEST_CMD = cd ${MODPY_TEST_DIR} && ${SETENV} ${ALL_TEST_ENV} ${MODPY_BIN}
.if ${MODPY_PYTEST:L} == "yes"
MODPY_TEST_CMD += -m pytest
+MODPY_TEST_LIBDIR ?= lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
.else
MODPY_TEST_CMD += ./${MODPY_SETUP} ${MODPY_SETUP_ARGS}
.endif
MODPY_TEST_LOCALE ?= LC_CTYPE=en_US.UTF-8
-
TEST_ENV +=${MODPY_TEST_LOCALE}
+.if !empty(MODPY_TEST_LIBDIR)
+TEST_ENV +=PYTHONPATH=${MODPY_TEST_LIBDIR}
+.endif
+
SUBST_VARS := MODPY_PYCACHE MODPY_COMMENT MODPY_ABI3SO MODPY_PYC_MAGIC_TAG \
MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX \
MODPY_PY_PREFIX MODPY_PYOEXTENSION ${SUBST_VARS}
@@ -243,8 +253,6 @@ MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_
MODPY_INSTALL_TARGET = \
${MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS} \
${MODPY_DISTUTILS_INSTALL} ${MODPY_DISTUTILS_INSTALLARGS}
-
-MODPY_PYTEST_ARGS ?=
MODPY_TEST_TARGET =${MODPY_TEST_CMD}
.if ${MODPY_PYTEST:L} == "yes"
Re: [update] net/py-cares 3.1.1 -> 4.1.2
On 2021/10/21 21:15, Kurt Mosiejczuk wrote:
> This updates py-cares to 4.1.2. >= 4.0.0 is requires for the py-aiodns
> update I'm sending right after this.
>
> I tweaked the testing to not require actual installation of the package
> for testing.
>
> All consumers (www/py-tornado and net/py-aiodns) pass tests the same
> as before the update on amd64.
>
> ok?
ok.
> RUN_DEPENDS =devel/py-cffi${MODPY_FLAVOR}
> BUILD_DEPENDS = ${RUN_DEPENDS}
> -TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
> +
> +TESTLIBDIR = lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
> +TEST_ENV += PYTHONPATH=${TESTLIBDIR}
Do you think we might be able to do this by default in python.port.mk
(at least for ports setting MODPY_PYTEST)?
