from:"Bjorn Ketelaars"

UPDATE net/samba-4.21.0

2024-09-02 Thread Bjorn Ketelaars

This is the first release of the 4.21 branch. Changes are listed in [0].

Changes to the port:
- Remove pyldb-util.cpython-${MODPY_MAJORMINOR} as API python bindings
  have been removed from the LDB module [0].
- No need any more for special handling of
  samba-policy.cpython-${MODPY_MAJORMINOR} as this is a normal C
  library, used by python but does not use any python itself (nor by
  dependencies any longer) [1].
- Bumped several shared libraries (based on output of check_sym).

The first two changes enable us to simplify Makefile.

I have been running the 4.21 branch since the first release candidate
and found no issues in my environment. Results may vary.
There is limited time to test this update before the ports tree is
locked. Not sure if there is enough time. Any opinion on this?
FWIW, the 4.20 branch we currently have in ports is supported until
2025-09 [2], thus well supported. Updating to 4.21 has a slight
advantage on backporting future updates.

Please note that this release of samba depends on an update of
databases/tdb to 1.4.12, which will be send in a separate mail.

Wait with updating / comments/ ok?


[0] https://www.samba.org/samba/history/samba-4.21.0.html
[1] 
https://github.com/samba-team/samba/commit/d11b281aefa98e6850053ccd6142253c6cf0d04f
[2] https://wiki.samba.org/index.php/Samba_Release_Planning


diff --git Makefile Makefile
index 3824cb19ee8..b4a3448447e 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.20.4
+VERSION =  4.21.0
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -14,29 +14,26 @@ SHARED_LIBS =   dcerpc  1.2 \
dcerpc-binding  5.0 \
dcerpc-samr 1.0 \
dcerpc-server-core  3.1 \
-   ldb 2.3 \
+   ldb 2.4 \
ndr 3.2 \
ndr-krb5pac 1.3 \
ndr-nbt 2.1 \
ndr-standard6.0 \
-   netapi  3.3 \
-   samba-credentials   1.6 \
+   netapi  3.4 \
+   samba-credentials   2.0 \
samba-errors2.1 \
-   samba-hostconfig14.0 \
-   samba-passdb3.0 \
-   samba-util  10.1 \
-   samdb   3.1 \
+   samba-hostconfig15.0 \
+   samba-passdb3.1 \
+   samba-policy0.0 \
+   samba-util  11.0 \
+   samdb   4.0 \
smbclient   6.2 \
-   smbconf 15.0 \
+   smbconf 16.0 \
smbldap 1.0 \
tevent  2.3 \
tevent-util 2.0 \
wbclient5.1
 
-# Those have to be handled specially, see "Python ABI" below.
-SHARED_LIBS += pyldb-util.cpython-${MODPY_MAJORMINOR}  1.0
-SHARED_LIBS += samba-policy.cpython-${MODPY_MAJORMINOR}1.0
-
 CATEGORIES =   net sysutils security
 
 HOMEPAGE = https://www.samba.org/
@@ -58,9 +55,6 @@ WANTLIB-docs =
 SITES =https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
 
-# XXX 0640 on Makefile breaks update-patches with PORTS_PRIVSEP=Yes
-FIX_EXTRACT_PERMISSIONS =  Yes
-
 MULTI_PACKAGES =   -main -docs
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
@@ -84,7 +78,7 @@ RUN_DEPENDS-docs =
 LIB_DEPENDS-main = archivers/libarchive \
converters/libiconv \
databases/openldap \
-   databases/tdb>=1.4.10 \
+   databases/tdb>=1.4.12 \
devel/jansson \
devel/libinotify \
devel/libtalloc>=2.4.2 \
@@ -150,30 +144,6 @@ MAKE_ENV = LC_ALL=en_US.UTF-8 \
 MAKE_ENV +=LIB${_l:S/-/_/g}_VERSION=${_v}
 .endfor
 
-## Python ABI
-# The samba project decided to also encode the python ABI name into shared
-# libraries that link against libpython.  Our ports infrastructure barely
-# copes.
-
-# 1. Those shared libraries names contain a variable whose value is not yet
-# known by the time the .for loop runs
-MAKE_ENV +=
LIBpyldb_util_cpython_${MODPY_MAJORMINOR}_VERSION=${LIBpyldb-util.cpython-${MODPY_MAJORMINOR}_VERSION}
-MAKE_ENV +=
LIBsamba_policy_cpython_${MODPY_MA

UPDATE databases/tdb-1.4.12

2024-09-02 Thread Bjorn Ketelaars

Simple diff for updating databases/tdb to 1.4.12, which is needed for an
update of net/samba.

Tested against the samba update.

Comments / OK?


diff --git Makefile Makefile
index 0cb79630e24..71ee8d7d360 100644
--- Makefile
+++ Makefile
@@ -2,11 +2,10 @@ COMMENT-main= trivial database library
 COMMENT-python=Python ${MODPY_VERSION} bindings for tdb
 
 # Keep in sync with the version bundled in net/samba
-V= 1.4.10
+V= 1.4.12
 
 DISTNAME=  tdb-$V
 PKGNAME-python=py3-${DISTNAME}
-REVISION=  1
 
 MULTI_PACKAGES=-main -python
 
diff --git distinfo distinfo
index 885f4093736..6471965a4ec 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.10.tar.gz) = AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8=
-SIZE (tdb-1.4.10.tar.gz) = 747139
+SHA256 (tdb-1.4.12.tar.gz) = bOSydJiBLQkjfs5loNbfrAlBYQ5wmEjsuCKqJBCEzXo=
+SIZE (tdb-1.4.12.tar.gz) = 748827
diff --git patches/patch-buildtools_wafsamba_wafsamba_py 
patches/patch-buildtools_wafsamba_wafsamba_py
index 1a8a28706d2..ae284e72547 100644
--- patches/patch-buildtools_wafsamba_wafsamba_py
+++ patches/patch-buildtools_wafsamba_wafsamba_py
@@ -4,7 +4,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -292,6 +292,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -294,6 +294,13 @@ def SAMBA_LIBRARY(bld, libname, source,
  realname = bld.map_shlib_extension(realname, 
python=(target_type=='PYTHON'))
  link_name = bld.map_shlib_extension(link_name, 
python=(target_type=='PYTHON'))
  
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
  # we don't want any public libraries without version numbers
  if (not private_library and target_type != 'PYTHON' and not realname):
  if vnum is None and soname is None:
-@@ -408,9 +415,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -410,9 +417,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  
  if pc_files is not None and not private_library:
  if pyembed:

UPDATE www/vaultwarden-web

2024-08-12 Thread Bjorn Ketelaars

Simple diff for updating vaultwarden-web to 2024.6.2b. Changes:
https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.6.2
https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.6.2b

Run tested alongside the vaultwarden update.

OK?


Index: Makefile
===
RCS file: /cvs/ports/www/vaultwarden-web/Makefile,v
diff -u -p -r1.17 Makefile
--- Makefile10 Jul 2024 04:53:12 -  1.17
+++ Makefile12 Aug 2024 14:15:14 -
@@ -1,6 +1,6 @@
 COMMENT =  Web vault builds for vaultwarden
 
-VERSION =  2024.5.1b
+VERSION =  2024.6.2b
 DISTNAME = bw_web_v${VERSION}
 PKGNAME =  vaultwarden-web-${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/www/vaultwarden-web/distinfo,v
diff -u -p -r1.15 distinfo
--- distinfo10 Jul 2024 04:53:12 -  1.15
+++ distinfo12 Aug 2024 14:15:14 -
@@ -1,2 +1,2 @@
-SHA256 (bw_web_v2024.5.1b.tar.gz) = 
vOrf9v+Wrscfurkdv2fLeQljX21L2KkCpYvZs+fK5tM=
-SIZE (bw_web_v2024.5.1b.tar.gz) = 11928177
+SHA256 (bw_web_v2024.6.2b.tar.gz) = 
ZBXEddvsMS6RLChnJBmJkty47SibqjM02xZlzL2mhyo=
+SIZE (bw_web_v2024.6.2b.tar.gz) = 12195401
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/vaultwarden-web/pkg/PLIST,v
diff -u -p -r1.15 PLIST
--- pkg/PLIST   10 Jul 2024 04:53:12 -  1.15
+++ pkg/PLIST   12 Aug 2024 14:15:14 -
@@ -1,80 +1,83 @@
 vaultwarden/
 vaultwarden/web-vault/
 vaultwarden/web-vault/.nojekyll
-vaultwarden/web-vault/125.0791c68011f28c5397e2.js
-vaultwarden/web-vault/125.0791c68011f28c5397e2.js.map
-vaultwarden/web-vault/229.0837cabc1f0c63f132c8.js
-vaultwarden/web-vault/229.0837cabc1f0c63f132c8.js.map
-vaultwarden/web-vault/367.3aa2579b622fbbb8602a.js
-vaultwarden/web-vault/367.3aa2579b622fbbb8602a.js.map
-vaultwarden/web-vault/395.eef1cb8a52613ac828e0.js
-vaultwarden/web-vault/395.eef1cb8a52613ac828e0.js.LICENSE.txt
-vaultwarden/web-vault/395.eef1cb8a52613ac828e0.js.map
-vaultwarden/web-vault/409.6492239d1a4b496ff7a9.js
-vaultwarden/web-vault/409.6492239d1a4b496ff7a9.js.map
-vaultwarden/web-vault/44.8c50b08611d419c1106c.js
-vaultwarden/web-vault/44.8c50b08611d419c1106c.js.LICENSE.txt
-vaultwarden/web-vault/44.8c50b08611d419c1106c.js.map
-vaultwarden/web-vault/446.aa3cbfc2fd486eed8e6b.js
-vaultwarden/web-vault/446.aa3cbfc2fd486eed8e6b.js.map
-vaultwarden/web-vault/554.a1976937ff8a44f781e7.js
-vaultwarden/web-vault/554.a1976937ff8a44f781e7.js.map
-vaultwarden/web-vault/651.17b23b646451d8e0299f.js
-vaultwarden/web-vault/651.17b23b646451d8e0299f.js.map
-vaultwarden/web-vault/74.210eee92632f00635b5e.js
-vaultwarden/web-vault/74.210eee92632f00635b5e.js.map
-vaultwarden/web-vault/77.9ea3c9e3fca7d8bab9e7.js
-vaultwarden/web-vault/77.9ea3c9e3fca7d8bab9e7.js.map
-vaultwarden/web-vault/838.b4055e25ea0ad876dfdf.js
-vaultwarden/web-vault/838.b4055e25ea0ad876dfdf.js.map
-vaultwarden/web-vault/968.af8051ce417955c452d1.js
-vaultwarden/web-vault/968.af8051ce417955c452d1.js.map
-vaultwarden/web-vault/979.e07af87d88679c6e8e25.js
-vaultwarden/web-vault/979.e07af87d88679c6e8e25.js.map
+vaultwarden/web-vault/125.566b2c59438df26b5803.js
+vaultwarden/web-vault/125.566b2c59438df26b5803.js.map
+vaultwarden/web-vault/229.c29d1ca01984fd6768c7.js
+vaultwarden/web-vault/229.c29d1ca01984fd6768c7.js.map
+vaultwarden/web-vault/367.b522ae86dd7ba6a33ae6.js
+vaultwarden/web-vault/367.b522ae86dd7ba6a33ae6.js.map
+vaultwarden/web-vault/395.146727a4c389f12f57c4.js
+vaultwarden/web-vault/395.146727a4c389f12f57c4.js.LICENSE.txt
+vaultwarden/web-vault/395.146727a4c389f12f57c4.js.map
+vaultwarden/web-vault/409.0f3d9af1accae5b8d568.js
+vaultwarden/web-vault/409.0f3d9af1accae5b8d568.js.map
+vaultwarden/web-vault/416.3bd4c7732de2050fd545.js
+vaultwarden/web-vault/416.3bd4c7732de2050fd545.js.map
+vaultwarden/web-vault/44.b3b5a3a8f7626e22cead.js
+vaultwarden/web-vault/44.b3b5a3a8f7626e22cead.js.LICENSE.txt
+vaultwarden/web-vault/44.b3b5a3a8f7626e22cead.js.map
+vaultwarden/web-vault/554.e82b45b7ffbc0fe7ce5c.js
+vaultwarden/web-vault/554.e82b45b7ffbc0fe7ce5c.js.map
+vaultwarden/web-vault/651.ac9708406b5cb777a758.js
+vaultwarden/web-vault/651.ac9708406b5cb777a758.js.map
+vaultwarden/web-vault/74.231ea0cb81db04140043.js
+vaultwarden/web-vault/74.231ea0cb81db04140043.js.map
+vaultwarden/web-vault/77.af4ce67fff8b77f09ebc.js
+vaultwarden/web-vault/77.af4ce67fff8b77f09ebc.js.map
+vaultwarden/web-vault/838.71f9ce66bb518d55337b.js
+vaultwarden/web-vault/838.71f9ce66bb518d55337b.js.map
+vaultwarden/web-vault/968.bca7acbecd5288b0f9ab.js
+vaultwarden/web-vault/968.bca7acbecd5288b0f9ab.js.map
+vaultwarden/web-vault/97.d236f792430150d595dd.js
+vaultwarden/web-vault/97.d236f792430150d595dd.js.LICENSE.txt
+vaultwarden/web-vault/97.d236f792430150d595dd.js.map
+vaultwarden/web-vault/979.d8eba5062c1ec7382639.js
+vaultwarden/web-vault/979.d8eba5062c1ec7382639.js.map
 vaultwarden/web-vault/app/
 vaultwarde

UPDATE security/vaultwarden

2024-08-12 Thread Bjorn Ketelaars

Diff below updates vaultwarden to 1.32.0, which fixes 3 CVE reports.
Changelog:
https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.0

Run tested on amd64.

OK?


Index: Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
diff -u -p -r1.35 Makefile
--- Makefile10 Jul 2024 04:55:58 -  1.35
+++ Makefile12 Aug 2024 14:15:28 -
@@ -5,7 +5,7 @@ BROKEN-i386 =   raw-cpuid-10.2.0/src/lib.
 
 COMMENT =  unofficial bitwarden compatible server
 
-DIST_TUPLE =   github dani-garcia vaultwarden 1.31.0 .
+DIST_TUPLE =   github dani-garcia vaultwarden 1.32.0 .
 
 CATEGORIES =   security
 
Index: crates.inc
===
RCS file: /cvs/ports/security/vaultwarden/crates.inc,v
diff -u -p -r1.14 crates.inc
--- crates.inc  10 Jul 2024 04:55:58 -  1.14
+++ crates.inc  12 Aug 2024 14:15:28 -
@@ -10,15 +10,15 @@ MODCARGO_CRATES +=  android_system_proper
 MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-channel   2.3.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.11  # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.12.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.12  # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.13.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io2.3.3   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  3.4.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-signal0.2.8   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-signal0.2.9   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-std   1.12.0  # Apache-2.0/MIT
 MODCARGO_CRATES += async-stream0.3.5   # MIT
 MODCARGO_CRATES += async-stream-impl   0.3.5   # MIT
@@ -43,13 +43,13 @@ MODCARGO_CRATES +=  blocking1.6.1   # Apac
 MODCARGO_CRATES += brotli  6.0.0   # BSD-3-Clause OR MIT
 MODCARGO_CRATES += brotli-decompressor 4.0.1   # BSD-3-Clause/MIT
 MODCARGO_CRATES += bumpalo 3.16.0  # MIT OR Apache-2.0
-MODCARGO_CRATES += bytemuck1.16.1  # Zlib OR Apache-2.0 OR MIT
+MODCARGO_CRATES += bytemuck1.16.3  # Zlib OR Apache-2.0 OR MIT
 MODCARGO_CRATES += byteorder   1.5.0   # Unlicense OR MIT
-MODCARGO_CRATES += bytes   1.6.0   # MIT
-MODCARGO_CRATES += cached  0.52.0  # MIT
-MODCARGO_CRATES += cached_proc_macro   0.22.0  # MIT
+MODCARGO_CRATES += bytes   1.7.1   # MIT
+MODCARGO_CRATES += cached  0.53.1  # MIT
+MODCARGO_CRATES += cached_proc_macro   0.23.0  # MIT
 MODCARGO_CRATES += cached_proc_macro_types 0.1.1   # MIT
-MODCARGO_CRATES += cc  1.0.106 # MIT OR Apache-2.0
+MODCARGO_CRATES += cc  1.1.8   # MIT OR Apache-2.0
 MODCARGO_CRATES += cfg-if  1.0.0   # MIT/Apache-2.0
 MODCARGO_CRATES += chrono  0.4.38  # MIT OR Apache-2.0
 MODCARGO_CRATES += chrono-tz   0.9.0   # MIT OR Apache-2.0
@@ -65,9 +65,9 @@ MODCARGO_CRATES +=crc32fast   1.4.2   # MIT
 MODCARGO_CRATES += cron0.12.1  # MIT OR Apache-2.0
 MODCARGO_CRATES += crossbeam-utils 0.8.20  # MIT OR Apache-2.0
 MODCARGO_CRATES += crypto-common   0.1.6   # MIT OR Apache-2.0
-MODCARGO_CRATES += darling 0.20.9  # MIT
-MODCARGO_CRATES += darling_core0.20.9  # MIT
-MODCARGO_CRATES += darling_macro   0.20.9  # MIT
+MODCARGO_CRATES += darling 0.20.10 # MIT
+MODCARGO_CRATES += darling_core0.20.10 # MIT
+MODCARGO_CRATES += darling_macro   0.20.10 # MIT
 MODCARGO_CRATES += dashmap 5.5.3   # MIT
 MODCARGO_CRATES += dashmap 6.0.1   # MIT
 MODCARGO_CRATES += data-encoding   2.6.0   # MIT
@@ -76,17 +76,17 @@ MODCARGO_CRATES +=  deranged0.3.11  # MIT
 MODCARGO_CRATES += devise  0.4.1   # MIT/Apache-2.0
 MODCARGO_CRATES += devise_codegen  0.4.1   # MIT/Apache-2.0
 MODCARGO_CRATES += devise_core 0.4.1   # MIT/Apache-2.0
-MODCARGO_CRATES += diesel  2.2.1   # MIT OR Apache-2.0
-MODCARGO_CRATES += diesel_derives  2.2.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += diesel  2.2.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += diesel_derives  2.2.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += diesel_logger   0.3.0   # MIT
 MODCARGO_CRATES += diesel_migrations   2.2.0   # MIT OR Apache-2.0
 MODCARGO_CRATES += diesel_table_macro_syntax   0.2.0   # MIT OR 
Apache-2.0
 MODCARGO_CRATES += digest  0.10.7  # MIT OR Apache-2.0
 MODCARGO_CRATES += dotenvy 0.15.7  # MIT
-MODCARG

Re: news/py-sabctools fix build on arm64

2024-08-04 Thread Bjorn Ketelaars

On Mon 05/08/2024 00:41, Peter Hessler wrote:
> This port checks the OS to decide how to detect runtime features on
> arm64, and expects getauxval() in the else case.  Bump REVISION because
> it did previously build on arm64.
> 
> OK?

OK bket@

UPDATE samba-4.20.3

2024-08-02 Thread Bjorn Ketelaars

Simple diff for updating samba to 4.20.3. Release notes:
https://www.samba.org/samba/history/samba-4.20.3.html

Run tested on amd64.

Tests and OKs welcome.


diff --git Makefile Makefile
index 311e62490ab..d5badfad5f1 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.20.2
+VERSION =  4.20.3
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -58,6 +58,9 @@ WANTLIB-docs =
 SITES =https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
 
+# XXX 0640 on Makefile breaks update-patches with PORTS_PRIVSEP=Yes
+FIX_EXTRACT_PERMISSIONS =  Yes
+
 MULTI_PACKAGES =   -main -docs
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
diff --git distinfo distinfo
index d47334ad9a5..0472bd72531 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.20.2.tar.gz) = +Wn/7VjM8+hcu8wOM6FybQJcK0D0KmU7ESW4K5LS4OU=
-SIZE (samba-4.20.2.tar.gz) = 42458953
+SHA256 (samba-4.20.3.tar.gz) = r9WpuwPlySHEwdTktPpuoWz3mNlOXlv/uf1hcWZBzzA=
+SIZE (samba-4.20.3.tar.gz) = 42464180

Re: sysutils/rustic: time crate update for upcoming lang/rust

2024-07-27 Thread Bjorn Ketelaars

On Sat 27/07/2024 17:39, Sebastien Marie wrote:
> Hi,
> 
> The following diff updates time crate to 0.3.36 (and dependencies). It
> is required for lang/rust 1.80.0
> 
> Comments or OK ?

OK bket@

CHANGE - unflavour devel/pre-commit

2024-07-19 Thread Bjorn Ketelaars

devel/pre-commit doesn't have a py- prefix, but is flavoured. As
pre-commit is a python3-only, standalone tool, proposal is to unflavour
it. Triggered by a comment from sthen@ [0].

Diff below:
- Removes FLAVOR= / FLAVORS= from devel/pre-commit, bumps REVISION and
  sets a @pkgpath marker
- Touches consumers: Changes depends devel/pre-commit${MODPY_FLAVOR} to
  devel/pre-commit and bumps REVISION

OK?

[0] https://marc.info/?l=openbsd-ports&m=172121815731770&w=2


diff --git devel/pre-commit/Makefile devel/pre-commit/Makefile
index 1e36b59ad35..5e2e72ccb26 100644
--- devel/pre-commit/Makefile
+++ devel/pre-commit/Makefile
@@ -3,6 +3,7 @@ COMMENT =   framework for managing git pre-commit 
hooks
 MODPY_EGG_VERSION =3.7.1
 DISTNAME = pre_commit-${MODPY_EGG_VERSION}
 PKGNAME =  pre-commit-${MODPY_EGG_VERSION}
+REVISION = 0
 
 CATEGORIES =   devel
 
@@ -14,9 +15,6 @@ MAINTAINER =  Pavel Korovin 
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
-FLAVOR =   python3
-FLAVORS =  python3
-
 MODPY_PI = Yes
 MODPY_PYBUILD =setuptools
 
diff --git devel/pre-commit/pkg/PLIST devel/pre-commit/pkg/PLIST
index 404c4ddc3ba..8f0c9c3c956 100644
--- devel/pre-commit/pkg/PLIST
+++ devel/pre-commit/pkg/PLIST
@@ -1,3 +1,4 @@
+@pkgpath devel/pre-commit,python3
 bin/pre-commit
 lib/python${MODPY_VERSION}/site-packages/pre_commit/
 
lib/python${MODPY_VERSION}/site-packages/pre_commit-${MODPY_EGG_VERSION}.dist-info/
diff --git devel/py-ipykernel/Makefile devel/py-ipykernel/Makefile
index fa606a77c1b..82d0f25905d 100644
--- devel/py-ipykernel/Makefile
+++ devel/py-ipykernel/Makefile
@@ -3,7 +3,7 @@ COMMENT =   IPython kernel for Jupyter
 MODPY_EGG_VERSION =6.29.4
 DISTNAME = ipykernel-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
+REVISION = 1
 
 PORTROACH= limit:^6
 
@@ -42,7 +42,7 @@ RUN_DEPENDS = devel/py-comm${MODPY_FLAVOR}>=0.1.1 \
www/py-tornado${MODPY_FLAVOR}>=6.1
 
 # needs ipyparallel
-TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
+TEST_DEPENDS = devel/pre-commit \
devel/py-flaky${MODPY_FLAVOR} \
devel/py-test-asyncio${MODPY_FLAVOR} \
devel/py-test-cov${MODPY_FLAVOR} \
diff --git devel/py-jupyter_client/Makefile devel/py-jupyter_client/Makefile
index f385abbac31..87f50f16b84 100644
--- devel/py-jupyter_client/Makefile
+++ devel/py-jupyter_client/Makefile
@@ -3,6 +3,7 @@ COMMENT =   Jupyter protocol implementation and 
client libraries
 MODPY_EGG_VERSION =8.6.2
 DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
+REVISION = 0
 
 CATEGORIES =   devel
 
@@ -29,7 +30,7 @@ RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}>=2.8.2 
\
www/py-tornado${MODPY_FLAVOR}>=6.2
 
 TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
-   devel/pre-commit${MODPY_FLAVOR} \
+   devel/pre-commit \
devel/py-coverage${MODPY_FLAVOR} \
devel/py-ipykernel${MODPY_FLAVOR}>=6.14 \
devel/py-mypy${MODPY_FLAVOR} \
diff --git devel/py-jupyter_core/Makefile devel/py-jupyter_core/Makefile
index 0ddc7899d8d..dad1b3e3ecf 100644
--- devel/py-jupyter_core/Makefile
+++ devel/py-jupyter_core/Makefile
@@ -3,7 +3,7 @@ COMMENT =   Jupyter core package
 MODPY_EGG_VERSION =5.7.2
 DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   devel
 
@@ -25,7 +25,7 @@ MODPY_PYBUILD =   hatchling
 RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR} \
sysutils/py-platformdirs${MODPY_FLAVOR}
 
-TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
+TEST_DEPENDS = devel/pre-commit \
devel/py-ipykernel${MODPY_FLAVOR} \
devel/py-test-cov${MODPY_FLAVOR} \
devel/py-test-timeout${MODPY_FLAVOR}
diff --git devel/py-jupyter_server/Makefile devel/py-jupyter_server/Makefile
index df6a3842694..ed6c35f29c9 100644
--- devel/py-jupyter_server/Makefile
+++ devel/py-jupyter_server/Makefile
@@ -3,6 +3,7 @@ COMMENT =   backend for Jupyter web applications
 MODPY_EGG_VERSION =2.14.2
 DISTNAME = jupyter_server-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
+REVISION = 1
 
 CATEGORIES =   devel
 
@@ -42,7 +43,7 @@ RUN_DEPENDS = 
devel/py-jupyter_client${MODPY_FLAVOR}>=7.4.4 \
www/py-terminado${MODPY_FLAVOR}>=0.8.3 \
www/py-tornado${MODPY_FLAVOR}>=6.2.0
 
-TEST_DEPENDS =

Re: update jupyter_server 1.x -> 2.x

2024-07-17 Thread Bjorn Ketelaars

On Tue 16/07/2024 23:25, Daniel Dickman wrote:
> Here are the final new ports needed to update jupyter_server and then see 
> inline below for the update of jupyter_server itself from the 1.x series 
> to the 2.x.
> 
> Once this goes in we can import jupyterlab, and then finally update 
> jupyter notebook.
> 
> Would appreciate an ok to import the attached 2 ports.

New ports and diff look good, and builds. One minor nit for
py-jupyter_events below as it initially failed to run tests. OK bket@
the 2 ports (and for and for updating py-jupyter_server).


diff --git devel/py-jupyter_events/Makefile devel/py-jupyter_events/Makefile
index bfb763aa65a..6acae151209 100644
--- devel/py-jupyter_events/Makefile
+++ devel/py-jupyter_events/Makefile
@@ -27,7 +27,8 @@ RUN_DEPENDS = 
devel/py-jsonschema${MODPY_FLAVOR}>=4.18.0 \
textproc/py-referencing${MODPY_FLAVOR} \
textproc/py-yaml${MODPY_FLAVOR}>=5.3
 
-TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
+TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
+   devel/pre-commit${MODPY_FLAVOR} \
devel/py-click${MODPY_FLAVOR} \
devel/py-test-asyncio${MODPY_FLAVOR} \
devel/py-test-console-scripts${MODPY_FLAVOR}

UPDATE x11/spectrwm-3.6.0

2024-07-10 Thread Bjorn Ketelaars

Diff below brings spectrwm to 3.6.0. Changes:
https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_6_0

Major of shared library requires a major bump because of removal of
symbols.

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index fae035a6dde..d367f579d23 100644
--- Makefile
+++ Makefile
@@ -1,10 +1,10 @@
 COMMENT=   small tiling window manager
 
-V= 3.5.1
+V= 3.6.0
 DIST_TUPLE=github conformal spectrwm SPECTRWM_${V:S/./_/g} /
 DISTNAME=  spectrwm-${V}
 
