Re: dhcpcd consistently terminates

2023-05-20 Thread Zack Newman

There are a few bugs in dhcpcd 9.4.1 as well as 10.0.1 that have since
been resolved in the master branch. The bug that was causing dhcpcd to
terminate every 5 days was related to how the privsep code responded to
DHCP truncated packets: it would gracefully exit. This has been fixed
with this commit:
https://github.com/NetworkConfiguration/dhcpcd/commit/8b29c0ddf026c1c5647c3b8c6cfe21699c4056ae

Another bug that was fixed was the incorrect enforcement of the source
UDP port from the DHCP server to be 67. This has been fixed with this commit:
https://github.com/NetworkConfiguration/dhcpcd/commit/b9ac3021af19088fc70e0e7466adb717296cd3c7

The least important bug that was affecting me was privsep causing
issues with dhcpcd -U . This has been fixed with this commit:
https://github.com/NetworkConfiguration/dhcpcd/commit/41084f34629d4da5937dc44e0b68677b11eb65a3

I don't expect ports to be updated with this new version for OpenBSD 7.3.
I am merely concluding the thread that I started.



[update] security/osv-scanner to 1.3.3.

2023-05-20 Thread Lucas Raab
Hello,

Here's a quick update to 1.3.3, runs fine

changelog:
Fixes:
Bug #369 Fix requirements.txt misparsing lines that contain --hash
Bug #237 Clarify when no vulnerabilities are found
Bug #354 Fix cycle in requirements.txt causing infinite recursion
Bug #367 Fix panic when parsing empty lockfile

API Features
Feature #357 Update pkg/osv to allow overriding the http client / transport

Thanks,
Lucas
diff refs/heads/master refs/heads/osv-scanner
commit - f381dcdca76d90f4031515d36be712c61299e96f
commit + 6323aa5feeab6c61f06bbc3dd37c74ed22d9633d
blob - b1d8bf866628d68282b8fa0ac39fc5e345c3f23b
blob + a46631c8f3102603e93a61f9857d8b8ad7899411
--- security/osv-scanner/Makefile
+++ security/osv-scanner/Makefile
@@ -6,7 +6,7 @@ V = 1.3.2
 
 COMMENT =  scan your project's dependencies for vulnerabilities
 
-V =1.3.2
+V =1.3.3
 MODGO_MODNAME =github.com/google/osv-scanner
 MODGO_VERSION =v${V}
 
blob - 11a0fd580b104397e581c21a593d72324be4b34b
blob + f8641c8b2f4cc3195ea99c403e16f4ca21b2938c
--- security/osv-scanner/distinfo
+++ security/osv-scanner/distinfo
@@ -9,6 +9,8 @@ SHA256 (go_modules/github.com/anmitsu/go-shlex/@v/v0.0
 SHA256 
(go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230217124315-7d5c6f04bbb8.zip)
 = QwUH/oqnnj2zdodYBPMSbvCZZdheyYaRH5jQmXUU4Tc=
 SHA256 (go_modules/github.com/acomagu/bufpipe/@v/v1.0.4.mod) = 
Iaxsw323lcL/h53Hl9IqRY/0F1um/IBgrFx8/DYOoWw=
 SHA256 (go_modules/github.com/acomagu/bufpipe/@v/v1.0.4.zip) = 
Oj1OO/HH5GpaEMpDGEcx1fFnEgE6YoMIfzYy9xw/P8U=
+SHA256 
(go_modules/github.com/anchore/go-struct-converter/@v/v0.0.0-20221118182256-c68fdcfa2092.mod)
 = WggzYMJ2oV0NvIKxftIioKjw0UBjFCKw6YbWdrPy93k=
+SHA256 
(go_modules/github.com/anchore/go-struct-converter/@v/v0.0.0-20221118182256-c68fdcfa2092.zip)
 = Ocmj9VeqVIbAhoGmJoWLydfDM6809s4iFC+xV4KNAPE=
 SHA256 
(go_modules/github.com/anmitsu/go-shlex/@v/v0.0.0-20200514113438-38f4b401e2be.mod)
 = YFvwqg2YIjVA9dr3+pcJHq+79ImJx9F2Uq+ZLKdkr7Y=
 SHA256 
(go_modules/github.com/anmitsu/go-shlex/@v/v0.0.0-20200514113438-38f4b401e2be.zip)
 = Klz3yaJwn2Sf1QjLrLK+luT7pNU0oooSLuTXV0r0C14=
 SHA256 
(go_modules/github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod)
 = eH9fmKshF09xFkyrjuplEl5gqnL111F+EuCOe47szNI=
@@ -16,11 +18,13 @@ SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v
 SHA256 (go_modules/github.com/bradleyjkemp/cupaloy/v2/@v/v2.8.0.mod) = 
Irw2AV+FCyXe73ShEsNARxdI76cC9taJWn6pcIumIZM=
 SHA256 (go_modules/github.com/bradleyjkemp/cupaloy/v2/@v/v2.8.0.zip) = 
+nOEG0auVcwJj3c5M4gl5XREHETrknHSzqt1rMDbPtc=
 SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v/v1.2.0.mod) = 
NorKF1e+h0XM47kN60Aee+V0CWPKU1nEqVTMA1AtjwM=
-SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v/v1.2.0.zip) = 
RZ6byrTT29I8JWJebDwSHZzBjz9oPhO7YXQA9offe3I=
+SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v/v1.2.3.mod) = 
NorKF1e+h0XM47kN60Aee+V0CWPKU1nEqVTMA1AtjwM=
+SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v/v1.2.3.zip) = 
ToAJtAKuZJbmazogNwAtwS8abq0JAOchM5D7er/AOUw=
 SHA256 (go_modules/github.com/client9/misspell/@v/v0.3.4.mod) = 
0bw2Ld3Zb7OkPtS5Kqq3CqbH71pQDX8JVk4+skq88Lg=
 SHA256 (go_modules/github.com/client9/misspell/@v/v0.3.4.zip) = 
o68gY3LhMd0QporEcMZqGxjq9Rxq+stVsuKgbjm5Byg=
 SHA256 (go_modules/github.com/cloudflare/circl/@v/v1.1.0.mod) = 
HbnQ8RL5ropyoGhB9PGR01RcFExuBe082BYBiliCKBo=
-SHA256 (go_modules/github.com/cloudflare/circl/@v/v1.1.0.zip) = 
vGIgcUMzpWYndEC0f6KpArlTR2nbVvhPvHGuKZLfF5o=
+SHA256 (go_modules/github.com/cloudflare/circl/@v/v1.3.3.mod) = 
aLEuRmK7BjlyhJAVP/xS2L3WO+VYvdQbyw2PHu6wPkE=
+SHA256 (go_modules/github.com/cloudflare/circl/@v/v1.3.3.zip) = 
XhGMBQbVxujLM33jULSE2jRUQIXNpV0xFKPm9DJSjfQ=
 SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = 
FMOvou9iNVXBtINNH4ixTfd1Sa/uheV1DBkQJGW3iro=
 SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = 
cKfmCYCc8qksVTUQTbXrgtdcVL/P7S0iTofdL9lyn2I=
 SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.mod) = 
6rBwW8ShjdMVwnpOPbqPIKnhIwZfogYzlmMytczPdzE=
@@ -43,7 +47,6 @@ SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.7.
 SHA256 (go_modules/github.com/go-git/go-git/v5/@v/v5.6.1.zip) = 
IK23A5GiSiadaVfoyqwdVUUl9GFyzL91vPOlGXFPi/U=
 SHA256 
(go_modules/github.com/google/go-cmdtest/@v/v0.4.1-0.20220921163831-55ab3332a786.mod)
 = YBCCwe/4ls1GJ8PCPRVrWD+85CRh5UhHNLZGe5ZOtk0=
 SHA256 
(go_modules/github.com/google/go-cmdtest/@v/v0.4.1-0.20220921163831-55ab3332a786.zip)
 = 4HEz61u+FEJsMN3UCV7i91TREi2XN28NVlyNqGMOhBw=
-SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.7.mod) = 
e1G+1TTzn2zfY8noFgqsIOf6SUl52PWprel0NH+JvjY=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) = 
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.zip) = 
MkUIdKx1bvXUf2uBkwUQUwS5gZBFoW4/EFKJt88lLFE=
@@ -103,20 +106,22 @@ SHA256 (go_modules/

Re: [update] net/ddclient 3.10.0

2023-05-20 Thread Morgan Aldridge
Builds under amd64/7.2-stable and successfully run-tested for my use case:
Gandi LiveDNS. Actually, this version introduces Gandi LiveDNS support and
many others, so is required in my setup.

I have yet to test under 7.3-stable or -current, but will try to do so in
the next week or two now that I have working configs.

Morgan

On Thu, Oct 20, 2022 at 6:20 PM Pascal Stumpf  wrote:
>
> Update to ddclient 3.10.0.
>
> * switched to auto(re)conf
> * killed the samples (they are mostly useless)
> * is there any reason we're placing the config file in a separate
>   directory?  I kept the /etc/ddclient/ddclient.conf dance for now, but
>   maybe we can just go with /etc/ddclient.conf?
> * there is now the option to use curl.  I think it's reasonable to not
>   add a dependency.  However, the path needs to be hardcoded.
> * there are now tests.  One of them fails for a stupid reason.
>
>
> Works for my use case (afraid.freedns.org).  Please test with your
> configuration.
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/net/ddclient/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- Makefile11 Mar 2022 19:45:52 -  1.28
> +++ Makefile20 Oct 2022 22:04:21 -
> @@ -2,7 +2,7 @@ COMMENT=update client for dynamic DNS s
>
>  GH_ACCOUNT=ddclient
>  GH_PROJECT=ddclient
> -GH_TAGNAME=v3.9.1
> +GH_TAGNAME=v3.10.0
>
>  CATEGORIES=net
>
> @@ -11,30 +11,26 @@ HOMEPAGE=   https://ddclient.net/
>  # GPLv2+
>  PERMIT_PACKAGE=Yes
>
> -RUN_DEPENDS=   devel/p5-Data-Validate-IP \
> -   net/p5-IO-Socket-INET6 \
> +CONFIGURE_STYLE=gnu autoreconf
> +AUTOMAKE_VERSION=  1.11
> +AUTOCONF_VERSION=  2.63
> +
> +# hardcode path, but do not add a dependency
> +CONFIGURE_ENV= CURL=${LOCALBASE}/bin/curl
> +
> +MAKE_ENV=  runstatedir=/var/run/ddclient
> +FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/ddclient
> +
> +RUN_DEPENDS=   net/p5-IO-Socket-INET6 \
> security/p5-IO-Socket-SSL
> +TEST_DEPENDS=  devel/p5-Test-Warnings
>
> -NO_BUILD=  Yes
> -NO_TEST=   Yes
>  PKG_ARCH=  *
>
> -SAMPLES=   sample-etc_cron.d_ddclient sample-etc_ddclient.conf \
> -   sample-etc_dhclient-exit-hooks
sample-etc_dhcpc_dhcpcd-eth0.exe \
> -   sample-etc_ppp_ip-up.local sample-ddclient-wrapper.sh
> +SYSCONFDIR=${BASESYSCONFDIR}/ddclient
>
>  post-extract:
> -   @sed -i -e "s,/var/cache/ddclient/,/var/db/ddclient/,g;" \
> -   -e "s,/etc/ddclient/,${SYSCONFDIR}/ddclient/,g" \
> -   ${WRKSRC}/ddclient
> -
> -do-install:
> -   ${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin/
> -   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ddclient
> -   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddclient
> -   ${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/ddclient
> -.for i in ${SAMPLES}
> -   ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/ddclient
> -.endfor
> +   @sed -i -e "s,/cache/ddclient,/db/ddclient,g" \
> +   ${WRKSRC}/{ddclient.in,Makefile.am}
>
>  .include 
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/net/ddclient/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo17 Jan 2021 15:46:53 -  1.12
> +++ distinfo20 Oct 2022 19:36:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (ddclient-3.9.1.tar.gz) =
5JaeFcxJH8Ur3NZJ1MKw5LG/DJ+duiNHHGNIcazFJHA=
> -SIZE (ddclient-3.9.1.tar.gz) = 63469
> +SHA256 (ddclient-3.10.0.tar.gz) =
NLbZqUYpCvCSfidGCpZa0BinxSViUGOw84DL3f/AHBs=
> +SIZE (ddclient-3.10.0.tar.gz) = 275494
> Index: patches/patch-ddclient
> ===
> RCS file: patches/patch-ddclient
> diff -N patches/patch-ddclient
> --- patches/patch-ddclient  11 Mar 2022 19:45:52 -  1.4
> +++ /dev/null   1 Jan 1970 00:00:00 -
> @@ -1,20 +0,0 @@
> -Index: ddclient
>  ddclient.orig
> -+++ ddclient
> -@@ -1163,16 +1163,6 @@ sub _read_config {
> -   # fatal("Cannot open file '%s'. ($!)", $file);
> -   warning("Cannot open file '%s'. ($!)", $file);
> - }
> --# Check for only owner has any access to config file
> --my ($dev, $ino, $mode, @statrest) = stat(FD);
> --if ($mode & 077) {
> --  if (-f FD && (chmod 0600, $file)) {
> --  warning("file $file must be accessible only by its owner
(fixed).");
> --  } else {
> --  # fatal("file $file must be accessible only by its owner.");
> --  warning("file $file must be accessible only by its owner.");
> --  }
> --}
> -
> - local $lineno   = 0;
> - my$continuation = '';
> Index: patches/patch-sample-etc_ddclient_conf
> ===
> RCS file: patches/patch-sample-etc_ddclient_conf
> diff -N patches/patch-sample-etc_ddclient_conf
> --- 

UPDATE: lighttpd 1.4.70

2023-05-20 Thread Brad Smith
Here is an update to lighttpd 1.4.70.


- speed up CGI spawning
- support HTTP/2 downstream proxy serving multiple clients on single connection
  (mod_extforward, mod_maxminddb)
- restructure code to isolate HTTP/2


Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.177
diff -u -p -u -p -r1.177 Makefile
--- Makefile25 Apr 2023 16:23:34 -  1.177
+++ Makefile10 May 2023 17:57:25 -
@@ -1,10 +1,9 @@
 COMMENT=   secure, fast, compliant, and very flexible web-server
 
-DISTNAME=  lighttpd-1.4.69
+DISTNAME=  lighttpd-1.4.70
 CATEGORIES=www net
 MASTER_SITES=  https://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=  .tar.xz
-REVISION=  0
 
 HOMEPAGE=  https://www.lighttpd.net/
 
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 distinfo
--- distinfo4 Apr 2023 06:21:08 -   1.72
+++ distinfo10 May 2023 17:57:31 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.69.tar.xz) = FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ=
-SIZE (lighttpd-1.4.69.tar.xz) = 1045516
+SHA256 (lighttpd-1.4.70.tar.xz) = kh6+HPS2uYl+A3eat6I6MfS6QKGr4gZ1JcM8085h/oU=
+SIZE (lighttpd-1.4.70.tar.xz) = 1070048
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/lighttpd/pkg/PLIST,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 PLIST
--- pkg/PLIST   4 Apr 2023 06:21:08 -   1.34
+++ pkg/PLIST   10 May 2023 17:58:53 -
@@ -2,32 +2,21 @@
 @newuser _lighttpd:585:_lighttpd::lighttpd Account:/nonexistent:/sbin/nologin
 @rcscript ${RCDIR}/lighttpd
 lib/lighttpd/
-@so lib/lighttpd/mod_access.so
 @so lib/lighttpd/mod_accesslog.so
 @so lib/lighttpd/mod_ajp13.so
-@so lib/lighttpd/mod_alias.so
 @so lib/lighttpd/mod_auth.so
 @so lib/lighttpd/mod_authn_file.so
 @so lib/lighttpd/mod_cgi.so
 @so lib/lighttpd/mod_deflate.so
 @so lib/lighttpd/mod_dirlisting.so
-@so lib/lighttpd/mod_evhost.so
-@so lib/lighttpd/mod_expire.so
 @so lib/lighttpd/mod_extforward.so
-@so lib/lighttpd/mod_fastcgi.so
-@so lib/lighttpd/mod_indexfile.so
+@so lib/lighttpd/mod_h2.so
 @so lib/lighttpd/mod_magnet.so
 @so lib/lighttpd/mod_openssl.so
 @so lib/lighttpd/mod_proxy.so
-@so lib/lighttpd/mod_redirect.so
-@so lib/lighttpd/mod_rewrite.so
 @so lib/lighttpd/mod_rrdtool.so
-@so lib/lighttpd/mod_scgi.so
-@so lib/lighttpd/mod_setenv.so
-@so lib/lighttpd/mod_simple_vhost.so
 @so lib/lighttpd/mod_sockproxy.so
 @so lib/lighttpd/mod_ssi.so
-@so lib/lighttpd/mod_staticfile.so
 @so lib/lighttpd/mod_status.so
 @so lib/lighttpd/mod_userdir.so
 @so lib/lighttpd/mod_vhostdb.so



UPDATE: net/nextcloudclient-3.8.2

2023-05-20 Thread Adriano Barbosa
Hi.
Update for net/nextcloudclient v3.8.2
Changelog: https://github.com/nextcloud/desktop/releases/v3.8.2

Obrigado!
--
Adriano


Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile24 Apr 2023 11:41:24 -  1.50
+++ Makefile20 May 2023 21:35:10 -
@@ -2,9 +2,8 @@ USE_WXNEEDED =  Yes
 
 COMMENT =  desktop sync client for Nextcloud
 
-V =3.8.0
+V =3.8.2
 DISTNAME = nextcloudclient-${V}
-REVISION = 1
 
 GH_ACCOUNT =   nextcloud
 GH_PROJECT =   desktop
@@ -14,8 +13,8 @@ CATEGORIES =  net
 
 HOMEPAGE = https://nextcloud.com
 
-SHARED_LIBS +=  nextcloudsync 10.0 # 3.8.0
-SHARED_LIBS +=  nextcloud_csync   3.1 # 3.8.0
+SHARED_LIBS +=  nextcloudsync 10.1 # 3.8.2
+SHARED_LIBS +=  nextcloud_csync   4.0 # 3.8.2
 SHARED_LIBS +=  nextcloudsync_vfs_suffix  0.1 # 3.6.6
 
 MAINTAINER =   Adriano Barbosa 
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo1 Apr 2023 17:52:07 -   1.39
+++ distinfo20 May 2023 21:35:10 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.8.0.tar.gz) = 
YSpgRSJpMILOMEBWVUMAeRIrdqx0wnffuz5aYqI5U/Q=
-SIZE (nextcloudclient-3.8.0.tar.gz) = 15729588
+SHA256 (nextcloudclient-3.8.2.tar.gz) = 
YYaqpwuCsGtFMc/y5V4N04oNgX3n7wOagSk9gssF6MA=
+SIZE (nextcloudclient-3.8.2.tar.gz) = 15605319



Re: NEW: asio

2023-05-20 Thread A Tammy


On 5/19/23 00:16, A Tammy wrote:
> On 5/19/23 00:11, Brad Smith wrote:
>> On 2023-05-19 12:07 a.m., A Tammy wrote:
>>> On 5/18/23 23:54, Brad Smith wrote:
 On 2023-05-18 11:37 p.m., A Tammy wrote:
> On 5/18/23 02:18, Brad Smith wrote:
>> On Sun, May 14, 2023 at 05:10:08PM -0400, Brad Smith wrote:
>>> Here is a port for asio.
>>>
>>> This is the standalone copy unlike the Boost integrated version.
>>>
>>>
>>> Information for inst:asio-1.28.0
>>>
>>> Comment:
>>> header-only C++ library for asynchronous I/O programming
>>>
>>> Description:
>>> Asio is a cross-platform C++ library for network and low-level I/O
>>> programming that provides developers with a consistent asynchronous
>>> model using a modern C++ approach.
>> and here is a diff to have galera use the external copy. The included
>> version is very old.
> why can't this use the library from devel/boost ?
 At one point 13 years ago they did. They intentionally made the
 switch. You would
 have to ask upstream.
>>> Oh, I didn't know that it needed anything explicit from a project to use
>>> the devel/boost copy instead of standalone ASIO.
>>>
>>> Is it a build system level thing (like needing to
>>> -I/usr/local/include/boost/asio/) or some more complex function name
>>> mangling?
>>>
>>> Am asking that cuz if its just the build system then maintaining a
>>> separate copy of ASIO with its own set of patches sounds a bit more
>>> tedious than patching the build system.
>>
>> No, it's not that simple. It's intentional.
>>
>> https://github.com/codership/galera/commit/b0ca8b67d345811476418168f493b45da6d32717
>>
>>
>> There are no patches and that's definitely not the case.
> Yikes! Yea, that's ugly.
>
> Will check out port for asio tomorrow but the patch for galera looks OK.
>
OK aisha, for asio and galera



Re: maintainer update net/gajim 1.5.2 --> 1.7.3

2023-05-20 Thread Paco Esteban
On Sat, 20 May 2023, Paco Esteban wrote:

> Hi ports@,
> 
> This is an update for net/gajim to its latest version 1.7.3
> Tons of changes since last version.  I did not update sooner because of
> setuptools version dependency.  Find the full changelog here:
> 
> https://dev.gajim.org/gajim/python-nbxmpp/-/blob/4.2.2/ChangeLog
> 
> Upstream seems to have changed the way they package gajim, and now the
> man pages and the freedesktop file thingy are not copied during the fake
> stage.
> I see there is a script to copy this on pep517build/install_metadata.py
> 
> According to python-module(5):
> Most modern Python software can be packaged using a PEP 517
> build frontend (in the devel/py-build port).  To use this, set
> MODPY_PYBUILD to the name of the build backend.  If the port
> provides a pyproject.toml file, check the "build-backend" line in
> the [build-system] section.
> 
> And the build-system section says:
> [build-system]
> requires = [
> "setuptools >= 65.0.0",
> ]
> build-backend = "backend"
> backend-path = ["pep517build"]
> 
> 
> Not sure which backend is "backend" ...
> 
> python-module(5) also says:
> In rare cases, the build backend is distributed with the software
> itself and MODPY_PYBUILD can be set to Yes to use this mechanism
> without adding a dependency for another backend.
> 
> So I tried both "setuptools" and "Yes" for MODPY_PYBUILD, with the same
> result.

By the way, I've found this on their repo:
https://dev.gajim.org/gajim/gajim/-/blob/1.7.3/README.md#building-the-metadata-files-unix-only

Not sure at which stage to add those commands.
Any ideas ?

> Any help here appreciated.
> 
> For the rest, lightly tested on amd64 with OMEMO without issues.
> 
> I guess no oks until I fix the man page issues, so comments welcome.
> 
> diff /usr/ports
> commit - 630d98e3b12a74e52362425cf2d761365414e347
> path + /usr/ports
> blob - 037049d9a0c82ad41915ada2b6a58aaab898c574
> file + net/gajim/Makefile
> --- net/gajim/Makefile
> +++ net/gajim/Makefile
> @@ -1,8 +1,7 @@
>  COMMENT= fully-featured XMPP client written in Python
> -MODPY_EGG_VERSION=   1.5.2
> +MODPY_EGG_VERSION=   1.7.3
>  DISTNAME=gajim-${MODPY_EGG_VERSION}
>  CATEGORIES=  net x11
> -REVISION=2
>  
>  HOMEPAGE=https://www.gajim.org
>  
> @@ -21,13 +20,14 @@ RUN_DEPENDS=  audio/gsound \
>  RUN_DEPENDS= audio/gsound \
>   devel/desktop-file-utils \
>   devel/glib2>=2.60.0 \
> - devel/libsoup \
> + devel/libsoup3 \
>   devel/pango>=1.50.0 \
>   devel/py-gobject3 \
>   graphics/py-Pillow${MODPY_FLAVOR} \
>   graphics/py-cairo${MODPY_FLAVOR} \
> - net/py-nbxmpp${MODPY_FLAVOR}>=3.2.4 \
> + net/py-nbxmpp${MODPY_FLAVOR}>=4.2.2 \
>   security/py-cryptodome${MODPY_FLAVOR} \
> + security/py-cryptography${MODPY_FLAVOR} \
>   security/py-gnupg${MODPY_FLAVOR} \
>   security/py-keyring${MODPY_FLAVOR} \
>   security/py-openssl${MODPY_FLAVOR} \
> blob - 3a74457a37730c59b4b3b6a1fabb018cbb6b5dc2
> file + net/gajim/distinfo
> --- net/gajim/distinfo
> +++ net/gajim/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (gajim-1.5.2.tar.gz) = kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8=
> -SIZE (gajim-1.5.2.tar.gz) = 7187355
> +SHA256 (gajim-1.7.3.tar.gz) = t8yzWfdsY8pXye7Dn5hME0bOHgf+MzuyVY3hweXc0xg=
> +SIZE (gajim-1.7.3.tar.gz) = 3753831
> blob - 08c6f2f9a910710296de88933af24bf4dbb75c23
> file + /dev/null
> --- net/gajim/patches/patch-setup_py
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -Use correct location and do not compress man pages.
> -
> -Index: setup.py
>  setup.py.orig
> -+++ setup.py
> -@@ -104,11 +104,11 @@ def build_man() -> None:
> - 
> - def install_man(data_files: DataFilesT) -> None:
> - man_dir = BUILD_DIR / 'man'
> --target = 'share/man/man1'
> -+target = 'man/man1'
> - 
> - for man in MAN_FILES:
> - man_file_gz = str(man_dir / (man + '.gz'))
> --data_files.append((target, [man_file_gz]))
> -+data_files.append((target, [os.path.join('data', man)]))
> - 
> - 
> - def build_intl() -> None:
> blob - a00d581b86e9cee3f1e2cbb56207ac0738e05e21
> file + net/gajim/pkg/PLIST
> --- net/gajim/pkg/PLIST
> +++ net/gajim/pkg/PLIST
> @@ -55,6 +55,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/
>  
> lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  
> lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}iana.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}iana.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/py

