Re: [update] audio/ncspot to 1.1.1
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@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/15 23:09:26 Modified files: news/nzbget: Makefile distinfo Log message: Update to nzbget-24.1 Changes: https://github.com/nzbgetcom/nzbget/releases/tag/v24.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/09 09:19:23 Modified files: net/samba : Makefile distinfo net/samba/pkg : PLIST-main Log message: Update to samba-4.20.1 Release notes: https://www.samba.org/samba/history/samba-4.20.1.html Test and OK Ian McWilliam (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/08 04:53:37 Modified files: devel/git-cola : Makefile distinfo Log message: Update to git-cola-4.7.1 Changes: https://github.com/git-cola/git-cola/blob/v4.7.1/CHANGES.rst
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/08 04:49:24 Modified files: net/unison : Makefile distinfo Log message: Update to unison-2.53.5 Changes: https://github.com/bcpierce00/unison/releases/tag/v2.53.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/08 04:48:03 Modified files: news/sabnzbd : Makefile distinfo news/sabnzbd/pkg: PLIST Log message: Update to sabnzbd-4.3.1 Changes: https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/02 12:38:19 Modified files: devel/git-cola : Makefile distinfo devel/git-cola/pkg: PLIST Log message: Update to git-cola-4.7.0 Changes: https://github.com/git-cola/git-cola/blob/v4.7.0/CHANGES.rst
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/05/02 11:12:03 Modified files: news/sabnzbd : Makefile distinfo news/sabnzbd/pkg: PLIST Log message: Update to sabnzbd-4.3.0 Release notes: https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/30 08:38:41 Modified files: net/mcast-proxy: Makefile distinfo Log message: Update mcast-proxy to HEAD Fixes a possible buffer overflow found by smatch. Changes: https://github.com/bket/mcast-proxy/compare/07978f1...063e083 Discussed with Paul de Weerd (MAINTAINER).
Re: update www/vaultwarden-web
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@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/27 03:06:05 Modified files: news/nzbget: Makefile distinfo news/nzbget/patches: patch-nzbget_conf news/nzbget/pkg: PLIST Log message: Update to nzbget-24.0 Changelog: https://github.com/nzbgetcom/nzbget/releases/tag/v24.0
Re: [update] nginx 1.26.0
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.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/18 21:30:27 Modified files: devel/ipython : Makefile Log message: Add RDEP on devel/py-typing-extensions typing_extensions is needed until python 3.12. OK sthen@, daniel@
devel/ipython - missing RDEP
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/16 11:29:50 Modified files: archivers/zstd : Makefile distinfo archivers/zstd/patches: patch-lib_libzstd_mk Log message: Update to zstd-1.5.6 Changes: https://github.com/facebook/zstd/releases/tag/v1.5.6 Bump minor of libzstd because of some additions. OK kn@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/16 11:24:18 Modified files: net/filezilla : Makefile distinfo net/filezilla/pkg: PLIST Log message: Update to filezilla-3.67.0 Fixes PuTTY ECDSA NIST P-521 private key recovery vulnerability (CVE-2024-31497). Release notes: https://filezilla-project.org/ Bump major of libfzclient-private because of removal of symbols. Sync WANTLIB.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/16 11:21:40 Modified files: net/libfilezilla: Makefile distinfo net/libfilezilla/pkg: PLIST Log message: Update to libfilezilla-0.47.0 Needed for updating filezilla. Release notes: https://lib.filezilla-project.org/ Bump major of shared lib because of removal of symbols. Sync WANTLIB.
Re: UPDATE archivers/zstd-1.5.6
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 \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/16 10:44:24 Modified files: net/samba : Tag: OPENBSD_7_5 Makefile distinfo net/samba/pkg : Tag: OPENBSD_7_5 README-main Log message: Update to samba-4.19.6 Release notes: https://www.samba.org/samba/history/samba-4.19.6.html Add note that VFS Modules are essentially broken on OpenBSD. Feedback, test and OK Ian McWilliam (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/04/16 10:34:58 Modified files: net/samba : Makefile net/samba/pkg : README-main Log message: Add note that VFS Modules are essentially broken on OpenBSD Feedback and OK Ian McWilliam (maintainer)
Re: borgbackup: switch to openssl/3.2
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
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
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/30 14:56:39 Modified files: sysutils/borgbackup/1.2: Makefile distinfo Log message: Update to borgbackup-1.2.8 Changelog: https://github.com/borgbackup/borg/blob/1.2.8/docs/changes.rst#version-128-2024-03-29 OK sthen@
UPDATE borgbackup-1.2.8
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/29 22:31:12 Modified files: net/samba : Makefile distinfo net/samba/patches: patch-buildtools_wafsamba_samba_abi_py patch-buildtools_wafsamba_samba_autoconf_py patch-buildtools_wafsamba_wafsamba_py patch-lib_ldb_wscript patch-python_samba_provision___init___py patch-source3_wscript patch-source4_dsdb_samdb_ldb_modules_acl_c net/samba/pkg : PLIST-main Log message: Update to samba-4.20.0 Release notes: https://www.samba.org/samba/history/samba-4.20.0.html Test and OK Ian McWilliam (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/29 22:30:18 Modified files: devel/libtalloc: Makefile distinfo devel/libtalloc/patches: patch-buildtools_wafsamba_wafsamba_py Log message: Update to libtalloc-2.4.2 Needed for samba-4.20.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/29 22:29:55 Modified files: databases/tdb : Makefile distinfo databases/tdb/patches: patch-buildtools_wafsamba_wafsamba_py Log message: Update to tdb-1.4.10 Needed for samba-4.20.0
UPDATE archivers/zstd-1.5.6
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
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 \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/24 22:18:17 Modified files: devel/bats : Makefile distinfo devel/bats/pkg : PLIST Log message: Update to bats-1.11.0 Changes: https://github.com/bats-core/bats-core/releases/tag/v1.11.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/24 22:17:50 Modified files: archivers/libdeflate: Makefile distinfo Log message: Update to libdeflate-1.20 Changes: https://github.com/ebiggers/libdeflate/blob/v1.20/NEWS.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/17 22:16:51 Modified files: devel/git-cola : Makefile distinfo devel/git-cola/patches: patch-cola_app_py Log message: Update to git-cola-4.6.1 Changes: https://github.com/git-cola/git-cola/blob/v4.6.1/CHANGES.rst
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/17 22:16:34 Modified files: news/sabnzbd : Makefile distinfo Log message: Update to sabnzbd-4.2.3 Changes: https://github.com/sabnzbd/sabnzbd/releases/tag/4.2.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/17 22:16:11 Modified files: mail/notmuch : Makefile.inc mail/notmuch/notmuch: distinfo mail/notmuch/py-notmuch: distinfo Log message: Update to notmuch-0.38.3 Fixes a bug in configuration code that caused the notmuch command to erroneously report "Error: could not locate database" under some circumstances.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/17 22:15:45 Modified files: net/ocserv : Makefile distinfo net/ocserv/patches: patch-doc_sample_config patch-src_main-ban_c patch-src_occtl_occtl_c patch-src_occtl_time_c patch-src_ocpasswd_ocpasswd_c Log message: Update to ocserve-1.2.4 Changes: https://ocserv.openconnect-vpn.net/changelog.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/17 22:15:30 Modified files: sysutils/rclone: Makefile distinfo Log message: Update to rclone-1.66.0 Changes: https://rclone.org/changelog/#v1-66-0-2024-03-10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/06 21:15:01 Modified files: security/vaultwarden: Makefile crates.inc distinfo Log message: Update to vaultwarden-1.30.5 Changes: https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.4 https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.5 OK denis@, aisha@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/06 21:14:38 Modified files: www/vaultwarden-web: Makefile distinfo www/vaultwarden-web/pkg: PLIST Log message: Update to vaultwarden-web-2024.1.2b Changes: https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.1.2b OK denis@, aisha@
UPDATE security/vaultwarden-1.30.5 and www/vaultwarden-web-2024.1.2b
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/24 23:28:18 Modified files: sysutils/borgbackup/2.0: Makefile distinfo sysutils/borgbackup/2.0/patches: patch-pyproject_toml patch-setup_py sysutils/borgbackup/2.0/pkg: PLIST Log message: Update to borg-2.0.0b8 Changes: https://borgbackup.readthedocs.io/en/2.0.0b8/changes.html#version-2-0-0b8-2024-02-20
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/24 08:39:44 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add quirk for the rename unison => unison-gui OK jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/24 08:38:36 Modified files: net: Makefile Log message: Drop unison FLAVOR OK jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/24 08:35:56 Modified files: net/unison : Makefile distinfo net/unison/files: unison.desktop Added files: net/unison/pkg : DESCR-gui DESCR-main PLIST-gui PLIST-main README-main Removed files: net/unison/pkg : DESCR PFRAG.no-no_x11 PLIST README Log message: Update to unison-2.54.3 Changes: https://github.com/bcpierce00/unison/releases/tag/v2.53.4 Build now allows to build the cli and the gui at the same time. Switch from FLAVORS to MULTI_PACKAGES. @pkgpaths markers have been added to make upgrading transparent for users. OK jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/20 12:46:31 Modified files: net/samba : Tag: OPENBSD_7_4 Makefile distinfo net/samba/patches: Tag: OPENBSD_7_4 patch-source3_wscript Log message: Update to samba-4.19.5 Release notes: https://www.samba.org/samba/history/samba-4.19.5.html Tested by and OK Ian McWilliam (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/20 12:45:20 Modified files: net/samba : Makefile distinfo Log message: Update to samba-4.19.5 Release notes: https://www.samba.org/samba/history/samba-4.19.5.html OK Ian McWilliam (maintainer)
Re: UPDATE net/unison-2.53.4
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
+
+.if ${BUILD_PACKAGES:M-x11}
+BUILD_DEPENDS =x11/lablgtk3
+.endif
+
# Do not use INSTALL_PROGRA
UPDATE net/unison-2.53.4
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
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/17 11:17:27 Modified files: news/nzbget: Makefile distinfo news/nzbget/patches: patch-nzbget_conf news/nzbget/pkg: PLIST Log message: Update to nzbget-23.0 Changes: https://github.com/nzbgetcom/nzbget/releases/tag/v23.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/14 21:16:48 Modified files: security/vaultwarden: Makefile crates.inc distinfo Removed files: security/vaultwarden/files: config.vendor Log message: Update to vaultwarden-1.30.3 Changes: https://github.com/dani-garcia/vaultwarden/releases Feedback from tb@. OK aisha@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/14 21:16:07 Modified files: www/vaultwarden-web: Makefile distinfo www/vaultwarden-web/pkg: PLIST Log message: Update to vaultwarden-web-2024.1.2 Changes: https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.1.2 OK aisha@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/07 10:31:19 Modified files: net/filezilla : Makefile distinfo net/filezilla/patches: patch-configure_ac patch-src_engine_Makefile_am Log message: Update to filezilla-3.66.5 Changes: https://filezilla-project.org/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/07 10:31:00 Modified files: net/libfilezilla: Makefile distinfo Log message: Update to libfilezilla-0.46.0 Changes: https://lib.filezilla-project.org/ Bump major of SHLIB because of removal of symbols.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/04 09:41:48 Modified files: sysutils/rustic: Makefile crates.inc distinfo sysutils/rustic/pkg: PLIST Log message: Update to rustic-0.7.0 Changes: https://github.com/rustic-rs/rustic/blob/v0.7.0/CHANGELOG.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/02 14:31:45 Modified files: www/nextcloud_notify_push: Makefile Log message: nextcloud_notify_push - Drop BDEP on rust-ring and reduce NOT_FOR_ARCHS OK tb@
www/nextcloud_notify_push - drop BDEP on rust-ring
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/02/02 13:38:15 Modified files: sysutils/rustic: Makefile distinfo Log message: rustic - drop BDEP on rust-ring and reduce NOT_FOR_ARCHS While here move to DIST_TUPLE
Re: UPDATE vaultwarden-1.30.2 and vaultwarden-web-2024.1.2
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/31 11:09:01 Modified files: news/sabnzbd : Makefile distinfo news/sabnzbd/pkg: PLIST Log message: Update to sabnzbd-4.2.2 Changes: https://github.com/sabnzbd/sabnzbd/releases/tag/4.2.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/30 22:56:29 Modified files: devel/p5-Parse-Yapp: Makefile devel/libtalloc: Makefile databases/tdb : Makefile Log message: Take maintainership These ports are deps for net/samba, which is maintained by Ian McWilliam and me.
UPDATE vaultwarden-1.30.2 and vaultwarden-web-2024.1.2
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 +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/30 12:39:37 Modified files: sysutils/fdupes: Makefile distinfo Log message: Update to fdupes-2.3.0 >From Martin Ziemer (MAINTAINER). Some minor nits from me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/24 22:17:52 Modified files: sysutils/rclone: Makefile distinfo Log message: Update to rclone-1.65.2 Fixes uploading corrupted data to azure blob. Changes: https://rclone.org/changelog/#v1-65-2-2024-01-24
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/24 07:38:14 Modified files: devel/git-cola : Makefile distinfo devel/git-cola/patches: patch-cola_app_py devel/git-cola/pkg: PLIST Log message: Update to git-cola-4.5.0 Changes: https://github.com/git-cola/git-cola/blob/v4.5.0/CHANGES.rst
Re: Any change updating ocserv to latest
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 notes:
@@ -108,7 +108,7
Re: [update] samba-4.19.4
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/08 21:23:07 Modified files: sysutils/rclone: Makefile distinfo Log message: Update to rclone-1.65.1 Changelog: https://rclone.org/changelog/#v1-65-1-2024-01-08
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/06 14:50:38 Modified files: news/nzbget: Makefile distinfo news/nzbget/patches: patch-nzbget_conf Log message: Update to nzbget-22.0 Original developer has archived the project more than a year ago. Fortunate the project has been forked and is actively maintained by a small team. Changes: https://github.com/nzbgetcom/nzbget/releases/tag/v22.0 HOMEPAGE and DIST_TUPLE have been switched to the fork.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/05 12:07:04 Modified files: news/sabnzbd : Makefile distinfo Log message: Update to sabnzbd-4.2.1 New downloads did not appear in the History after the update to 4.2.0. Changes: https://github.com/sabnzbd/sabnzbd/releases/tag/4.2.1.
Re: spotifyd: pledge
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@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/04 23:57:21 Modified files: sysutils/borgbackup: Makefile.inc sysutils/borgbackup/1.2: Makefile Log message: sysutils/borgbackup - update TEST_DEPENDS py-dateutil$ is not needed as TDEP for 2.0. No REVISION bump needed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/04 23:54:10 Modified files: net/filezilla : Makefile Log message: net/filezilla - sync WANTLIB Forgotten in previous update. Bumped REVISION.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/04 12:43:35 Modified files: net/mcast-proxy: Makefile distinfo Log message: Update mcast-proxy to HEAD Changes: https://github.com/bket/mcast-proxy/compare/6222960...07978f1 OK Paul de Weerd (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/03 11:34:58 Modified files: news/sabnzbd : Makefile distinfo news/sabnzbd/pkg: PLIST Log message: Update to sabnzbd-4.2.0 Changes: https://github.com/sabnzbd/sabnzbd/releases/tag/4.2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/03 11:34:19 Modified files: news/py-sabctools: Makefile distinfo Log message: Update to py-sabctools-8.1.0 Changes: https://github.com/sabnzbd/sabctools/releases/tag/v8.0.0 https://github.com/sabnzbd/sabctools/releases/tag/v8.0.1 https://github.com/sabnzbd/sabctools/releases/tag/v8.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/01/02 23:28:01 Modified files: security/lastpass-cli: Makefile distinfo Removed files: security/lastpass-cli/patches: patch-process_c patch-process_h Log message: Update to lastpass-cli-1.3.7 Changes: https://github.com/lastpass/lastpass-cli/blob/v1.3.7/CHANGELOG.md
Re: ocaml 4.12.1 -> 4.13.1
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
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
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/12/28 14:15:00 Modified files: x11/xdrawchem : Makefile Log message: Drop workaround to fix the build of xdracwchem with libcxx 16.0.6 Issue has been resolved in openbabel. Diff from tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/12/28 14:14:31 Modified files: misc/openbabel : Makefile Added files: misc/openbabel/patches: patch-include_openbabel_inchiformat_h patch-include_openbabel_plugin_h patch-scripts_openbabel-R_i patch-scripts_openbabel-csharp_i patch-scripts_openbabel-java_i patch-scripts_openbabel-perl_i patch-scripts_openbabel-php_i patch-scripts_openbabel-python_i patch-scripts_openbabel-ruby_i patch-src_ops_sort_cpp Log message: Remove std::binary_function from openbabel tb@ found that libcxx 16.0.6 breaks building of xdrawchem, which is caused by openbabel not being C++17 compatible. Upstream has fixed this with https://github.com/openbabel/openbabel/pull/2464. The latter has been backported. No bump required as diff does not affect symbols. Build tested by tb@. OK tb@
Re: NEW: audio/spotify-qt
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
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@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/12/21 12:16:35 Modified files: net/filezilla : Makefile distinfo net/filezilla/pkg: PLIST Log message: Update to filezilla-3.66.4 Fixes address Terrapin protocol vulnerability. Change: https://filezilla-project.org/
UPDATE net/py-msgpack-1.0.7
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/12/16 00:43:03 Modified files: mail/notmuch : Makefile.inc mail/notmuch/notmuch: distinfo mail/notmuch/py-notmuch: Makefile distinfo Log message: Update to notmuch-0.38.2 Changes: https://git.notmuchmail.org/git?p=notmuch;a=blob;f=NEWS;h=315f41360bd66038e461f0337d0062b56d2597f6;hb=c769658360e10a6d01a4134e680e2f498741bc5c
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/12/11 05:39:39 Modified files: security/vaultwarden: Makefile security/vaultwarden/pkg: vaultwarden.rc Log message: Fix vaultwarden.rc OK sthen@, aisha@, sdk@
FIX security/vaultwarden: unbreak vaultwarden.rc
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/12/02 09:45:57 Modified files: sysutils/borgbackup/1.2: Makefile distinfo Log message: Update to borgbackup-1.2.7 Changes: https://github.com/borgbackup/borg/blob/1.2.7/docs/changes.rst#version-127-2023-12-02
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/11/27 10:58:16 Modified files: security/vaultwarden: Makefile crates.inc distinfo Log message: Update to vaultwarden-1.30.1 Changes: https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.1 OK aisha@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/11/26 22:35:45 Modified files: sysutils/rclone: Makefile distinfo Log message: Update to rclone-1.65.0 Changes: https://rclone.org/changelog/#v1-65-0-2023-11-26
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/11/26 22:21:43 Modified files: x11/spectrwm : Makefile distinfo x11/spectrwm/patches: patch-spectrwm_1 patch-spectrwm_c Log message: Update to spectrwm-3.5.1 Changes: https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_1 OK sdk@
Re: audio/audacious/plugins disable openmpt
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
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
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.0 #
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/11/20 21:35:14 Modified files: devel/git-cola : Makefile distinfo Log message: Update to git-cola-4.4.1 Changes: https://github.com/git-cola/git-cola/blob/v4.4.1/CHANGES.rst
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/11/20 13:56:39 Modified files: sysutils/rustic: Makefile crates.inc distinfo Removed files: sysutils/rustic/patches: patch-modcargo-crates_rustic_core-0_1_1_src_error_rs Log message: Update to rustic-0.6.1 Changes: https://github.com/rustic-rs/rustic/releases/tag/v0.6.1
Re: vaultwarden 1.30.0 breaks autofilling
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 #
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/11/11 23:08:41 Modified files: security/vaultwarden: Makefile crates.inc distinfo Log message: Update to vaultwarden-1.30.0 Changes: https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.0 OK aisha@