-SHARED_LIBS=   swmhack 1.0
+SHARED_LIBS=   swmhack 2.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 2e0f3b923c5..a8df3db4586 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 
f+QmAgilLZ+4RCkdCv5q8YiHxUUt8Lkh7XgK97kiPw8=
-SIZE (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 196431
+SHA256 (conformal-spectrwm-SPECTRWM_3_6_0.tar.gz) = 
SYVMUhVHXSRQ0lWNoSo6/pAZhhFwup1VbItAPU1m8NE=
+SIZE (conformal-spectrwm-SPECTRWM_3_6_0.tar.gz) = 205957
diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
index b7f9931e564..d91b6f1efee 100644
--- patches/patch-lib_Makefile
+++ patches/patch-lib_Makefile
@@ -9,4 +9,4 @@ Index: lib/Makefile
 +CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow 
-Wno-uninitialized
  CFLAGS+= -fPIC
  CFLAGS+= -I${X11BASE}/include
- LDADD+= -L${X11BASE}/lib -lX11
+ 
diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
index 08dc93fa75b..6e76f33c3ae 100644
--- patches/patch-spectrwm_1
+++ patches/patch-spectrwm_1
@@ -1,7 +1,7 @@
 Index: spectrwm.1
 --- spectrwm.1.orig
 +++ spectrwm.1
-@@ -1990,7 +1990,7 @@ via
+@@ -2295,7 +2295,7 @@ via
  .Pa LD_PRELOAD
  must be specified.
  .Bd -literal -offset indent
diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
index 6fc372bca93..2f0c886a260 100644
--- patches/patch-spectrwm_c
+++ patches/patch-spectrwm_c
@@ -1,7 +1,7 @@
 Index: spectrwm.c
 --- spectrwm.c.orig
 +++ spectrwm.c
-@@ -379,7 +379,7 @@ uint32_t   swm_debug = 0
+@@ -380,7 +380,7 @@ uint32_t   swm_debug = 0
  #define SWM_CONF_WHITESPACE   " \t\n"
  
  #ifndef SWM_LIB

Re: UPDATE security-vaultwarden-1.31.0

2024-07-08 Thread Bjorn Ketelaars

On Tue 09/07/2024 07:09, Bjorn Ketelaars wrote:
> Diff below updates vaultwarden to 1.31.0. Changes:
> https://github.com/dani-garcia/vaultwarden/releases/tag/1.31.0
> 
> Noticeable is that support for WebSocket traffic on port 3012 has been
> removed, as it's been integrated on the main HTTP port for a few
> releases.
> 
> Tested on amd64.
> 
> Comments / OK?

Oops, forgot to 'cvs rm' an obsolete patch. New diff below.


Index: Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
diff -u -p -r1.34 Makefile
--- Makefile7 Mar 2024 04:15:01 -   1.34
+++ Makefile9 Jul 2024 05:23:46 -
@@ -5,7 +5,7 @@ BROKEN-i386 =   raw-cpuid-10.2.0/src/lib.
 
 COMMENT =  unofficial bitwarden compatible server
 
-DIST_TUPLE =   github dani-garcia vaultwarden 1.30.5 .
+DIST_TUPLE =   github dani-garcia vaultwarden 1.31.0 .
 
 CATEGORIES =   security
 
Index: crates.inc
===
RCS file: /cvs/ports/security/vaultwarden/crates.inc,v
diff -u -p -r1.13 crates.inc
--- crates.inc  7 Mar 2024 04:15:01 -   1.13
+++ crates.inc  9 Jul 2024 05:23:46 -
@@ -1,106 +1,106 @@
-MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += addr2line   0.22.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.9   # MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
+MODCARGO_CRATES += ahash   0.8.11  # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.3   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
-MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
+MODCARGO_CRATES += allocator-api2  0.2.18  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
 MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-channel   2.2.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.6   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.11  # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.12.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-io2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.3.3   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-lock  3.3.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-lock  3.4.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-signal0.2.5   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-signal0.2.8   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-std   1.12.0  # Apache-2.0/MIT
 MODCARGO_CRATES += async-stream0.3.5   # MIT
 MODCARGO_CRATES += async-stream-impl   0.3.5   # MIT
-MODCARGO_CRATES += async-task  4.7.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-trait 0.1.77  # MIT OR Apache-2.0
+MODCARGO_CRATES += async-task  4.7.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-trait 0.1.81  # MIT OR Apache-2.0
 MODCARGO_CRATES += atomic  0.5.3   # Apache-2.0/MIT
 MODCARGO_CRATES += atomic  0.6.0   # Apache-2.0/MIT
 MODCARGO_CRATES += atomic-waker1.1.2   # Apache-2.0 OR MIT
-MODCARGO_CRATES += autocfg 1.1.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += backtrace   0.3.69  # MIT OR Apache-2.0
+MODCARGO_CRATES += autocfg 1.3.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += backtrace   0.3.73  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64  0.13.1  # MIT/Apache-2.0
 MODCARGO_CRATES += base64  0.21.7  # MIT OR Apache-2.0
+MODCARGO_CRATES += base64  0.22.1  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64ct1.6.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += bigdecimal  0.4.2   # MIT/Apache-2.0
+MODCARGO_CRATES += bigdecimal  0.4.5   # MIT/Apache-2.0
 MODCARGO_CRATES += binascii0.1.4   # MIT
 MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags2.4.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += bitflags2.6.0   # MIT OR Apache-2.0
 MODCARGO_CRATES += blake2  0.10.6  # MIT OR Ap

UPDATE www/vaultwarden-web-2024.5.1b

2024-07-08 Thread Bjorn Ketelaars

Diff below updates www/vaultwarden-web to 2024.5.1b

Changes:
https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.5.1b
https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.5.1

Comments / OK?


Index: Makefile
===
RCS file: /cvs/ports/www/vaultwarden-web/Makefile,v
diff -u -p -r1.16 Makefile
--- Makefile29 Apr 2024 09:20:15 -  1.16
+++ Makefile9 Jul 2024 04:59:04 -
@@ -1,6 +1,6 @@
 COMMENT =  Web vault builds for vaultwarden
 
-VERSION =  2024.3.1
+VERSION =  2024.5.1b
 DISTNAME = bw_web_v${VERSION}
 PKGNAME =  vaultwarden-web-${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/www/vaultwarden-web/distinfo,v
diff -u -p -r1.14 distinfo
--- distinfo29 Apr 2024 09:20:15 -  1.14
+++ distinfo9 Jul 2024 04:59:04 -
@@ -1,2 +1,2 @@
-SHA256 (bw_web_v2024.3.1.tar.gz) = A9TS/WPZZ6joHLucsa+aql1+eUS1wefMPIkV8amFsYc=
-SIZE (bw_web_v2024.3.1.tar.gz) = 11663162
+SHA256 (bw_web_v2024.5.1b.tar.gz) = 
vOrf9v+Wrscfurkdv2fLeQljX21L2KkCpYvZs+fK5tM=
+SIZE (bw_web_v2024.5.1b.tar.gz) = 11928177
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/vaultwarden-web/pkg/PLIST,v
diff -u -p -r1.14 PLIST
--- pkg/PLIST   29 Apr 2024 09:20:15 -  1.14
+++ pkg/PLIST   9 Jul 2024 04:59:04 -
@@ -1,80 +1,80 @@
 vaultwarden/
 vaultwarden/web-vault/
 vaultwarden/web-vault/.nojekyll
-vaultwarden/web-vault/125.99ad3392af9029ab785c.js
-vaultwarden/web-vault/125.99ad3392af9029ab785c.js.map
-vaultwarden/web-vault/319.f8244d96c41fa98843ef.js
-vaultwarden/web-vault/319.f8244d96c41fa98843ef.js.map
-vaultwarden/web-vault/367.00f5a63604ed125355fa.js
-vaultwarden/web-vault/367.00f5a63604ed125355fa.js.map
-vaultwarden/web-vault/395.38a9c38835d7b081bc1d.js
-vaultwarden/web-vault/395.38a9c38835d7b081bc1d.js.LICENSE.txt
-vaultwarden/web-vault/395.38a9c38835d7b081bc1d.js.map
-vaultwarden/web-vault/409.1696c619d8380678bd38.js
-vaultwarden/web-vault/409.1696c619d8380678bd38.js.map
-vaultwarden/web-vault/44.544b48d02483cf302a8e.js
-vaultwarden/web-vault/44.544b48d02483cf302a8e.js.LICENSE.txt
-vaultwarden/web-vault/44.544b48d02483cf302a8e.js.map
-vaultwarden/web-vault/554.26858b356a8fca25f37b.js
-vaultwarden/web-vault/554.26858b356a8fca25f37b.js.map
-vaultwarden/web-vault/627.6c3604056804346e394f.js
-vaultwarden/web-vault/627.6c3604056804346e394f.js.map
-vaultwarden/web-vault/651.6617eae790351aa1ac81.js
-vaultwarden/web-vault/651.6617eae790351aa1ac81.js.map
-vaultwarden/web-vault/74.c6304b54543b574643f3.js
-vaultwarden/web-vault/74.c6304b54543b574643f3.js.map
-vaultwarden/web-vault/77.27e8598fd2fdf84e102c.js
-vaultwarden/web-vault/77.27e8598fd2fdf84e102c.js.map
-vaultwarden/web-vault/838.4708f4e6417b45fd413e.js
-vaultwarden/web-vault/838.4708f4e6417b45fd413e.js.map
-vaultwarden/web-vault/968.225a74c55200ccb35667.js
-vaultwarden/web-vault/968.225a74c55200ccb35667.js.map
-vaultwarden/web-vault/979.27e7418889fb723ffcfe.js
-vaultwarden/web-vault/979.27e7418889fb723ffcfe.js.map
+vaultwarden/web-vault/125.0791c68011f28c5397e2.js
+vaultwarden/web-vault/125.0791c68011f28c5397e2.js.map
+vaultwarden/web-vault/229.0837cabc1f0c63f132c8.js
+vaultwarden/web-vault/229.0837cabc1f0c63f132c8.js.map
+vaultwarden/web-vault/367.3aa2579b622fbbb8602a.js
+vaultwarden/web-vault/367.3aa2579b622fbbb8602a.js.map
+vaultwarden/web-vault/395.eef1cb8a52613ac828e0.js
+vaultwarden/web-vault/395.eef1cb8a52613ac828e0.js.LICENSE.txt
+vaultwarden/web-vault/395.eef1cb8a52613ac828e0.js.map
+vaultwarden/web-vault/409.6492239d1a4b496ff7a9.js
+vaultwarden/web-vault/409.6492239d1a4b496ff7a9.js.map
+vaultwarden/web-vault/44.8c50b08611d419c1106c.js
+vaultwarden/web-vault/44.8c50b08611d419c1106c.js.LICENSE.txt
+vaultwarden/web-vault/44.8c50b08611d419c1106c.js.map
+vaultwarden/web-vault/446.aa3cbfc2fd486eed8e6b.js
+vaultwarden/web-vault/446.aa3cbfc2fd486eed8e6b.js.map
+vaultwarden/web-vault/554.a1976937ff8a44f781e7.js
+vaultwarden/web-vault/554.a1976937ff8a44f781e7.js.map
+vaultwarden/web-vault/651.17b23b646451d8e0299f.js
+vaultwarden/web-vault/651.17b23b646451d8e0299f.js.map
+vaultwarden/web-vault/74.210eee92632f00635b5e.js
+vaultwarden/web-vault/74.210eee92632f00635b5e.js.map
+vaultwarden/web-vault/77.9ea3c9e3fca7d8bab9e7.js
+vaultwarden/web-vault/77.9ea3c9e3fca7d8bab9e7.js.map
+vaultwarden/web-vault/838.b4055e25ea0ad876dfdf.js
+vaultwarden/web-vault/838.b4055e25ea0ad876dfdf.js.map
+vaultwarden/web-vault/968.af8051ce417955c452d1.js
+vaultwarden/web-vault/968.af8051ce417955c452d1.js.map
+vaultwarden/web-vault/979.e07af87d88679c6e8e25.js
+vaultwarden/web-vault/979.e07af87d88679c6e8e25.js.map
 vaultwarden/web-vault/app/
 vaultwarden/web-vault/app-id.json
-vaultwarden/web-vault/app/main.66fcce61d039069f536d.js
-vaultwarden/web-vault/app/main.66fcce61d039069f536d.js.map
-vaultwarden/web-vault/app/main.86263cf634b908626b83.css
-vaultwarden/

UPDATE security-vaultwarden-1.31.0

2024-07-08 Thread Bjorn Ketelaars

Diff below updates vaultwarden to 1.31.0. Changes:
https://github.com/dani-garcia/vaultwarden/releases/tag/1.31.0

Noticeable is that support for WebSocket traffic on port 3012 has been
removed, as it's been integrated on the main HTTP port for a few
releases.

Tested on amd64.

Comments / OK?


Index: Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
diff -u -p -r1.34 Makefile
--- Makefile7 Mar 2024 04:15:01 -   1.34
+++ Makefile9 Jul 2024 04:59:42 -
@@ -5,7 +5,7 @@ BROKEN-i386 =   raw-cpuid-10.2.0/src/lib.
 
 COMMENT =  unofficial bitwarden compatible server
 
-DIST_TUPLE =   github dani-garcia vaultwarden 1.30.5 .
+DIST_TUPLE =   github dani-garcia vaultwarden 1.31.0 .
 
 CATEGORIES =   security
 
Index: crates.inc
===
RCS file: /cvs/ports/security/vaultwarden/crates.inc,v
diff -u -p -r1.13 crates.inc
--- crates.inc  7 Mar 2024 04:15:01 -   1.13
+++ crates.inc  9 Jul 2024 04:59:42 -
@@ -1,106 +1,106 @@
-MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += addr2line   0.22.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.9   # MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
+MODCARGO_CRATES += ahash   0.8.11  # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.3   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
-MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
+MODCARGO_CRATES += allocator-api2  0.2.18  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
 MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-channel   2.2.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.6   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.11  # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.12.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-io2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.3.3   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-lock  3.3.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-lock  3.4.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-signal0.2.5   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-signal0.2.8   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-std   1.12.0  # Apache-2.0/MIT
 MODCARGO_CRATES += async-stream0.3.5   # MIT
 MODCARGO_CRATES += async-stream-impl   0.3.5   # MIT
-MODCARGO_CRATES += async-task  4.7.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-trait 0.1.77  # MIT OR Apache-2.0
+MODCARGO_CRATES += async-task  4.7.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-trait 0.1.81  # MIT OR Apache-2.0
 MODCARGO_CRATES += atomic  0.5.3   # Apache-2.0/MIT
 MODCARGO_CRATES += atomic  0.6.0   # Apache-2.0/MIT
 MODCARGO_CRATES += atomic-waker1.1.2   # Apache-2.0 OR MIT
-MODCARGO_CRATES += autocfg 1.1.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += backtrace   0.3.69  # MIT OR Apache-2.0
+MODCARGO_CRATES += autocfg 1.3.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += backtrace   0.3.73  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64  0.13.1  # MIT/Apache-2.0
 MODCARGO_CRATES += base64  0.21.7  # MIT OR Apache-2.0
+MODCARGO_CRATES += base64  0.22.1  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64ct1.6.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += bigdecimal  0.4.2   # MIT/Apache-2.0
+MODCARGO_CRATES += bigdecimal  0.4.5   # MIT/Apache-2.0
 MODCARGO_CRATES += binascii0.1.4   # MIT
 MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags2.4.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += bitflags2.6.0   # MIT OR Apache-2.0
 MODCARGO_CRATES += blake2  0.10.6  # MIT OR Apache-2.0
 MODCARGO_CRATES += block-buffer0.10.4  # MIT OR Apache-2.0
-MODCARGO_CRATES += blocking1.5.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += brotli  3.

Re: 回复: shall we create new port lang/cython3 ?

2024-07-04 Thread Bjorn Ketelaars

On Thu 04/07/2024 15:54, Stuart Henderson wrote:
> On 2024/06/30 14:53, Stuart Henderson wrote:
> > On 2024/06/28 18:44, Daniel Dickman wrote:
> > > > These use python 2 and fail with cython 3:
> > > >
> > > > games/pygame_sdl2
> > > > games/renpy
> > > 
> > > please mark these as BROKEN
> > > 
> > > > The following ports didn't build and I don't have diffs to fix/update
> > > > them. If anyone wants to push this forward then figuring out how to 
> > > > patch
> > > > or update these would be helpful:
> > > >
> > > > math/mlpack ?
> > > > math/py-h5py,python33.11.0 supports newer cython, but needs 
> > > > newer numpy
> > > > math/py-pandas,python3  ?
> > > > math/py-scikit-image,python30.22.0/newer, need newer numpy (0.22.0: 
> > > > 1.23.3, 0.23.x: 2.x)
> > > > math/py-scipy,python3   ?
> > > 
> > > please mark the above as BROKEN for now.
> > > 
> > > I use scipy and pandas so will be motivated to fix once we have Cython
> > > 3 in the tree.
> 
> Here's the diff that I have doing the above, maintainers of touched ports 
> CC'd.
> Alternatively for mlpack, there's an update which works with new cython at
> https://junkpile.org/mlpack-4.4.0.diff but I have no idea how to test it.
> 
>  games/pygame_sdl2/Makefile|7 ++
>  games/renpy/Makefile  |2 
>  geo/py-fiona/Makefile |8 +--
>  geo/py-fiona/distinfo |4 -
>  geo/py-fiona/pkg/PLIST|   20 ++-
>  geo/py-proj/Makefile  |3 -
>  geo/py-proj/distinfo  |4 -
>  geo/py-rasterio/Makefile  |3 -
>  geo/py-rasterio/distinfo  |4 -
>  geo/py-rasterio/pkg/PLIST |3 -
>  lang/cython/Makefile  |3 -
>  lang/cython/distinfo  |4 -
>  lang/cython/pkg/PLIST |  111 
> +-
>  math/mlpack/Makefile  |2 
>  math/py-h5py/Makefile |2 
>  math/py-pandas/Makefile   |2 
>  math/py-scikit-image/Makefile |2 
>  math/py-scipy/Makefile|2 
>  net/py-msgpack/Makefile   |3 -
>  net/py-msgpack/distinfo   |4 -
>  textproc/py-yaml/Makefile |   16 ++
>  textproc/py-yaml/distinfo |4 -
>  22 files changed, 119 insertions(+), 94 deletions(-)

OK for net/py-msgpack

Re: borgbackup 1.4 (Re: CVS: cvs.openbsd.org: ports)

2024-07-04 Thread Bjorn Ketelaars

On Thu 04/07/2024 07:44, Matthieu Herrb wrote:
> On Wed, Jul 03, 2024 at 11:14:26PM -0600, Bjorn Ketelaars wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: b...@cvs.openbsd.org2024/07/03 23:14:26
> > 
> > Modified files:
> > sysutils/borgbackup: Makefile 
> > 
> > Log message:
> > sysutils/borgbackup - hook up 1.4/ and unhook 1.2/
> > 
> 
> Hi,
> 
> Is 1.4 compatible with 1.2 repositories or is there some constraint to
> upgrade the server and clients simultaneously ?

sthen@ beat me to it:
- borg 1.4 will behave quite similar to borg 1.2. Repositories are
  compatible
- tested connecting 1.2 to 1.4 in both directions

NEW sysutils/borgbackup/1.4

2024-07-03 Thread Bjorn Ketelaars

borgbackup 1.4.0 has been released, which is kind of a refreshed 1.2.x
with mostly the same features and behavior, but a few bigger changes.
1.4.0 is the new stable. Changelog summary can be found at
https://www.borgbackup.org/releases/borg-1.4.html.

Port itself is similar to the port for 1.2/. Difference however is that
1.4 carries a patch for enabling building/running with the version of
Cython we have in ports.

'make test' passes all tests, and works for me on amd64.

Enclosed is a tarball for the to be imported 1.4 branch. After
import, plan is to:
- hook up 1.4 in sysutils/borgbackup/Makefile
- unhook 1.2 from sysutils/borgbackup/Makefile
- rm -rf sysutils/borgbackup/1.2

@pkgpath-marker has been set in 1.4/pkg/PLIST, thus enabling 'pkg_add
-u' to update borgbackup to the new version.

Comments / OK?


borgbackup-1.4.tgz
Description: application/tar-gz

Re: CHANGE net/samba - drop meta rc-script

2024-07-03 Thread Bjorn Ketelaars

On Tue 02/07/2024 20:57, Bjorn Ketelaars wrote:
> The meta rc-script for Samba does not play nice with 'rcctl ls rogue'.
> When a meta script is used, services started by the child scripts are
> seen as rogue [0].
> 
> Samba's meta script provides little functionality, which can be easily
> replaced by using its two child scipts. Proposal is to remove the meta
> script and inform users via faq/current.html.
> 
> Diff for net/samba below.
> Diff for current.html attached.
> 
> OK?

After consideration this is not the right solution for getting rid
of rogue messages from daily(8). Please ignore this diff.

CHANGE net/samba - drop meta rc-script

2024-07-02 Thread Bjorn Ketelaars

The meta rc-script for Samba does not play nice with 'rcctl ls rogue'.
When a meta script is used, services started by the child scripts are
seen as rogue [0].

Samba's meta script provides little functionality, which can be easily
replaced by using its two child scipts. Proposal is to remove the meta
script and inform users via faq/current.html.

Diff for net/samba below.
Diff for current.html attached.

OK?


diff --git Makefile Makefile
index 311e62490ab..594ec3d5b0f 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,7 @@
 VERSION =  4.20.2
 DISTNAME = samba-${VERSION}
 EPOCH =0
+REVISION = 0
 
 COMMENT-main = SMB and CIFS client and server for UNIX
 COMMENT-docs = additional documentation and examples for Samba
diff --git pkg/PLIST-main pkg/PLIST-main
index 65400a77f88..e5af321c94b 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -8,7 +8,6 @@
 @pkgpath net/samba,-tevent
 @pkgpath net/samba,-util
 @rcscript ${RCDIR}/nmbd
-@rcscript ${RCDIR}/samba
 @rcscript ${RCDIR}/smbd
 @rcscript ${RCDIR}/winbindd
 @sample ${SYSCONFDIR}/samba/
diff --git pkg/samba.rc pkg/samba.rc
deleted file mode 100644
index 71080d984c7..000
--- pkg/samba.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/ksh
-
-# "meta" script running the following rc.d(8) scripts with the given argument;
-# note that "daemon_*" variables are not passed to the child scripts.
-_pkg_scripts="smbd nmbd"
-
-if [[ $1 == restart ]]; then
-   $0 stop && $0 start
-   exit
-fi
-
-if [[ $1 == stop ]]; then
-   for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
-   _pkg_scripts=${_l% }
-fi
-
-for _i in ${_pkg_scripts}; do
-   if [[ -x ${RCDIR}/${_i} ]]; then
-   ${RCDIR}/${_i} $@ || exit $?
-   fi
-done
Index: current.html
===
RCS file: /cvs/www/faq/current.html,v
diff -u -p -r1.1120 current.html
--- current.html7 May 2024 09:20:30 -   1.1120
+++ current.html2 Jul 2024 18:42:14 -
@@ -84,6 +84,19 @@ Once the new tables are installed, no ch
 are needed.
 
 
+2024/07/02 - [packages] Samba port change
+
+The meta rc-script for Samba (samba) has been dropped as it does
+not play nicely with rcctl ls rogue.
+When a meta script is used, services started by the child scripts are seen as
+rogue.
+To replace the meta script by the child script one can use:
+
+rcctl disable samba
+rcctl enable nmbd smbd
+
+
+

Re: UPDATE audio/audacious to 4.4

2024-06-29 Thread Bjorn Ketelaars

On Sat 29/06/2024 13:26, Theo Buehler wrote:
> On Thu, Jun 27, 2024 at 05:16:14AM +0200, Bjorn Ketelaars wrote:
> > On Thu 13/06/2024 17:43, Bjorn Ketelaars wrote:
> > > Diff below updates {audio,meta}/audacious to 4.4. Changes are listed on
> > > https://audacious-media-player.org/news/59-audacious-4-4-released.
> > > 
> > > Changes to port:
> > > - bumped minor of libaudcore because of an addition
> > > - bumped major of libaudqt because of a removal
> > > - updated dependencies
> > > - synced patches and WANTLIB
> > > 
> > > Tested on amd64.
> > > 
> > > Comments/OK?
> > 
> > Ping...
> > 
> > I saw one positive test report.
> > 
> 
> meta/audacious failed to build:


My bad. This has been fixed by setting the correct REVISION.

Re: UPDATE audio/audacious to 4.4

2024-06-26 Thread Bjorn Ketelaars

On Thu 13/06/2024 17:43, Bjorn Ketelaars wrote:
> Diff below updates {audio,meta}/audacious to 4.4. Changes are listed on
> https://audacious-media-player.org/news/59-audacious-4-4-released.
> 
> Changes to port:
> - bumped minor of libaudcore because of an addition
> - bumped major of libaudqt because of a removal
> - updated dependencies
> - synced patches and WANTLIB
> 
> Tested on amd64.
> 
> Comments/OK?

Ping...

I saw one positive test report.

Diff enclosed again for your convenience:


diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
index dc147db461f..7a0a5713d63 100644
--- audio/audacious/Makefile.inc
+++ audio/audacious/Makefile.inc
@@ -1,5 +1,5 @@
 # Do not forget to sync meta/audacious
-VERSION =  4.3.1
+VERSION =  4.4
 
 CATEGORIES =   audio multimedia
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS +=  devel/gettext,-tools
 
 MODULES += x11/qt5
 CONFIGURE_ARGS +=  --disable-gtk \
-   --enable-qt
+   --enable-qt5
 
 USE_GMAKE =Yes
 
diff --git audio/audacious/player/Makefile audio/audacious/player/Makefile
index fe25b02d5f7..79bc651b73d 100644
--- audio/audacious/player/Makefile
+++ audio/audacious/player/Makefile
@@ -3,22 +3,22 @@ COMMENT = graphical audio player which supports 
lots of formats
 DISTNAME = audacious-${VERSION}
 PKGNAME =  audacious-player-${VERSION}
 
-REVISION = 0
-
-SHARED_LIBS += audcore 5.2 # 5.3
-SHARED_LIBS += audtag  3.0 # 3.0
-SHARED_LIBS += audqt   0.2 # 2.4
+SHARED_LIBS += audcore 5.3
+SHARED_LIBS += audtag  3.0
+SHARED_LIBS += audqt   1.0
 
 # BSD
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 iconv intl m
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
+WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
+WANTLIB += m
+
+# needed for displaying icons
+LIB_DEPENDS =  x11/qt5/qtsvg
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+4,-guic
-# needed for displaying icons
-RUN_DEPENDS += x11/qt5/qtsvg
 
 MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
LIBaudtag_VERSION=${LIBaudtag_VERSION} \
diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo
index 17417f6e3f5..1b3848192e9 100644
--- audio/audacious/player/distinfo
+++ audio/audacious/player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-4.3.1.tar.bz2) = heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI=
-SIZE (audacious-4.3.1.tar.bz2) = 630820
+SHA256 (audacious-4.4.tar.bz2) = qtxdJuopVCNqABU+QkCU2ebrVcXDJMCP0EkbfCri+DA=
+SIZE (audacious-4.4.tar.bz2) = 635856
diff --git audio/audacious/player/patches/patch-buildsys_mk_in 
audio/audacious/player/patches/patch-buildsys_mk_in
deleted file mode 100644
index b5370c4f27c..000
--- audio/audacious/player/patches/patch-buildsys_mk_in
+++ /dev/null
@@ -1,103 +0,0 @@
-Show compiler invocations.
-
-Index: buildsys.mk.in
 buildsys.mk.in.orig
-+++ buildsys.mk.in
-@@ -123,18 +123,18 @@ DEPS = ${OBJS:.o=.dep}   \
- 
- MO_FILES = ${LOCALES:.po=.mo}
- 
--.SILENT:
-+#.SILENT:
- .SUFFIXES:
- .SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m 
.mm .o .plugin.o .po .py .pyc .rc .S .xpm
- .PHONY: all subdirs subdirs-after pre-depend depend install install-extra 
uninstall uninstall-extra clean distclean locales copy-headers-into-framework 
${SUBDIRS} ${SUBDIRS_AFTER}
- 
- all:
--  ${MAKE} -s pre-all
--  ${MAKE} -s subdirs
--  ${MAKE} -s depend
--  ${MAKE} -s ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} 
${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} 
${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} 
${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} 
${PROG_NOINST} ${JARFILE} locales
--  ${MAKE} -s subdirs-after
--  ${MAKE} -s post-all
-+  ${MAKE} pre-all
-+  ${MAKE} subdirs
-+  ${MAKE} depend
-+  ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} 
${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} 
${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} 
${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} 
${PROG_NOINST} ${JARFILE} locales
-+  ${MAKE} subdirs-after
-+  ${MAKE} post-all
- 
- pre-all post-all:
- 
-@@ -144,7 +144,7 @@ subdirs-after: ${SUBDIRS_AFTER}
- ${SUBDIRS} ${SUBDIRS_AFTER}:
-   for i in $@; do \
-   ${DIR_ENTER}; \
--  ${MAKE} -s || exit $$?; \
-+  ${MAKE} || exit $$?; \
-   ${DIR_LEAVE}; \
-   done
- 
-@@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
- ${FRAMEW

UPDATE sysutils/rclone 1.67.0

2024-06-14 Thread Bjorn Ketelaars

Diff below brings sysutils/rclone to 1.67.0, which fixes CVE-2023-45288
and CVE-2024-35255.
- https://www.cve.org/CVERecord?id=CVE-2023-45288
- https://www.cve.org/CVERecord?id=CVE-2024-35255

Full changelog can be found at
https://rclone.org/changelog/#v1-67-0-2024-06-14.

Run tested on amd64 -current.

Backporting this diff to -stable is straightforward.

OK for committing this to -current and -stable?


diff --git Makefile Makefile
index 916b3afb845..ef389fd97b8 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
 COMMENT =  rsync for cloud storage
 
-V =1.66.0
+V =1.67.0
 DISTNAME = rclone-v${V}
 PKGNAME =  rclone-${V}
 
diff --git distinfo distinfo
index 12d57cb8251..45e69c044b4 100644
--- distinfo
+++ distinfo
@@ -1,4 +1,4 @@
-SHA256 (rclone-v1.66.0-vendor.tar.gz) = 
FHF1proaSOZRbqLXJQsTfULZWdK0XR8IrpURoyWdi28=
-SHA256 (rclone-v1.66.0.tar.gz) = bWI/D6w3C1QVI5neF6r0mDWicD2w9ZpA5BHjoVWaBl0=
-SIZE (rclone-v1.66.0-vendor.tar.gz) = 13547678
-SIZE (rclone-v1.66.0.tar.gz) = 17019917
+SHA256 (rclone-v1.67.0-vendor.tar.gz) = 
gmRj2aK8XlEeCRwkvn1L9vLfOWcCZi+1KEmCI8yzm5Q=
+SHA256 (rclone-v1.67.0.tar.gz) = 84Y+8/y8wKoMoAxr8cCZvpRw3zYHUZEttckCHT5UnRA=
+SIZE (rclone-v1.67.0-vendor.tar.gz) = 13795247
+SIZE (rclone-v1.67.0.tar.gz) = 17179909

UPDATE audio/audacious to 4.4

2024-06-13 Thread Bjorn Ketelaars

Info.plist; fi && 
if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 
module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o 
$$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} 
${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} 
-fs ${CODESIGN_IDENTITY} $$out; then \
-   ${LINK_OK}; \
-   else \
-   rm -fr $$out; false; \
-@@ -205,7 +205,7 @@ copy-headers-into-framework:
-   for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
-   test x"$$i" = x"" && continue; \
-   cd $$i || exit 1; \
--  ${MAKE} -s copy-headers-into-framework || exit $$?; \
-+  ${MAKE} copy-headers-into-framework || exit $$?; \
-   cd .. || exit 1; \
-   done
- 
-@@ -654,7 +654,7 @@ install: install-extra
-   for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
-   test x"$$i" = x"" && continue; \
-   ${DIR_ENTER}; \
--  ${MAKE} -s install || exit $$?; \
-+  ${MAKE} install || exit $$?; \
-   ${DIR_LEAVE}; \
-   done
- 
-@@ -767,7 +767,7 @@ uninstall: uninstall-extra
-   for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
-   test x"$$i" = x"" && continue; \
-   ${DIR_ENTER}; \
--  ${MAKE} -s uninstall || exit $$?; \
-+  ${MAKE} uninstall || exit $$?; \
-   ${DIR_LEAVE}; \
-   done
- 
-@@ -882,7 +882,7 @@ clean:
-   for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
-   test x"$$i" = x"" && continue; \
-   ${DIR_ENTER}; \
--  ${MAKE} -s clean || exit $$?; \
-+  ${MAKE} clean || exit $$?; \
-   ${DIR_LEAVE}; \
-   done
- 
-@@ -903,7 +903,7 @@ distclean: clean
-   for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
-   test x"$$i" = x"" && continue; \
-   ${DIR_ENTER}; \
--  ${MAKE} -s distclean || exit $$?; \
-+  ${MAKE} distclean || exit $$?; \
-   ${DIR_LEAVE}; \
-   done
- 
-@@ -923,7 +923,7 @@ print-hierarchy:
-   test x"$$i" = x"" && continue; \
-   echo ${PRINT_HIERARCHY_PREFIX}$$i; \
-   cd $$i || exit $$?; \
--  ${MAKE} -s PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit 
$$?; \
-+  ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit 
$$?; \
-   cd .. || exit $$?; \
-   done
- 
diff --git audio/audacious/plugins/patches/patch-configure 
audio/audacious/plugins/patches/patch-configure
index bc73a8f82aa..2c95a6cdce5 100644
--- audio/audacious/plugins/patches/patch-configure
+++ audio/audacious/plugins/patches/patch-configure
@@ -5,7 +5,7 @@ polluted very early on, breaking most of the checks using 
AC_CHECK_LIB.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -11758,8 +11758,6 @@ printf "%s\n" "yes" >&6; }
+@@ -11977,8 +11977,6 @@ printf "%s\n" "yes" >&6; }
  
  fi
  