maintainer update net/gajim 1.5.2 --> 1.7.3

2023-05-20 Thread Paco Esteban
Hi ports@,

This is an update for net/gajim to its latest version 1.7.3
Tons of changes since last version.  I did not update sooner because of
setuptools version dependency.  Find the full changelog here:

https://dev.gajim.org/gajim/python-nbxmpp/-/blob/4.2.2/ChangeLog

Upstream seems to have changed the way they package gajim, and now the
man pages and the freedesktop file thingy are not copied during the fake
stage.
I see there is a script to copy this on pep517build/install_metadata.py

According to python-module(5):
Most modern Python software can be packaged using a PEP 517
build frontend (in the devel/py-build port).  To use this, set
MODPY_PYBUILD to the name of the build backend.  If the port
provides a pyproject.toml file, check the "build-backend" line in
the [build-system] section.

And the build-system section says:
[build-system]
requires = [
"setuptools >= 65.0.0",
]
build-backend = "backend"
backend-path = ["pep517build"]


Not sure which backend is "backend" ...

python-module(5) also says:
In rare cases, the build backend is distributed with the software
itself and MODPY_PYBUILD can be set to Yes to use this mechanism
without adding a dependency for another backend.

So I tried both "setuptools" and "Yes" for MODPY_PYBUILD, with the same
result.

Any help here appreciated.

For the rest, lightly tested on amd64 with OMEMO without issues.

I guess no oks until I fix the man page issues, so comments welcome.

diff /usr/ports
commit - 630d98e3b12a74e52362425cf2d761365414e347
path + /usr/ports
blob - 037049d9a0c82ad41915ada2b6a58aaab898c574
file + net/gajim/Makefile
--- net/gajim/Makefile
+++ net/gajim/Makefile
@@ -1,8 +1,7 @@
 COMMENT=   fully-featured XMPP client written in Python
-MODPY_EGG_VERSION= 1.5.2
+MODPY_EGG_VERSION= 1.7.3
 DISTNAME=  gajim-${MODPY_EGG_VERSION}
 CATEGORIES=net x11
-REVISION=  2
 
 HOMEPAGE=  https://www.gajim.org
 
@@ -21,13 +20,14 @@ RUN_DEPENDS=audio/gsound \
 RUN_DEPENDS=   audio/gsound \
devel/desktop-file-utils \
devel/glib2>=2.60.0 \
-   devel/libsoup \
+   devel/libsoup3 \
devel/pango>=1.50.0 \
devel/py-gobject3 \
graphics/py-Pillow${MODPY_FLAVOR} \
graphics/py-cairo${MODPY_FLAVOR} \
-   net/py-nbxmpp${MODPY_FLAVOR}>=3.2.4 \
+   net/py-nbxmpp${MODPY_FLAVOR}>=4.2.2 \
security/py-cryptodome${MODPY_FLAVOR} \
+   security/py-cryptography${MODPY_FLAVOR} \
security/py-gnupg${MODPY_FLAVOR} \
security/py-keyring${MODPY_FLAVOR} \
security/py-openssl${MODPY_FLAVOR} \
blob - 3a74457a37730c59b4b3b6a1fabb018cbb6b5dc2
file + net/gajim/distinfo
--- net/gajim/distinfo
+++ net/gajim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gajim-1.5.2.tar.gz) = kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8=
-SIZE (gajim-1.5.2.tar.gz) = 7187355
+SHA256 (gajim-1.7.3.tar.gz) = t8yzWfdsY8pXye7Dn5hME0bOHgf+MzuyVY3hweXc0xg=
+SIZE (gajim-1.7.3.tar.gz) = 3753831
blob - 08c6f2f9a910710296de88933af24bf4dbb75c23
file + /dev/null
--- net/gajim/patches/patch-setup_py
+++ /dev/null
@@ -1,19 +0,0 @@
-Use correct location and do not compress man pages.
-
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -104,11 +104,11 @@ def build_man() -> None:
- 
- def install_man(data_files: DataFilesT) -> None:
- man_dir = BUILD_DIR / 'man'
--target = 'share/man/man1'
-+target = 'man/man1'
- 
- for man in MAN_FILES:
- man_file_gz = str(man_dir / (man + '.gz'))
--data_files.append((target, [man_file_gz]))
-+data_files.append((target, [os.path.join('data', man)]))
- 
- 
- def build_intl() -> None:
blob - a00d581b86e9cee3f1e2cbb56207ac0738e05e21
file + net/gajim/pkg/PLIST
--- net/gajim/pkg/PLIST
+++ net/gajim/pkg/PLIST
@@ -55,6 +55,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}iana.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}iana.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}idle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}idle.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -69,8 +71,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/
 