@@ -14,7 +14,7 @@ Index: configure
  
  
  if test $HAVE_DARWIN = yes ; then
-@@ -17192,6 +17190,8 @@ then :
+@@ -17629,6 +17627,8 @@ then :
  
  fi
  
diff --git audio/audacious/plugins/patches/patch-src_neon_neon_cc 
audio/audacious/plugins/patches/patch-src_neon_neon_cc
index 40d0e88e56d..e46219bea5a 100644
--- audio/audacious/plugins/patches/patch-src_neon_neon_cc
+++ audio/audacious/plugins/patches/patch-src_neon_neon_cc
@@ -6,7 +6,7 @@ bool NeonFile::feof ()
 Index: src/neon/neon.cc
 --- src/neon/neon.cc.orig
 +++ src/neon/neon.cc
-@@ -45,6 +45,8 @@
+@@ -50,6 +50,8 @@
  #define NEON_ICY_BUFSIZE(4096)
  #define NEON_RETRY_COUNT 6
  
diff --git audio/audacious/plugins/pkg/PLIST audio/audacious/plugins/pkg/PLIST
index 085fe33e349..d653b0a4a36 100644
--- audio/audacious/plugins/pkg/PLIST
+++ audio/audacious/plugins/pkg/PLIST
@@ -11,6 +11,7 @@ lib/audacious/Container/
 @so lib/audacious/Container/pls.so
 @so lib/audacious/Container/xspf.so
 lib/audacious/Effect/
+@so lib/audacious/Effect/background_music.so
 @so lib/audacious/Effect/bitcrusher.so
 @so lib/audacious/Effect/compressor.so
 @so lib/audacious/Effect/crossfade.so
@@ -27,7 +28,7 @@ lib/audacious/General/
 @so lib/audacious/General/albumart-qt.so
 @so lib/audacious/General/cd-menu-items.so
 @so lib/audacious/General/delete-files.so
-@so lib/audacious/General/lyricwiki-qt.so
+@so lib/audacious/General/lyrics-qt.so
 @so lib/audacious/General/mpris2.so
 @so lib/audacious/General/notify.so
 @so lib/audacious/General/playlist-manager-qt.so
diff --git meta/audacious/Makefile meta/audacious/Makefile
index b13f16bed74..52d76b142b9 100644
--- meta/audacious/Makefile
+++ meta/audacious/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  audacious meta-package
 
-VERSION =  4.3.1
+VERSION =  4.4.0
 PKGNAME =  audacious-${VERSION}
 
 MAINTAINER =   Bjorn Ketelaars

[-stable UPDATE] samba-4.19.7

2024-06-10 Thread Bjorn Ketelaars

Here is an update to the latest release of the Samba 4.19 release series
for -stable. Release notes:
https://www.samba.org/samba/history/samba-4.19.7.html

Tests/comments/OKs welcome.


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.343.2.1
diff -u -p -r1.343.2.1 Makefile
--- Makefile16 Apr 2024 16:44:24 -  1.343.2.1
+++ Makefile10 Jun 2024 19:20:02 -
@@ -1,4 +1,4 @@
-VERSION =  4.19.6
+VERSION =  4.19.7
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.114.2.1
diff -u -p -r1.114.2.1 distinfo
--- distinfo16 Apr 2024 16:44:24 -  1.114.2.1
+++ distinfo10 Jun 2024 19:20:02 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.19.6.tar.gz) = ZTtSCVVU28IjxjuWr1zfnpjD4EhUnF9WFD07M9zhzvE=
-SIZE (samba-4.19.6.tar.gz) = 41847853
+SHA256 (samba-4.19.7.tar.gz) = K7uACvLWvHucI+cIzVjQCNo7+m735iHZ7ItTOH7+5EU=
+SIZE (samba-4.19.7.tar.gz) = 41851647
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.73
diff -u -p -r1.73 PLIST-main
--- pkg/PLIST-main  12 Oct 2023 07:28:23 -  1.73
+++ pkg/PLIST-main  10 Jun 2024 19:20:03 -
@@ -1042,6 +1042,10 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}check_output.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1073,6 +1077,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/bug13653.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/check_output.py
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/downgradedatabase.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py

Re: [update] audio/ncspot to 1.1.1

2024-05-18 Thread Bjorn Ketelaars

On Sat 18/05/2024 21:54, Lucas Raab wrote:
> Hello,
> 
> This update to ncspot has been working for me on amd64. Other tests?
> 
> Changelog:
> https://github.com/hrkfdn/ncspot/releases/tag/v1.1.1

Run tested on amd64. Works for me, ok bket@

Re: update www/vaultwarden-web

2024-04-27 Thread Bjorn Ketelaars

On Fri 26/04/2024 18:49, Solene Rapenne wrote:
> a new vaultwarden-web build is available upstream
> 
> https://github.com/dani-garcia/bw_web_builds/releases

I have the same diff in my tree, and have been using it for ~2 weeks. So
far, no surprises found.

OK bket@

Re: [update] nginx 1.26.0

2024-04-26 Thread Bjorn Ketelaars

On Wed 24/04/2024 15:45, Landry Breuil wrote:
> hi,
> 
> upstream just released 1.26.0, the attached diff builds fine. testing
> for various modules welcome !

Gave it a spin with the stream module. Also tested it on 2 other
instances without any modules.

Diff looks good and works for me.

devel/ipython - missing RDEP

2024-04-18 Thread Bjorn Ketelaars

jupyter-notebook fails to run notebooks with the following error:

Traceback (most recent call last):
  File "/usr/local/lib/python3.10/runpy.py", line 196, in _run_module_as_main
return _run_code(code, main_globals, None,
  File "/usr/local/lib/python3.10/runpy.py", line 86, in _run_code
exec(code, run_globals)
  File "/usr/local/lib/python3.10/site-packages/ipykernel_launcher.py", line 
16, in 
from ipykernel import kernelapp as app
  File "/usr/local/lib/python3.10/site-packages/ipykernel/kernelapp.py", line 
21, in 
from IPython.core.application import (  # type:ignore[attr-defined]
  File "/usr/local/lib/python3.10/site-packages/IPython/__init__.py", line 55, 
in 
from .terminal.embed import embed
  File "/usr/local/lib/python3.10/site-packages/IPython/terminal/embed.py", 
line 16, in 
from IPython.terminal.interactiveshell import TerminalInteractiveShell
  File 
"/usr/local/lib/python3.10/site-packages/IPython/terminal/interactiveshell.py", 
line 48, in 
from .debugger import TerminalPdb, Pdb
  File "/usr/local/lib/python3.10/site-packages/IPython/terminal/debugger.py", 
line 6, in 
from IPython.core.completer import IPCompleter
  File "/usr/local/lib/python3.10/site-packages/IPython/core/completer.py", 
line 219, in 
from IPython.core.guarded_eval import guarded_eval, EvaluationContext
  File "/usr/local/lib/python3.10/site-packages/IPython/core/guarded_eval.py", 
line 35, in 
from typing_extensions import Self, LiteralString
ModuleNotFoundError: No module named 'typing_extensions'

I believe this is caused by a missing RDEP in devel/ipython, which
recently received an update. With the diff below jupyer-notebook is
happy again.

Comments/OK?


diff --git Makefile Makefile
index 18f85e7a7f5..432c6ddaa5a 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,7 @@
 COMMENT =  enhanced interactive Python shell
 
 MODPY_EGG_VERSION =8.23.0
+REVISION = 0
 DISTNAME = ipython-${MODPY_EGG_VERSION}
 PKGNAME =  ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
 
@@ -32,6 +33,7 @@ RUN_DEPENDS = databases/py-pickleshare${MODPY_FLAVOR} 
\

devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.41v1,<3.1.0v1 \
devel/py-stack_data${MODPY_FLAVOR} \
devel/py-traitlets${MODPY_FLAVOR}>=5.13.0 \
+   devel/py-typing-extensions${MODPY_FLAVOR} \
graphics/py-matplotlib-inline${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.4.0

Re: UPDATE archivers/zstd-1.5.6

2024-04-16 Thread Bjorn Ketelaars

On Wed 27/03/2024 22:39, Bjorn Ketelaars wrote:
> Diff below updates zstd to 1.5.6. Release notes can be found at
> https://github.com/facebook/zstd/releases/tag/v1.5.6. Minor of shared
> lib has been bumped because of the addition of a symbol.
> 
> Passes all tests, and run tested with several tools from ports.
> 
> I did not build-test all consumers (~70), but looking at the changelog I
> expect that this update will not cause an issue.
> 
> Comments/OK?

Ping...

Diff enclosed again.


diff --git Makefile Makefile
index 65affa06e14..3b6d18883ae 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.5.5
+V =1.5.6
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd6.3 # 1.5.5
+SHARED_LIBS =  zstd6.4 # 1.5.6
 
 CATEGORIES =   archivers
 
diff --git distinfo distinfo
index bd76eb4b7f4..aecd777277e 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.5.tar.gz) = nEOWzIKc+uMZpuJhUgLoKq1BNyBzSC/OKG+seGRtPuQ=
-SIZE (zstd-1.5.5.tar.gz) = 2368543
+SHA256 (zstd-1.5.6.tar.gz) = jCngbPQqrMHq/EB3ri7Gxvy5amJhV+BZPV6Co0/UA8E=
+SIZE (zstd-1.5.6.tar.gz) = 2406875
diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk
index c2272b3b354..d853a6303ce 100644
--- patches/patch-lib_libzstd_mk
+++ patches/patch-lib_libzstd_mk
@@ -3,7 +3,7 @@ Some compilers don't have -Wvla.
 Index: lib/libzstd.mk
 --- lib/libzstd.mk.orig
 +++ lib/libzstd.mk
-@@ -100,7 +100,7 @@ endif
+@@ -113,7 +113,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \

Re: borgbackup: switch to openssl/3.2

2024-04-14 Thread Bjorn Ketelaars

On Sun 14/04/2024 23:48, Theo Buehler wrote:
> I'd like to remove openssl/3.1, so switch borgbackup to using 3.2.
>

BUILD_DEPENDS needs to be updated to security/openssl/3.2 as well. With
this, borgbackup-2.0 builds, passes all tests and works for me on amd64.

With the bit below on top of your diff, OK bket@


diff --git Makefile Makefile
index 2a4f6126fa7..274fba2b856 100644
--- Makefile
+++ Makefile
@@ -8,7 +8,7 @@ REVISION =  0
 
 # OpenSSL used for EVP_aes_256_ocb. It is linked statically to avoid 
conflicting
 # with shared libcrypto from the base OS pulled in via dependencies.
-BUILD_DEPENDS =security/openssl/3.1
+BUILD_DEPENDS =security/openssl/3.2
 RUN_DEPENDS =  security/py-argon2-cffi${MODPY_FLAVOR} \
sysutils/py-platformdirs${MODPY_FLAVOR}>=3.8.1

Re: lang/node: switch to openssl/3.2

2024-04-14 Thread Bjorn Ketelaars

On Mon 15/04/2024 00:01, Theo Buehler wrote:
> @@ -77,8 +78,8 @@ LIB_DEPENDS +=  archivers/brotli \
>   www/nghttp2 \
>   security/openssl/3.1

LIB_DEPENDS needs to be updated as well  ^^^

[-stable UPDATE] samba-4.19.6

2024-04-08 Thread Bjorn Ketelaars

Here is an update to the latest release of the Samba 4.19 release series
for -stable. Release notes:
https://www.samba.org/samba/history/samba-4.19.6.html

Note that -current is on the 4.20 release series.

libndr-nbt needs a minor bump because of an addition of a symbol.
Lightly run tested on OpenBSD-7.5 amd64.

Tests/comments/OKs welcome.


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.343
diff -u -p -r1.343 Makefile
--- Makefile20 Feb 2024 19:45:20 -  1.343
+++ Makefile8 Apr 2024 16:39:39 -
@@ -1,4 +1,4 @@
-VERSION =  4.19.5
+VERSION =  4.19.6
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -17,7 +17,7 @@ SHARED_LIBS = dcerpc  1.1 \
ldb 2.3 \
ndr 3.1 \
ndr-krb5pac 1.3 \
-   ndr-nbt 2.0 \
+   ndr-nbt 2.1 \
ndr-standard5.0 \
netapi  3.3 \
samba-credentials   1.4 \
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.114
diff -u -p -r1.114 distinfo
--- distinfo20 Feb 2024 19:45:20 -  1.114
+++ distinfo8 Apr 2024 16:39:39 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.19.5.tar.gz) = DiQFtM7CnQRZYh9DQKGnSvdx7Hz/7f9DJQytfx+HYF4=
-SIZE (samba-4.19.5.tar.gz) = 41840159
+SHA256 (samba-4.19.6.tar.gz) = ZTtSCVVU28IjxjuWr1zfnpjD4EhUnF9WFD07M9zhzvE=
+SIZE (samba-4.19.6.tar.gz) = 41847853

UPDATE borgbackup-1.2.8

2024-03-29 Thread Bjorn Ketelaars

Simple diff below updates borgbackup to 1.2.8, which is a maintenance
release. Changelog:
https://github.com/borgbackup/borg/blob/1.2.8/docs/changes.rst#version-128-2024-03-29

'make test' passes all tests. Run tested on amd64 against an existing
borg repository.

Tests, comments and OKs welcome.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/borgbackup/1.2/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile5 Jan 2024 06:57:21 -   1.18
+++ Makefile30 Mar 2024 04:50:02 -
@@ -1,4 +1,4 @@
-MODPY_EGG_VERSION =1.2.7
+MODPY_EGG_VERSION =1.2.8
 
 WANTLIB =  crypto
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/borgbackup/1.2/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo2 Dec 2023 16:45:57 -   1.8
+++ distinfo30 Mar 2024 04:50:02 -
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.2.7.tar.gz) = 9j8oozg8BBlxzsh7BhyjmoFbX9RF2ySqgXLKxBfZQRo=
-SIZE (borgbackup-1.2.7.tar.gz) = 4370372
+SHA256 (borgbackup-1.2.8.tar.gz) = 050isNLLdFWE1oYIoXm2x197QOSW6W/reJ5B00mR9Ko=
+SIZE (borgbackup-1.2.8.tar.gz) = 4369117

UPDATE archivers/zstd-1.5.6

2024-03-27 Thread Bjorn Ketelaars

Diff below updates zstd to 1.5.6. Release notes can be found at
https://github.com/facebook/zstd/releases/tag/v1.5.6. Minor of shared
lib has been bumped because of the addition of a symbol.

Passes all tests, and run tested with several tools from ports.

I did not build-test all consumers (~70), but looking at the changelog I
expect that this update will not cause an issue.

Comments/OK?


diff --git Makefile Makefile
index 65affa06e14..3b6d18883ae 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.5.5
+V =1.5.6
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd6.3 # 1.5.5
+SHARED_LIBS =  zstd6.4 # 1.5.6
 
 CATEGORIES =   archivers
 
diff --git distinfo distinfo
index bd76eb4b7f4..aecd777277e 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.5.tar.gz) = nEOWzIKc+uMZpuJhUgLoKq1BNyBzSC/OKG+seGRtPuQ=
-SIZE (zstd-1.5.5.tar.gz) = 2368543
+SHA256 (zstd-1.5.6.tar.gz) = jCngbPQqrMHq/EB3ri7Gxvy5amJhV+BZPV6Co0/UA8E=
+SIZE (zstd-1.5.6.tar.gz) = 2406875
diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk
index c2272b3b354..d853a6303ce 100644
--- patches/patch-lib_libzstd_mk
+++ patches/patch-lib_libzstd_mk
@@ -3,7 +3,7 @@ Some compilers don't have -Wvla.
 Index: lib/libzstd.mk
 --- lib/libzstd.mk.orig
 +++ lib/libzstd.mk
-@@ -100,7 +100,7 @@ endif
+@@ -113,7 +113,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \

UPDATE samba-4.20.0

2024-03-27 Thread Bjorn Ketelaars

samba-4.20.0 has been released [0]. Although samba-4.19 is supported
until March 2025 [1], I prefer to move to the newer branch on current.
7.5 will remain on the 4.19 branch.

The samba update depends on newer versions of libtalloc and tdb, and are
part of the diff below. Several shared libs required a bump.

Run tested on amd64.

Comments/OK?

[0] https://www.samba.org/samba/history/samba-4.20.0.html
[1] https://wiki.samba.org/index.php/Samba_Release_Planning


diff --git databases/tdb/Makefile databases/tdb/Makefile
index 49145f94548..65adbdc2938 100644
--- databases/tdb/Makefile
+++ databases/tdb/Makefile
@@ -2,8 +2,7 @@ COMMENT-main=   trivial database library
 COMMENT-python=Python ${MODPY_VERSION} bindings for tdb
 
 # Keep in sync with the version bundled in net/samba
-V= 1.4.9
-REVISION=  1
+V= 1.4.10
 
 DISTNAME=  tdb-$V
 PKGNAME-python=py3-${DISTNAME}
diff --git databases/tdb/distinfo databases/tdb/distinfo
index 53ade095d6b..885f4093736 100644
--- databases/tdb/distinfo
+++ databases/tdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.9.tar.gz) = CsImBz46LbhkjaevdEy5X1B2alL+6wAdVYsrMht0p2U=
-SIZE (tdb-1.4.9.tar.gz) = 746608
+SHA256 (tdb-1.4.10.tar.gz) = AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8=
+SIZE (tdb-1.4.10.tar.gz) = 747139
diff --git databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 
databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
index f7ddb2aad5d..1a8a28706d2 100644
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
@@ -4,7 +4,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -281,6 +281,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -292,6 +292,13 @@ def SAMBA_LIBRARY(bld, libname, source,
  realname = bld.map_shlib_extension(realname, 
python=(target_type=='PYTHON'))
  link_name = bld.map_shlib_extension(link_name, 
python=(target_type=='PYTHON'))
  
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
  # we don't want any public libraries without version numbers
  if (not private_library and target_type != 'PYTHON' and not realname):
  if vnum is None and soname is None:
-@@ -398,9 +405,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -408,9 +415,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  
  if pc_files is not None and not private_library:
  if pyembed:
diff --git devel/libtalloc/Makefile devel/libtalloc/Makefile
index d145b85eeed..55f59214856 100644
--- devel/libtalloc/Makefile
+++ devel/libtalloc/Makefile
@@ -2,8 +2,7 @@ COMMENT-main=   hierarchical memory pool system with destructors
 COMMENT-python=Python ${MODPY_VERSION} bindings for talloc
 
 # Keep in sync with the version bundled in net/samba
-V= 2.4.1
-REVISION=  1
+V= 2.4.2
 
 DISTNAME=  talloc-$V
 PKGNAME-main=  lib${DISTNAME}
diff --git devel/libtalloc/distinfo devel/libtalloc/distinfo
index 303224c1adf..dab0d3b4e1d 100644
--- devel/libtalloc/distinfo
+++ devel/libtalloc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (talloc-2.4.1.tar.gz) = QQpUfwhVcAe+DogZTyGIaDWO3Aq5jJi6jBZ5MNs9M/k=
-SIZE (talloc-2.4.1.tar.gz) = 679160
+SHA256 (talloc-2.4.2.tar.gz) = hez55GXiD5j5lQpS6aQR4UMgvFVfolfYdpe356mx2KY=
+SIZE (talloc-2.4.2.tar.gz) = 679750
diff --git devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py 
devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
index 4a8745485b9..98e0fbc18f6 100644
--- devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
+++ devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
@@ -3,7 +3,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -281,6 +281,16 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -292,6 +292,16 @@ def SAMBA_LIBRARY(bld, libname, source,
  realname = bld.map_shlib_extension(realname, 
python=(target_type=='PYTHON'))
  link_name = bld.map_shlib_extension(link_name, 
python=(target_type=='PYTHON'))
  
diff --git net/samba/Makefile net/samba/Makefile
index 190cf0de907..50005a0eec5 100644
--- net/samba/Makefile
+++ net/samba/Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.19.5
+VERSION =  4.20.0
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -11,23 +11,23 @@ PKGNAME-docs =  samba-docs-${VERSION}
 PKG_ARCH-docs =*
 
 SHARED_LIBS =  dcerpc  1.1 \
-   dcerpc-binding  4.0 \
+   dcerpc-binding  5.0 \
dcerpc-samr 1.0 \
-   dcerpc-server-core  3.0 \
+   dcerpc-server-core  3.1 \
ldb 2.3 \
-   ndr 3.1 \
+   ndr 3.2 \

UPDATE security/vaultwarden-1.30.5 and www/vaultwarden-web-2024.1.2b

2024-03-03 Thread Bjorn Ketelaars

Simple diff for updating vaultwarden to 1.30.5 and vaultwarden-web to
2024.1.2b.

Changelog:
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.4
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.5

https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.1.2b

Run tested on amd64.

OK?


diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile
index c41d70343f6..477158080cd 100644
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -5,7 +5,7 @@ BROKEN-i386 =   raw-cpuid-10.2.0/src/lib.rs:80:37 
"could not find `arch` in `self
 
 COMMENT =  unofficial bitwarden compatible server
 
-DIST_TUPLE =   github dani-garcia vaultwarden 1.30.3 .
+DIST_TUPLE =   github dani-garcia vaultwarden 1.30.5 .
 
 CATEGORIES =   security
 
diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc
index 7718075f069..4fb9bad62d3 100644
--- security/vaultwarden/crates.inc
+++ security/vaultwarden/crates.inc
@@ -1,6 +1,6 @@
 MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.7   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.9   # MIT OR Apache-2.0
 MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
@@ -9,12 +9,12 @@ MODCARGO_CRATES +=android-tzdata  0.1.1   # MIT OR 
Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
 MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-channel   2.1.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.2.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-compression   0.4.6   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-executor  1.8.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-io2.3.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.3.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  3.3.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
@@ -41,28 +41,27 @@ MODCARGO_CRATES +=  block-buffer0.10.4  # MIT OR 
Apache-2.0
 MODCARGO_CRATES += blocking1.5.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += brotli  3.4.0   # BSD-3-Clause/MIT
 MODCARGO_CRATES += brotli-decompressor 2.5.1   # BSD-3-Clause/MIT
-MODCARGO_CRATES += bumpalo 3.14.0  # MIT OR Apache-2.0
-MODCARGO_CRATES += bytemuck1.14.1  # Zlib OR Apache-2.0 OR MIT
+MODCARGO_CRATES += bumpalo 3.15.3  # MIT OR Apache-2.0
+MODCARGO_CRATES += bytemuck1.14.3  # Zlib OR Apache-2.0 OR MIT
 MODCARGO_CRATES += byteorder   1.5.0   # Unlicense OR MIT
 MODCARGO_CRATES += bytes   1.5.0   # MIT
 MODCARGO_CRATES += cached  0.48.1  # MIT
 MODCARGO_CRATES += cached_proc_macro   0.19.1  # MIT
 MODCARGO_CRATES += cached_proc_macro_types 0.1.1   # MIT
-MODCARGO_CRATES += cc  1.0.83  # MIT OR Apache-2.0
+MODCARGO_CRATES += cc  1.0.86  # MIT OR Apache-2.0
 MODCARGO_CRATES += cfg-if  1.0.0   # MIT/Apache-2.0
-MODCARGO_CRATES += chrono  0.4.33  # MIT OR Apache-2.0
-MODCARGO_CRATES += chrono-tz   0.8.5   # MIT OR Apache-2.0
+MODCARGO_CRATES += chrono  0.4.34  # MIT OR Apache-2.0
+MODCARGO_CRATES += chrono-tz   0.8.6   # MIT OR Apache-2.0
 MODCARGO_CRATES += chrono-tz-build 0.2.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += chumsky 0.9.3   # MIT
 MODCARGO_CRATES += concurrent-queue2.4.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += cookie  0.16.2  # MIT OR Apache-2.0
+MODCARGO_CRATES += cookie  0.17.0  # MIT OR Apache-2.0
 MODCARGO_CRATES += cookie  0.18.0  # MIT OR Apache-2.0
-MODCARGO_CRATES += cookie_store0.16.2  # MIT/Apache-2.0
-MODCARGO_CRATES += cookie_store0.19.1  # MIT/Apache-2.0
+MODCARGO_CRATES += cookie_store0.20.0  # MIT/Apache-2.0
 MODCARGO_CRATES += core-foundation 0.9.4   # MIT OR Apache-2.0
 MODCARGO_CRATES += core-foundation-sys 0.8.6   # MIT OR Apache-2.0
 MODCARGO_CRATES += cpufeatures 0.2.12  # MIT OR Apache-2.0
-MODCARGO_CRATES += crc32fast   1.3.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += crc32fast   1.4.0   # MIT OR Apache-2.0
 MODCARGO_CRATES += cron0.12.0  # MIT OR Apache-2.0
 MODCARGO_CRATES += crossbeam-utils 0.8.19  # MIT OR Apache-2.0
 MODCARGO_CRATES += crypto-common   0.1.6   # MIT OR Apache-2.0
@@ -83,7 +82,7 @@ MODCARGO_CRATES +=diesel_migrations   2.1.0   #

Re: UPDATE net/unison-2.53.4

2024-02-20 Thread Bjorn Ketelaars

On Tue 20/02/2024 11:30, Jeremie Courreges-Anglas wrote:
> On Mon, Feb 19 2024, Bjorn Ketelaars  wrote:
> > Diff below updates net/unison to 2.53.4, which includes bug fixes, minor
> > improvements and clean-ups. Release notes:
> > https://github.com/bcpierce00/unison/releases/tag/v2.53.4.
> >
> > Change in the build system is that the gtk3 flavor of unison is
> > renamed to unison-gui. This is undone in the diff below by setting the
> > correct binary and renaming it in the do-install phase. I'm not sure
> > if this is the way to go, or if there is a better way to do this.
> 
> If lablgtk3 is installed then both unison and unison-gui are built, with
> or without FLAVOR=no_x11.  The problem is you're *adding* to MAKE_FLAGS
> instead of *setting* ALL_TARGET=gui/tui.
> 
> Now that the build system lets you build both, it would be interesting
> to use MULTI_PACKAGES, with a -gui subpackage shipping just the
> unison-gui program and carrying the gtk3 dep.  With proper @pkgpaths the
> upgrade path would be mostly transparent for users (gotta retrain their
> fingers to type unison-gui when needed).
> 
> Additionally no_x11 could stay as a PSEUDO_FLAVOR so that people can
> build and install the tui program/package without having lablgtk3
> installed.

New diff, which addresses Jeremie's feedback:
- uses MULTI_PACKAGES (with a -x11 subpackage);
- no_x11 as PSEUDO_FLAVOR;
- updated @pkgpath markers;
- added quirks entry;
- updated net/Makefile.

With this users are able to use `pkg_add -u` and:
- update unison-2.53.3 to unison-x11-2.53.4 (pulls in unison-2.53.4 as
  RDEP);
- update unison-no_x11-2.53.3 to unison-2.53.4.

Comments/OK?


diff --git devel/quirks/Makefile devel/quirks/Makefile
index b52a6ca153c..29352025828 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-7.6
+PKGNAME =  quirks-7.7
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index a5641d20104..e0a8ce89fc4 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -809,6 +809,8 @@ my $stem_extensions = {
'py-analyzemft' => 'py3-analyzemft',
'llama' => 'walk',
'py-setuptools-git' => 'py3-setuptools-git',
+   'unison' => 'unison-x11',
+   'unison-no_x11' => 'unison',
 };
 
 my $obsolete_reason = {};
diff --git net/Makefile net/Makefile
index eaee3c5bf66..370c6a22f70 100644
--- net/Makefile
+++ net/Makefile
@@ -749,7 +749,6 @@
  SUBDIR += uhttpmock
  SUBDIR += unifi
  SUBDIR += unison
- SUBDIR += unison,no_x11
  SUBDIR += unworkable
  SUBDIR += usockets
  SUBDIR += utox
diff --git net/unison/Makefile net/unison/Makefile
index d240adb9879..da4c1fef4e1 100644
--- net/unison/Makefile
+++ net/unison/Makefile
@@ -2,12 +2,12 @@
 USE_NOEXECONLY = yes
 .endif
 
-COMMENT =  multi-platform file synchronization tool
+COMMENT-main = multi-platform file synchronization tool
+COMMENT-x11 =  gtk3 based interface for unison
 
 GH_ACCOUNT =   bcpierce00
 GH_PROJECT =   unison
-GH_TAGNAME =   v2.53.3
-REVISION = 2
+GH_TAGNAME =   v2.53.4
 
 CATEGORIES =   net
 
@@ -16,47 +16,46 @@ MAINTAINER =Bjorn Ketelaars 
 # GPLv3
 PERMIT_PACKAGE =   Yes
 
-WANTLIB =  c m util
+WANTLIB =  c m pthread util
+WANTLIB-x11 =  ${WANTLIB} atk-1.0 cairo cairo-gobject fontconfig freetype
+WANTLIB-x11 += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
+WANTLIB-x11 += harfbuzz intl pango-1.0 pangocairo-1.0
 
 MODULES =  lang/ocaml
 MODOCAML_RUNDEP =  if-not-native
 
-USE_GMAKE =Yes
+LIB_DEPENDS-x11 =  x11/gtk+3
+RUN_DEPENDS-x11 =  ${BASE_PKGPATH},-main=${GH_TAGNAME:S/v//} \
+   devel/desktop-file-utils
 
 # CFLAGS _must_ be empty. This is an OCaml compiler.
 MAKE_FLAGS =   NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
OCAMLOPT=ocamlopt.opt \
CFLAGS=
 
-FLAVORS =  no_x11
-FLAVOR ?=
-
-.if ${FLAVOR:Mno_x11}
-MAKE_FLAGS +=  UISTYLE=text
-.else
-WANTLIB += atk-1.0 cairo cairo-gobject fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz
-WANTLIB += intl pango-1.0 pangocairo-1.0
-BUILD_DEPENDS +=   x11/lablgtk3
-LIB_DEPENDS += x11/gtk+3
-RUN_DEPENDS += devel/desktop-file-utils
-MAKE_FLAGS +=  UISTYLE=gtk3
-.endif
+USE_GMAKE =Yes
 
-FLAVOR_COMMA = ${FLAVOR_EXT:S/-/,/g}
-SUBST_VARS =   FLAVOR_COMMA
+MULTI_PACKAGES =   -main -x11
+PSEUDO_FLAVORS =   no_x11
+FLAVOR ?=
 
 PORTHOME = ${WRKDIR}
 DOCS = NEWS.md README.md
 
-# Avoid the nightmare of their Makefile install target.
+.include

UPDATE net/unison-2.53.4

2024-02-19 Thread Bjorn Ketelaars

Diff below updates net/unison to 2.53.4, which includes bug fixes, minor
improvements and clean-ups. Release notes:
https://github.com/bcpierce00/unison/releases/tag/v2.53.4.

Change in the build system is that the gtk3 flavor of unison is
renamed to unison-gui. This is undone in the diff below by setting the
correct binary and renaming it in the do-install phase. I'm not sure
if this is the way to go, or if there is a better way to do this.

Run tested on amd64.

Comments / OK?


diff --git Makefile Makefile
index d240adb9879..d9b47062baf 100644
--- Makefile
+++ Makefile
@@ -6,8 +6,7 @@ COMMENT =   multi-platform file synchronization tool
 
 GH_ACCOUNT =   bcpierce00
 GH_PROJECT =   unison
-GH_TAGNAME =   v2.53.3
-REVISION = 2
+GH_TAGNAME =   v2.53.4
 
 CATEGORIES =   net
 
@@ -16,7 +15,7 @@ MAINTAINER =  Bjorn Ketelaars 
 # GPLv3
 PERMIT_PACKAGE =   Yes
 
-WANTLIB =  c m util
+WANTLIB =  c m pthread util
 
 MODULES =  lang/ocaml
 MODOCAML_RUNDEP =  if-not-native
@@ -32,7 +31,8 @@ FLAVORS = no_x11
 FLAVOR ?=
 
 .if ${FLAVOR:Mno_x11}
-MAKE_FLAGS +=  UISTYLE=text
+MAKE_FLAGS +=  tui
+PROG = unison
 .else
 WANTLIB += atk-1.0 cairo cairo-gobject fontconfig freetype gdk-3
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz
@@ -40,7 +40,8 @@ WANTLIB +=intl pango-1.0 pangocairo-1.0
 BUILD_DEPENDS +=   x11/lablgtk3
 LIB_DEPENDS += x11/gtk+3
 RUN_DEPENDS += devel/desktop-file-utils
-MAKE_FLAGS +=  UISTYLE=gtk3
+MAKE_FLAGS +=  gui
+PROG = unison-gui
 .endif
 
 FLAVOR_COMMA = ${FLAVOR_EXT:S/-/,/g}
@@ -49,10 +50,9 @@ SUBST_VARS = FLAVOR_COMMA
 PORTHOME = ${WRKDIR}
 DOCS = NEWS.md README.md
 
-# Avoid the nightmare of their Makefile install target.
 # Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
 do-install:
-   ${INSTALL_SCRIPT} ${WRKSRC}/src/unison ${PREFIX}/bin
+   ${INSTALL_SCRIPT} ${WRKSRC}/src/${PROG} ${PREFIX}/bin/unison
${INSTALL_MAN} ${WRKSRC}/man/unison.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison
@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison
diff --git distinfo distinfo
index df466e43a6d..aaf7e3e2284 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (unison-2.53.3.tar.gz) = quoE/FvHbc/oYnaDyWWe5MGU1PmSzIqqFbuygg/I3kY=
-SIZE (unison-2.53.3.tar.gz) = 1415490
+SHA256 (unison-2.53.4.tar.gz) = 0Z5CkwE1gdvE0Umu+Js0x2Ih78vYc8eqUZPeSJrduFo=
+SIZE (unison-2.53.4.tar.gz) = 1407429

UPDATE samba-4.19.5

2024-02-19 Thread Bjorn Ketelaars

Simple diff for updating samba to 4.19.5. Release notes:
https://www.samba.org/samba/history/samba-4.19.5.html

Run tested on amd64.

Tests and OKs welcome (for -stable too)!


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.342
diff -u -p -r1.342 Makefile
--- Makefile29 Jan 2024 18:04:27 -  1.342
+++ Makefile19 Feb 2024 17:35:50 -
@@ -1,5 +1,4 @@
-VERSION =  4.19.4
-REVISION = 0
+VERSION =  4.19.5
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.113
diff -u -p -r1.113 distinfo
--- distinfo12 Jan 2024 12:33:48 -  1.113
+++ distinfo19 Feb 2024 17:35:50 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.19.4.tar.gz) = QCbZO4ZtsZjIyhaFsPXVJ5P2XG5jyzZBY69mH9/wlow=
-SIZE (samba-4.19.4.tar.gz) = 41839810
+SHA256 (samba-4.19.5.tar.gz) = DiQFtM7CnQRZYh9DQKGnSvdx7Hz/7f9DJQytfx+HYF4=
+SIZE (samba-4.19.5.tar.gz) = 41840159

www/nextcloud_notify_push - drop BDEP on rust-ring

2024-02-02 Thread Bjorn Ketelaars

nextcloud_notify_push has ring 0.17.7 in crates.inc. Drop BDEP on
rust-ring and reduce NOT_FOR_ARCHS. 

OK?


diff --git Makefile Makefile
index a4b8f590c93..8f87e36ee48 100644
--- Makefile
+++ Makefile
@@ -1,5 +1,5 @@
-# ring-v0.16.20 does not support those archs
-NOT_FOR_ARCHS = powerpc64 riscv64 sparc64
+# ring-v0.17 does not support this arch
+NOT_FOR_ARCHS =sparc64
 
 # 20220112 - build often fails due to out of memory
 # memory allocation of 402653184 bytes failed
@@ -32,6 +32,4 @@ WANTLIB += ${MODCARGO_WANTLIB} m
 CONFIGURE_STYLE =  cargo
 SEPARATE_BUILD =   Yes
 
-BUILD_DEPENDS +=   security/rust-ring
-
 .include

Re: UPDATE vaultwarden-1.30.2 and vaultwarden-web-2024.1.2

2024-02-01 Thread Bjorn Ketelaars

On Thu 01/02/2024 23:02, Theo Buehler wrote:
> Two small things:
> 
> > -MODCARGO_CRATES += ring0.17.5  # LICENSE
> > +MODCARGO_CRATES += ring0.17.7  # LICENSE
> 
> crates.inc no longer contains ring 0.16, so the BDEP on rust-ring can
> be dropped and the NOT_FOR_ARCHS should be changed to:
> 
> # ring-v0.17 does not support this arch
> NOT_FOR_ARCHS = sparc64

Thank you for this! I forgot about ring.

In the meantime upstream released 1.30.3, which fixes issues with push
notification device registration. Changes:
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.2 and
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.3.

Diff below addresses the comment of tb@, and updates vaultwarden to
1.30.3. Please note that the update of vaultwarden-web to 2024.1.2 is
part of this diff.

OK?


diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile
index 486e3e0c616..c41d70343f6 100644
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -1,14 +1,11 @@
-# ring-v0.16.20 does not support those archs
-NOT_FOR_ARCHS =powerpc64 riscv64 sparc64
+# ring-v0.17 does not support this arch
+NOT_FOR_ARCHS =sparc64
 
 BROKEN-i386 =  raw-cpuid-10.2.0/src/lib.rs:80:37 "could not find 
`arch` in `self`"
 
 COMMENT =  unofficial bitwarden compatible server
 
-GH_ACCOUNT =   dani-garcia
-GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.30.1
-REVISION = 0
+DIST_TUPLE =   github dani-garcia vaultwarden 1.30.3 .
 
 CATEGORIES =   security
 
@@ -17,26 +14,21 @@ MAINTAINER =Aisha Tammy 
 # AGPLv3 only
 PERMIT_PACKAGE =   Yes
 
-FLAVORS =  mysql postgresql
-FLAVOR ?=
-
-WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl
-
-SITES.deps =   https://files.bsd.ac/openbsd-distfiles/
-DISTFILES.deps +=  vaultwarden-deps-${GH_TAGNAME}.tgz
+WANTLIB =  ${MODCARGO_WANTLIB} crypto m ssl
 
 MODULES =  devel/cargo
+MODCARGO_CRATES_KEEP = libsqlite3-sys
+MODCARGO_FEATURES =sqlite
 
-CONFIGURE_STYLE =  cargo
+RUN_DEPENDS =  www/vaultwarden-web
 
 SEPARATE_BUILD =   Yes
 
-BUILD_DEPENDS =security/rust-ring
+CONFIGURE_STYLE =  cargo
 
-RUN_DEPENDS =  www/vaultwarden-web
+FLAVORS =  mysql postgresql
+FLAVOR ?=
 
-MODCARGO_CRATES_KEEP +=libsqlite3-sys
-MODCARGO_FEATURES =sqlite
 .if ${FLAVOR:Mmysql}
 MODCARGO_FEATURES +=   mysql
 WANTLIB += mariadb
@@ -48,13 +40,6 @@ WANTLIB +=   pq
 LIB_DEPENDS += databases/postgresql
 .endif
 
-SUBST_VARS +=  WRKSRC
-
-post-configure:
-   mv ${WRKDIR}/myvendordir ${WRKSRC}
-   ${SUBST_CMD} -m 644 -c ${FILESDIR}/config.vendor ${WRKDIR}/config.vendor
-   cat ${WRKDIR}/config.vendor >> ${WRKDIR}/.cargo/config
-
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vaultwarden
${INSTALL_DATA} ${WRKSRC}/.env.template ${PREFIX}/share/doc/vaultwarden
diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc
index f1bca2a4e4f..7718075f069 100644
--- security/vaultwarden/crates.inc
+++ security/vaultwarden/crates.inc
@@ -1,77 +1,78 @@
 MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.7   # MIT OR Apache-2.0
 MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
 MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
-MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-channel   2.1.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.1.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-io2.2.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.3.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-lock  3.

UPDATE vaultwarden-1.30.2 and vaultwarden-web-2024.1.2

2024-01-30 Thread Bjorn Ketelaars

Diff below updates security/vaultwarden to 1,30.2 and
www/vaultwarden-web to 2024.1.2. Overview on changes can be found at
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.2 and
https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.1.2.

Changes to port of vaultwarden:
- No need any more for using a vendored tarball of rocket as upstream
  moved to rocket-0.5.0
- Switched to DIST_TUPLE
- Reordered Makefile a bit (use Makefile.template as guide)

Changes to port of vaultwarden-web:
- Added HOMEPAGE
- Reordered Makefile a bit

Run tested on amd64.

Comments/OK?


diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile
index 486e3e0c616..27520b15b2d 100644
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -5,10 +5,7 @@ BROKEN-i386 =  raw-cpuid-10.2.0/src/lib.rs:80:37 
"could not find `arch` in `self
 
 COMMENT =  unofficial bitwarden compatible server
 
-GH_ACCOUNT =   dani-garcia
-GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.30.1
-REVISION = 0
+DIST_TUPLE =   github dani-garcia vaultwarden 1.30.2 .
 
 CATEGORIES =   security
 
@@ -17,26 +14,22 @@ MAINTAINER =Aisha Tammy 
 # AGPLv3 only
 PERMIT_PACKAGE =   Yes
 
-FLAVORS =  mysql postgresql
-FLAVOR ?=
-
-WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl
-
-SITES.deps =   https://files.bsd.ac/openbsd-distfiles/
-DISTFILES.deps +=  vaultwarden-deps-${GH_TAGNAME}.tgz
+WANTLIB =  ${MODCARGO_WANTLIB} crypto m ssl
 
 MODULES =  devel/cargo
+MODCARGO_CRATES_KEEP = libsqlite3-sys
+MODCARGO_FEATURES =sqlite
 
-CONFIGURE_STYLE =  cargo
+BUILD_DEPENDS =security/rust-ring
+RUN_DEPENDS =  www/vaultwarden-web
 
 SEPARATE_BUILD =   Yes
 
-BUILD_DEPENDS =security/rust-ring
+CONFIGURE_STYLE =  cargo
 
-RUN_DEPENDS =  www/vaultwarden-web
+FLAVORS =  mysql postgresql
+FLAVOR ?=
 
-MODCARGO_CRATES_KEEP +=libsqlite3-sys
-MODCARGO_FEATURES =sqlite
 .if ${FLAVOR:Mmysql}
 MODCARGO_FEATURES +=   mysql
 WANTLIB += mariadb
@@ -48,13 +41,6 @@ WANTLIB +=   pq
 LIB_DEPENDS += databases/postgresql
 .endif
 
-SUBST_VARS +=  WRKSRC
-
-post-configure:
-   mv ${WRKDIR}/myvendordir ${WRKSRC}
-   ${SUBST_CMD} -m 644 -c ${FILESDIR}/config.vendor ${WRKDIR}/config.vendor
-   cat ${WRKDIR}/config.vendor >> ${WRKDIR}/.cargo/config
-
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vaultwarden
${INSTALL_DATA} ${WRKSRC}/.env.template ${PREFIX}/share/doc/vaultwarden
diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc
index f1bca2a4e4f..7718075f069 100644
--- security/vaultwarden/crates.inc
+++ security/vaultwarden/crates.inc
@@ -1,77 +1,78 @@
 MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.7   # MIT OR Apache-2.0
 MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
 MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
-MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += argon2  0.5.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-channel   2.1.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.1.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-global-executor   2.4.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-io2.2.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.3.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-lock  3.1.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-lock  3.3.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-signal0.2.5   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-std   1.12.0  # Apache-2.0/MIT
 MODCARGO_CRATES += async-stream0.3.5   # MIT
 MODCARGO_CRATES += async-str

Re: Any change updating ocserv to latest

2024-01-15 Thread Bjorn Ketelaars

On Mon 01/01/2024 08:34, Bjorn Ketelaars wrote:
> On Sun 31/12/2023 23:05, Dylan D'Silva wrote:
> > Hello Bjorn,
> > 
> > Any change of getting a update to ocserv?
> > Latest is 1.2.3.
> > 
> > Thanks
> > Dylan
> 
> (CC'ed to ports@ for some exposure)
> 
> Diff below updates ocserv to 1.2.3. Overview on changes can be found on
> https://gitlab.com/openconnect/ocserv/-/blob/0f5ba83f762bed11815d1dd37c37dcc6d1cd26d1/NEWS
> 
> Synced patches (several did not apply cleanly), and changed
> AUTOCONF_VERSION to 2.71 to get rid of a warning. No new failing tests
> while running 'make test'.
> 
> I stopped using ocserv some time ago so testing is limited to building
> and running 'make test'. Before committing this it would be helpful if
> actual users test this update, and report back.
> 
> Comments?

Ping?

Diff enclosed again for you convenience.


diff --git Makefile Makefile
index 3e6077b19b1..1041430bb21 100644
--- Makefile
+++ Makefile
@@ -1,8 +1,7 @@
 COMMENT=   server implementing the AnyConnect SSL VPN protocol
 
-DISTNAME=  ocserv-1.1.6
+DISTNAME=  ocserv-1.2.3
 EXTRACT_SUFX=  .tar.xz
-REVISION=  2
 
 CATEGORIES=net
 
@@ -46,7 +45,7 @@ CONFIGURE_ARGS=   --disable-namespaces \
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-AUTOCONF_VERSION=  2.69
+AUTOCONF_VERSION=  2.71
 
 post-extract:
find ${WRKSRC}/tests -type f -perm -+x -exec \
@@ -65,7 +64,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ocserv
cd ${WRKSRC}/doc; ${INSTALL_DATA} profile.xml sample.passwd \
${PREFIX}/share/examples/ocserv/
-   mv ${PREFIX}/bin/ocserv-fw ${PREFIX}/share/examples/ocserv/
+   mv ${PREFIX}/libexec/ocserv-fw ${PREFIX}/share/examples/ocserv/
${SUBST_CMD} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} \
${WRKSRC}/doc/sample.config \
${PREFIX}/share/examples/ocserv/sample.config
diff --git distinfo distinfo
index 16c7a6c526b..5af47ccb0fe 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ocserv-1.1.6.tar.xz) = amy+kiEuMigEJqUcY0rcPUgDV53QSc/bfgFHFMyCxpM=
-SIZE (ocserv-1.1.6.tar.xz) = 839744
+SHA256 (ocserv-1.2.3.tar.xz) = Bs4Py1moszuNZdblUd4rXvd7fqZBuHyqZUpe6cSfG78=
+SIZE (ocserv-1.2.3.tar.xz) = 757484
diff --git patches/patch-configure_ac patches/patch-configure_ac
index 57995c43ca3..2ebaa85895b 100644
--- patches/patch-configure_ac
+++ patches/patch-configure_ac
@@ -1,7 +1,7 @@
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -222,7 +222,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind
+@@ -219,7 +219,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind
  fi
  
  have_readline=no
diff --git patches/patch-doc_sample_config patches/patch-doc_sample_config
index e509136066d..60a4aea8589 100644
--- patches/patch-doc_sample_config
+++ patches/patch-doc_sample_config
@@ -52,14 +52,14 @@ Index: doc/sample.config
  ### failures during the reloading time.
  
  
--# Whether to enable seccomp/Linux namespaces worker isolation. That restricts 
the number of 
+-# Whether to enable seccomp/Linux namespaces worker isolation. That restricts 
the number of
 -# system calls allowed to a worker process, in order to reduce damage from a
 -# bug in the worker process. It is available on Linux systems at a 
performance cost.
 -# The performance cost is roughly 2% overhead at transfer time (tested on a 
Linux 3.17.8).
 -# Note however, that process isolation is restricted to the specific libc 
versions
 -# the isolation was tested at. If you get random failures on worker 
processes, try
 -# disabling that option and report the failures you, along with system and 
debugging
--# information at: https://gitlab.com/ocserv/ocserv/issues
+-# information at: https://gitlab.com/openconnect/ocserv/issues
 -isolate-workers = true
 -
  # A banner to be displayed on clients after connection
@@ -94,11 +94,11 @@ Index: doc/sample.config
 -pid-file = /var/run/ocserv.pid
 +pid-file = ${LOCALSTATEDIR}/run/ocserv.pid
  
- # Log Level. It can be overridden in the command line with the -d option.
- # All messages at the configure level and lower will be displayed.
-@@ -563,6 +540,11 @@ no-route = 192.168.5.0/255.255.255.0
+ # Log Level. Ocserv sends the logging messages to standard error
+ # as well as the system log. The log level can be overridden in the
+@@ -568,6 +545,11 @@ no-route = 192.168.5.0/255.255.255.0
  # any other routes. In case of defaultroute, the no-routes are restricted.
- # All the routes applied by ocserv can be reverted using /etc/ocserv/ocserv-fw
+ # All the routes applied by ocserv can be reverted using 
/usr/libexec/ocserv-fw
  # --removeall. This option can be set globally or in the per-user 
configuration.
 +#
 +# OpenBSD package

Re: [update] samba-4.19.4

2024-01-11 Thread Bjorn Ketelaars

On Thu 11/01/2024 21:19, Jeremie Courreges-Anglas wrote:
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.19.4.html
> 
> Tests and oks welcome (for -stable too)!

According to checksym; libnetapi, libsamba-credentails and libsmbconf
need a minor bump:

/usr/local/lib/libnetapi.so.3.2 --> 
/tmp/pobj/samba-4.19.4/fake-amd64/usr/local/lib/libnetapi.so.3.2
Dynamic export changes:
added:
NetComposeOfflineDomainJoin
NetComposeOfflineDomainJoin_l
NetComposeOfflineDomainJoin_r
ndr_print_NetComposeOfflineDomainJoin

PLT added:
NetComposeOfflineDomainJoin_l

/usr/local/lib/libsamba-credentials.so.1.3 --> 
/tmp/pobj/samba-4.19.4/fake-amd64/usr/local/lib/libsamba-credentials.so.1.3
Dynamic export changes:
added:
cli_credentials_get_domain_and_obtained

/usr/local/lib/libsmbconf.so.14.0 --> 
/tmp/pobj/samba-4.19.4/fake-amd64/usr/local/lib/libsmbconf.so.14.0
Dynamic export changes:
added:
samba_copyright_string


Bumps have been added on top of your diff (see below), and build- and
run-tested on amd64 current. Works for me. Build-tested on current. No
issues found.


diff --git Makefile Makefile
index efe0e23a71b..1516135db05 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.19.3
+VERSION =  4.19.4
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -19,15 +19,15 @@ SHARED_LIBS =   dcerpc  1.1 \
ndr-krb5pac 1.3 \
ndr-nbt 2.0 \
ndr-standard5.0 \
-   netapi  3.2 \
-   samba-credentials   1.3 \
+   netapi  3.3 \
+   samba-credentials   1.4 \
samba-errors2.1 \
samba-hostconfig13.0 \
samba-passdb3.0 \
samba-util  10.0 \
samdb   3.0 \
smbclient   6.1 \
-   smbconf 14.0 \
+   smbconf 14.1 \
smbldap 1.0 \
tevent  2.3 \
tevent-util 2.0 \
diff --git distinfo distinfo
index facbecb36ab..e3b081cca2c 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.19.3.tar.gz) = KAVTuQ8TGxlAWA3yk2U8npvYkGIB9d725ejBYPC/rJY=
-SIZE (samba-4.19.3.tar.gz) = 41829749
+SHA256 (samba-4.19.4.tar.gz) = QCbZO4ZtsZjIyhaFsPXVJ5P2XG5jyzZBY69mH9/wlow=
+SIZE (samba-4.19.4.tar.gz) = 41839810

Re: spotifyd: pledge

2024-01-05 Thread Bjorn Ketelaars

On Fri 05/01/2024 15:54, Klemens Nanni wrote:
> On Mon, Jan 01, 2024 at 02:03:49PM +, Klemens Nanni wrote:
> > Code comments explain the promises a bit more, tl;dr:
> > main() {
> > pledge("stdio rpath wpath cpath inet mcast flock chown unix dns 
> > proc exec audio", NULL)
> > [CLI arg and config parsing]
> > if (on-song-change-hook)
> > pledge("stdio rpath wpath cpath inet mcast unix dns proc exec 
> > audio", NULL)
> > else
> > pledge("stdio rpath wpath cpath inet mcast unix dns audio", 
> > NULL)
> > [...]
> > }
> > 
> > Daemon or in foreground, static credentials or --*-cmd or zeroconf 
> > discovery,
> > cache or no persistent files, rc.d script or manually run, MPRIS interaction
> > via playerctl(1):  it all works for me.
> > 
> > Unveil looks viable and doable, but as a second step.
> > 
> > Please try to break this.
> > Feedback? OK?

Tested as daemon and in foreground as user _spotifyd. So far, with
spotify-qt, no issues found.
¬
OK bket@

Re: ocaml 4.12.1 -> 4.13.1

2024-01-01 Thread Bjorn Ketelaars

On Sun 31/12/2023 20:58, Daniel Dickman wrote:
> Hi Anil,
> 
> Here is an update of ocaml to 4.13.1. I've tested that all ocaml ports 
> still build and the ones I use still seem to work ok.
> 
> ok for the below?

Used this update to build and test a couple of ports including
net/unison. No issues found.

OK bket@

Re: spotifyd: add user and rc.d script

2024-01-01 Thread Bjorn Ketelaars

On Sun 31/12/2023 22:05, Klemens Nanni wrote:
> On Sun, Dec 31, 2023 at 08:49:48PM +, Klemens Nanni wrote:
> > _nginx is the oldest commented user from 2012 according to my blame/grep.
> > I'd like to recycle the ID into _spotifyd and isolate this internet facing
> > daemon into /var/spotifyd/, away from /home/kn/.
> > 
> > Looks like this is the first case of an unprivileged user in ports playing.
> > sndio(7) needs a cookie file;  neither PortAudio (audio/portaudio-svn), nor
> > Rust's portaudio-rs crate or spotifyd seem to use that, so I've added a
> > trivial rc_pre() one-shot hook leveraging aucat(1).
> > 
> > Existing users as per README won't have to do anything after upgrading
> > to spotifyd-0.3.5p3;  ~/.spotifyd/spotifyd.conf continues to take
> > precedence and is NOT merged with /etc/spotifyd.conf used by rc.d/spotifyd.
> 
> Same diff plus README bits on how to share sndio(7) cookies since sndiod(8)
> does not concurrent connections from different users/accounts (read: cookies).
> 
> > Works like a charm for me.
> > 
> > Feedback? OK?

Works for me as well.

Recycling id 593 should be ok. I am not sure if using aucat(1) in
spotifyd.rc has any downsides. Maybe doing something like 'mkdir
~/.sndiod && if=/dev/urandom bs=16 count=1 of=~/.sndio/cookie' is a good
alternative, which is more self explaining.

Re: Any change updating ocserv to latest

2023-12-31 Thread Bjorn Ketelaars

On Sun 31/12/2023 23:05, Dylan D'Silva wrote:
> Hello Bjorn,
> 
> Any change of getting a update to ocserv?
> Latest is 1.2.3.
> 
> Thanks
> Dylan

(CC'ed to ports@ for some exposure)

Diff below updates ocserv to 1.2.3. Overview on changes can be found on
https://gitlab.com/openconnect/ocserv/-/blob/0f5ba83f762bed11815d1dd37c37dcc6d1cd26d1/NEWS

Synced patches (several did not apply cleanly), and changed
AUTOCONF_VERSION to 2.71 to get rid of a warning. No new failing tests
while running 'make test'.

I stopped using ocserv some time ago so testing is limited to building
and running 'make test'. Before committing this it would be helpful if
actual users test this update, and report back.

Comments?


diff --git Makefile Makefile
index 3e6077b19b1..1041430bb21 100644
--- Makefile
+++ Makefile
@@ -1,8 +1,7 @@
 COMMENT=   server implementing the AnyConnect SSL VPN protocol
 
-DISTNAME=  ocserv-1.1.6
+DISTNAME=  ocserv-1.2.3
 EXTRACT_SUFX=  .tar.xz
-REVISION=  2
 
 CATEGORIES=net
 
@@ -46,7 +45,7 @@ CONFIGURE_ARGS=   --disable-namespaces \
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-AUTOCONF_VERSION=  2.69
+AUTOCONF_VERSION=  2.71
 
 post-extract:
find ${WRKSRC}/tests -type f -perm -+x -exec \
@@ -65,7 +64,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ocserv
cd ${WRKSRC}/doc; ${INSTALL_DATA} profile.xml sample.passwd \
${PREFIX}/share/examples/ocserv/
-   mv ${PREFIX}/bin/ocserv-fw ${PREFIX}/share/examples/ocserv/
+   mv ${PREFIX}/libexec/ocserv-fw ${PREFIX}/share/examples/ocserv/
${SUBST_CMD} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} \
${WRKSRC}/doc/sample.config \
${PREFIX}/share/examples/ocserv/sample.config
diff --git distinfo distinfo
index 16c7a6c526b..5af47ccb0fe 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ocserv-1.1.6.tar.xz) = amy+kiEuMigEJqUcY0rcPUgDV53QSc/bfgFHFMyCxpM=
-SIZE (ocserv-1.1.6.tar.xz) = 839744
+SHA256 (ocserv-1.2.3.tar.xz) = Bs4Py1moszuNZdblUd4rXvd7fqZBuHyqZUpe6cSfG78=
+SIZE (ocserv-1.2.3.tar.xz) = 757484
diff --git patches/patch-configure_ac patches/patch-configure_ac
index 57995c43ca3..2ebaa85895b 100644
--- patches/patch-configure_ac
+++ patches/patch-configure_ac
@@ -1,7 +1,7 @@
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -222,7 +222,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind
+@@ -219,7 +219,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind
  fi
  
  have_readline=no
diff --git patches/patch-doc_sample_config patches/patch-doc_sample_config
index e509136066d..60a4aea8589 100644
--- patches/patch-doc_sample_config
+++ patches/patch-doc_sample_config
@@ -52,14 +52,14 @@ Index: doc/sample.config
  ### failures during the reloading time.
  
  
--# Whether to enable seccomp/Linux namespaces worker isolation. That restricts 
the number of 
+-# Whether to enable seccomp/Linux namespaces worker isolation. That restricts 
the number of
 -# system calls allowed to a worker process, in order to reduce damage from a
 -# bug in the worker process. It is available on Linux systems at a 
performance cost.
 -# The performance cost is roughly 2% overhead at transfer time (tested on a 
Linux 3.17.8).
 -# Note however, that process isolation is restricted to the specific libc 