lib/python${MODPY_VERSI

maintainer update py-nbxmpp 3.4.2 --> 4.2.2

2023-05-20 Thread Paco Esteban
Hi ports@,

This is an update of net/py-nbxmpp to its latest version 4.2.2
It's needed for an upcoming update of net/gajim

Main changes are now python 3.10 is needed and they moved from libsoup
2 to 3.  Full changelog here:

https://dev.gajim.org/gajim/python-nbxmpp/-/blob/4.2.2/ChangeLog

Nothing really special on the port itself.

Ok to commit ?

diff /usr/ports
commit - 630d98e3b12a74e52362425cf2d761365414e347
path + /usr/ports
blob - 337888249008cd57a876734605f787d6812516df
file + net/py-nbxmpp/Makefile
--- net/py-nbxmpp/Makefile
+++ net/py-nbxmpp/Makefile
@@ -1,10 +1,9 @@
 COMMENT =  Python XMPP and Jabber implementation
 
-MODPY_EGG_VERSION =3.2.4
+MODPY_EGG_VERSION =4.2.2
 DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net devel
-REVISION = 0
 
 HOMEPAGE = https://python-nbxmpp.gajim.org/
 
@@ -20,8 +19,8 @@ RUN_DEPENDS = devel/glib2>=2.6.0 \
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =test
 
-RUN_DEPENDS =  devel/glib2>=2.6.0 \
-   devel/libsoup \
+RUN_DEPENDS =  devel/glib2>=2.60.0 \
+   devel/libsoup3 \
devel/py-gobject3${MODPY_FLAVOR} \
net/py-idna${MODPY_FLAVOR} \
sysutils/py-packaging${MODPY_FLAVOR} \
blob - d7ad69572af4ab366b3c8905877c70805d0972a3
file + net/py-nbxmpp/distinfo
--- net/py-nbxmpp/distinfo
+++ net/py-nbxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nbxmpp-3.2.4.tar.gz) = dN7/T8IGAyVVcffgtM1oFX5E4edpNB5j0y3YRqKRphU=
-SIZE (nbxmpp-3.2.4.tar.gz) = 161470
+SHA256 (nbxmpp-4.2.2.tar.gz) = hvSIVtrwV3l/+WPtdUKvxsZEoN5m9hdxho1GuY33tiQ=
+SIZE (nbxmpp-4.2.2.tar.gz) = 166998
blob - a8138138b501a3f2181360deb7dfd4bdeb46afe1
file + net/py-nbxmpp/pkg/PLIST
--- net/py-nbxmpp/pkg/PLIST
+++ net/py-nbxmpp/pkg/PLIST
@@ -26,6 +26,8 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -65,15 +67,8 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/exampl
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/const.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/dispatcher.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/errors.py
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/client.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/http.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/idlequeue.py
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/__init__.py
@@ -158,8 +153,12 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/module
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}reactions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}reactions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/m

powerpc64 bulk build report

2023-05-20 Thread gkoehler
Bulk build on powerpc64-1.ports.openbsd.org

Started : Wed May 17 15:27:02 MDT 2023
Finished: Sat May 20 11:18:56 MDT 2023
Duration: 2 Days 19 hours 52 minutes

Built using OpenBSD 7.3-current (GENERIC.MP) #5: Wed May 17 15:13:03 MDT 2023

Built 8340 packages

Number of packages built each day:
May 17: 1668
May 18: 1861
May 19: 1264
May 20: 3547



Critical path missing pkgs:
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/summary.log

Build failures: 21
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/archivers/libzim.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/arm-none-eabi/gcc,arm.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/bullet.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/py-thrift,python3.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/riscv-elf/gcc.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/riscv32-esp-elf/gcc-bootstrap.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/xtensa-esp32s2-elf/gcc-bootstrap.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/xtensa-esp32s3-elf/gcc-bootstrap.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/devel/xtensa-lx106-elf/gcc-bootstrap.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/editors/emacs,no_x11.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/games/boswars.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/lang/gambit.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/lang/racket-minimal.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/math/gbc.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/math/lean.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/multimedia/transcode.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/productivity/tryton/5.2/customs.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/textproc/apertium-dicts/br-fr.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/textproc/apertium-dicts/eo-en.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/textproc/apertium-dicts/eo-fr.log
http://build-failures.rhaalovely.net/powerpc64/2023-05-17/textproc/apertium-dicts/hbs-slv.log

Recurrent failures:
 failures/devel/arm-none-eabi/gcc,arm.log
 failures/devel/bullet.log
 failures/devel/py-thrift,python3.log
 failures/devel/xtensa-esp32s3-elf/gcc-bootstrap.log
 failures/devel/xtensa-lx106-elf/gcc-bootstrap.log
 failures/editors/emacs,no_x11.log
 failures/games/boswars.log
 failures/lang/gambit.log
 failures/lang/racket-minimal.log
 failures/math/gbc.log
 failures/math/lean.log
 failures/textproc/apertium-dicts/br-fr.log
 failures/textproc/apertium-dicts/eo-en.log
 failures/textproc/apertium-dicts/eo-fr.log

New failures:
+failures/archivers/libzim.log
+failures/multimedia/transcode.log
+failures/productivity/tryton/5.2/customs.log
+failures/textproc/apertium-dicts/hbs-slv.log

Resolved failures:
-failures/fonts/noto/fonts.log
-failures/games/gigalomania.log

Packages newly built:
+databases/galera
+devel/kainjow-mustache
+fonts/noto/fonts
+games/brogue
+games/gigalomania
+lang/vala,,-main
+textproc/apertium-dicts/arg-cat
+textproc/apertium-dicts/bel-rus
+textproc/apertium-dicts/cat
+textproc/apertium-dicts/dan-nor
+textproc/apertium-dicts/fra-cat
+textproc/apertium-dicts/hbs
+textproc/apertium-dicts/hbs-eng
+textproc/apertium-dicts/isl-swe
+textproc/apertium-dicts/mlt-ara
+textproc/apertium-dicts/nno
+textproc/apertium-dicts/nno-nob
+textproc/apertium-dicts/rus
+textproc/apertium-dicts/rus-ukr
+textproc/apertium-dicts/spa-cat
+textproc/apertium-dicts/swe
+textproc/apertium-dicts/swe-dan
+textproc/apertium-dicts/swe-nor

Packages not built this time:
-archivers/pecl-rar,php74
-archivers/pecl-rar,php80
-databases/mdbtools
-databases/pecl-redis,php74
-databases/pecl-redis,php81
-databases/pecl-redis,php82
-databases/pg_stats_reporter
-databases/pgfouine
-databases/postgresql-odbc
-databases/ruby-mysql,ruby31
-databases/ruby-mysql,ruby32
-databases/tdbc-odbc
-devel/boris
-devel/pecl-xdebug,php80
-devel/pecl-xdebug,php81
-devel/pecl-xdebug,php82
-lang/php/7.4,embed,-embed
-lang/php/8.0,embed,-embed
-lang/php/8.1,embed,-embed
-lang/php/8.2,embed,-embed
-lang/swi-prolog
-mail/pecl-mailparse,php82
-mail/rcube-contextmenu
-mail/rcube-dkimstatus
-mail/rcube-dovecot_ident
-mail/rcube-html5-notifier
-mail/rcube-ldapAliasSync
-mail/rcube-markasjunk2
-mail/rcube-sieverules
-mail/rcube-yubikey-plugin
-net/freeradius
-net/freeradius,-freetds
-net/freeradius,-iodbc
-net/freeradius,-ldap
-net/freeradius,-main
-net/freeradius,-memcached
-net/freeradius,-mysql
-net/freeradius,-pgsql
-net/freeradius,-python
-net/freeradius,-python3
-net/icinga/icinga-php-library
-net/icinga/icinga-php-thirdparty
-net/icinga/web2
-net/icinga/web2-module-director
-net/icinga/web2-module-incubator
-net/librenms
-net/nagios/nagios,-web
-net/nagios/nagios,chroot,-web
-net/nfsen
-net/zab

Re: [NEW] devel/libnjs

2023-05-20 Thread Landry Breuil
Le Thu, May 18, 2023 at 09:31:35PM +, Sergey A. Osokin a écrit :
> Hi there,
> 
> here's the port of nginx javascript static library for OpenBSD
> ports tree.
> Please let me know your thoughts, ask questions, provide comments.

you should be able to use the various GH_PROJECT/GH_ACCOUNT/GH_TAGNAME
variables instead of handrolling DISTFILES/MASTER_SITES/PKGNAME/WRKDIST.

is only the static lib necessary in libnjs ? for both ports, why the
auto/make patch, afaict, our sed supports s,X,Y, constructs..

i dont think do-build is necessary, setting ALL_TARGET=libnjs njs should
achieve the same.

why two ports, instead of a single, or eventually a MULTI_PACKAGE ?  i
suppose your hidden untold goal is to enable support in nginx, if so why
not saying it upfront ?

Landry



Re: [NEW] lang/erlang/26

2023-05-20 Thread Volker Schlecht
Extended the patch to erlang/Makefile.inc so that an instance of epmd 
started by 'make test' is killed after the test.

Currently it keeps running (it has been like this since 'make test'
was made functional in the port). Noted by kn@, thanks.

This will also kill instances of epmd that were started via the 
rc-script, but only as long as there are no other active erlang services

connected.

On 5/20/23 12:29, Volker Schlecht wrote:

Curious that WXNEEDED=Yes seems to be only required on some platforms.
Here (AMD 3960X) it worked without any issues without WXNEEDED.

Attached is the erlang/26 port with wxneeded, and the two adjacent diffs 
unmodified.


On 5/20/23 10:53, Klemens Nanni wrote:

On Sat, May 20, 2023 at 08:33:45AM +, Klemens Nanni wrote:

26 fails with
May 20 12:26:48 atar /bsd: beam.smp(57653): mmap W^X violation
and thanks to kern.wxabort=1 I now have 29 *.core files in WRKDIR.

Setting wxallowed on /usr/ports/pobj/ does not help, I'll try 
USE_WXNEEDED

and/or USE_NOEXECONLY.


USE_WXNEEDED=Yes is enough to make it build, tests then also pass without
failure.

No PLIST or WANTLIB change for 26, either, so with W^X fixed this looks
fine port-wise.



I'm building on a 12th gen intel with PKU.


erlang26.tar.gz
Description: application/gzip
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile	17 May 2023 13:39:46 -	1.16
+++ Makefile	19 May 2023 06:35:03 -
@@ -10,6 +10,7 @@ PKGNAME=	erlang-$V
 PKGNAME-main=	erlang-$V
 PKGNAME-wx=	erlang-wx-$V
 EPOCH=		0
+REVISION=	0
 
 VERSION_SPEC=	>=25v0,<26v0
 PKGSPEC-main=	erlang-${VERSION_SPEC}
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main	17 May 2023 13:39:46 -	1.9
+++ pkg/PLIST-main	19 May 2023 06:35:03 -
@@ -6,7 +6,7 @@
 @pkgpath lang/erlang/21,-main
 @newgroup _epmd:888
 @newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
-@rcscript ${RCDIR}/epmd
+@rcscript ${RCDIR}/epmd25
 bin/ct_run25
 bin/dialyzer25
 bin/epmd25
Index: pkg/epmd.rc
===
RCS file: pkg/epmd.rc
diff -N pkg/epmd.rc
--- pkg/epmd.rc	31 Jan 2023 01:59:09 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-#!/bin/ksh
-
-daemon="${TRUEPREFIX}/bin/epmd${MAJ_V} -daemon"
-daemon_flags="-address 127.0.0.1"
-daemon_user=_epmd
-
-. /etc/rc.d/rc.subr
-
-rc_reload=NO
-
-rc_cmd $1
Index: pkg/epmd25.rc
===
RCS file: pkg/epmd25.rc
diff -N pkg/epmd25.rc
--- /dev/null	1 Jan 1970 00:00:00 -
+++ pkg/epmd25.rc	19 May 2023 06:35:03 -
@@ -0,0 +1,11 @@
+#!/bin/ksh
+
+daemon="${TRUEPREFIX}/bin/epmd${MAJ_V} -daemon"
+daemon_flags="-address 127.0.0.1"
+daemon_user=_epmd
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/erlang/Makefile.inc,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.inc
--- Makefile.inc	1 Sep 2022 20:03:37 -	1.27
+++ Makefile.inc	20 May 2023 11:41:19 -
@@ -11,8 +11,9 @@ MAJ_V =		${V:C/\.[0-9]+//g}
 
 MAINTAINER =	Volker Schlecht 
 
+DOCDISTNAME ?=  otp_doc_man_${V}
 DISTFILES ?=	${DISTNAME}.tar.gz \
-		otp_doc_man_${V}.tar.gz
+		${DOCDISTNAME}.tar.gz
 
 EXTRACT_ONLY ?=	${DISTNAME}.tar.gz
 
@@ -80,7 +81,6 @@ gen-versions: extract
 	@find ${WRKSRC} -name 'vsn.mk' -exec awk -F'=' '/_VSN=/ { print $$1"\t"$$2 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_' | sort
 	@grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }' | sort
 
-# Erlang >= 25 uses configure.ac instead of configure.in
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/make/install_bin \
 		 ${WRKSRC}/Makefile.in \
@@ -88,9 +88,12 @@ pre-configure:
 		 ${WRKSRC}/erts/etc/common/dialyzer.c \
 		 ${WRKSRC}/erts/etc/common/erlc.c \
 		 ${WRKSRC}/erts/etc/common/escript.c \
-		 ${WRKSRC}/erts/etc/common/typer.c \
-		 ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl 
-	if [ -f ${WRKSRC}/lib/wx/configure.in ]; then ${SUBST_CMD} ${WRKSRC}/lib/wx/configure.in ; fi;
+		 ${WRKSRC}/erts/etc/common/typer.c
+.if ${MAJ_V} == 25
+	${SUBST_CMD} ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl
+.else
+	${SUBST_CMD} ${WRKSRC}/lib/dialyzer/src/dialyzer_cplt.erl
+.endif
 	if [ -f ${WRKSRC}/lib/wx/configure.ac ]; then ${SUBST_CMD} ${WRKSRC}/lib/wx/configure.ac ; fi;
 
 
@@ -109,10 +112,11 @@ do-test:
 
 post-test:
 	rm ${WRKSRC}/bin/erl${MAJ_V}
+	-${WRKSRC}/bin/*-unknown-openbsd*/epmd -kill
 
 post-install:
 	ln -sf ../lib/erlang${MAJ_V}/lib/${ERL_EI}/bin/erl_call ${PREFIX}/bin/erl_call${MAJ_V}
-	tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}
+	tar zxf ${FULLDISTDIR}/${DOCDISTNAME}.tar.gz -

Re: Getting braille support into OpenBSD with BRLTTY

2023-05-20 Thread Sebastien Marie
Hi,

First, I am moving the discussion to ports@.

I updated misc/brltty port to latest version (6.5 from June 9, 2022). I have 
mostly redone the port (lot of things changed since 2004), so I provide both a 
diff and a tarball.

But I don't have the hardware to test that it is working as expected. Martin, 
would you be able to test it ? it means applying the diff (or using the 
tarball) 
on ports tree, compiling and installing the port, and next use it with your 
hardware to effectively test it at runtime.

Regarding the use without screen session, I can't really comment. It seems to 
have some support for serial (via termios) and usb. But I can't say nothing 
about usage or configuration.

If someone could test it at runtime, I would be more confident in the update. I 
don't want to break such sensible port.

The port doesn't include manual as it needs 'linuxdoc' tool we don't have.

Comments or OK ?
-- 
Sebastien Marie

On Fri, May 19, 2023 at 11:28:41PM +0200, Odd Martin Baanrud wrote:
> Hello,
> 
> I’m blind, and therefor I’m using a refreshable braille display.
> In Linux, support is provided by the BRLTTY daemon.
> It doesn’t work under *BSD, and as far as I understand, it has to do with the 
> way the console driver is providing data.
> However, it could run within a screen session.
> In fact, OpenBSD has a port of BRLTTY for that purpose, but it’s a very old 
> version, which wouldn’t work with todays hardware.
> 
> My question is, can someone take a look at BRLTTY, and see if it’s possible 
> to get it work natively with *BSD?
> Perhaps things has changed in the last couple of years, so it is possible to 
> get it working without having to use screen.
> 
> If it’s possible, it would be nice if it could be integrated into the OpenBSD 
> base system, and made available in the installer as well.
> That way, a braille user can install OpenBSD without sighted help.
> 
> Just to keep things clear, a braille user can of course access a OpenBSD 
> system using braille, either via a serial console or ssh, from a linux 
> machine.
> 
> The homepage for BRLTTY is:
> http://www.brltty.com
> 
> Thanks!
> 
> Regards, Martin
> 
diff /home/semarie/repos/openbsd/ports
commit - 89d1b5b47fedce5d08047c32f13d4a4f0a8b3501
path + /home/semarie/repos/openbsd/ports
blob - 9c8ca8b046614aaa9c2a4eb6acaadd0674d65ec7
file + misc/brltty/Makefile
--- misc/brltty/Makefile
+++ misc/brltty/Makefile
@@ -1,45 +1,78 @@
-COMMENT=   access software for a blind person using a braille terminal
+COMMENT =  access software for a blind person using a braille terminal
 