versions
 -# the isolation was tested at. If you get random failures on worker 
processes, try
 -# disabling that option and report the failures you, along with system and 
debugging
--# information at: https://gitlab.com/ocserv/ocserv/issues
+-# information at: https://gitlab.com/openconnect/ocserv/issues
 -isolate-workers = true
 -
  # A banner to be displayed on clients after connection
@@ -94,11 +94,11 @@ Index: doc/sample.config
 -pid-file = /var/run/ocserv.pid
 +pid-file = ${LOCALSTATEDIR}/run/ocserv.pid
  
- # Log Level. It can be overridden in the command line with the -d option.
- # All messages at the configure level and lower will be displayed.
-@@ -563,6 +540,11 @@ no-route = 192.168.5.0/255.255.255.0
+ # Log Level. Ocserv sends the logging messages to standard error
+ # as well as the system log. The log level can be overridden in the
+@@ -568,6 +545,11 @@ no-route = 192.168.5.0/255.255.255.0
  # any other routes. In case of defaultroute, the no-routes are restricted.
- # All the routes applied by ocserv can be reverted using /etc/ocserv/ocserv-fw
+ # All the routes applied by ocserv can be reverted using 
/usr/libexec/ocserv-fw
  # --removeall. This option can be set globally or in the per-user 
configuration.
 +#
 +# OpenBSD package notes:
@@ -108,7 +108,7 @@ Index: doc/sample.config
  #restrict-user-to-routes = true
  
  # This option implies restrict-user-to-routes set to true. If set, the
-@@ -635,23 +617,6 @@ no-route = 192.168.5.0/255.255.255.0
+@@ -640,23 +622,6 @@ no-route = 192.168.5.0/255.255.255.0
  # and '%{G}', if present will be replaced by the u

Re: NEW: audio/spotify-qt

2023-12-26 Thread Bjorn Ketelaars

On Wed 27/12/2023 03:58, Klemens Nanni wrote:
> On Wed, Dec 27, 2023 at 01:41:04AM +, Klemens Nanni wrote:
> > Qt6, search, playlists, album covers, synced lyrics, play/pause/seek,
> > sharing links to artists/albums/songs, etc. is all working great for me.
> > 
> > You can also see (librespot) logs and go into developer mode with more
> > options and the ability to test arbitrary API requests -- in the GUI.
> > 
> > Having librespot configured (instead of the unported spotifyd), there are
> > plaintext credentials in the process list:
> > 57711 /usr/local/bin/librespot --bitrate 320 --username [redacted] 
> > --password [redacted] --name spotify-qt (librespot) --initial-volume 100 
> > --cache /home/kn/.cache/kraxarn/spotify-qt/librespot --autoplay
> 
> Using spotifyd avoid this.
> 
> > Alternatives are setting up spotifyd (WIP) or perhaps using the enabled
> > GNOME/KDE/whatever keychain support (I don't have that under Xfce, 
> > apparently):
> > [02:25:54] [wrn] Failed to get password: The name org.freedesktop.secrets 
> > was not provided by any .service files
> > [02:26:16] [wrn] Failed to set password: The name org.freedesktop.secrets 
> > was not provided by any .service files
> 
> spotifyd works great and spotify-qt's GUI configuration is straight
> forward enough to set this up without having to explain anything in the
> package, imho, so new port attached that now RUN_DEPENDS on audio/spotifyd
> instead of audio/librespot.
> 
> Feedback? OK?
> ---
> Information for inst:spotify-qt-3.10
> 
> Comment:
> lightweight Spotify client using Qt
> 
> Description:
> An unofficial Spotify client using Qt as a simpler, lighter alternative to the
> official client.
> 
> Maintainer: Klemens Nanni 
> 
> WWW: https://github.com/kraxarn/spotify-qt

portcheck(1) complains with:

missing RUN_DEPENDS+=x11/gtk+4,-guic
missing RUN_DEPENDS+=devel/desktop-file-utils

Diff below fixes this.

Run tested with spotifyd on amd64. Works for me.

OK bket@


diff --git Makefile Makefile
index f299b03d500..c62dfb93293 100644
--- Makefile
+++ Makefile
@@ -18,7 +18,9 @@ LIB_DEPENDS = devel/glib2 \
x11/gnome/libsecret \
x11/qt6/qtsvg

-RUN_DEPENDS =  audio/spotifyd
+RUN_DEPENDS =  audio/spotifyd \
+   devel/desktop-file-utils \
+   x11/gtk+4,-guic

 # devel/kf5/kcrash is qt5-only
 CONFIGURE_ARGS =   -DUSE_QT6=ON \

Re: NEW: audio/spotifyd

2023-12-26 Thread Bjorn Ketelaars

On Wed 27/12/2023 03:53, Klemens Nanni wrote:
> New dependency for "NEW: audio/spotify-qt".
> 
> Compared to plain librespot, spotifyd has config files, can get
> passwords from command output instead and supports discovery, so in
> theory you can also get an authentication token via local network,
> but I haven't tried that yet.
> 
> Since it only ships a binary with sparse --help output, a little README
> gets you going with a minimal working config.
> 
> Feedback? OK?
> ---
> Information for inst:spotifyd-0.3.5
> 
> Comment:
> Spotify client running as UNIX daemon
> 
> Required by:
> spotify-qt-3.10
> 
> Description:
> Spotifyd streams music just like the official client, but is more lightweight
> and supports more platforms. Spotifyd also supports the Spotify Connect
> protocol, which makes it show up as a device that can be controlled from the
> official clients.
> 
> Maintainer: Klemens Nanni 
> 
> WWW: https://spotifyd.rs

Tested with spotify-qt on amd64. Works for me.

OK bket@

UPDATE net/py-msgpack-1.0.7

2023-12-16 Thread Bjorn Ketelaars

Diff below updates py-msgpack to 1.0.7. As far as I can tell this update
is just a maintenance release with no big changes:
https://github.com/msgpack/msgpack-python/compare/v1.0.5...v1.0.7

This release relies on Cython-3.0, which we do not have. Cython-0.29.30
still works. Patched pyproject.toml to exclude source files being
packaged.

Tests run successfully, and all consumers - except
sysutils/borgbackup/2.0 - build. I have a separate diff for the latter
in my tree. Run tested with both borgbackup-1.2 and -2.0 on amd64.

Comments / OK?


diff --git Makefile Makefile
index bf892d5cbdf..7bb89b01eee 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
 COMMENT =  messagepack (de)serializer
 
-MODPY_EGG_VERSION =1.0.5
+MODPY_EGG_VERSION =1.0.7
 EPOCH =0
 DISTNAME = msgpack-${MODPY_EGG_VERSION}
 PKGNAME =  py-msgpack-${MODPY_EGG_VERSION}
diff --git distinfo distinfo
index 1003d9d1b40..aefa6b0aa62 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (msgpack-1.0.5.tar.gz) = wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw=
-SIZE (msgpack-1.0.5.tar.gz) = 127834
+SHA256 (msgpack-1.0.7.tar.gz) = Vy78k9t6TSfkBFAZdcptLZd1cFwtkiOQ2Hj892jZLIc=
+SIZE (msgpack-1.0.7.tar.gz) = 166311
diff --git patches/patch-pyproject_toml patches/patch-pyproject_toml
new file mode 100644
index 000..535c82299e2
--- /dev/null
+++ patches/patch-pyproject_toml
@@ -0,0 +1,26 @@
+Allow use of Cython>=0.29.30, which we have in ports.
+
+Do not package source files.
+
+Index: pyproject.toml
+--- pyproject.toml.orig
 pyproject.toml
+@@ -2,7 +2,7 @@
+ requires = [
+ # Also declared in requirements.txt, if updating here please also update
+ # there
+-"Cython~=3.0.0",
++"Cython~=0.29.30",
+ "setuptools >= 35.0.2",
+ ]
+ build-backend = "setuptools.build_meta"
+@@ -41,6 +41,9 @@ Changelog = "https://github.com/msgpack/msgpack-python
+ 
+ [tool.setuptools.dynamic]
+ version = {attr = "msgpack.__version__"}
++
++[tool.setuptools.exclude-package-data]
++"*" = ["*.cpp", "*.h", "*.pyx"]
+ 
+ [tool.black]
+ line-length = 100

FIX security/vaultwarden: unbreak vaultwarden.rc

2023-12-10 Thread Bjorn Ketelaars

Recent change to vaultwarden ("Change VARBASE to LOCALSTATEDIR") broke
pkg/vaultwarden.rc. Diff below fixes this.

OK?


diff --git Makefile Makefile
index 9d06d593160..486e3e0c616 100644
--- Makefile
+++ Makefile
@@ -8,6 +8,7 @@ COMMENT =   unofficial bitwarden compatible server
 GH_ACCOUNT =   dani-garcia
 GH_PROJECT =   vaultwarden
 GH_TAGNAME =   1.30.1
+REVISION = 0
 
 CATEGORIES =   security
 
diff --git pkg/vaultwarden.rc pkg/vaultwarden.rc
index 0a5f4739650..b82b1064bdb 100644
--- pkg/vaultwarden.rc
+++ pkg/vaultwarden.rc
@@ -1,7 +1,7 @@
 #!/bin/ksh
 
 daemon="${PREFIX}/bin/vaultwarden"
-daemon_execdir="${VARBASE}/vaultwarden"
+daemon_execdir="${LOCALSTATEDIR}/vaultwarden"
 daemon_user="_vaultwarden"
 
 . /etc/rc.d/rc.subr

Re: audio/audacious/plugins disable openmpt

2023-11-25 Thread Bjorn Ketelaars

On Sat 25/11/2023 14:47, Peter Hessler wrote:
> Broke on the most recent aarch64 bulk build, a junk happened between
> configure and build.
> 
> OK?

Thank you for this!

OK bket@

UPDATE x11/spectrwm-3.5.1

2023-11-25 Thread Bjorn Ketelaars

Diff below brings spectrwm to 3.5.1. Changes:
https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_1

OK?


diff --git Makefile Makefile
index 45da60f00e1..fae035a6dde 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
 COMMENT=   small tiling window manager
 
-V= 3.5.0
+V= 3.5.1
 DIST_TUPLE=github conformal spectrwm SPECTRWM_${V:S/./_/g} /
 DISTNAME=  spectrwm-${V}
 