-DISTNAME=  brltty-3.6
-REVISION=  6
-CATEGORIES=misc
-HOMEPAGE=  http://mielke.cc/brltty
-MASTER_SITES=  ${HOMEPAGE}/releases/
+DISTNAME = brltty-6.5
 
-# GPLv2
-PERMIT_PACKAGE=Yes
+CATEGORIES =   misc
 
-COMPILER=  base-clang ports-gcc
-COMPILER_LANGS=c
+HOMEPAGE = https://brltty.app/
 
-WANTLIB=   c curses pthread sndio
+# LGPLv2.1
+PERMIT_PACKAGE =   Yes
 
-RUN_DEPENDS=   screen-*-shm:misc/screen-shm
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-install-root=${WRKINST} \
-   --with-data-directory=${LOCALBASE}/share/brltty \
-   --without-flite --without-x
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/aux
+WANTLIB += X11 Xaw Xfixes Xt atspi c curses dbus-1 espeak-ng execinfo
+WANTLIB += expat flite flite_cmu_us_kal flite_cmulex flite_usenglish
+WANTLIB += glib-2.0 icudata icuuc intl louis m pcre2-32 pthread
+WANTLIB += sndio speechd
 
-NO_TEST=   Yes
-SEPARATE_BUILD=Yes
+MASTER_SITES = https://brltty.app/archive/
 
+BUILD_DEPENDS +=   devel/gettext,-tools
+
+LIB_DEPENDS += audio/espeak \
+   audio/flite \
+   audio/speech-dispatcher \
+   devel/gettext,-runtime \
+   devel/glib2 \
+   devel/liblouis \
+   devel/pcre2 \
+   textproc/icu4c,-main \
+   x11/dbus,-main \
+   x11/gnome/at-spi2-core
+
+RUN_DEPENDS += screen-*-shm:misc/screen-shm
+
+SEPARATE_BUILD =   Yes
+USE_GMAKE =Yes
+
+CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS =   \
+   --with-install-root="${WRKINST}" \
+   --with-manpage-directory="${PREFIX}/man" \
+   --sysconfdir="${PREFIX}/share/examples/brltty" \
+   --with-tables-directory="${PREFIX}/share/brltty" \
+   --disable-api \
+   --with-api-socket-path="${LOCALSTATEDIR}/BrlAPI" \
+   --enable-liblouis \
+   --disable-gpm \
+   --disable-polkit \
+   --disable-emacs-bindings \
+   --disable-java-bindings \
+   --disable-lisp-bindings \
+   --disable-lua-bindings \
+   --disable-ocaml-bindings \
+   --disable-python-bindings \
+   --disable-tcl-bindings \
+   --with-espeak_ng="${LOCALBASE}" \
+   --without-espeak \
+   --without-mikropuhe \
+  

Re: urllib3 fails tests with LibreSSL 3.7.2

2023-05-20 Thread Theo Buehler
> I just saw this too.
> 
> Probably easier to look into this on OpenBSD as cryptography doesn't
> need touching.

Thanks. The problem is that the tests when run from the ports tree are
quite sensitive to the environment. I have a working test setup and
can deal with this. I'll report my findings to them when I get time.

There is one minor thing that was already singled out by the urllib3
maintainers. urllib3 goes to some lengths to check that the verifier
doesn't accept certs with CN but no SAN. As far as I can tell this is
inspired by some CA/B baseline requirements, so it makes some sense for
them to want that. It's governed by X509_CHECK_FLAG_NEVER_CHECK_SUBJECT.

Historically, the host flags would only be copied if there was a list of
hosts to copy for some reason. Python people upstreamed a (sensible)
change of behavior on which urllib3 now relies.

https://github.com/openssl/openssl/issues/14579

A variant of this change is below, including a regress test that ensures
that. With this (only the first hunk is actually necessary), the three
tests in question pass. We probably want to follow OpenSSL and drop
the id indirection from X509_VERIFY_PARAM, but that can wait.

As I already mentioned on the urllib3 issue, once this lands, I will add
a patch to the stable portable trees which will be included when we cut
the next release.
 
Index: lib/libcrypto/x509/x509_vpm.c
===
RCS file: /cvs/src/lib/libcrypto/x509/x509_vpm.c,v
retrieving revision 1.37
diff -u -p -r1.37 x509_vpm.c
--- lib/libcrypto/x509/x509_vpm.c   28 Apr 2023 16:50:16 -  1.37
+++ lib/libcrypto/x509/x509_vpm.c   20 May 2023 09:26:40 -
@@ -326,7 +326,9 @@ X509_VERIFY_PARAM_inherit(X509_VERIFY_PA
return 0;
}
 
-   /* Copy the host flags if and only if we're copying the host list */
+   if (test_x509_verify_param_copy_id(hostflags, 0))
+   dest->id->hostflags = id->hostflags;
+
if (test_x509_verify_param_copy_id(hosts, NULL)) {
if (dest->id->hosts) {
sk_OPENSSL_STRING_pop_free(dest->id->hosts, str_free);
@@ -337,7 +339,6 @@ X509_VERIFY_PARAM_inherit(X509_VERIFY_PA
sk_deep_copy(id->hosts, strdup, str_free);
if (dest->id->hosts == NULL)
return 0;
-   dest->id->hostflags = id->hostflags;
}
}
 
@@ -550,6 +551,13 @@ X509_VERIFY_PARAM_add1_host(X509_VERIFY_
return 0;
 }
 LCRYPTO_ALIAS(X509_VERIFY_PARAM_add1_host);
+
+/* Public API in OpenSSL - nothing seems to use this. */
+unsigned int
+X509_VERIFY_PARAM_get_hostflags(X509_VERIFY_PARAM *param)
+{
+   return param->id->hostflags;
+}
 
 void
 X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags)
Index: regress/lib/libssl/Makefile.inc
===
RCS file: /cvs/src/regress/lib/libssl/Makefile.inc,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.inc
--- regress/lib/libssl/Makefile.inc 4 Nov 2016 17:51:54 -   1.1
+++ regress/lib/libssl/Makefile.inc 20 May 2023 08:54:49 -
@@ -1,2 +1,4 @@
+# Use this variable when the test needs internal symbols from libcrypto
+CRYPTO_INT=  -Wl,-Bstatic -lcrypto -Wl,-Bdynamic
 # Use this variable when the test needs internal symbols from libssl
 SSL_INT=  -Wl,-Bstatic -lssl -Wl,-Bdynamic
Index: regress/lib/libssl/unit/Makefile
===
RCS file: /cvs/src/regress/lib/libssl/unit/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- regress/lib/libssl/unit/Makefile2 Dec 2022 01:15:11 -   1.14
+++ regress/lib/libssl/unit/Makefile20 May 2023 09:30:49 -
@@ -4,6 +4,7 @@ PROGS += cipher_list
 PROGS += ssl_get_shared_ciphers
 PROGS += ssl_methods
 PROGS += ssl_set_alpn_protos
+PROGS += ssl_verify_param
 PROGS += ssl_versions
 PROGS += tls_ext_alpn
 PROGS += tls_prf
@@ -14,5 +15,7 @@ DPADD =   ${LIBSSL} ${LIBCRYPTO}
 CFLAGS+=   -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
 CFLAGS+=   -DCERTSDIR=\"${.CURDIR}/../certs\"
 CFLAGS+=   -I${.CURDIR}/../../../../lib/libssl
+
+LDADD_ssl_verify_param = ${LIBSSL} ${CRYPTO_INT}
 
 .include 
Index: regress/lib/libssl/unit/ssl_verify_param.c
===
RCS file: regress/lib/libssl/unit/ssl_verify_param.c
diff -N regress/lib/libssl/unit/ssl_verify_param.c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ regress/lib/libssl/unit/ssl_verify_param.c  20 May 2023 09:16:36 -
@@ -0,0 +1,99 @@
+/* $OpenBSD$ */
+
+/*
+ * Copyright (c) 2023 Theo Buehler 
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all

Re: [NEW] lang/erlang/26

2023-05-20 Thread Volker Schlecht

Curious that WXNEEDED=Yes seems to be only required on some platforms.
Here (AMD 3960X) it worked without any issues without WXNEEDED.

Attached is the erlang/26 port with wxneeded, and the two adjacent diffs 
unmodified.


On 5/20/23 10:53, Klemens Nanni wrote:

On Sat, May 20, 2023 at 08:33:45AM +, Klemens Nanni wrote:

26 fails with
May 20 12:26:48 atar /bsd: beam.smp(57653): mmap W^X violation
and thanks to kern.wxabort=1 I now have 29 *.core files in WRKDIR.

Setting wxallowed on /usr/ports/pobj/ does not help, I'll try USE_WXNEEDED
and/or USE_NOEXECONLY.


USE_WXNEEDED=Yes is enough to make it build, tests then also pass without
failure.

No PLIST or WANTLIB change for 26, either, so with W^X fixed this looks
fine port-wise.



I'm building on a 12th gen intel with PKU.


erlang26.tar.gz
Description: application/gzip
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/erlang/Makefile.inc,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.inc
--- Makefile.inc	1 Sep 2022 20:03:37 -	1.27
+++ Makefile.inc	17 May 2023 15:34:17 -
@@ -11,8 +11,9 @@ MAJ_V =		${V:C/\.[0-9]+//g}
 
 MAINTAINER =	Volker Schlecht 
 
+DOCDISTNAME ?=  otp_doc_man_${V}
 DISTFILES ?=	${DISTNAME}.tar.gz \
-		otp_doc_man_${V}.tar.gz
+		${DOCDISTNAME}.tar.gz
 
 EXTRACT_ONLY ?=	${DISTNAME}.tar.gz
 
@@ -80,7 +81,6 @@ gen-versions: extract
 	@find ${WRKSRC} -name 'vsn.mk' -exec awk -F'=' '/_VSN=/ { print $$1"\t"$$2 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_' | sort
 	@grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }' | sort
 
-# Erlang >= 25 uses configure.ac instead of configure.in
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/make/install_bin \
 		 ${WRKSRC}/Makefile.in \
@@ -88,9 +88,12 @@ pre-configure:
 		 ${WRKSRC}/erts/etc/common/dialyzer.c \
 		 ${WRKSRC}/erts/etc/common/erlc.c \
 		 ${WRKSRC}/erts/etc/common/escript.c \
-		 ${WRKSRC}/erts/etc/common/typer.c \
-		 ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl 
-	if [ -f ${WRKSRC}/lib/wx/configure.in ]; then ${SUBST_CMD} ${WRKSRC}/lib/wx/configure.in ; fi;
+		 ${WRKSRC}/erts/etc/common/typer.c
+.if ${MAJ_V} == 25
+	${SUBST_CMD} ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl
+.else
+	${SUBST_CMD} ${WRKSRC}/lib/dialyzer/src/dialyzer_cplt.erl
+.endif
 	if [ -f ${WRKSRC}/lib/wx/configure.ac ]; then ${SUBST_CMD} ${WRKSRC}/lib/wx/configure.ac ; fi;
 
 
@@ -112,7 +115,7 @@ post-test:
 
 post-install:
 	ln -sf ../lib/erlang${MAJ_V}/lib/${ERL_EI}/bin/erl_call ${PREFIX}/bin/erl_call${MAJ_V}
-	tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}
+	tar zxf ${FULLDISTDIR}/${DOCDISTNAME}.tar.gz -C ${DOC_DIR}
 	rm -r ${DOC_DIR}/man/man7/*MIB.7
 	rm -r ${DOC_DIR}/man/man7/*TM.7
 	if [ ! -x ${PREFIX}/lib/erlang${MAJ_V}/${ERL_ERTS}/bin/beam.smp ]; then \
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile	17 May 2023 13:39:46 -	1.16
+++ Makefile	19 May 2023 06:35:03 -
@@ -10,6 +10,7 @@ PKGNAME=	erlang-$V
 PKGNAME-main=	erlang-$V
 PKGNAME-wx=	erlang-wx-$V
 EPOCH=		0
+REVISION=	0
 
 VERSION_SPEC=	>=25v0,<26v0
 PKGSPEC-main=	erlang-${VERSION_SPEC}
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main	17 May 2023 13:39:46 -	1.9
+++ pkg/PLIST-main	19 May 2023 06:35:03 -
@@ -6,7 +6,7 @@
 @pkgpath lang/erlang/21,-main
 @newgroup _epmd:888
 @newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
-@rcscript ${RCDIR}/epmd
+@rcscript ${RCDIR}/epmd25
 bin/ct_run25
 bin/dialyzer25
 bin/epmd25
Index: pkg/epmd.rc
===
RCS file: pkg/epmd.rc
diff -N pkg/epmd.rc
--- pkg/epmd.rc	31 Jan 2023 01:59:09 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-#!/bin/ksh
-
-daemon="${TRUEPREFIX}/bin/epmd${MAJ_V} -daemon"
-daemon_flags="-address 127.0.0.1"
-daemon_user=_epmd
-
-. /etc/rc.d/rc.subr
-
-rc_reload=NO
-
-rc_cmd $1
Index: pkg/epmd25.rc
===
RCS file: pkg/epmd25.rc
diff -N pkg/epmd25.rc
--- /dev/null	1 Jan 1970 00:00:00 -
+++ pkg/epmd25.rc	19 May 2023 06:35:03 -
@@ -0,0 +1,11 @@
+#!/bin/ksh
+
+daemon="${TRUEPREFIX}/bin/epmd${MAJ_V} -daemon"
+daemon_flags="-address 127.0.0.1"
+daemon_user=_epmd
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1


Re: [NEW] lang/erlang/26

2023-05-20 Thread Klemens Nanni
On Sat, May 20, 2023 at 08:33:45AM +, Klemens Nanni wrote:
> 26 fails with
>   May 20 12:26:48 atar /bsd: beam.smp(57653): mmap W^X violation
> and thanks to kern.wxabort=1 I now have 29 *.core files in WRKDIR.
> 
> Setting wxallowed on /usr/ports/pobj/ does not help, I'll try USE_WXNEEDED
> and/or USE_NOEXECONLY.

USE_WXNEEDED=Yes is enough to make it build, tests then also pass without
failure.

No PLIST or WANTLIB change for 26, either, so with W^X fixed this looks
fine port-wise.

> 
> I'm building on a 12th gen intel with PKU.



Re: [NEW] lang/erlang/26

2023-05-20 Thread Klemens Nanni
On Sat, May 20, 2023 at 08:09:43AM +, Klemens Nanni wrote:
> Both 25 and 26 package fine on amd64 without PLIST or WANTLIB change.

Sorry, I forgot the Makefile '+ SUBDIR += 26' diff, so 26 was skipped...

26 fails with
May 20 12:26:48 atar /bsd: beam.smp(57653): mmap W^X violation
and thanks to kern.wxabort=1 I now have 29 *.core files in WRKDIR.

Setting wxallowed on /usr/ports/pobj/ does not help, I'll try USE_WXNEEDED
and/or USE_NOEXECONLY.

I'm building on a 12th gen intel with PKU.

25 did indeed build and package fine without wxallowed or USE_*=Yes
(defaul on my machine).



Re: [NEW] lang/erlang/26

2023-05-20 Thread Klemens Nanni
On Fri, May 19, 2023 at 09:00:28AM +0200, Volker Schlecht wrote:
> Attached is a port for erlang26 along with a few related changes to the
> erlang port.
> 
> 1. Prepare erlang/Makefile.inc for 26
> See also https://marc.info/?l=openbsd-ports&m=168433772724808&w=2

Looks OK to me port-wise, but I have no clue about erlang itself.

> 2. New port for erlang26
> Tests are passing, but dependent ports at their current releases are
> either cautiously compatible (lang/elixir) or straightforward
> incompatible (net/rabbitmq). For devel/rebar3 there is a new release,
> update proposal to follow.
> 
> Includes additional patch to make CHACHA20_POLY1305 and CHACHA20
> available with LibreSSL. Submitted, but not yet included upstream.
> 
> Other patches are adapted from erlang25.
> 
> 3. Change rc-script naming from epmd.rc to epmd25.rc for the erlang25
> port for consistency reasons.

Both 25 and 26 package fine on amd64 without PLIST or WANTLIB change.