diff --git distinfo distinfo
index a12233acd18..2e0f3b923c5 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 
tN6LLFkvxapMpNvQ6KQh9/0Wi31fVMetgZl63ADawg8=
-SIZE (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 194387
+SHA256 (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 
f+QmAgilLZ+4RCkdCv5q8YiHxUUt8Lkh7XgK97kiPw8=
+SIZE (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 196431
diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
index e002bc0b708..08dc93fa75b 100644
--- patches/patch-spectrwm_1
+++ patches/patch-spectrwm_1
@@ -1,12 +1,12 @@
 Index: spectrwm.1
 --- spectrwm.1.orig
 +++ spectrwm.1
-@@ -164,7 +164,7 @@ For example, starting
- via
- .Xr xinit 1 :
+@@ -1990,7 +1990,7 @@ via
+ .Pa LD_PRELOAD
+ must be specified.
  .Bd -literal -offset indent
 -LD_PRELOAD=/usr/lib/libswmhack.so.0.0 urxvtd -q -o -f
 +LD_PRELOAD=${PREFIX}/lib/libswmhack.so.${LIBswmhack_VERSION} urxvtd -q -o -f
  .Ed
  .Pp
- Spawned programs automatically have
+ Note that some operating systems may ignore
diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
index 6404edb119c..6fc372bca93 100644
--- patches/patch-spectrwm_c
+++ patches/patch-spectrwm_c
@@ -1,7 +1,7 @@
 Index: spectrwm.c
 --- spectrwm.c.orig
 +++ spectrwm.c
-@@ -373,7 +373,7 @@ uint32_t   swm_debug = 0
+@@ -379,7 +379,7 @@ uint32_t   swm_debug = 0
  #define SWM_CONF_WHITESPACE   " \t\n"
  
  #ifndef SWM_LIB

Re: vaultwarden 1.30.0 breaks autofilling

2023-11-23 Thread Bjorn Ketelaars

On Thu 23/11/2023 23:44, A Tammy wrote:
> 
> 
> On 11/20/23 14:12, Bjorn Ketelaars wrote:
> > On Mon 20/11/2023 15:00, Oliver Schweger wrote:
> >> Hello,
> >> please consider updating vaultwarden to version 1.30.1 asap, as version 
> >> 1.30.0 breaks autofilling on nearly all websites.
> >>
> >> https://github.com/dani-garcia/vaultwarden/discussions/4052
> >> https://github.com/dani-garcia/vaultwarden/pull/4056
> >> https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.1
> >>
> >> Thank you.
> > 
> > Thank you Oliver for the heads up. It would have helped if you also
> > provided a diff for updating vaultwarden. Do you think this is possible
> > for the next time?
> > 
> > In the mean time: the diff below updates vaultwarden to 1.30.1. Lightly
> > run tested on amd64.
> > 
> > Once again, this update uses the same version of Rocket-* as the version
> > we have in ports. As such, the same vendored tarball can be used. A more
> > pretty solution is to provide vaultwarden-deps-1.30.1.tgz, which is a
> > copy of vaultwarden-deps-1.30.0.tgz, and slightly adapt the diff below.
> > 
> > Test reports are welcome.
> > 
> 
> 
> I will test it out over the weekend but the diff looks OK to me!
> 
> I've also copied the deps tarball, so we can remove that line from the diff.

New diff below, which takes into account the copied deps tarball.


diff --git Makefile Makefile
index f60121b2188..81270d5dc93 100644
--- Makefile
+++ Makefile
@@ -7,7 +7,7 @@ COMMENT =   unofficial bitwarden compatible server
 
 GH_ACCOUNT =   dani-garcia
 GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.30.0
+GH_TAGNAME =   1.30.1
 
 CATEGORIES =   security
 
diff --git crates.inc crates.inc
index e49a3bb9038..f1bca2a4e4f 100644
--- crates.inc
+++ crates.inc
@@ -1,7 +1,6 @@
 MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.7.6   # MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.6   # MIT OR Apache-2.0
 MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
@@ -10,13 +9,16 @@ MODCARGO_CRATES +=   android-tzdata  0.1.1   # MIT OR 
Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
 MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.1.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.2.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-lock  3.1.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-signal0.2.4   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-signal0.2.5   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-std   1.12.0  # Apache-2.0/MIT
 MODCARGO_CRATES += async-stream0.3.5   # MIT
 MODCARGO_CRATES += async-stream-impl   0.3.5   # MIT
@@ -28,37 +30,37 @@ MODCARGO_CRATES +=  atomic-waker1.1.2   # Apache-2.0 OR 
MIT
 MODCARGO_CRATES += autocfg 1.1.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += backtrace   0.3.69  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64  0.13.1  # MIT/Apache-2.0
-MODCARGO_CRATES += base64  0.21.4  # MIT OR Apache-2.0
+MODCARGO_CRATES += base64  0.21.5  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64ct1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += binascii0.1.4   # MIT
 MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
 MODCARGO_CRATES += bitflags2.4.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += blake2  0.10.6  # MIT OR Apache-2.0
 MODCARGO_CRATES += block-buffer0.10.4  # MIT OR Apache-2.0
-MODCARGO_CRATES += blocking1.4.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += blocking1.5.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += brotli  3.4.0   # BSD-3-Clause/MIT
-MODCARGO_CRATES += brotli-decompressor 2.5.0   # BSD-3-Clause/MIT
+MODCARGO_CRATES += brotli-decompressor 2.5.1   # BSD-3-Clause/MIT
 MODCARGO_CRATES += bumpalo 3.14.0  # MIT OR Apache-2.0
 MODCARGO_CRATES += bytemuck1.14.

Re: vaultwarden 1.30.0 breaks autofilling

2023-11-20 Thread Bjorn Ketelaars

On Mon 20/11/2023 15:00, Oliver Schweger wrote:
> Hello,
> please consider updating vaultwarden to version 1.30.1 asap, as version 
> 1.30.0 breaks autofilling on nearly all websites.
> 
> https://github.com/dani-garcia/vaultwarden/discussions/4052
> https://github.com/dani-garcia/vaultwarden/pull/4056
> https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.1
> 
> Thank you.

Thank you Oliver for the heads up. It would have helped if you also
provided a diff for updating vaultwarden. Do you think this is possible
for the next time?

In the mean time: the diff below updates vaultwarden to 1.30.1. Lightly
run tested on amd64.

Once again, this update uses the same version of Rocket-* as the version
we have in ports. As such, the same vendored tarball can be used. A more
pretty solution is to provide vaultwarden-deps-1.30.1.tgz, which is a
copy of vaultwarden-deps-1.30.0.tgz, and slightly adapt the diff below.

Test reports are welcome.

Lets wait and see what aisha@ (maintainer, cc) thinks.


diff --git Makefile Makefile
index f60121b2188..774f14f51f3 100644
--- Makefile
+++ Makefile
@@ -7,7 +7,7 @@ COMMENT =   unofficial bitwarden compatible server
 
 GH_ACCOUNT =   dani-garcia
 GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.30.0
+GH_TAGNAME =   1.30.1
 
 CATEGORIES =   security
 
@@ -22,7 +22,7 @@ FLAVOR ?=
 WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl
 
 SITES.deps =   https://files.bsd.ac/openbsd-distfiles/
-DISTFILES.deps +=  vaultwarden-deps-${GH_TAGNAME}.tgz
+DISTFILES.deps +=  vaultwarden-deps-1.30.0.tgz
 
 MODULES =  devel/cargo
 
diff --git crates.inc crates.inc
index e49a3bb9038..f1bca2a4e4f 100644
--- crates.inc
+++ crates.inc
@@ -1,7 +1,6 @@
 MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.7.6   # MIT OR Apache-2.0
-MODCARGO_CRATES += ahash   0.8.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.6   # MIT OR Apache-2.0
 MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
@@ -10,13 +9,16 @@ MODCARGO_CRATES +=   android-tzdata  0.1.1   # MIT OR 
Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
 MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-channel   2.1.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-io2.2.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-lock  3.1.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-signal0.2.4   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-signal0.2.5   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-std   1.12.0  # Apache-2.0/MIT
 MODCARGO_CRATES += async-stream0.3.5   # MIT
 MODCARGO_CRATES += async-stream-impl   0.3.5   # MIT
@@ -28,37 +30,37 @@ MODCARGO_CRATES +=  atomic-waker1.1.2   # Apache-2.0 OR 
MIT
 MODCARGO_CRATES += autocfg 1.1.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += backtrace   0.3.69  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64  0.13.1  # MIT/Apache-2.0
-MODCARGO_CRATES += base64  0.21.4  # MIT OR Apache-2.0
+MODCARGO_CRATES += base64  0.21.5  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64ct1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += binascii0.1.4   # MIT
 MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
 MODCARGO_CRATES += bitflags2.4.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += blake2  0.10.6  # MIT OR Apache-2.0
 MODCARGO_CRATES += block-buffer0.10.4  # MIT OR Apache-2.0
-MODCARGO_CRATES += blocking1.4.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += blocking1.5.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += brotli  3.4.0   # BSD-3-Clause/MIT
-MODCARGO_CRATES += brotli-decompressor 2.5.0   # BSD-3-Clause/MIT
+MODCARGO_CRATES += brotli-decompressor 2.5.1   # BSD-3-Clause/MIT
 MODCARGO_CRATES += bumpalo 3.14.0  # MIT OR Apache-2.0
 MODCARGO_CRATES += bytemuck1.14.0  # Zlib OR Apache-2.0 OR MIT
 MODCARGO_CRATES += byteorder   1.5.0   # Unlicense OR MIT
 MODCARGO_CRATES += bytes   1.5.0   # MIT
-MODCARGO_CRATES += cached  0.46.0  # MIT
-MODCARGO_CRATES += cached_proc_macro   0.18.0  # MIT

Re: UPDATE security/vaultwarden-1.30.0 and www/vaultwarden-web-2023.10.0

2023-11-06 Thread Bjorn Ketelaars

On Mon 06/11/2023 21:13, Theo Buehler wrote:
> On Mon, Nov 06, 2023 at 08:44:22PM +0100, Bjorn Ketelaars wrote:
> > Diff below updates security/vaultwarden to 1.30.0 and
> > www/vaultwarden-web to 2023.10.0. Main changes are the addition of
> > passkey support, and integration of the WebSocket service in the HTTP
> > server. Full overview on changes can be found at
> > https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.0 and
> > https://github.com/dani-garcia/bw_web_builds/releases/tag/v2023.10.0/.
> > 
> > This release is kind of special as it uses both ring-0.16.20 and
> > ring-0.17.5. The first has been imported to security/rust-ring and has
> > been patched to work with OpenBSD's execute only policy. The latter has
> > not been imported but has seemingly been fixed upstream. Proposal is to
> > keep both crates and patch 0.16.20 locally.
> > As a reminder I added a comment to the Makefile of security/rust-ring to
> > sync the patches of vaultwarden.
> > 
> > Please note that vaultwarden-1.30.0 uses the same version of Rocket-*
> > thus the same vendored tarball can be used. I guess a more pretty
> > solution is to provide vaultwarden-deps-1.30.0.tgz, which is a copy of
> > vaultwarden-deps-1.29.1.tgz, and slightly adapt the diff below.
> > 
> > Lightly run tested on amd64.
> > 
> > I'm not sure if the ring-related changes/additions are sane. I'm hoping
> > that tb@ can comment on this.
> 
> When the rust-ring replacement hack was added, it was unclear what would
> happen to the patches. We were able to merge them into BoringSSL and
> hence it was a matter of time that ring would pick them up. It is a
> great thing that Brian Smith completed this work a few weeks ago and we
> can now wait for the ecosystem to drop 0.16 and then remove our
> rust-ring port.
> 
> I do not think we should be copying these patches around. The better
> fix is to teach cargo.port.mk to be more selective about what ring
> crate to replace as below. This means 0.16.20 will be replaced with
> the patches rust-ring source and 0.17 will remain untouched. You can
> then delete the patches, reinstate the bdep on security/rust-ring and
> remove the MODCARGO_CRATES_KEEP and the comment.

Thanks to tb@ [0] the diff can be simplified significantly.

[0] https://marc.info/?l=openbsd-ports-cvs&m=169930329207834&w=2


diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile
index 807e4eb2dea..73b14662299 100644
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -7,8 +7,7 @@ COMMENT =   unofficial bitwarden compatible server
 
 GH_ACCOUNT =   dani-garcia
 GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.29.2
-REVISION = 0
+GH_TAGNAME =   1.30.0
 
 CATEGORIES =   security
 
@@ -23,7 +22,7 @@ FLAVOR ?=
 WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl
 
 SITES.deps =   https://files.bsd.ac/openbsd-distfiles/
-DISTFILES.deps +=  vaultwarden-deps-${GH_TAGNAME}.tgz
+DISTFILES.deps +=  vaultwarden-deps-1.29.2.tgz
 
 MODULES =  devel/cargo
 
diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc
index 9800221215f..e49a3bb9038 100644
--- security/vaultwarden/crates.inc
+++ security/vaultwarden/crates.inc
@@ -1,57 +1,64 @@
-MODCARGO_CRATES += addr2line   0.20.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick1.0.3   # Unlicense OR MIT
+MODCARGO_CRATES += ahash   0.7.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
+MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
-MODCARGO_CRATES += argon2  0.5.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.1   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.5.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.

UPDATE security/vaultwarden-1.30.0 and www/vaultwarden-web-2023.10.0

2023-11-06 Thread Bjorn Ketelaars

Diff below updates security/vaultwarden to 1.30.0 and
www/vaultwarden-web to 2023.10.0. Main changes are the addition of
passkey support, and integration of the WebSocket service in the HTTP
server. Full overview on changes can be found at
https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.0 and
https://github.com/dani-garcia/bw_web_builds/releases/tag/v2023.10.0/.

This release is kind of special as it uses both ring-0.16.20 and
ring-0.17.5. The first has been imported to security/rust-ring and has
been patched to work with OpenBSD's execute only policy. The latter has
not been imported but has seemingly been fixed upstream. Proposal is to
keep both crates and patch 0.16.20 locally.
As a reminder I added a comment to the Makefile of security/rust-ring to
sync the patches of vaultwarden.

Please note that vaultwarden-1.30.0 uses the same version of Rocket-*
thus the same vendored tarball can be used. I guess a more pretty
solution is to provide vaultwarden-deps-1.30.0.tgz, which is a copy of
vaultwarden-deps-1.29.1.tgz, and slightly adapt the diff below.

Lightly run tested on amd64.

I'm not sure if the ring-related changes/additions are sane. I'm hoping
that tb@ can comment on this.


diff --git security/rust-ring/Makefile security/rust-ring/Makefile
index 7b041715640..f219f4d1e1b 100644
--- security/rust-ring/Makefile
+++ security/rust-ring/Makefile
@@ -1,4 +1,5 @@
 # If this port is changed, its consumers need to be bumped (static linking)
+# Keep ../vaultwarden/patches in sync with patches/
 COMMENT =  ring crate source patched for x-only assembly
 
 VERSION =  0.16.20

commit 8cd7af2b935cb175ebee7debfb3c7bbe1eebb902
Author: Björn Ketelaars 
Date:   Mon Nov 6 20:22:11 2023 +0100

security/vaultwarden @1.29.2: update to 1.30.0

diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile
index 807e4eb2dea..334258208ac 100644
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -7,8 +7,7 @@ COMMENT =   unofficial bitwarden compatible server
 
 GH_ACCOUNT =   dani-garcia
 GH_PROJECT =   vaultwarden
-GH_TAGNAME =   1.29.2
-REVISION = 0
+GH_TAGNAME =   1.30.0
 
 CATEGORIES =   security
 
@@ -23,7 +22,7 @@ FLAVOR ?=
 WANTLIB += ${MODCARGO_WANTLIB} crypto m ssl
 
 SITES.deps =   https://files.bsd.ac/openbsd-distfiles/
-DISTFILES.deps +=  vaultwarden-deps-${GH_TAGNAME}.tgz
+DISTFILES.deps +=  vaultwarden-deps-1.29.2.tgz
 
 MODULES =  devel/cargo
 
@@ -31,10 +30,14 @@ CONFIGURE_STYLE =   cargo
 
 SEPARATE_BUILD =   Yes
 
-BUILD_DEPENDS =security/rust-ring
-
 RUN_DEPENDS =  www/vaultwarden-web
 
+# Vaultwarden depends on ring-0.16.20 and ring-0.17.5. The first has been
+# imported (security/rust-ring) and has been patched to work with OpenBSD's
+# execute only policy. The latter has not yet been imported but has been fixed
+# upstream. Keep both crates, and patch 0.16.20 locally.
+MODCARGO_CRATES_KEEP +=ring
+
 MODCARGO_CRATES_KEEP +=libsqlite3-sys
 MODCARGO_FEATURES =sqlite
 .if ${FLAVOR:Mmysql}
diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc
index 9800221215f..e49a3bb9038 100644
--- security/vaultwarden/crates.inc
+++ security/vaultwarden/crates.inc
@@ -1,57 +1,64 @@
-MODCARGO_CRATES += addr2line   0.20.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += addr2line   0.21.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick1.0.3   # Unlicense OR MIT
+MODCARGO_CRATES += ahash   0.7.6   # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.8.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.2   # Unlicense OR MIT
 MODCARGO_CRATES += alloc-no-stdlib 2.0.4   # BSD-3-Clause
 MODCARGO_CRATES += alloc-stdlib0.2.2   # BSD-3-Clause
+MODCARGO_CRATES += allocator-api2  0.2.16  # MIT OR Apache-2.0
 MODCARGO_CRATES += android-tzdata  0.1.1   # MIT OR Apache-2.0
 MODCARGO_CRATES += android_system_properties   0.1.5   # MIT/Apache-2.0
-MODCARGO_CRATES += argon2  0.5.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += argon2  0.5.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += async-channel   1.9.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-compression   0.4.1   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-executor  1.5.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-compression   0.4.4   # MIT OR Apache-2.0
+MODCARGO_CRATES += async-executor  1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-global-executor   2.3.1   # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-io1.13.0  # Apache-2.0 OR MIT
 MODCARGO_CRATES += async-lock  2.8.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += async-process   1.7.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-process   1.8.1   # Apache-2.0 OR MIT
+MODCARG

Re: borgbackup: switch to openssl/3.1

2023-10-24 Thread Bjorn Ketelaars

On Tue 24/10/2023 17:59, Theo Buehler wrote:
> I want to remove openssl/3.0 soon: it's very slow, doesn't have landing
> pads in its asm and there's no real reason for us to use it as we don't
> care about FIPS and we don't care about it being LTS. One member from
> the OpenSSL 3 family is enough at this point in time.
> 
> This passes regress, but I don't use borgbackup, so it's not tested
> otherwise.
> 
> I'll update the comment about bumps in openssl/3.*/Makefile as well.

The OpenSSL version is hardcoded in setup.py, and needs to be patched.
With the diff below all tests pass successfully.

With the change below, OK bket@


diff --git Makefile Makefile
index 258ccfa52d8..a542de1e61c 100644
--- Makefile
+++ Makefile
@@ -1,14 +1,14 @@
-# Static linking with OpenSSL 1.1
+# Static linking with OpenSSL 3.1
 .if ${MACHINE_ARCH} != aarch64 && ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} 
!= riscv64
 USE_NOEXECONLY=Yes
 .endif
 
 MODPY_EGG_VERSION =2.0.0b7
-REVISION = 1
+REVISION = 2
 
 # OpenSSL used for EVP_aes_256_ocb. It is linked statically to avoid 
conflicting
 # with shared libcrypto from the base OS pulled in via dependencies.
-BUILD_DEPENDS =security/openssl/3.0
+BUILD_DEPENDS =security/openssl/3.1
 RUN_DEPENDS =  security/py-argon2-cffi${MODPY_FLAVOR} \
sysutils/py-platformdirs${MODPY_FLAVOR}>=3.8.1
 
diff --git patches/patch-setup_py patches/patch-setup_py
new file mode 100644
index 000..1fa42d53314
--- /dev/null
+++ patches/patch-setup_py
@@ -0,0 +1,14 @@
+Index: setup.py
+--- setup.py.orig
 setup.py
+@@ -161,8 +161,8 @@ if not on_rtd:
+ # Use openssl (not libressl) because we need AES-OCB via EVP api. Link
+ # it statically to avoid conflicting with shared libcrypto from the 
base
+ # OS pulled in via dependencies.
+-crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl30"]}
+-crypto_extra_objects += ["/usr/local/lib/eopenssl30/libcrypto.a"]
++crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl31"]}
++crypto_extra_objects += ["/usr/local/lib/eopenssl31/libcrypto.a"]
+ else:
+ crypto_ext_lib = lib_ext_kwargs(pc, "BORG_OPENSSL_PREFIX", "crypto", 
"libcrypto", ">=1.1.1")
+

UPDATE x11/specctrwm-3.5.0

2023-10-22 Thread Bjorn Ketelaars

spectrwm-3.5.0 has been released, which includes a bunch of major new
features and improvements, such as dock/panel support, an always mapped
window mode, floating workspace layout, transparent color support, tons
of fixes, and more. Changelog can be found at
https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_0.

Changes to port:
- Synced WANTLIB
- Switched to DIST_TUPLE

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index e29ee65dc69..514dc05bbaa 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,8 @@
 COMMENT=   small tiling window manager
 
-GH_ACCOUNT=conformal
-GH_PROJECT=spectrwm
-GH_COMMIT= 06e3733175969c307a6fd47240a7a37b29d60513
-DISTNAME=  ${GH_PROJECT}-3.4.1.20230507
+V= 3.5.0
+DIST_TUPLE=github conformal spectrwm SPECTRWM_${V:S/./_/g} /
+DISTNAME=  spectrwm-${V}
 
 SHARED_LIBS=   swmhack 1.0
 
@@ -16,8 +15,8 @@ MAINTAINER=   Gonzalo L. R. , \
 PERMIT_PACKAGE=Yes
 
 # uses pledge()
-WANTLIB += X11 X11-xcb Xcursor Xft c util xcb xcb-icccm xcb-keysyms
-WANTLIB += xcb-randr xcb-util xcb-xinput xcb-xtest
+WANTLIB += X11 X11-xcb Xcursor Xft c fontconfig util xcb xcb-icccm
+WANTLIB += xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest
 
 RUN_DEPENDS=   x11/dmenu>=4.5
 
diff --git distinfo distinfo
index f7f66c46998..a12233acd18 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 
1stB8RPoDDQYPHbg5BNgFYRdbqK8wvlyaKO8QMriJng=
-SIZE (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 172202
+SHA256 (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 
tN6LLFkvxapMpNvQ6KQh9/0Wi31fVMetgZl63ADawg8=
+SIZE (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 194387
diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
index a2748e15bd8..e002bc0b708 100644
--- patches/patch-spectrwm_1
+++ patches/patch-spectrwm_1
@@ -1,7 +1,7 @@
 Index: spectrwm.1
 --- spectrwm.1.orig
 +++ spectrwm.1
-@@ -149,7 +149,7 @@ For example, starting
+@@ -164,7 +164,7 @@ For example, starting
  via
  .Xr xinit 1 :
  .Bd -literal -offset indent
diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
index c6b86658164..6404edb119c 100644
--- patches/patch-spectrwm_c
+++ patches/patch-spectrwm_c
@@ -1,8 +1,8 @@
 Index: spectrwm.c
 --- spectrwm.c.orig
 +++ spectrwm.c
-@@ -331,7 +331,7 @@ uint32_t   swm_debug = 0
- #define SWM_CONF_KEYMAPPING   (1)
+@@ -373,7 +373,7 @@ uint32_t   swm_debug = 0
+ #define SWM_CONF_WHITESPACE   " \t\n"
  
  #ifndef SWM_LIB
 -#define SWM_LIB   "/usr/local/lib/libswmhack.so"

Re: [update] samba-4.19.2

2023-10-16 Thread Bjorn Ketelaars

On Tue 17/10/2023 00:13, Jeremie Courreges-Anglas wrote:
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.19.2.html
> 
> Test reports and oks welcome.

Run tested on amd64 current. OK bket@

Thank you...again!

Re: [SECURITY] samba-4.19.1

2023-10-11 Thread Bjorn Ketelaars

On Wed 11/10/2023 19:34, Jeremie Courreges-Anglas wrote:
> 
> Here's an update to samba-4.19.1, intended for both 7.4 and -current.
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.19.1.html
> 
> (Same CVEs.)
> 
> Tests and oks welcome.

Run tested on amd64 current. OK bket@

Re: [SECURITY] samba-4.17.12

2023-10-11 Thread Bjorn Ketelaars

On Wed 11/10/2023 09:21, Jeremie Courreges-Anglas wrote:
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.17.12.html
> 
> CVE-2023-3961 looks nasty, not so sure about the others.
> 
> Tests and oks welcome.

Lightly run tested. OK bket@

Switch sysutils/borgbackup/2.0 to openssl-3.0

2023-09-11 Thread Bjorn Ketelaars

Diff below switches sysutils/borgbackup/2.0 from OpenSSL-1.1 to
OpenSSL-3.0. Reason to switch is the EOL status of OpenSSL-1.1.1.

It should be noted that OpenSSL is used for EVP_aes_256_ocb, and is
linked statically to avoid conflicting with shared libcrypto from the
base OS pulled in via dependencies.

Passes all tests, and run tested on amd64.

Comments/OK?


Index: Makefile
===
RCS file: /cvs/ports/sysutils/borgbackup/2.0/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Sep 2023 17:59:47 -  1.14
+++ Makefile11 Sep 2023 19:34:04 -
@@ -4,11 +4,11 @@ USE_NOEXECONLY=   Yes
 .endif
 
 MODPY_EGG_VERSION =2.0.0b6
-REVISION = 2
+REVISION = 3
 
 # OpenSSL used for EVP_aes_256_ocb. It is linked statically to avoid 
conflicting
 # with shared libcrypto from the base OS pulled in via dependencies.
-BUILD_DEPENDS =security/openssl/1.1
+BUILD_DEPENDS =security/openssl/3.0
 RUN_DEPENDS =  security/py-argon2-cffi${MODPY_FLAVOR} \
sysutils/py-platformdirs${MODPY_FLAVOR}>=3.8.1
 
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-setup_py  11 Sep 2023 19:34:04 -
@@ -0,0 +1,14 @@
+Index: setup.py
+--- setup.py.orig
 setup.py
+@@ -161,8 +161,8 @@ if not on_rtd:
+ # Use openssl (not libressl) because we need AES-OCB via EVP api. Link
+ # it statically to avoid conflicting with shared libcrypto from the 
base
+ # OS pulled in via dependencies.
+-crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl11"]}
+-crypto_extra_objects += ["/usr/local/lib/eopenssl11/libcrypto.a"]
++crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl30"]}
++crypto_extra_objects += ["/usr/local/lib/eopenssl30/libcrypto.a"]
+ else:
+ crypto_ext_lib = lib_ext_kwargs(pc, "BORG_OPENSSL_PREFIX", "crypto", 
"libcrypto", ">=1.1.1")
+

Re: REMOVE sysutils/borgbackup/1.1

2023-09-08 Thread Bjorn Ketelaars

On Fri 08/09/2023 22:30, Daniel Jakots wrote:
> On Fri, 8 Sep 2023 16:04:19 +0200, Bjorn Ketelaars 
> wrote:
> 
> > It probably makes sense to remove the 1.1 branch of borgbackup as
> > upstream considers it EOL [0]. As a result, a recent security fix
> > (CVE-2023-36811) has not been made available for 1.1.x.
> > The 1.2 branch, which we have in ports, is actively maintained, and
> > upgrading from 1.1.x to 1.2.x is possible [1].
> 
> Thanks for raising this issue!
> 
> > Diff below removes the 1.1 branch and adds @pkgpath markers to the
> > PLIST of 1.2. With this I'm able to 'pkg_add -u' cleanly from
> > borgbackup-1.1.18 to borgbackup-1.2.6.
> 
> Is that the right thing to do though? Checking the upgrade notes,
> there's a couple of commands to run, and things to check.
> 
> I'm afraid if we provide an update path to borgbackup-1.2, people will
> not notice the silent upgrade, and their backups may consequently be
> broken.
> Not a big issue since I'm sure everyone does monthly 'restore attempt'
> to ensure the backup validity, right (:
> 
> Either way, adding a current.html entry with the upgrade notes would be
> quite useful I think. (At least, I appreciated having them in your
> email!)

An addition to current.html makes sense. Do you think the bit below
suffices?


Index: current.html
===
RCS file: /cvs/www/faq/current.html,v
retrieving revision 1.1108
diff -u -p -r1.1108 current.html
--- current.html9 Sep 2023 05:47:12 -   1.1108
+++ current.html9 Sep 2023 06:18:08 -
@@ -175,6 +175,20 @@ please do the following BEFORE starting 
 
 
 
+2023/09/09 - [packages] sysutils/borgbackup/1.1 removal
+
+
+The 1.1 branch of borgbackup is end-of-life, and has been removed from
+ports. Upgrading packages using pkg_add -u will result in
+borgbackup-1.1.8 to be replaced by a release from the 1.2 branch, 
which
+at this time is borgbackup-1.2.6.
+
+
+Before upgrading it is recommended to follow the https://github.com/borgbackup/borg/blob/1.2.6/docs/changes.rst#upgrade-notes";>upgrade
+notes.
+
+

REMOVE sysutils/borgbackup/1.1

2023-09-08 Thread Bjorn Ketelaars

It probably makes sense to remove the 1.1 branch of borgbackup as
upstream considers it EOL [0]. As a result, a recent security fix
(CVE-2023-36811) has not been made available for 1.1.x.
The 1.2 branch, which we have in ports, is actively maintained, and
upgrading from 1.1.x to 1.2.x is possible [1].

Diff below removes the 1.1 branch and adds @pkgpath markers to the PLIST
of 1.2. With this I'm able to 'pkg_add -u' cleanly from
borgbackup-1.1.18 to borgbackup-1.2.6.

Comments/OK?

[0] https://mail.python.org/pipermail/borgbackup/2023q3/002292.html
[1] 
https://github.com/borgbackup/borg/blob/1.2.6/docs/changes.rst#borg-11x-to-12x


Index: Makefile
===
RCS file: /cvs/ports/sysutils/borgbackup/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile27 Jan 2023 20:30:26 -  1.46
+++ Makefile8 Sep 2023 13:50:40 -
@@ -1,5 +1,4 @@
 SUBDIR =
-SUBDIR += 1.1
 SUBDIR += 1.2
 SUBDIR += 2.0
 
Index: 1.1/Makefile
===
RCS file: 1.1/Makefile
diff -N 1.1/Makefile
--- 1.1/Makefile1 May 2023 15:54:38 -   1.10
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-PORTROACH =limit:^1\.1\.
-
-MODPY_EGG_VERSION =1.1.18
-REVISION = 4
-
-WANTLIB =  ${COMPILER_LIBCXX} b2 crypto m
-
-LIB_DEPENDS =  security/libb2
-
-# same cherry-pick as in net/py-msgpack (used by borg 1.2.x), see details in
-# https://github.com/borgbackup/borg/pull/6149#issuecomment-1335632116 ff.
-MASTER_SITES0 =https://github.com/borgbackup/borg/
-# merged "fix msgpack runtime on big-endian OpenBSD/sparc64"
-# https://github.com/borgbackup/borg/pull/7181
-PATCHFILES =   ${PKGSTEM}-msgpack-fix-big-endian-{pull/}7181.patch:0
-PATCH_DIST_STRIP = -p1
-
-# Address formatting issue with borg.1
-USE_GROFF =Yes
-
-.include 
Index: 1.1/distinfo
===
RCS file: 1.1/distinfo
diff -N 1.1/distinfo
--- 1.1/distinfo4 Dec 2022 18:08:41 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-SHA256 (borgbackup-1.1.18.tar.gz) = 
XLpf59tNCJRLRn7BHvwBdoelErDZjM8K0aqcQylmUnU=
-SHA256 (borgbackup-msgpack-fix-big-endian-7181.patch) = 
li9NhN0ARAsKffKO7Umhe+MKoo4uVcBcQOaAj+hpLo0=
-SIZE (borgbackup-1.1.18.tar.gz) = 3854385
-SIZE (borgbackup-msgpack-fix-big-endian-7181.patch) = 5633
Index: 1.1/pkg/DESCR
===
RCS file: 1.1/pkg/DESCR
diff -N 1.1/pkg/DESCR
--- 1.1/pkg/DESCR   23 Feb 2022 18:23:07 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,7 +0,0 @@
-BorgBackup (short: Borg) is a deduplicating backup program. Optionally, it
-supports compression and authenticated encryption.
-
-The main goal of Borg is to provide an efficient and secure way to backup data.
-The data deduplication technique used makes Borg suitable for daily backups
-since only changes are stored. The authenticated encryption technique makes it
-suitable for backups to not fully trusted targets.
Index: 1.1/pkg/PLIST
===
RCS file: 1.1/pkg/PLIST
diff -N 1.1/pkg/PLIST
--- 1.1/pkg/PLIST   10 Sep 2022 20:28:05 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,257 +0,0 @@
-@option is-branch
-@pkgpath sysutils/borgbackup
-bin/borg
-bin/borgfs
-lib/python${MODPY_VERSION}/site-packages/borg/
-lib/python${MODPY_VERSION}/site-packages/borg/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borg/__main__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}archiver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}archiver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}cac

Re: [update] samba-4.19.0

2023-09-06 Thread Bjorn Ketelaars

On Wed 06/09/2023 12:37, Jeremie Courreges-Anglas wrote:
> 
> Hi,
> 
> samba-4.19.0 has been released[0].  The question is whether we want to
> update now or to postpone the update to after 7.4 (should happen in
> october).  Per the samba release planning[1] samba-4.18 will be
> discontinued in 2024-09 so we're not in a hurry.  What do you folks
> think?  If you prefer to move to samba-4.19.0 before 7.4 then I'll
> obviously need test reports & oks.
> 
> [0] https://www.samba.org/samba/history/samba-4.19.0.html
> [1] https://wiki.samba.org/index.php/Samba_Release_Planning

Builds, and works for me on amd64 (tested as part of my home setup).

There are no exciting features/changes, and I agree that we are not in a
hurry. That said, I think it has some value to update now: There is
still time for (more) testing, and updating now will make it more easy
to backport fixes to future stable (7.4).

OK bket@

(+1 for updating now)

SECURITY UPDATE sysutils/borgbackup/1.2 to 1.2.5

2023-08-30 Thread Bjorn Ketelaars

Below a simple diff for bringing sysutils/borgbackup/1.2 to 1.2.5, which
fixes a flaw in the cryptographic authentication scheme in Borg allowing
an attacker to fake archives and potentially indirectly cause backup
data loss in the repository (CVE-2023-36811). Please note that this diff
also contains changes to devel/quirks.

https://github.com/borgbackup/borg/blob/1.2.5-cvedocs/docs/changes.rst#pre-125-archives-spoofing-vulnerability-cve-2023-36811
describes steps that must be taken to check/upgrade a repository.

Overview on changes:
https://github.com/borgbackup/borg/blob/1.2.5-cvedocs/docs/changes.rst#version-125-2023-08-30

Passes all tests on amd64. Run tested on amd64

I think it makes sense to update current as well.

OK to commit to -current and -stable?


diff --git devel/quirks/Makefile devel/quirks/Makefile
index a5075fcc435..815dcced1ab 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-6.140
+PKGNAME =  quirks-6.141
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index 96790d33884..e0677ecdb4d 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -2101,6 +2101,7 @@ my $cve = {
'security/sudo' => 'sudo-<1.8.31',
'shells/bash' => 'bash-<4.3.27',
'sysutils/ansible,-main' => 'ansible-<2.7.1',
+   'sysutils/borgbackup/1.2' => 'borgbackup-<1.2.5',
'sysutils/mcollective' => 'mcollective-<2.5.3',
'sysutils/rclone' => 'rclone-<1.53.3',
'sysutils/salt' => 'salt-<3002',
diff --git sysutils/borgbackup/1.2/Makefile sysutils/borgbackup/1.2/Makefile
index 257193414ef..8935ff064d9 100644
--- sysutils/borgbackup/1.2/Makefile
+++ sysutils/borgbackup/1.2/Makefile
@@ -1,4 +1,4 @@
-MODPY_EGG_VERSION =1.2.4
+MODPY_EGG_VERSION =1.2.5
 
 WANTLIB =  crypto
 
diff --git sysutils/borgbackup/1.2/distinfo sysutils/borgbackup/1.2/distinfo
index 63d310e016d..6d38753a245 100644
--- sysutils/borgbackup/1.2/distinfo
+++ sysutils/borgbackup/1.2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.2.4.tar.gz) = pL1U6UaegbejCmcRQjEVq8gY2c2ETsscoOYQS8U3Tag=
-SIZE (borgbackup-1.2.4.tar.gz) = 4056513
+SHA256 (borgbackup-1.2.5.tar.gz) = clgHeUWbpy6n59LiouvU83fEAyNt0OoUhgYDbktjGHY=
+SIZE (borgbackup-1.2.5.tar.gz) = 4074588

Re: [update] samba-4.18.6

2023-08-19 Thread Bjorn Ketelaars

On Sat 19/08/2023 16:26, Jeremie Courreges-Anglas wrote:
> 
> 
> Straightforward update to samba-4.18.6.
> Release notes: https://www.samba.org/samba/history/samba-4.18.6.html
> 
> Tests and oks welcome.

Diff looks good and run tested on amd64 (current). OK bket@

Re: rsync and xxhash are broken on strict alignment architectures

2023-08-16 Thread Bjorn Ketelaars

On Thu 17/08/2023 01:07, Stuart Henderson wrote:
> On 2023/08/16 23:55, Christian Weisgerber wrote:
> > Stuart Henderson:
> > 
> > > +-#  if defined(__GNUC__) && !(defined(__ARM_ARCH) && __ARM_ARCH < 7 && 
> > > defined(__ARM_FEATURE_UNALIGNED))
> > > ++#  if defined(__GNUC__) && !(defined(__ARM_ARCH) && __ARM_ARCH < 7 && 
> > > defined(__ARM_FEATURE_UNALIGNED)) && !defined(__sparc64__)
> > 
> > This should include  and check __STRICT_ALIGNMENT rather than
> > hardcoding architectures.
> 
> ...which would look something like the diff below (trying to keep the
> added #include so that it's only used in as few cases as possible).
> 
> No idea if this is actually needed on other strict alignment archs
> though, it does sound like upstream weren't expecting this to be broken...
> from 
> https://fastcompression.blogspot.com/2015/08/accessing-unaligned-memory.html
> it seems like setting to 1 may be mostly intended as a speed optimisation
> for armv7, and this ifdef intended to prevent it making things worse for
> armv6. But it's been a while, perhaps armv7 compilers are better by now,
> so maybe we're better off just disabling the #define XXH_FORCE_MEMORY_ACCESS 
> 1.
> 
> I don't have any affected hw to test with.

No objections here, OK bket@

Re: [update] security/vaultwarden to 1.29.1

2023-08-08 Thread Bjorn Ketelaars

On Tue 08/08/2023 23:16, aisha wrote:
> Hi,
>   Trivial update for vaultwarden from 1.29.0 to 1.29.1
> 
> Impactful change:
>   Fix Org API Key generation on PosgreSQL by @BlackDex in #3678
> 
> Full changelog:
>   https://github.com/dani-garcia/vaultwarden/releases/tag/1.29.1
> 
> OK?

Run tested on amd64. OK bket@

Re: [SECURITY] samba-4.18.5

2023-07-19 Thread Bjorn Ketelaars

On Wed 19/07/2023 22:11, Jeremie Courreges-Anglas wrote:
> 
> 
> Same as for -stable, only build-tested.
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.18.5.html
> 
> Tests and oks welcome.

Build- and run-tested as part of my installation at home. OK bket@

Re: [SECURITY] samba-4.17.10

2023-07-19 Thread Bjorn Ketelaars

On Wed 19/07/2023 22:15, Jeremie Courreges-Anglas wrote:
> On Wed, Jul 19 2023, Jeremie Courreges-Anglas  wrote:
> > Security update published today, some problems in winbind, SMB2 packet
> > signing.  As far as I know we don't ship spotlight support.
> >
> > Release notes:
> > https://www.samba.org/samba/history/samba-4.17.10.html
> >
> > Tests and oks welcome!
> 
> volker@ noted that I had extra files in distinfo, thanks!
> Here's a cleaner diff.

Diff looks good, and build- and lightly run-tested using vmd on amd64.

OK bket@

Re: [update] security/vaultwarden - update to 1.29.0 - needs testing

2023-07-16 Thread Bjorn Ketelaars

On Sun 16/07/2023 18:04, aisha wrote:
> Hi,
>   I've attached an update for security/vaultwarden (1.29.0) + 
> www/vaultwarden-web (to 2023.5.0).
> It needs some vendored files again, so have made a small dependency tarball 
> as well and attached the patch.
> 
> It could do with some testing as there have been a couple of major changes 
> around notification + websockets stuff.
> Full changelog - 
> https://github.com/dani-garcia/vaultwarden/releases/tag/1.29.0
> >  Major changes and New Features
> >
> >WebSocket notifications now work via the default HTTP port. No need for 
> > WEBSOCKET_ENABLED and a separate port anymore.
> >The proxy examples still need to be updated for this. Support for the 
> > old websockets port 3012 will remain for the time being.
> >Mobile Client push notification support, see #3304 thanks @GeekCornerGH!
> >Web-Vault updated to v2023.5.0 (v2023.5.1 does not add any improvements 
> > for us)
> >The latest Bitwarden Directory Connector can be used now (v2022.11.0)
> >Storing passkeys is supported, though the clients are not yet released. 
> > So, it might be we need to make some changes once they are released.
> >See: #3593, thanks @GeekCornerGH!

Builds and works for me. Tested with several clients.

OK bket@

Re: UPDATE sysutils/py-platfromdirs-3.8.1

2023-07-07 Thread Bjorn Ketelaars

On Sat 08/07/2023 06:11, Bjorn Ketelaars wrote:
> Diff below updates py-platformdirs to 3.8.1, which addresses an issue
> with user_runtime_dir on OpenBSD. Changes:
> https://github.com/platformdirs/platformdirs/releases
> 
> This update is needed for sysutils/borgbackup-2.0.0b6 to pass all tests
> (without patching borg).

This should actually read: "This update is needed for
sysutils/borgbackup>2.0.0b6..."

UPDATE sysutils/py-platfromdirs-3.8.1

2023-07-07 Thread Bjorn Ketelaars

Diff below updates py-platformdirs to 3.8.1, which addresses an issue
with user_runtime_dir on OpenBSD. Changes:
https://github.com/platformdirs/platformdirs/releases

This update is needed for sysutils/borgbackup-2.0.0b6 to pass all tests
(without patching borg).

Comments/OK?


diff --git Makefile Makefile
index 81c1b7a38a1..52e392f52a1 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
 COMMENT=   determine appropriate platform-specific directories
 
-MODPY_EGG_VERSION= 3.7.0
+MODPY_EGG_VERSION= 3.8.1
 DISTNAME=  platformdirs-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 
diff --git distinfo distinfo
index c5413eb4d35..1b1a67cb5dc 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (platformdirs-3.7.0.tar.gz) = 
h/v2Rz6HwHjVNpgLqXCkckIulPF7dSz60XAkwYh21IE=
-SIZE (platformdirs-3.7.0.tar.gz) = 18322
+SHA256 (platformdirs-3.8.1.tar.gz) = 
+Hyk/P99Kw+BxqdIp3lz168PTVJvmPMIR3w8Q2x01Sg=
+SIZE (platformdirs-3.8.1.tar.gz) = 18533
diff --git patches/patch-tests_test_unix_py patches/patch-tests_test_unix_py
new file mode 100644
index 000..31de31dec1d
--- /dev/null
+++ patches/patch-tests_test_unix_py
@@ -0,0 +1,14 @@
+Fix failing test.
+
+Index: tests/test_unix.py
+--- tests/test_unix.py.orig
 tests/test_unix.py
+@@ -94,7 +94,7 @@ def _func_to_path(func: str) -> XDGVariable | None:
+ "user_cache_dir": XDGVariable("XDG_CACHE_HOME", "~/.cache"),
+ "user_state_dir": XDGVariable("XDG_STATE_HOME", "~/.local/state"),
+ "user_log_dir": XDGVariable("XDG_STATE_HOME", "~/.local/state"),
+-"user_runtime_dir": XDGVariable("XDG_RUNTIME_DIR", "/run/user/1234"),
++"user_runtime_dir": XDGVariable("XDG_RUNTIME_DIR", 
"/tmp/runtime-1234"),
+ }
+ return mapping.get(func)
+

Re: [update] samba-4.18.4 (was: Re: [update] samba-4.18.3)

2023-07-05 Thread Bjorn Ketelaars

On Wed 05/07/2023 14:51, Jeremie Courreges-Anglas wrote:
> On Wed, Jul 05 2023, Jeremie Courreges-Anglas  wrote:
> > Here's an update to samba-4.18.3 and required talloc/tdb versions.
> > I expect us to follow the 4.18 series for OpenBSD 7.4.
> >
> > Release announcements:
> > https://www.samba.org/samba/history/samba-4.18.0.html
> > https://www.samba.org/samba/history/samba-4.18.1.html
> > https://www.samba.org/samba/history/samba-4.18.2.html
> > https://www.samba.org/samba/history/samba-4.18.3.html
> 
> and https://www.samba.org/samba/history/samba-4.18.4.html
> 
> > This includes the addition of libarchive as a dep for smbclient.
> >
> > Tests and oks welcome.
> 
> New diff that updates to samba-4.18.4 - released today - and discards an
> unwarranted change in devel/libtalloc/pkg.

Diff looks good, build- and run-tested on amd64.

OK bket@

Re: [update] add desktop file to net/unison

2023-06-06 Thread Bjorn Ketelaars

On Tue 06/06/2023 23:38, Joel Carnat wrote:
> Hello,
> 
> I have seen that Unison does not have a launch icon in my XFCE whisker menu.
> Looking at https://github.com/bcpierce00/unison/issues/162, a PR has been
> submitted in 2018 but it is still opened and unresolved.
> 
> Using the unison.desktop file from ArchLinux, this patch adds the file to
> the OpenBSD port. Not sure if it's the proper way to do it but I use the
> patch feature to create the unison.desktop from NULL.
> 
> Attached is the patch to create the unison.desktop and the cvs diff to the
> port.

Some comments:
- REVISION starts at 0
- !no_x11 flavor has a run dependency on devel/desktop-file-utils
- Instead of creating unison.desktop from NULL just have it in
  ${FILESDIR}
- !no_x11 flavor specific bits should be placed in PFRAG.no-no_x11

Could you check if the diff below works for you?


diff --git Makefile Makefile
index 0fa4c136fc1..9cd720972b8 100644
--- Makefile
+++ Makefile
@@ -8,6 +8,7 @@ COMMENT =   multi-platform file synchronization tool
 GH_ACCOUNT =   bcpierce00
 GH_PROJECT =   unison
 GH_TAGNAME =   v2.53.3
+REVISION = 0
 
 CATEGORIES =   net
 
@@ -39,6 +40,7 @@ WANTLIB +=gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 
gtk-3 harfbuzz
 WANTLIB += intl pango-1.0 pangocairo-1.0
 BUILD_DEPENDS +=   x11/lablgtk3
 LIB_DEPENDS += x11/gtk+3
+RUN_DEPENDS += devel/desktop-file-utils
 MAKE_FLAGS +=  UISTYLE=gtk3
 .endif
 
@@ -55,5 +57,13 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/man/unison.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison
@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison
+.if !${FLAVOR:Mno_x11}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+   ${INSTALL_DATA} ${WRKSRC}/icons/U.svg \
+   ${PREFIX}/share/pixmaps/unison.svg
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+   ${INSTALL_DATA} ${FILESDIR}/unison.desktop \
+   ${PREFIX}/share/applications/
+.endif
 
 .include 
diff --git files/unison.desktop files/unison.desktop
new file mode 100644
index 000..af64ef6617c
--- /dev/null
+++ files/unison.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Comment=File synchronisation tool for X11
+TryExec=unison
+Exec=unison
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison
+StartupNotify=true
diff --git pkg/PFRAG.no-no_x11 pkg/PFRAG.no-no_x11
new file mode 100644
index 000..a8d2b57156d
--- /dev/null
+++ pkg/PFRAG.no-no_x11
@@ -0,0 +1,4 @@
+share/applications/unison.desktop
+share/pixmaps/
+share/pixmaps/unison.svg
+@tag update-desktop-database
diff --git pkg/PLIST pkg/PLIST
index c8a7e9ab292..4b3d8d144fa 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -10,3 +10,4 @@ share/doc/pkg-readmes/${PKGSTEM}
 share/doc/unison/
 share/doc/unison/NEWS.md
 share/doc/unison/README.md
+!%%no_x11%%

Re: update: spectrwm-3.4.1.20230507

2023-05-07 Thread Bjorn Ketelaars

On Sun 07/05/2023 11:16, Gleydson Soares wrote:
> update spectrwm to latest commit which includes a fix that addresses a
> crash found hardway while running ssh-askpass(1):
> 
> - Fix possible crash when a window claims to be transient for itself. 

Thanks for pursuing this!

OK bket@

Re: man borg - unexpected output with borgbackup-1.1.18p3

2023-04-29 Thread Bjorn Ketelaars

On Sat 29/04/2023 08:21, Mikolaj Kucharski wrote:
> Hi,
> 
> I just wanted to have a quick look at `man borg` and it doesn't look
> right.
> 
> Do you guys see the same?

Yes, think so. Manual page is displayed with markup language.

I'm not familiar with the language and not sure if the attached patch is
the right solution. At least with this patch 'man borg' looks good.

Hopefully someone - with more knowledge on manpages - chimes in.


diff --git Makefile Makefile
index 2bf9cd961fa..3ce565536c1 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 PORTROACH =limit:^1\.1\.
 
 MODPY_EGG_VERSION =1.1.18
-REVISION = 3
+REVISION = 4
 
 WANTLIB =  ${COMPILER_LIBCXX} b2 crypto m
 
diff --git patches/patch-docs_man_borg_1 patches/patch-docs_man_borg_1
new file mode 100644
index 000..2bfdc8ebd57
--- /dev/null
+++ patches/patch-docs_man_borg_1
@@ -0,0 +1,157 @@
+Index: docs/man/borg.1
+--- docs/man/borg.1.orig
 docs/man/borg.1
+@@ -27,29 +27,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-lev
+ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+ .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+ ..
+-.TH ""  "" "" ""
++.TH "BORG" 1 "2023-03-22" "" "borg backup tool"
+ .SH NAME
+- \- 
+-.SH BORG
+-.SS deduplicating and encrypting backup tool
+-.INDENT 0.0
+-.TP
+-.B Author
+-The Borg Collective
+-.TP
+-.B Date
+-2017\-02\-05
+-.TP
+-.B Manual section
+-1
+-.TP
+-.B Manual group
+-borg backup tool
+-.UNINDENT
+-.SS SYNOPSIS
++borg \- deduplicating and encrypting backup tool
++.SH SYNOPSIS
+ .sp
+ borg [common options]  [options] [arguments]
+-.SS DESCRIPTION
++.SH DESCRIPTION
+ .\" we don't include the README.rst here since we want to keep this terse.
+ .
+ .sp
+@@ -66,8 +50,8 @@ Borg stores a set of files in an \fIarchive\fP\&. A \f
+ of \fIarchives\fP\&. The format of repositories is Borg\-specific. Borg does 
not
+ distinguish archives from each other in any way other than their name,
+ it does not matter when or where archives were created (e.g. different hosts).
+-.SS EXAMPLES
+-.SS A step\-by\-step example
++.SH EXAMPLES
++.SH A step\-by\-step example
+ .INDENT 0.0
+ .IP 1. 3
+ Before a backup can be made a repository has to be initialized:
+@@ -201,8 +185,8 @@ reports during command execution.  You can also add th
+ get other informational messages.
+ .UNINDENT
+ .UNINDENT
+-.SS NOTES
+-.SS Positional Arguments and Options: Order matters
++.SH NOTES
++.SH Positional Arguments and Options: Order matters
+ .sp
+ Borg only supports taking options (\fB\-s\fP and \fB\-\-progress\fP in the 
example)
+ to the left or right of all positional arguments (\fBrepo::archive\fP and 
\fBpath\fP
+@@ -222,7 +206,7 @@ borg create repo::archive \-s \-\-progress path  # BAD
+ .UNINDENT
+ .sp
+ This is due to a problem in the argparse module: 
\fI\%https://bugs.python.org/issue15112\fP
+-.SS Repository URLs
++.SH Repository URLs
+ .sp
+ \fBLocal filesystem\fP (or locally mounted network filesystem):
+ .sp
+@@ -278,7 +262,7 @@ to use the default \- it will be read from BORG_REPO t
+ .sp
+ Use \fB::\fP syntax to give the repo URL when syntax requires giving a 
positional
+ argument for the repo (e.g. \fBborg mount :: /mnt\fP).
+-.SS Repository / Archive Locations
++.SH Repository / Archive Locations
+ .sp
+ Many commands want either a repository (just give the repo URL, see above) or
+ an archive location, which is a repo URL followed by \fB::archive_name\fP\&.
+@@ -290,7 +274,7 @@ name).
+ .sp
+ If you have set BORG_REPO (see above) and an archive location is needed, use
+ \fB::archive_name\fP \- the repo URL part is then read from BORG_REPO.
+-.SS Logging
++.SH Logging
+ .sp
+ Borg writes all log output to stderr by default. But please note that 
something
+ showing up on stderr does \fInot\fP indicate an error condition just because 
it is
+@@ -343,7 +327,7 @@ Options \fB\-\-critical\fP and \fB\-\-error\fP are pro
+ their usage is not recommended as you might miss important information.
+ .UNINDENT
+ .UNINDENT
+-.SS Return codes
++.SH Return codes
+ .sp
+ Borg can exit with the following return codes (rc):
+ .TS
+@@ -386,7 +370,7 @@ _
+ .sp
+ If you use \fB\-\-show\-rc\fP, the return code is also logged at the indicated
+ level as the last log entry.
+-.SS Environment Variables
++.SH Environment Variables
+ .sp
+ Borg uses some environment variables for automation:
+ .INDENT 0.0
+@@ -597,7 +581,7 @@ Be very careful when using the "yes" sayers, the warni
+ Also be very careful when putting your passphrase into a script, make sure it 
has appropriate file permissions (e.g.
+ mode 600, root:root).
+ .UNINDENT
+-.SS File systems
++.SH File systems
+ .sp
+ We strongly recommend against using Borg (or any other database\-like
+ software) on non\-journaling file systems like FAT, since it is not
+@@ -630,14 +614,14 @@ Hardlinks are needed for \fIborg_upgrade\fP (if \fB\-\
+ Also hardlinks are used for more safe and secure file updating (e.g. of the 
repo
+ confi

UPDATE news/sabnzbd-4.0.0

2023-04-28 Thread Bjorn Ketelaars

SABnzbd-4.0.0 has been released, which is a major update that optimized
a core part of the SSL handling, resulting in large performance
increases when downloading from news servers with SSL enabled. In
addition, the general connection handling was improved, resulting in
performance improvements for all news servers. Overview on changes can
be found at https://github.com/sabnzbd/sabnzbd/releases/tag/4.0.0.

This update depends on py-sabctools that has been send in a separate
mail to ports@.

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 898f5f05211..69b98278126 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,6 @@
 COMMENT =  retrieve and process nzb-files via web interface
 
-VERSION =  3.7.2
-REVISION = 1
+VERSION =  4.0.0
 DISTNAME = SABnzbd-${VERSION}
 PKGNAME =  sabnzbd-${VERSION}
 
@@ -18,35 +17,45 @@ MASTER_SITES =  
https://github.com/sabnzbd/sabnzbd/releases/download/${VERSION}
 EXTRACT_SUFX = -src.tar.gz
 
 MODULES =  lang/python
-# XXX broken, needs pyfakefs, pytest-httpserver, tavern and tavalidate (not in
-# ports)
-MODPY_PYTEST = Yes
 
 BUILD_DEPENDS =${_MODPY_BUILD_DEPENDS}
 RUN_DEPENDS =  archivers/par2cmdline \
archivers/unrar \
archivers/unzip \
-   devel/py-cheetah${MODPY_FLAVOR}>=3.0.0 \
+   devel/py-cffi${MODPY_FLAVOR} \
+   devel/py-cheetah${MODPY_FLAVOR} \
devel/py-configobj${MODPY_FLAVOR} \
+   devel/py-cparser${MODPY_FLAVOR} \
+   devel/py-dateutil${MODPY_FLAVOR} \
+   devel/py-jaraco-classes${MODPY_FLAVOR} \
+   devel/py-jaraco-collections${MODPY_FLAVOR} \
+   devel/py-jaraco-context${MODPY_FLAVOR} \
+   devel/py-jaraco-functools${MODPY_FLAVOR} \
+   devel/py-more-itertools${MODPY_FLAVOR} \
devel/py-puremagic${MODPY_FLAVOR} \
+   devel/py-six${MODPY_FLAVOR} \
+   devel/py-tempora${MODPY_FLAVOR} \
+   devel/py-tz${MODPY_FLAVOR} \
+   devel/py-zc-lockfile${MODPY_FLAVOR} \
+   misc/py-babelfish${MODPY_FLAVOR} \
multimedia/py-guessit${MODPY_FLAVOR} \
net/py-portend${MODPY_FLAVOR} \
net/py-socks${MODPY_FLAVOR} \
-   news/py-sabyenc${MODPY_FLAVOR}>=5.4.4v0 \
+   news/py-sabctools${MODPY_FLAVOR} \
security/py-cryptography${MODPY_FLAVOR} \
textproc/py-chardet${MODPY_FLAVOR} \
textproc/py-feedparser${MODPY_FLAVOR} \
+   textproc/py-jaraco-text${MODPY_FLAVOR} \
+   textproc/py-rebulk${MODPY_FLAVOR} \
www/py-CherryPy${MODPY_FLAVOR} \
www/py-cheroot${MODPY_FLAVOR}
-TEST_DEPENDS = devel/py-flaky${MODPY_FLAVOR} \
-   devel/py-test-httpbin${MODPY_FLAVOR} \
-   textproc/py-lxml${MODPY_FLAVOR} \
-   textproc/py-xmltodict${MODPY_FLAVOR} \
-   www/py-requests${MODPY_FLAVOR} \
-   www/py-selenium${MODPY_FLAVOR}
 
 NO_BUILD = Yes
 
+# XXX broken, needs pyfakefs, pytest-httpserver, tavern and tavalidate (not in
+# ports)
+NO_TEST =  Yes
+
 do-install:
${INSTALL_DATA_DIR} \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/sabnzbd
diff --git distinfo distinfo
index 7431007c045..fc455af4916 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-3.7.2-src.tar.gz) = 
ASUOzQnNtQ2ovogp5PRPM/C/G88fz/E2rWBF5fSioXI=
-SIZE (SABnzbd-3.7.2-src.tar.gz) = 5108729
+SHA256 (SABnzbd-4.0.0-src.tar.gz) = 
MuYHOiONJXR++GkZ/wgEclz1ndvPq2DIEuIcmYzi7XE=
+SIZE (SABnzbd-4.0.0-src.tar.gz) = 5079964

NEW news/py-sabctools-7.0.1

2023-04-28 Thread Bjorn Ketelaars

Enclosed is a port for py-sabctools, which is needed for an update of
news/sabnzbd.

DESCR
-
This module implements several sets of C implementations that are used
within SABnzbd:
- yEnc decoding and encoding using SIMD routines
- CRC32 calculations
- Non-blocking SSL-socket reading
- Marking files as sparse


py-sabctools actually is a rename of py-sabyenc, which is already in
ports. Assuming that someone given an OK to import this, plan is to move
news/py-sabyenc to the attic and register the rename in quirks.

OK for importing this?


py-sabctools.tgz
Description: application/tar-gz

Re: samba share and nobody user (was: Re: [SECURITY UPDATE] samba-4.17.7)

2023-04-24 Thread Bjorn Ketelaars

On Mon 24/04/2023 18:27, kasak wrote:
> 
> 24.04.2023 16:34, Bjorn Ketelaars пишет:
> > On Mon 24/04/2023 10:09, kasak wrote:
> > > i'm sorry for the noise, but samba package in openbsd has some bug since 
> > > 7.2
> > > 
> > > It erroneously map "nobody" as a homes share when it should not.
> > I remember replying to a mail from you on misc@ a couple of months ago
> > on the same (?) topic [0].
> You are right, and since then I made some research to prove my point!

During your research, did you use the exact same smb.conf on the
different samba hosts? And the outcome is that samba on OpenBSD is the
odd one out?

Are there details that you can share?

> > > I have many other samba hosts, and I often use [homes] special share, but 
> > > it
> > > never map "nobody" as a home share.
> > Unfortunately I do not have experience with "other smaba hosts", and
> > cannot comment on them. Is it possible that samba on these hosts has
> > been compiled using other compile time options than on OpenBSD?
> > 
> > [0] https://marc.info/?l=openbsd-misc&m=166676711319993&w=2
> 
> I can speak for all rpm based distros, for arch and for freebsd, no one of
> them maps nobody as a homes share.
> 
> And i've tried to figure out what's gone wrong and failed :( that's why i'm
> posting here, searching for help.

Did you compare the samba port for, e.g., FreeBSD [0] with that of
OpenBSD [1]? Are there options that catch your eye?

[0] https://github.com/freebsd/freebsd-ports/tree/main/net/samba416
[1] https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/samba/

samba share and nobody user (was: Re: [SECURITY UPDATE] samba-4.17.7)

2023-04-24 Thread Bjorn Ketelaars

On Mon 24/04/2023 10:09, kasak wrote:
> i'm sorry for the noise, but samba package in openbsd has some bug since 7.2
> 
> It erroneously map "nobody" as a homes share when it should not.

I remember replying to a mail from you on misc@ a couple of months ago
on the same (?) topic [0].

> I have many other samba hosts, and I often use [homes] special share, but it
> never map "nobody" as a home share.

Unfortunately I do not have experience with "other smaba hosts", and
cannot comment on them. Is it possible that samba on these hosts has
been compiled using other compile time options than on OpenBSD?

[0] https://marc.info/?l=openbsd-misc&m=166676711319993&w=2

Re: [SECURITY UPDATE] samba-4.17.7

2023-04-23 Thread Bjorn Ketelaars

On Sun 23/04/2023 22:24, Jeremie Courreges-Anglas wrote:
> 
> This diff is valid for both -stable and -current.  The 4.17.7 release
> was intended to be a security release, but two CVEs affect the AD DC
> server which we don't build, the third CVE (CVE-2023-0922) affects
> samba-tool.  I guess some people may use samba-tool on OpenBSD, though
> I haven't tested joining a domain with samba-tool recently.
> 
> https://www.samba.org/samba/security/CVE-2023-0225.html
> https://www.samba.org/samba/security/CVE-2023-0922.html
> https://www.samba.org/samba/security/CVE-2023-0614.html
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.17.7.html
> 
> Packaging-wise, libldb gets new symbols so it gets a minor bump.  Not
> relevant as far as the ports tree is concerned, there are no consumers
> of libldb in ports.
> 
> Tests and oks welcome.

Run tested on amd64 current. Works for me.

OK bket@

UPDATE x11/spectrwm to HEAD

2023-04-23 Thread Bjorn Ketelaars

Upstream of spectrwm has not released an update for over more than 2
years, but has fixed numerous issues, and added useful features. Because
of these fixes/additions our port was moved to HEAD in December of 2022.
Proposal is to once more update to HEAD. Relevant changes:
- efc458e Cleanup some extra debug.
- be32ce1 Escape backslashes correctly in manual page
- 049b3db Improve max layout window mapping.
- 9e3d6e0 Fix input focus should fallback to the region window, when
  possible.
- 5279e61 Fix follow mode focus issues.
- 26ba631 Update html manual.
- 67e16a1 Improve window floating geometry handling.
- 0d79be6 Update spectrwm_fr.conf
- 95c5325 Add stack modes and window states to manpage
- 1d4b3be Add details to the `modkey` option entry in man page.
- a16904c Improve font loading.
- 9a8989d Passively handle `REPLAY` button bindings when X Input
  Extension >= 2.1.
- 1bb6063 Improve focus, mapping, stacking, and restart handling.
- d94906b Improve pointer event flushing.
- cd55588 Workaround application issues related to ICCCM 6.3 button
  grabs.
- 61c9356 Fix _NET_DESKTOP_VIEWPORT should update on workspace and
  region changes.
- 987b2ff Fix `bar_action` piping deadlock issue.
- c3251db Fix man page `wmctrl(1)` examples.
- b08ee2b Fix `name_workspace` should clear on empty string.
- c7bc651 Add missing code point ranges to `bar_font_pua`.
- 092796f Fix `focus_main` issue with iconified/floating windows.

I have been using this as my daily driver.

Comments/OK?


diff --git Makefile Makefile
index 41599e4a5b5..ba6fbafe1bd 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,8 @@ COMMENT=small tiling window manager
 
 GH_ACCOUNT=conformal
 GH_PROJECT=spectrwm
-GH_COMMIT= 5b7298872e00aa23ba9fe7eb9a219296a98760ac
-DISTNAME=  ${GH_PROJECT}-3.4.1.20211013
+GH_COMMIT= efc458efa5730680a5ff3805f6cf9d88dc88748b
+DISTNAME=  ${GH_PROJECT}-3.4.1.20230310
 
 SHARED_LIBS=   swmhack 1.0
 
diff --git distinfo distinfo
index 5d1bfc6a059..6323c9aba13 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-3.4.1.20211013-5b729887.tar.gz) = 
dNCIMq7eexETAgJ/k9FeFE4Q4i10Kc9/EAEAMpLjLTQ=
-SIZE (spectrwm-3.4.1.20211013-5b729887.tar.gz) = 161707
+SHA256 (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 
8hjhkgcC+mA+PlGZxDIRmNXAOMMWLPLCtPuGlF2ghyw=
+SIZE (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 172141
diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
index 44a875e3cb1..c6b86658164 100644
--- patches/patch-spectrwm_c
+++ patches/patch-spectrwm_c
@@ -1,9 +1,7 @@
-Let spectrwm quit when X dies. Taken from 
https://github.com/conformal/spectrwm/pull/478
-
 Index: spectrwm.c
 --- spectrwm.c.orig
 +++ spectrwm.c
-@@ -332,7 +332,7 @@ uint32_t   swm_debug = 0
+@@ -331,7 +331,7 @@ uint32_t   swm_debug = 0
  #define SWM_CONF_KEYMAPPING   (1)
  
  #ifndef SWM_LIB
@@ -12,13 +10,3 @@ Index: spectrwm.c
  #endif
  
  char  **start_argv;
-@@ -13931,6 +13931,9 @@ main(int argc, char *argv[])
-   restart(NULL, NULL, NULL);
- 
-   if (!running)
-+  goto done;
-+
-+  if(xcb_connection_has_error(conn))
-   goto done;
- 
-   if (stdin_ready) {

UPDATE www/nginx-1.24.0

2023-04-16 Thread Bjorn Ketelaars

Diff below updates nginx to 1.24.0, which is the latest stable release.
Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.

Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
headers-more-nginx-module to a newer version because nginx >1.23.0
changed handling of multiple headers. Added 2 patches for
lua-nginx-module because of the header change.

Lightly run test, with a simple config, on am64.

Comments/OK?


diff --git Makefile Makefile
index cc6eed8f6ff..fb79699f981 100644
--- Makefile
+++ Makefile
@@ -15,7 +15,7 @@ COMMENT-passenger=nginx passenger (ruby/python/nodejs) 
integration module
 COMMENT-rtmp=  nginx module for RTMP streaming
 COMMENT-securelink=nginx HMAC secure link module
 
-VERSION=   1.22.0
+VERSION=   1.24.0
 DISTNAME=  nginx-${VERSION}
 CATEGORIES=www
 
@@ -36,8 +36,6 @@ PKGNAME-passenger=nginx-passenger-${VERSION}
 PKGNAME-rtmp=  nginx-rtmp-${VERSION}
 PKGNAME-securelink=nginx-securelink-${VERSION}
 
-REVISION-main= 0
-
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
 MASTER_SITES=  https://nginx.org/download/
@@ -48,9 +46,9 @@ MASTER_SITES1=
https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=  \
-   openresty   headers-more-nginx-module   v0.33 \
+   openresty   headers-more-nginx-module   v0.34 \
openresty   lua-nginx-modulev0.10.11 \
-   nbs-system  naxsi   1.3 \
+   nbs-system  naxsi   
d714f1636ea49a9a9f4f06dba14aee003e970834 \
kvspb   nginx-auth-ldap 
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module   v${VERSION-rtmp} \
simpl   ngx_devel_kit   v0.3.0 \
@@ -81,7 +79,7 @@ COMPILER =base-clang ports-gcc base-gcc
 
 .include 
 
-WANTLIB-main=  c z pcre ssl crypto
+WANTLIB-main=  c crypto pcre2-8 ssl z
 WANTLIB-mailproxy=
 WANTLIB-stream=
 WANTLIB-image_filter=  gd
@@ -96,7 +94,7 @@ WANTLIB-perl= c m perl
 WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=crypto
 
-LIB_DEPENDS-main=  devel/pcre
+LIB_DEPENDS-main=  devel/pcre2
 LIB_DEPENDS-xslt=  textproc/libxml \
textproc/libxslt
 LIB_DEPENDS-image_filter=graphics/gd
@@ -182,7 +180,6 @@ CONFIGURE_ARGS+=--prefix=${NGINX_DIR} \
--with-stream=dynamic \
--with-stream_ssl_module \
--with-stream_ssl_preread_module \
-   --without-pcre2 \
--add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
--add-dynamic-module=${WRKSRC}/ngx_devel_kit \

--add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
diff --git distinfo distinfo
index 92e4cc852ed..f508a39a69d 100644
--- distinfo
+++ distinfo
@@ -1,18 +1,18 @@
-SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
+SHA256 (headers-more-nginx-module-v0.34.tar.gz) = 
DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
-SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
+SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 
2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
 SHA256 (nginx-1.20.1-chroot.patch) = 
SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
+SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
 SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
 SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = 
h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
 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=
-SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
+SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
-SIZE (naxsi-1.3.tar.gz) = 235626
+SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.22.0.tar.gz) = 1073322
+SIZE (nginx-1.24.0.tar.gz) = 1112471
 SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
 SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
 SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
diff --git patches/patch-lua-nginx-module_src_ngx_http_lua_headers_in_c 
patches/patch-lua-nginx-module_src_ngx_http_lua_headers

Re: UPDATE archivers/zstd-1.5.5

2023-04-04 Thread Bjorn Ketelaars

On Wed 05/04/2023 06:45, Stuart Henderson wrote:
> On 2023/04/05 06:47, Bjorn Ketelaars wrote:
> > ztsd-1.5.5 has been released. Primary focus is to correct a rare
> > corruption bug in high compression mode. Overview on changes can be
> > found at https://github.com/facebook/zstd/releases/tag/v1.5.5.
> > 
> > Bumped minor of libzstd because of additions of symbols. Dropped a patch
> > as it has been addressed upstream.
> > 
> > Build- and run-tested on amd64, 'make test' passes all tests, and build
> > tested several consumers.
> > 
> > Comments/OK?
> 
> OK. More info on the bug at https://github.com/facebook/zstd/pull/3517
> 
> Despite the rarity it probably makes sense to go to -stable (fortunately
> only a minor bump), do you agree?

Yes, this makes sense. I will prepare a diff for -stable.

UPDATE archivers/zstd-1.5.5

2023-04-04 Thread Bjorn Ketelaars

ztsd-1.5.5 has been released. Primary focus is to correct a rare
corruption bug in high compression mode. Overview on changes can be
found at https://github.com/facebook/zstd/releases/tag/v1.5.5.

Bumped minor of libzstd because of additions of symbols. Dropped a patch
as it has been addressed upstream.

Build- and run-tested on amd64, 'make test' passes all tests, and build
tested several consumers.

Comments/OK?


diff --git Makefile Makefile
index 519ca26f1c4..29bc6d41676 100644
--- Makefile
+++ Makefile
@@ -1,10 +1,9 @@
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.5.4
+V =1.5.5
 DISTNAME = zstd-${V}
-REVISION = 0
 
-SHARED_LIBS =  zstd6.2 # 1.5.4
+SHARED_LIBS =  zstd6.3 # 1.5.5
 
 CATEGORIES =   archivers
 
diff --git distinfo distinfo
index 84f5ab5dc76..bd76eb4b7f4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.4.tar.gz) = D0cJkq7a1UMSbQbvqzRNxfPhcYk4EEVXh9ODRzQ6RCQ=
-SIZE (zstd-1.5.4.tar.gz) = 2161536
+SHA256 (zstd-1.5.5.tar.gz) = nEOWzIKc+uMZpuJhUgLoKq1BNyBzSC/OKG+seGRtPuQ=
+SIZE (zstd-1.5.5.tar.gz) = 2368543
diff --git patches/patch-programs_fileio_c patches/patch-programs_fileio_c
deleted file mode 100644
index 47a6450c6a8..000
--- patches/patch-programs_fileio_c
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't crash on 'zstd /etc/motd' -- setvbuf isn't NULL safe.
-https://github.com/facebook/zstd/issues/3523
-
-Index: programs/fileio.c
 programs/fileio.c.orig
-+++ programs/fileio.c
-@@ -644,6 +644,7 @@ FIO_openDstFile(FIO_ctx_t* fCtx, FIO_prefs_t* const pr
- #endif
- if (f == NULL) {
- DISPLAYLEVEL(1, "zstd: %s: %s\n", dstFileName, strerror(errno));
-+return NULL;
- }
- /* An increased buffer size can provide a significant performance 
boost on some platforms.
-  * Note that providing a NULL buf with a size that's not 0 is not 
defined in ANSI C, but is defined

security/vaultwarden - change order of PLIST

2023-03-17 Thread Bjorn Ketelaars

Found that .env is not created in www/vaultwarden/data/ when installing
vaultwarden, which is caused by www/vaultwarden/data/ being created as
last step.

OK?


Index: Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile24 Feb 2023 22:14:17 -  1.19
+++ Makefile17 Mar 2023 18:35:04 -
@@ -8,7 +8,7 @@ COMMENT =   unofficial bitwarden compatib
 GH_ACCOUNT =   dani-garcia
 GH_PROJECT =   vaultwarden
 GH_TAGNAME =   1.27.0
-REVISION = 3
+REVISION = 4
 
 CATEGORIES =   security
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/vaultwarden/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   1 Jan 2023 23:03:29 -   1.4
+++ pkg/PLIST   17 Mar 2023 18:35:04 -
@@ -1,6 +1,13 @@
 @newgroup _vaultwarden:879
 @newuser _vaultwarden:879:879::Vaultwarden Daemon:/nonexistent:/sbin/nologin
 @rcscript ${RCDIR}/vaultwarden
+@mode 750
+@owner _vaultwarden
+@group _vaultwarden
+@sample ${VARBASE}/vaultwarden/data/
+@mode
+@owner
+@group
 @bin bin/vaultwarden
 share/doc/vaultwarden/
 share/doc/vaultwarden/.env.template
@@ -8,5 +15,3 @@ share/doc/vaultwarden/.env.template
 @owner _vaultwarden
 @group _vaultwarden
 @sample ${VARBASE}/vaultwarden/.env
-@mode 750
-@sample ${VARBASE}/vaultwarden/data/

Re: [update] samba-4.17.6

2023-03-14 Thread Bjorn Ketelaars

On Tue 14/03/2023 13:37, Jeremie Courreges-Anglas wrote:
> 
> No configure/PLIST/shared libs symbols change.
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.17.6.html
> 
> Tests and oks welcome.

Build- and run tested on amd64.

OK bket@

Re: UPDATE {audio,meta}/audacious-4.3

2023-03-07 Thread Bjorn Ketelaars

On Mon 06/03/2023 22:07, Edd Barrett wrote:
> On Mon, Mar 06, 2023 at 07:55:51PM +0100, Bjorn Ketelaars wrote:
> > Comments/OK?
> 
> Seems to work for me.
> 
> When I run `make plist` in the plugins/ package, it removes some directory
> entries. Should they be removed?

Yes, they should be removed. I double checked by building in a clean
chroot, and running 'make update-plist'. New diff enclosed below. While
here remove unneeded patch, and remove --disable-oss4 from
plugins/Makefile as the plugins will no longer utilize OSS on OpenBSD
(thanks to Brad Smith, [0]).

[0] 
https://github.com/audacious-media-player/audacious-plugins/commit/a7ed79da3dd3c9114e3e850535f588698d319e81

Comments / OK?


diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
index 2434ee8e8cb..8df2e0114f5 100644
--- audio/audacious/Makefile.inc
+++ audio/audacious/Makefile.inc
@@ -1,5 +1,5 @@
 # Do not forget to sync meta/audacious
-VERSION =  4.2
+VERSION =  4.3
 
 CATEGORIES =   audio multimedia
 
diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo
index e92bca49cb1..dff637055db 100644
--- audio/audacious/player/distinfo
+++ audio/audacious/player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-4.2.tar.bz2) = /rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM=
-SIZE (audacious-4.2.tar.bz2) = 612155
+SHA256 (audacious-4.3.tar.bz2) = J1hNyEXH5w24ySZ5kJRfFzIqHsyA/4tFLpypFqDOkJE=
+SIZE (audacious-4.3.tar.bz2) = 623855
diff --git audio/audacious/player/patches/patch-buildsys_mk_in 
audio/audacious/player/patches/patch-buildsys_mk_in
index 8cac2a6f988..b5370c4f27c 100644
--- audio/audacious/player/patches/patch-buildsys_mk_in
+++ audio/audacious/player/patches/patch-buildsys_mk_in
@@ -3,7 +3,7 @@ Show compiler invocations.
 Index: buildsys.mk.in
 --- buildsys.mk.in.orig
 +++ buildsys.mk.in
-@@ -122,18 +122,18 @@ DEPS = ${OBJS:.o=.dep}   \
+@@ -123,18 +123,18 @@ DEPS = ${OBJS:.o=.dep}   \
  
  MO_FILES = ${LOCALES:.po=.mo}
  
@@ -29,7 +29,7 @@ Index: buildsys.mk.in
  
  pre-all post-all:
  
-@@ -143,7 +143,7 @@ subdirs-after: ${SUBDIRS_AFTER}
+@@ -144,7 +144,7 @@ subdirs-after: ${SUBDIRS_AFTER}
  ${SUBDIRS} ${SUBDIRS_AFTER}:
for i in $@; do \
${DIR_ENTER}; \
@@ -38,7 +38,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -192,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
+@@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
  ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS}
out="$@"; \
@@ -47,7 +47,7 @@ Index: buildsys.mk.in
${LINK_OK}; \
else \
rm -fr $$out; false; \
-@@ -203,7 +203,7 @@ copy-headers-into-framework:
+@@ -205,7 +205,7 @@ copy-headers-into-framework:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
cd $$i || exit 1; \
@@ -56,7 +56,7 @@ Index: buildsys.mk.in
cd .. || exit 1; \
done
  
-@@ -652,7 +652,7 @@ install: install-extra
+@@ -654,7 +654,7 @@ install: install-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
@@ -65,7 +65,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -765,7 +765,7 @@ uninstall: uninstall-extra
+@@ -767,7 +767,7 @@ uninstall: uninstall-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
@@ -74,7 +74,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -880,7 +880,7 @@ clean:
+@@ -882,7 +882,7 @@ clean:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
@@ -83,7 +83,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -901,7 +901,7 @@ distclean: clean
+@@ -903,7 +903,7 @@ distclean: clean
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
@@ -92,7 +92,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -921,7 +921,7 @@ print-hierarchy:
+@@ -923,7 +923,7 @@ print-hierarchy:
test x"$$i" = x"" && continue; \
echo ${PRINT_HIERARCHY_PREFIX}$$i; \
cd $$i || exit $$?; \
diff --git audio/audacious/player/patches/patch-src_libaudcore_Makefile 
audio/audacious/player/patches/patch-src_libaudcore_Makefile
index 932822edb6e..3be6a06faed 100644
--- audio/audacious/player/patches/patch-src_libaudcore_Makefile
+++ aud

UPDATE {audio,meta}/audacious-4.3

2023-03-06 Thread Bjorn Ketelaars

t;$$i" = x"" && continue; \
${DIR_ENTER}; \
@@ -83,7 +83,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -901,7 +901,7 @@ distclean: clean
+@@ -903,7 +903,7 @@ distclean: clean
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
@@ -92,7 +92,7 @@ Index: buildsys.mk.in
${DIR_LEAVE}; \
done
  
-@@ -921,7 +921,7 @@ print-hierarchy:
+@@ -923,7 +923,7 @@ print-hierarchy:
test x"$$i" = x"" && continue; \
echo ${PRINT_HIERARCHY_PREFIX}$$i; \
cd $$i || exit $$?; \
diff --git audio/audacious/plugins/patches/patch-configure 
audio/audacious/plugins/patches/patch-configure
index ef7aacd8fc3..bc73a8f82aa 100644
--- audio/audacious/plugins/patches/patch-configure
+++ audio/audacious/plugins/patches/patch-configure
@@ -5,7 +5,7 @@ polluted very early on, breaking most of the checks using 
AC_CHECK_LIB.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -11411,8 +11411,6 @@ printf "%s\n" "yes" >&6; }
+@@ -11758,8 +11758,6 @@ printf "%s\n" "yes" >&6; }
  
  fi
  
@@ -14,7 +14,7 @@ Index: configure
  
  
  if test $HAVE_DARWIN = yes ; then
-@@ -16600,6 +16598,8 @@ then :
+@@ -17192,6 +17190,8 @@ then :
  
  fi
  
diff --git audio/audacious/plugins/pkg/PLIST audio/audacious/plugins/pkg/PLIST
index c7bd024c243..c404cbeb1f7 100644
--- audio/audacious/plugins/pkg/PLIST
+++ audio/audacious/plugins/pkg/PLIST
@@ -48,6 +48,7 @@ lib/audacious/Input/
 @so lib/audacious/Input/madplug.so
 @so lib/audacious/Input/metronom.so
 @so lib/audacious/Input/modplug.so
+@so lib/audacious/Input/opus.so
 @so lib/audacious/Input/psf2.so
 @so lib/audacious/Input/sndfile.so
 @so lib/audacious/Input/tonegen.so
@@ -67,6 +68,7 @@ lib/audacious/Visualization/
 @so lib/audacious/Visualization/gl-spectrum-qt.so
 @so lib/audacious/Visualization/qt-spectrum.so
 @so lib/audacious/Visualization/vumeter-qt.so
+share/audacious/
 share/audacious/Skins/
 share/audacious/Skins/Classic/
 share/audacious/Skins/Classic/balance.png
@@ -199,6 +201,8 @@ share/locale/ar/LC_MESSAGES/audacious-plugins.mo
 share/locale/be/LC_MESSAGES/audacious-plugins.mo
 share/locale/bg/LC_MESSAGES/audacious-plugins.mo
 share/locale/ca/LC_MESSAGES/audacious-plugins.mo
+share/locale/cmn/
+share/locale/cmn/LC_MESSAGES/
 share/locale/cmn/LC_MESSAGES/audacious-plugins.mo
 share/locale/cs/LC_MESSAGES/audacious-plugins.mo
 share/locale/da/LC_MESSAGES/audacious-plugins.mo
@@ -206,33 +210,48 @@ share/locale/de/LC_MESSAGES/audacious-plugins.mo
 share/locale/el/LC_MESSAGES/audacious-plugins.mo
 share/locale/en_GB/LC_MESSAGES/audacious-plugins.mo
 share/locale/es/LC_MESSAGES/audacious-plugins.mo
+share/locale/es_AR/
+share/locale/es_AR/LC_MESSAGES/
 share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo
+share/locale/es_MX/
+share/locale/es_MX/LC_MESSAGES/
 share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
 share/locale/et/LC_MESSAGES/audacious-plugins.mo
 share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+share/locale/fa_IR/
+share/locale/fa_IR/LC_MESSAGES/
 share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
 share/locale/fi/LC_MESSAGES/audacious-plugins.mo
 share/locale/fr/LC_MESSAGES/audacious-plugins.mo
 share/locale/gl/LC_MESSAGES/audacious-plugins.mo
 share/locale/hu/LC_MESSAGES/audacious-plugins.mo
+share/locale/id_ID/
+share/locale/id_ID/LC_MESSAGES/
 share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo
 share/locale/it/LC_MESSAGES/audacious-plugins.mo
 share/locale/ja/LC_MESSAGES/audacious-plugins.mo
 share/locale/ko/LC_MESSAGES/audacious-plugins.mo
 share/locale/lt/LC_MESSAGES/audacious-plugins.mo
 share/locale/lv/LC_MESSAGES/audacious-plugins.mo
+share/locale/ml_IN/
+share/locale/ml_IN/LC_MESSAGES/
 share/locale/ml_IN/LC_MESSAGES/audacious-plugins.mo
 share/locale/ms/LC_MESSAGES/audacious-plugins.mo
 share/locale/nl/LC_MESSAGES/audacious-plugins.mo
 share/locale/pl/LC_MESSAGES/audacious-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/audacious-plugins.mo
+share/locale/pt_PT/
+share/locale/pt_PT/LC_MESSAGES/
 share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo
+share/locale/ro/LC_MESSAGES/audacious-plugins.mo
 share/locale/ru/LC_MESSAGES/audacious-plugins.mo
 share/locale/si/LC_MESSAGES/audacious-plugins.mo
 share/locale/sk/LC_MESSAGES/audacious-plugins.mo
 share/locale/sl/LC_MESSAGES/audacious-plugins.mo
 share/locale/sq/LC_MESSAGES/audacious-plugins.mo
 share/locale/sr/LC_MESSAGES/audacious-plugins.mo
+share/locale/sr_RS/
+share/locale/sr_RS/LC_MESSAGES/
 share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
 share/locale/sv/LC_MESSAGES/audacious-plugins.mo
 share/locale/ta/LC_MESSAGES/audacious-plugins.mo
diff --git meta/audacious/Makefile meta/audacious/Makefile
index 81224d5c6fe..c9ff0e71204 100644
--- meta/audacious/Makefile
+++ meta/audacious/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  audacious meta-package
 
-VERSION =  4.2
+VERSION =  4.3
 PKGNAME =  audacious-${VERSION}
 
 MAINTAINER =   Bjorn Ketelaars

Re: Unbreak zstd on strict alignment architectures

2023-03-03 Thread Bjorn Ketelaars

On Fri 03/03/2023 12:35, Theo Buehler wrote:
> On Fri, Mar 03, 2023 at 09:42:42AM +, Stuart Henderson wrote:
> > On 2023/03/03 06:49, Bjorn Ketelaars wrote:
> > > On Fri 03/03/2023 01:55, Theo Buehler wrote:
> > > > zstd is broken on sparc64 due to unaligned accesses resulting in bus
> > > > errors. Since __GNUC__ is defined and MEM_FORCE_MEMORY_ACCESS isn't
> > > > defined, it defaults to 1, and we run into these:
> > > > 
> > > > https://github.com/facebook/zstd/blob/1be95291a89160be121c987c2e385331a65a4a0e/lib/common/mem.h#L192-L199
> > > > 
> > > > One simple fix is to define MEM_FORCE_MEMORY_ACCESS to 0 via CPPFLAGS.
> > > > This forces all platforms to use memcpy, which may or may not result in
> > > > some slowdown. We can consider more elaborate platform-specific fixes if
> > > > that is desired, but then I need instructions.
> > > > 
> > > > With this diff, the cmake test for zstd doesn't abort with a bus error,
> > > > which allows me to build qt6/qtbase on sparc64, and in turn we should
> > > > get a sizable chunk of the tree back to building.
> > 
> > So it's from this commit
> > 
> > https://github.com/facebook/zstd/commit/a78c91ae59b9487fc32224b67c4a854dc3720367
> 
> This diff isn't a clean revert, of course.
> 
> > > I did some light benchmarking using your patch and first impression,
> > > i.e. looking at the numbers, is that there is no slow dowm. I did *not*
> > > perform statistical analysis to underpin this observation.
> > > 
> > > That said I have a slight preference for making this change platform
> > > specific, and tested https://pbot.rmdir.de/9-6H2Qy6ah89TpUnMYCzeg.
> > 
> > If we're taking that approach, can we have some test (e.g. in
> > post-build) so that zstd build fails on an arch that requires this
> > so we can keep the list up to date more easily?
> 
> Something like this would be enough:
> 
> post-build:
>   ${WRKRSC}/zstd -o /dev/null /etc/rc
> 
> Honestly, I think this is going too far. Also, we might not get this
> into a bulk on some potentially affected hardware (powerpc*?) before
> release packages are built. As mentioned, this breaks the cmake zstd
> detection, and I expect a good number of ports to be affected. I think
> release is getting close too fast to play such games.
> 
> Another possibility is to do
> 
>   --- lib/common/mem.h.patch.orig Fri Mar  3 07:38:13 2023
>   +++ lib/common/mem.hFri Mar  3 07:38:33 2023
>   @@ -141,7 +141,8 @@ MEM_STATIC size_t MEM_swapST(size_t in);
> * Default  : method 1 if supported, else method 0
> */
>#ifndef MEM_FORCE_MEMORY_ACCESS   /* can be defined externally, on 
> command line for example */
>   -#  ifdef __GNUC__
>   +#  include 
>   +#  if defined(__GNUC__) && !defined(__STRICT_ALIGNMENT)
>#define MEM_FORCE_MEMORY_ACCESS 1
>#  endif
>#endif
> 
> > Though I think my preference for now would be to either use the
> > MEM_FORCE_MEMORY_ACCESS=0 hammer for all archs, or patch to backout
> > that upstream commit, and report upstream to see what they want to do..
> 
> Long story short, I'd like to commit the diff below.

Please, go ahead. OK bket@

Re: Unbreak zstd on strict alignment architectures

2023-03-02 Thread Bjorn Ketelaars

On Fri 03/03/2023 01:55, Theo Buehler wrote:
> zstd is broken on sparc64 due to unaligned accesses resulting in bus
> errors. Since __GNUC__ is defined and MEM_FORCE_MEMORY_ACCESS isn't
> defined, it defaults to 1, and we run into these:
> 
> https://github.com/facebook/zstd/blob/1be95291a89160be121c987c2e385331a65a4a0e/lib/common/mem.h#L192-L199
> 
> One simple fix is to define MEM_FORCE_MEMORY_ACCESS to 0 via CPPFLAGS.
> This forces all platforms to use memcpy, which may or may not result in
> some slowdown. We can consider more elaborate platform-specific fixes if
> that is desired, but then I need instructions.
> 
> With this diff, the cmake test for zstd doesn't abort with a bus error,
> which allows me to build qt6/qtbase on sparc64, and in turn we should
> get a sizable chunk of the tree back to building.

I did some light benchmarking using your patch and first impression,
i.e. looking at the numbers, is that there is no slow dowm. I did *not*
perform statistical analysis to underpin this observation.

That said I have a slight preference for making this change platform
specific, and tested https://pbot.rmdir.de/9-6H2Qy6ah89TpUnMYCzeg.

OK for the latter.

misc/openbabel has a hidden dep on math/eigen3

2023-03-02 Thread Bjorn Ketelaars

tb@ found that misc/openbabel has a hidden dep on math/eigen3. Diff
below addresses this. Minor of libopenbabel requires a bump because of
additions of symbols.

Tested on amd64. Run tested with x11/xdrawchem.

Comments/OK?


diff --git Makefile Makefile
index 32758c97397..21ac8b7d578 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,7 @@
 COMMENT=   chemistry file translation program
 
 V= 3.1.1
+REVISION=  0
 DISTNAME=  openbabel-${V}
 
 CATEGORIES=misc
@@ -8,7 +9,7 @@ CATEGORIES= misc
 SHARED_LIBS += coordgen0.0 \
inchi   0.0 \
maeparser   0.0 \
-   openbabel   6.0
+   openbabel   6.1
 
 HOMEPAGE=  https://openbabel.org
 
@@ -34,6 +35,8 @@ LIB_DEPENDS=  devel/boost \
graphics/cairo \
textproc/libxml
 
+BUILD_DEPENDS= math/eigen3
+
 CONFIGURE_ARGS=-DBUILD_GUI=OFF
 
 SEPARATE_BUILD=No
diff --git pkg/PLIST pkg/PLIST
index d77e9e5fa81..4bf64c2796e 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,5 +1,6 @@
 @bin bin/obabel
 @bin bin/obconformer
+@bin bin/obdistgen
 @bin bin/obenergy
 @bin bin/obfit
 @bin bin/obfitall
@@ -9,6 +10,7 @@
 @bin bin/obmm
 @bin bin/obprobe
 @bin bin/obprop
+@bin bin/obrms
 @bin bin/obrotamer
 @bin bin/obrotate
 @bin bin/obspectrophore
@@ -48,6 +50,12 @@ include/maeparser/MaeParserConfig.hpp
 include/maeparser/Reader.hpp
 include/maeparser/Writer.hpp
 include/openbabel3/
+include/openbabel3/LBFGS/
+include/openbabel3/LBFGS.h
+include/openbabel3/LBFGS/LineSearchBacktracking.h
+include/openbabel3/LBFGS/LineSearchBracketing.h
+include/openbabel3/LBFGS/LineSearchNocedalWright.h
+include/openbabel3/LBFGS/Param.h
 include/openbabel3/openbabel/
 include/openbabel3/openbabel/alias.h
 include/openbabel3/openbabel/atom.h
@@ -184,6 +192,7 @@ lib/openbabel/${V}/
 @so lib/openbabel/${V}/cmlformat.so
 @so lib/openbabel/${V}/cmlreactformat.so
 @so lib/openbabel/${V}/cofformat.so
+@so lib/openbabel/${V}/confabreport.so
 @so lib/openbabel/${V}/copyformat.so
 @so lib/openbabel/${V}/crkformat.so
 @so lib/openbabel/${V}/crystal09format.so

UPDATE sysutils/py-platformdirs-3.0.0

2023-02-26 Thread Bjorn Ketelaars

Simple diff below for updating py-platformdirs to 3.0.0, some minor
changes only [0]. This update is needed or updating borgbackup/2.0

Run tested in combination with borgbackup-2.0.0b5. So far, no issues
found with current consumers, and no new failing tests while running
'make test'.

Comments/OK?


[0] https://github.com/platformdirs/platformdirs/releases/tag/3.0.0
diff --git Makefile Makefile
index 0883927e15e..472bbf873c1 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
 COMMENT=   determine appropriate platform-specific directories
 
-MODPY_EGG_VERSION= 2.6.2
+MODPY_EGG_VERSION= 3.0.0
 DISTNAME=  platformdirs-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 
diff --git distinfo distinfo
index 27ff6483162..0a4b1567a0c 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (platformdirs-2.6.2.tar.gz) = 
4f6h/kcbn/gzLiKd88t95PU+7qSZjTtr//VCEV6Zi9I=
-SIZE (platformdirs-2.6.2.tar.gz) = 14260
+SHA256 (platformdirs-3.0.0.tar.gz) = 
ihIoq7HvgteI90E5mIsTfnhpKYTsewjqpsZfFyOvKPk=
+SIZE (platformdirs-3.0.0.tar.gz) = 14462

Re: [update] www/vaultwarden-web to 2023.1.1

2023-02-18 Thread Bjorn Ketelaars

On Sat 18/02/2023 09:49, aisha wrote:
> On 23/01/14 09:17PM, Bjorn Ketelaars wrote:
> > On Sat 14/01/2023 12:26, A Tammy wrote:
> > > There can be multiple versions of the web-vault which are compatible
> > > with the current version of vaultwarden, so keeping it independent makes
> > > it easy to update it separately.
> > > 
> > > Also the web-vault has had more frequent releases, not always breaking,
> > > mostly bug fixes. So it would be good to have them when possible. It's
> > > rare that the breakage happens but not impossible, so I wanted to get
> > > more testers.
> > > 
> > > One of the reasons why I initially made it separate was that the web
> > > vault is not developed by vaultwarden themselves, more of a patching of
> > > the upstream bitwarden web vault by removing branding. So I thought it
> > > made more sense to keep them in separate places.
> > > 
> > > Also didn't want to trigger a build of vaultwarden every time the web
> > > vault got a new release, my build machine is slow and rust is chonky.
> > > 
> > > Not a big difference imo.
> > 
> > Clear, I understand your reasoning.
> > 
> 
> forgot to apply this when I said I would, so now there is a new version 
> 2023.1.1 (patch release from 2023.1.0)
> 
> no functionality changes, everything is working fine.
> 
> OK?

OK bket@

UPDATE archivers/zstd-1.5.4

2023-02-10 Thread Bjorn Ketelaars

zstd-1.5.4 is a pretty big release benefiting from one year of work. It
offers performance improvements, as well as new features, and it fixes
some bugs. Details can be found at
https://github.com/facebook/zstd/releases/tag/v1.5.4

Bumped minor because of addition of symbols.

'make test' passes all tests, run tested with several consumers on
amd64, and build tested about half of the consumers.

Comments/OK?


diff --git Makefile Makefile
index c38c0d5bfb4..2a3b29ac836 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,9 @@
 COMMENT =  zstandard fast real-time compression algorithm
 
-V =1.5.2
+V =1.5.4
 DISTNAME = zstd-${V}
 
-SHARED_LIBS =  zstd6.1 # 1.5.1
+SHARED_LIBS =  zstd6.2 # 1.5.4
 
 CATEGORIES =   archivers
 
diff --git distinfo distinfo
index 25b30205e17..84f5ab5dc76 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.2.tar.gz) = fELVb6wSaSmmqF28c/8dskEdBPEE+um96lEwVmOoP9A=
-SIZE (zstd-1.5.2.tar.gz) = 1936664
+SHA256 (zstd-1.5.4.tar.gz) = D0cJkq7a1UMSbQbvqzRNxfPhcYk4EEVXh9ODRzQ6RCQ=
+SIZE (zstd-1.5.4.tar.gz) = 2161536
diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk
index 9f6a496dc90..c2272b3b354 100644
--- patches/patch-lib_libzstd_mk
+++ patches/patch-lib_libzstd_mk
@@ -3,7 +3,7 @@ Some compilers don't have -Wvla.
 Index: lib/libzstd.mk
 --- lib/libzstd.mk.orig
 +++ lib/libzstd.mk
-@@ -92,7 +92,7 @@ endif
+@@ -100,7 +100,7 @@ endif
  DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
  -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
  -Wstrict-prototypes -Wundef -Wpointer-arith \

Re: NEW sysutils/rustic-0.4.3

2023-02-05 Thread Bjorn Ketelaars

On Wed 25/01/2023 09:40, Bjorn Ketelaars wrote:
> Attached is a port of rustic, which is a backup tool that provides fast,
> encrypted, deduplicated backups. It reads and writes the restic repo,
> and can be used as a replacement for restic.
> 
> Rustic's backend is limited to local, restic-server and rclone, which is
> a loose against restic. Advantages of rustic (vs restic):
> - Allows using cold storage (e.g. AWS Glacier) repos which are only read
>   in the restore command + supports warm-up
> - All operations are completely lock-free as rustic supoorts
>   two-phase-pruning (prune option instant-delete is available)
> - Supports configuration in a config file (example config files)
> - Huge decrease in memory requirement
> - Already faster than restic for most operations (but not yet fully
>   speed optimized)
> - Cleaner concept of logging output; posibility to write logs to a log
>   file
> - rustic repair command allows to repair some kinds of broken
>   repositories
> - backup command can use .gitignore files
> - restore uses existing files; also option --delete available
> - Snapshots save much more information, available in snapshots command
> - Allows to save repository options in the repository config file via
>   the command config
> - New command repo-info
> - check command checks and uses cache; option --trust-cache is available
> - Option prune --fast-repack for faster repacking
> - Syntax [:PATH] is available for many commands
> 
> Note that rustic currently is in an beta release and misses tests. It is
> not yet considered to be ready for use in a production environment.
> 
> Comments / OK to import?

Friendly ping, tarball enclosed for your convenience.

OK to import?


rustic.tgz
Description: application/tar-gz

UPDATE x11/xdrawchem to 1.11.0

2023-02-05 Thread Bjorn Ketelaars

Diff below updates x11/xdrawchem to 1.11.0, which is actually a fork
that fixes many bugs and adds some convenience features:
- Bumped to OpenBabel3
- Changed license to GPLv3+ from GPLv2+
- Changed some shortcuts
- Added more font options
- Added zooming with control keys
- Added redo
- Fixed cut/paste
- Fixed undo
- Fixed lasso tool
- Fixed grid
- Fixed custom rings
- Fixed rounding issues with drawings
- Fixed many other bugs and segmentation faults

HOMEPAGE has been updated to reflect the move to this fork.

This is the same version as ported by FreeBSD and several Linux
flavours.

Run tested on amd64.

Comments/OK?

diff --git Makefile Makefile
index 6eb1adddfca..9a1837c4571 100644
--- Makefile
+++ Makefile
@@ -1,30 +1,30 @@
 COMMENT=   two-dimensional molecule drawing program
 
-DISTNAME=  xdrawchem-1.10.2
+V= 1.11.0
+DISTNAME=  xdrawchem-${V}
+
 CATEGORIES=x11 biology
-REVISION=  1
 
-HOMEPAGE=  https://www.woodsidelabs.com/chemistry/xdrawchem.php
+HOMEPAGE=  https://gitlab.com/yamanq/xdrawchem/
 
 MAINTAINER=Bjorn Ketelaars 
 
-# GPLv2
+# GPLv3+
 PERMIT_PACKAGE=Yes
 
 WANTLIB+=  ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB+=  Qt5Widgets Qt5Xml c m openbabel
-
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xdrawchem/}
+WANTLIB+=  Qt5Svg Qt5Widgets Qt5Xml c m openbabel
 
-EXTRACT_SUFX=  -1.rpmsrc.tar.gz
+MASTER_SITES=  https://gitlab.com/yamanq/xdrawchem/-/archive/v${V}/
 
 MODULES=   devel/qmake \
x11/qt5
-LIB_DEPENDS=   misc/openbabel>=2.2.3
 
-CONFIGURE_ARGS=--with-qtincdir=${MODQT_INCDIR} \
-   --with-qtlibdir=${MODQT_LIBDIR}
+LIB_DEPENDS=   misc/openbabel>=3.0.0 \
+   x11/qt5/qtsvg
 
 NO_TEST=   Yes
 
+WRKDIST=   
${WRKDIR}/xdrawchem-v1.11.0-53047f64b571b5f01623bf897eb9e2b212778031
+
 .include 
diff --git distinfo distinfo
index daf4d1a7af4..6608620ffb0 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xdrawchem-1.10.2-1.rpmsrc.tar.gz) = 
qoJJh9YobNgALcvaMePVLdncLjKcxKWTWu4K7MpRHCU=
-SIZE (xdrawchem-1.10.2-1.rpmsrc.tar.gz) = 732969
+SHA256 (xdrawchem-1.11.0.tar.gz) = iHOlg1xyeVHRUNMkID/kQ/VmkEGMd/kCcXXllKyWu6Y=
+SIZE (xdrawchem-1.11.0.tar.gz) = 713047
diff --git patches/patch-xdrawchem_pro patches/patch-xdrawchem_pro
index 7a50ee5206a..020d9f3018f 100644
--- patches/patch-xdrawchem_pro
+++ patches/patch-xdrawchem_pro
@@ -1,7 +1,22 @@
 Index: xdrawchem.pro
 --- xdrawchem.pro.orig
 +++ xdrawchem.pro
-@@ -46,7 +46,7 @@ ringdir.files = ring/*
+@@ -2,11 +2,11 @@ TEMPLATE = app
+ TARGET = xdrawchem
+ 
+ # edit to match your OB install
+-exists(/usr/include/openbabel3/openbabel/mol.h) {
+-INCLUDEPATH += /usr/include/openbabel3
++exists($${PREFIX}/include/openbabel3/openbabel/mol.h) {
++INCLUDEPATH += /usr/local/include/openbabel3
+ LIBS += -lopenbabel
+ }
+-exists(/usr/local/include/openbabel-3.0/openbabel/mol.h) {
++exists($${PREFIX}/include/openbabel-3.0/openbabel/mol.h) {
+ INCLUDEPATH += /usr/local/include/openbabel-3.0
+ LIBS += -lopenbabel
+ }
+@@ -45,7 +45,7 @@ ringdir.files = ring/*
  doc.path = $${PREFIX}/share/xdrawchem/doc
  doc.files = doc/*
  INSTALLS += ringdir doc
@@ -9,4 +24,4 @@ Index: xdrawchem.pro
 +QMAKE_CXXFLAGS_DEBUG +=
  
  CONFIG += debug
- QT += xml network core widgets printsupport network gui
+ QT += xml svg network core widgets printsupport network gui
diff --git patches/patch-xdrawchem_render2d_text_cpp 
patches/patch-xdrawchem_render2d_text_cpp
deleted file mode 100644
index e52b17b6c0d..000
--- patches/patch-xdrawchem_render2d_text_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix segfault when using (hot)key on bond twice in a row. Taken from
-https://github.com/bryanherger/xdrawchem/pull/12
-
-Index: xdrawchem/render2d_text.cpp
 xdrawchem/render2d_text.cpp.orig
-+++ xdrawchem/render2d_text.cpp
-@@ -380,6 +380,9 @@ void Render2D::keyPressEvent( QKeyEvent * k )
- }
- 
- if ( highlightobject->Type() != TYPE_TEXT ) {
-+delete localtexteditor;
-+localtexteditor = 0;
-+
- hotkeymode = false;
- mode = hkprevmode;
- return;
diff --git pkg/PLIST pkg/PLIST
index 651a84392b1..2876e6cb3f1 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,59 +1,12 @@
 @bin bin/xdrawchem
 share/xdrawchem/
-share/xdrawchem/6ring_boat.cml
-share/xdrawchem/6ring_boat.png
-share/xdrawchem/6ring_chair.cml
-share/xdrawchem/6ring_chair.png
-share/xdrawchem/CMakeLists.txt
 share/xdrawchem/COPYRIGHT.txt
-share/xdrawchem/GPL.txt
-share/xdrawchem/HISTORY.txt
-share/xdrawchem/adenine.cml
-share/xdrawchem/alanine.cml
-share/xdrawchem/anthracene.cml
-share/xdrawchem/arginine.cml
-share/xdrawchem/arrowtool.png
-share/xdrawchem/asparagine.cml
-share/xdrawchem/aspartic_acid.cml
-share/xdrawchem/back.xpm
-share/xdrawchem/benzene.cml
-share/xdrawchem/benzene.png
-share/xdrawchem/biotin.cml
-share/xdrawchem/biphenyl.cml
-share/

1 2 3 4 5 >

1 - 100 of 461 matches

Mail list logo