Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Sun, Nov 05, 2023 at 12:04:13PM -0700, Stefan Hagen wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   s...@cvs.openbsd.org2023/11/05 12:04:13
> 
> Log message:
> Import x11/srandrd version 0.6.3
> 
> $ cat pkg/DESCR
> srandrd is a tool that executes a command on xrandr output change
> events, i.e. if a monitor is plugged or unplugged.
> 
> I'm taking MAINTAINER as well.
> 
> OK op thfr (with hints from both)
> 
> Status:
> 
> Vendor Tag:   sdk
> Release Tags: sdk_20231105
> 
> N ports/x11/srandrd/Makefile
> N ports/x11/srandrd/distinfo
> N ports/x11/srandrd/pkg/DESCR
> N ports/x11/srandrd/pkg/PLIST
> N ports/x11/srandrd/patches/patch-Makefile
> 
> No conflicts created by this import

Make it respect CFLAGS.
OK?


Index: Makefile
===
RCS file: /cvs/ports/x11/srandrd/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile5 Nov 2023 19:04:12 -   1.1.1.1
+++ Makefile6 Nov 2023 07:55:23 -
@@ -1,6 +1,7 @@
 COMMENT =  execute program on xrandr output changes
 
 DIST_TUPLE =   github jceb srandrd v0.6.3 .
+REVISION = 0
 
 CATEGORIES =   x11
 
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/srandrd/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  5 Nov 2023 19:04:12 -   1.1.1.1
+++ patches/patch-Makefile  6 Nov 2023 07:55:23 -
@@ -6,7 +6,7 @@ Index: Makefile
  MANPREFIX := $(DESTDIR)$(MANPREFIX)
  
 -CFLAGS:= -Wall -g -Os -pedantic -std=c99 #-Werror -Wextra
-+CFLAGS:= -I$(X11BASE)/include -Wall -g -pedantic -std=c99 
#-Werror -Wextra
++CFLAGS+= -I$(X11BASE)/include -Wall -g -pedantic -std=c99 
#-Werror -Wextra
  CPPFLAGS  += -D_DEFAULT_SOURCE
  CPPFLAGS  += -DNAME=\"$(TARGET)\" -DVERSION=\"$(VERSION)\"
  CPPFLAGS  += -DCOPYRIGHT=\"$(COPYRIGHT)\" -DLICENSE=\"$(LICENSE)\"


-- 
Antoine

Re: WIP: devel/sccache

[Klemens Nanni]

On Tue, Sep 05, 2023 at 12:11:56PM +0200, Caspar Schutijser wrote:
> On Tue, Sep 05, 2023 at 08:42:34AM +0200, Landry Breuil wrote:
> > Le Mon, Sep 04, 2023 at 05:13:19PM +0200, Landry Breuil a écrit :
> > > Le Mon, Sep 04, 2023 at 04:58:49PM +0200, Caspar Schutijser a écrit :
> > > > Hi,
> > > > 
> > > > I started porting sccache ,
> > > > a ccache-like tool that a.o. supports many storage backends but
> > > > also (more importantly) caching Rust compilation objects. I hope that
> > > > eventually we can use something like USE_SCCACHE for Rust projects
> > > > (WIP, untested diff for bsd.port.mk below).
> > > > 
> > > > The attached port does not build yet and I can't immediately find
> > > > out how to fix it (trace of build failure below). I'm sending it
> > > > to the list just in case someone else is interested.
> > > 
> > > it fails because it looks for -lzstd but nothing tells it where to find
> > > it (eg missing -L/usr/local/lib somewhere id say)
> > 
> > fixed version with WANTLIB/LDEP/DESCR, with the help of tb and semarie
> > on icb.
> 
> Thanks! That looks much better. With this new version and the
> bsd.port.mk diff that I sent earlier, I was able to use USE_SCCACHE=Yes
> and see the second compilation of the benchmarks/hyperfine port
> (a Rust port) being much faster. So it seems like it actually works.
> Later I'll test it with a more complicated port, like one of the
> Mozillas.
> 
> Now we "just" need updates to bsd.port.mk.5 and then I think it would
> be close to committable shape. I may have a look at that today if time
> permits.
> 
> Caspar
> 

Did this go anywhere?
devel/sccache could be imported independently of bsd.port.mk bits, no?
The last tarball looks fine to me, I was just trying to use this for
local development.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2023/11/06 00:02:08

Modified files:
infrastructure/mk: dist-tuple.port.mk 

Log message:
tweak the hash check so that shortened commit hashes >= 10 characters
can be used. The risk of collision with tags seems very very small

okay thfr@

security/vaultwarden: adding pledge(2) and unveil(2)

[Zack Newman]

I inquired upstream
(https://github.com/dani-garcia/vaultwarden/discussions/4033)
if adding pledge(2) and unveil(2) into Vaultwarden would be accepted,
and they replied that it would so long as it was "self-contained". I am
currently running Vaultwarden with SQLite on OpenBSD 7.4-stable on the
amd64 platform that has integrated pledge and unveil using the priv_sep
crate (https://crates.io/crates/priv_sep) I maintain. Anyway, there is
much work to do this properly so that it works on both amd64 and
aarch64 for the many "knobs" that exist in the .env file. If anyone is
interested in helping with this endeavor, I'd appreciate it. Conversely,
if this is something that is not worth it or desired; then I'll stick to
running a locally maintained version.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2023/11/05 15:20:53

Modified files:
audio/vorbis-tools: Makefile 
Added files:
audio/vorbis-tools/patches: patch-oggenc_platform_c 

Log message:
audio/vorbis-tools: fix a buffer overflow in oggenc

CVE-2023-43361
The security implications of this are very limited.

UPDATE: net/swirc 3.4.6

[Markus Uhlin]

Hi ports@,

Today I released net/swirc 3.4.6 with the following changes:

## [3.4.6] - 2023-11-05 ##
- **Added** adoption of SPDX-tags for the distributed manual pages
- **Added** better detection of server Wallops
- **Added** command-line option `-S` (Force TLS)
- **Added** event 249 (`RPL_STATSDEBUG`)
- **Added** extensive use of the `CPPFLAGS` make macro
- **Added** handling of empty user@host combinations in Wallops messages
- **Added** handling of znc messages. (Made them look like notices and
  appear in the active window.)
- **Added** protection for bad filenames for IRC logs
- **Added** translations
- **Changed** the way of recognizing a user mode versus channel mode
- **Did** code improvements
- **Fixed** occurrences of hardcoded function names in messages
- **Fixed** typos in manual pages
- **Improved** C++ exception handling
- **Limited** notification messages in length

### Windows ###
- **Upgraded to**...
  - [Curl](https://curl.se/) 8.4.0
  - [LibreSSL](https://www.libressl.org/) 3.8.2

A patched file, namely 'posixshell/os_BSD.sh', has changed and the patch 
is therefore no longer valid so I had to delete it. I attach a diff.


Best regards
Markus Uhlin
Index: Makefile
===
RCS file: /cvs/ports/net/swirc/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile	27 Sep 2023 14:18:34 -	1.29
+++ Makefile	5 Nov 2023 19:40:19 -
@@ -1,5 +1,5 @@
 COMMENT =	curses icb and irc client
-DISTNAME =	swirc-3.4.5
+DISTNAME =	swirc-3.4.6
 CATEGORIES =	net
 HOMEPAGE =	https://www.nifty-networks.net/swirc/
 
Index: distinfo
===
RCS file: /cvs/ports/net/swirc/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo	15 Sep 2023 07:00:13 -	1.25
+++ distinfo	5 Nov 2023 19:40:19 -
@@ -1,2 +1,2 @@
-SHA256 (swirc-3.4.5.tgz) = olNz44AUDVGQd60VYz+577hJO/FXVUTWw6EWTL8AtI4=
-SIZE (swirc-3.4.5.tgz) = 336832
+SHA256 (swirc-3.4.6.tgz) = s0sv7XJ+tOvX9/3RNOJGbXBmXj/Dl7FIi9ssD0ddqYI=
+SIZE (swirc-3.4.6.tgz) = 338724
Index: patches/patch-posixshell_os_BSD_sh
===
RCS file: patches/patch-posixshell_os_BSD_sh
diff -N patches/patch-posixshell_os_BSD_sh
--- patches/patch-posixshell_os_BSD_sh	30 Jul 2022 11:14:47 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
-propagate cflags and neuter hardcoded optimizations
-
-Index: posixshell/os_BSD.sh
 posixshell/os_BSD.sh.orig
-+++ posixshell/os_BSD.sh
-@@ -9,13 +9,11 @@ SHARED_FLAGS=-DBSD=1\\
- 	-DUNIX=1\\
- 	-D_XOPEN_SOURCE_EXTENDED=1\\
- 	-I/usr/local/include\\
--	-O2\\
--	-Wall\\
--	-pipe
-+	-Wall
- CC=cc
--CFLAGS=\$(SHARED_FLAGS) -std=c17
-+CFLAGS=\$(SHARED_FLAGS) -std=c17 ${CFLAGS}
- CXX=c++
--CXXFLAGS=\$(SHARED_FLAGS) -std=c++17
-+CXXFLAGS=\$(SHARED_FLAGS) -std=c++17 ${CXXFLAGS}
- LDFLAGS=-L/usr/local/lib
- LDLIBS=-lcrypto\\
- 	-lcurl\\

sparc64 bulk build report

[kmos]

Bulk build on sparc64-0a.ports.openbsd.org

Started : Sat Nov  4 02:30:06 MDT 2023
Finished: Sun Nov  5 13:31:26 MST 2023
Duration: 1 Days 12 hours 1 minutes

Built using OpenBSD 7.4-current (GENERIC.MP) #1926: Fri Nov  3 21:25:39 MDT 2023

Built 8179 packages

Number of packages built each day:
Nov 4: 7151
Nov 5: 1028


Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2023-11-04/summary.log

Build failures: 32
http://build-failures.rhaalovely.net/sparc64/2023-11-04/audio/libsmackerdec.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/audio/ncmpc.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/databases/leveldb.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/databases/ruby-amalgalite,ruby31.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/arm-none-eabi/gdb.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/avr/gcc.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/difftastic.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/gobject-introspection.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/mtxclient.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/py-thrift,python3.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/vim-command-t.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/devel/yder.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/games/cataclysm-dda,no_x11.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/games/choria.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/games/fheroes2.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/games/gnukem.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/games/scid.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/graphics/glslang.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/graphics/py2-Pillow.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/graphics/spirv-tools.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/mail/rspamd,hyperscan.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/math/gunits.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/math/openfst.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/net/utox.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/security/clamav.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/shells/nsh,static.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/sysutils/e2fsprogs.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/sysutils/flashrom.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/sysutils/pftop.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/sysutils/u-boot-asahi.log
http://build-failures.rhaalovely.net/sparc64/2023-11-04/textproc/libmarisa,,-main.log

Recurrent failures:
 failures/audio/libsmackerdec.log
 failures/audio/ncmpc.log
 failures/databases/ruby-amalgalite,ruby31.log
 failures/devel/avr/gcc.log
 failures/devel/difftastic.log
 failures/devel/mtxclient.log
 failures/devel/py-thrift,python3.log
 failures/devel/vim-command-t.log
 failures/devel/yder.log
 failures/games/cataclysm-dda,no_x11.log
 failures/games/choria.log
 failures/games/fheroes2.log
 failures/games/gnukem.log
 failures/games/scid.log
 failures/graphics/glslang.log
 failures/graphics/spirv-tools.log
 failures/mail/rspamd,hyperscan.log
 failures/math/gunits.log
 failures/math/openfst.log
 failures/security/clamav.log
 failures/shells/nsh,static.log
 failures/sysutils/pftop.log
 failures/sysutils/u-boot-asahi.log
 failures/textproc/libmarisa,,-main.log

New failures:
+failures/databases/leveldb.log
+failures/devel/arm-none-eabi/gdb.log
+failures/devel/clang-tools-extra.log
+failures/devel/gobject-introspection.log
+failures/graphics/py2-Pillow.log
+failures/sysutils/e2fsprogs.log
+failures/sysutils/flashrom.log

Resolved failures:
-failures/audio/libcanberra.log
-failures/devel/appstream.log
-failures/devel/kf5/kwidgetsaddons.log
-failures/devel/qcoro.log
-failures/devel/xsd.log
-failures/graphics/ffmpeg.log
-failures/graphics/rawstudio.log
-failures/graphics/tesseract/tesseract.log
-failures/inputmethods/ibus.log
-failures/inputmethods/libime.log
-failures/mail/mu.log
-failures/textproc/redland-bindings,-main.log
-failures/textproc/xxdiff.log
-failures/www/webkitgtk4.log
-failures/x11/gnome/gcr4.log
-failures/x11/gnome/gjs.log
-failures/x11/grantlee-qt5.log
-failures/x11/gromit-mpx.log
-failures/x11/kde-applications/kde-dev-scripts.log
-failures/x11/kde-applications/libkexiv2.log
-failures/x11/libquotient.log
-failures/x11/qt5/qttranslations.log
-failures/x11/qt6/qtbase.log
-failures/x11/xpad.log

Packages newly built:
+fonts/iosevka-fonts/etoile
+graphics/nanosvg
+www/p5-REST-Client

Packages not built this time:
-archivers/gcab
-archivers/quazip
-astro/celestia
-astro/gnuastro
-audio/ario

prevent from using libudev if present

[Rafael Sadowski]

Here is a diff that deactivate libudev detection in dvdstyler and add a
comment in libudev-openbsd.

The list should then be complete, just like the list for libinput in
wayland/libinput-openbsd. All consumers should now be patched.

Comments, OK?

Rafael


Index: sysutils/libudev-openbsd/Makefile
===
RCS file: /cvs/ports/sysutils/libudev-openbsd/Makefile,v
diff -u -p -r1.3 Makefile
--- sysutils/libudev-openbsd/Makefile   21 Sep 2023 10:56:41 -  1.3
+++ sysutils/libudev-openbsd/Makefile   5 Nov 2023 20:16:24 -
@@ -1,3 +1,11 @@
+# XXX
+# The libudev detection has been deactivated in the following ports:
+# x11/tigervnc
+# devel/openmpi
+# sysutils/consolekit
+# multimedia/libv4l
+# multimedia/dvdstyler
+
 COMMENT =  library to access udev device information
 
 VERSION =  20230921
Index: multimedia/dvdstyler/Makefile
===
RCS file: /cvs/ports/multimedia/dvdstyler/Makefile,v
diff -u -p -r1.51 Makefile
--- multimedia/dvdstyler/Makefile   27 Sep 2023 10:10:19 -  1.51
+++ multimedia/dvdstyler/Makefile   5 Nov 2023 20:16:24 -
@@ -2,7 +2,7 @@ COMMENT=DVD authoring application
 
 DISTNAME=  DVDStyler-3.2.1
 PKGNAME=   ${DISTNAME:L}
-REVISION=  0
+REVISION=  1
 CATEGORIES=multimedia
 SITES= ${SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=  .tar.bz2
Index: multimedia/dvdstyler/patches/patch-configure
===
RCS file: multimedia/dvdstyler/patches/patch-configure
diff -N multimedia/dvdstyler/patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ multimedia/dvdstyler/patches/patch-configure5 Nov 2023 20:16:24 
-
@@ -0,0 +1,85 @@
+Index: configure
+--- configure.orig
 configure
+@@ -7492,81 +7492,6 @@ fi
+ CXXFLAGS="$CXXFLAGS $FONTCONFIG_CFLAGS"
+ LIBS="$LIBS $FONTCONFIG_LIBS"
+ 
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libudev" >&5
+-$as_echo_n "checking for libudev... " >&6; }
+-
+-if test -n "$LIBUDEV_CFLAGS"; then
+-pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
--print-errors \"libudev\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
+-test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-pkg_failed=untried
+-fi
+-if test -n "$LIBUDEV_LIBS"; then
+-pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-if test -n "$PKG_CONFIG" && \
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
--print-errors \"libudev\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
+-test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-_pkg_short_errors_supported=yes
+-else
+-_pkg_short_errors_supported=no
+-fi
+-if test $_pkg_short_errors_supported = yes; then
+-  LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
--cflags --libs "libudev" 2>&1`
+-else
+-  LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs 
"libudev" 2>&1`
+-fi
+-  # Put the nasty error message in config.log where it belongs
+-  echo "$LIBUDEV_PKG_ERRORS" >&5
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libudev will not be 
used to get list of devices" >&5
+-$as_echo "$as_me: WARNING: libudev will not be used to get list of devices" 
>&2;}
+-elif test $pkg_failed = untried; then
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libudev will not be 
used to get list of devices" >&5
+-$as_echo "$as_me: WARNING: libudev will not be used to get list of devices" 
>&2;}
+-else
+-  LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS
+-  LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-  CXXFLAGS="$CXXFLAGS $LIBUDEV_CFLAGS -DHAVE_LIBUDEV";LIBS="$LIBS 
$LIBUDEV_LIBS"
+-fi
+-
+-
+ pkg_failed=no
+ { $as_echo 

Re: patch: allow shortened commits in dist-tuple

[Stefan Hagen]

Marc Espie wrote (2023-11-05 20:08 CET):
> 
> I don't think we need to go the full 40 chars.
> 
> It is highly unlikely people are going to use 10 hex chars
> as a tag (and if they do, it's likely it's just a copy of the
> commit hash)
> 
> 10 seems like a good number. tb@ mentionned that 8 is too short
> (we already ran into collision with 8).
> 
> So 10 ? or 12 ?
> 
> Opinions ?

+1 for the shortened hash and 10 looks reasonable.

> Index: dist-tuple.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/dist-tuple.port.mk,v
> diff -u -p -r1.14 dist-tuple.port.mk
> --- dist-tuple.port.mk28 Sep 2023 06:02:43 -  1.14
> +++ dist-tuple.port.mk5 Nov 2023 19:06:56 -
> @@ -25,7 +25,7 @@ ERRORS += "Fatal: invalid choice for DIS
>  .endif
>  
>  _subdir =
> -.if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{40}$/HASH/}" != "HASH"
> +.if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{10,40}$/HASH/}" != "HASH"
>  # set DISTNAME if not done by the port and add refs/tags/ subdir
>  DISTNAME ?= 
> ${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
>  _subdir =refs/tags/
> 

patch: allow shortened commits in dist-tuple

[Marc Espie]

I don't think we need to go the full 40 chars.

It is highly unlikely people are going to use 10 hex chars
as a tag (and if they do, it's likely it's just a copy of the
commit hash)

10 seems like a good number. tb@ mentionned that 8 is too short
(we already ran into collision with 8).

So 10 ? or 12 ?

Opinions ?

Index: dist-tuple.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/dist-tuple.port.mk,v
diff -u -p -r1.14 dist-tuple.port.mk
--- dist-tuple.port.mk  28 Sep 2023 06:02:43 -  1.14
+++ dist-tuple.port.mk  5 Nov 2023 19:06:56 -
@@ -25,7 +25,7 @@ ERRORS += "Fatal: invalid choice for DIS
 .endif
 
 _subdir =
-.if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{40}$/HASH/}" != "HASH"
+.if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{10,40}$/HASH/}" != "HASH"
 # set DISTNAME if not done by the port and add refs/tags/ subdir
 DISTNAME ?= ${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
 _subdir =  refs/tags/

maintainer update net/dnscontrol --> 4.6.0

[Paco Esteban]

Hi ports@,

This is an update of net/dnscontrol to its latest version.

You can see the changes here:
https://github.com/StackExchange/dnscontrol/releases/tag/v4.6.0

Main ones are the removal of the diff1 algorithm and 2 deprecation
notices for ACME certs support and NAMEDOTCOM and SOFTLAYER providers.

Nothing remarkable on the port itself.

Builds, tests pass and works for me on amd64.

Ok to commit ?

diff /usr/ports
commit - c5b77b092bde2d474d0936a40ab5ec96b1cb48f7
path + /usr/ports
blob - 253d3b5cfe5455ea3e817be727a738f3a6a25fad
file + net/dnscontrol/Makefile
--- net/dnscontrol/Makefile
+++ net/dnscontrol/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  manage DNS configuration across any number of DNS hosts
 
-MODGO_VERSION =v4.5.0
+MODGO_VERSION =v4.6.0
 MODGO_MODNAME =github.com/StackExchange/dnscontrol/v4
 
 DISTNAME = dnscontrol-${MODGO_VERSION}
blob - 12d1d37e5a7ce8e2420a5c2f37d363e8a14b82d8
file + net/dnscontrol/distinfo
--- net/dnscontrol/distinfo
+++ net/dnscontrol/distinfo
@@ -1,4 +1,4 @@
-SHA256 (dnscontrol-v4.5.0.zip) = 5A9x7sXplkMVNfbs/rc5CUbHBoleMYqOZB9i+C1rx28=
+SHA256 (dnscontrol-v4.6.0.zip) = FrrH/22hzZSVv+xJwhIZz/F8bk+dOp3J8XgGSnFSDL8=
 SHA256 (go_modules/cloud.google.com/go/@v/v0.110.2.mod) = 
/s4a1MvtHl2Hbqh33OyjQI8BVXQ+80/P9rgBsismEqs=
 SHA256 (go_modules/cloud.google.com/go/@v/v0.110.2.zip) = 
KLdNUKql4bzaBnN/W4We5n7EaFIf2+2jo2QKrCh8ab4=
 SHA256 (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = 
IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
@@ -13,11 +13,11 @@ SHA256 (go_modules/github.com/!azure!a!d/microsoft-aut
 SHA256 
(go_modules/github.com/!azure!a!d/microsoft-authentication-library-for-go/@v/v1.1.1.mod)
 = 7Qhg33P5gdaF3uCyx4T31hPZ8gfqcTsNLxcoiYmJuG0=
 SHA256 
(go_modules/github.com/!azure!a!d/microsoft-authentication-library-for-go/@v/v1.1.1.zip)
 = b5M/ANUxBAnI8/4lkXw8SKu5T6nFgqnOauNeqv6A0Gw=
 SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azcore/@v/v1.4.0.mod) = 
ajXJzyKfZpxC3PgtrqUx5hHrKDJE1X9XgLVekjJt44Y=
-SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azcore/@v/v1.7.1.mod) = 
OpfCagdkJsYpdFdLc6MxeD5hyoH1qYX+9dxp49ZN42U=
-SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azcore/@v/v1.7.1.zip) = 
HhnJT+OONjGQxbtFxeuktyrj4Sk8itR1G+NwYKLXiKY=
+SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azcore/@v/v1.8.0.mod) = 
pfXLjM8Gc3XZe/zb3zCHxyeP9/eMHuN4JbIkY3HEoVc=
+SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azcore/@v/v1.8.0.zip) = 
wwn4V+gsYEtu/g5OBWFRNqenVzlPUdvjQpJy3SKBfZ8=
 SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azidentity/@v/v1.2.2.mod) = 
/cO9WBRUgF/hEDRzhKMKEfZk2m2GGImLjyM/NOPSF/8=
-SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azidentity/@v/v1.3.1.mod) = 
26BfvbYKOINVSNTOGyHSyQBYuzowgNlUYC2dinmHkLI=
-SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azidentity/@v/v1.3.1.zip) = 
5x5qrUjFsRviP8ZvDWpH9Ebr1wHOVUPUQhSyUqiEBDQ=
+SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azidentity/@v/v1.4.0.mod) = 
VGyPgaDR5BmgkcQYtgzt7pwXaz3rIsbnx8KZS90rpb0=
+SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/azidentity/@v/v1.4.0.zip) = 
OVZiSSVPBeWNiooTJM1EwFRcpAkbNNXYbfuDIGK4MCw=
 SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/internal/@v/v1.2.0.mod) = 
VC8h48Rjx2jsB3XRP9s0tQllLd9YJzF9k/OmJTSpGQU=
 SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/internal/@v/v1.3.0.mod) = 
taAvZV66xQR1vv3CMMy7KXov1v5oAwBmXZU5Sib3O2U=
 SHA256 
(go_modules/github.com/!azure/azure-sdk-for-go/sdk/internal/@v/v1.3.0.zip) = 
lGF/DtZr9UGXayNgxWib+1TgPlRK200f4eA+KXtmtks=
@@ -48,32 +48,32 @@ SHA256 (go_modules/github.com/andybalholm/cascadia/@v/
 SHA256 (go_modules/github.com/andybalholm/cascadia/@v/v1.3.1.zip) = 
c15xY/d3QlTNT5atOAteqMz3AtrFOZ2+MN0DhxcsWlE=
 SHA256 
(go_modules/github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod)
 = Lc2vYuwp96+g04U01I9al/o+AnNDsPi/ZhrttxAhT9Y=
 SHA256 
(go_modules/github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip)
 = ywkLKzwZmHNT6DHKebMesx6qU0sfRtEbiBOyNbEFiFk=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.21.1.mod) = 
llAxLlhWpJXKDly6MYtGbjQAjnqImUcmNEuAT8cXHys=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.21.1.zip) = 
nYAOWvMQpTvRldqp77C2Ls2RmEcZ/rfmso6+W5cEdls=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/config/@v/v1.18.44.mod) = 
V90ok/k5hdfC/TbxiRXA+JAdndhaoIy0xwlVZ0aYqHE=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/config/@v/v1.18.44.zip) = 
HSdxbjK6zA2yNSRZKx15IoPHrI0L5PrLS9a1pWLLGmg=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/credentials/@v/v1.13.42.mod) = 
yva4uiTyXsiB0u45A0MS7wfu4vNKXU2F8RzoWQk9SLU=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/credentials/@v/v1.13.42.zip) = 
B/n7Bgymo2kwzZn7q68XOMT76xeGymd6K9nGgx7uZL4=
-SHA256 
(go_modules/github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.13.12.mod) = 
knWSGnn+pWtTPyYmnLq2rCwnkipancUHg4yKoYR8YkM=
-SHA256 

CVS: cvs.openbsd.org: ports

[Stefan Hagen]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2023/11/05 12:05:15

Modified files:
x11: Makefile 

Log message:
Add dir srandrd

CVS: cvs.openbsd.org: ports

[Stefan Hagen]

CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2023/11/05 12:04:13

Log message:
Import x11/srandrd version 0.6.3

$ cat pkg/DESCR
srandrd is a tool that executes a command on xrandr output change
events, i.e. if a monitor is plugged or unplugged.

I'm taking MAINTAINER as well.

OK op thfr (with hints from both)

Status:

Vendor Tag: sdk
Release Tags:   sdk_20231105

N ports/x11/srandrd/Makefile
N ports/x11/srandrd/distinfo
N ports/x11/srandrd/pkg/DESCR
N ports/x11/srandrd/pkg/PLIST
N ports/x11/srandrd/patches/patch-Makefile

No conflicts created by this import

Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs

[Thomas Frohwein]

On Sun, Nov 05, 2023 at 07:20:36PM +0100, Stefan Hagen wrote:

[...]

> > Either way, you should probably pass those include and link dirs only
> > in one place, and not both Makefiles.
> 
> ...I clearly didn't sleep enough.
> 
> I tend to go back to my previous solution. Because when I need a patch
> anyway, then I can put these lines in there without redirection.
> 
> I can add $(X11BASE)/... and it's subsituted automatically (without
> SUBST_CMD).
> 
> And nothing in the port Makefile is needed.
> 
> Am I still not seeing it?

I think that's fine. It's the best solution that I'm seeing, too...

[...]

ok thfr@

Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs

[Stefan Hagen]

Thomas Frohwein wrote (2023-11-05 18:30 CET):
> On Sun, Nov 05, 2023 at 04:37:06PM +0100, Stefan Hagen wrote:
> 
> [...]
> 
> > > > SUBST_VARS =${WRKSRC}/Makefile
> 
> [...]
> 
> > > 
> > > CFLAGS += -I${X11BASE}/include
> > > LDFLAGS += -L${X11BASE}/lib
> > 
> > I mixed this up. This should have been:
> > 
> > post-patch:
> > ${SUBST_CMD} ${WRKSRC}/Makefile
> > 
> > To replace X11BASE in the Makefile.
> > 
> > But I like your solution better and took it over. New version attached.
> 
> You now have the CFLAGS and LDFLAGS in both the port Makefile and the
> Makefile in WRKSRC, the latter expanded to /usr/X11R6 in 2 places.
> 
> I was thinking of something like:
> 
> CFLAGS := $(CFLAGS) -Wall -g -pedantic -std=c99
> 
> My Makefile-fu isn't good enough to get this to work similarly for
> LDFLAGS without resorting to renaming the variable in
> ${WRKSRC}/Makefile...
> 
> Either way, you should probably pass those include and link dirs only
> in one place, and not both Makefiles.

...I clearly didn't sleep enough.

I tend to go back to my previous solution. Because when I need a patch
anyway, then I can put these lines in there without redirection.

I can add $(X11BASE)/... and it's subsituted automatically (without
SUBST_CMD).

And nothing in the port Makefile is needed.

Am I still not seeing it?

> > > This makes it easier to amend in the future if the need arises.
> > > 
> > > Lastly, as this is a demon, should this come with an rc file and a
> > > dedicated user, so that it can be run on system startup? With X11
> > > applications, this makes it a bit weirder to launch before .xsession.
> > > Not sure if that's worth a consideration, but I'm thinking of it
> > > because of some contortions that I've done with sensorsd(8) and
> > > something like in the sensorsd script:
> > > 
> > > su -l thfr -c "env DISPLAY=:0 $command"
> > 
> > srandrd needs to be started while X is running. If it can't connect to
> > X, it will just print an error and quit. So a traditional daemon won't
> > work.
> > 
> > I got it to work from xenodm/Xsetup_0. But when the switch to the
> > user happens, the login session is closed and srandrd will quit.
> > So you still need to add it to .xsession as well.
> > 
> > If you find a better solution, I'm all ears.
> 
> This makes sense... an rc file would not be useful at all then. Thanks
> for the clarification!
> 
> > 
> > If you want to switch from sensorsd, you could use the "srandrd list"
> > output as check. This doesn't daemonize. But I wouldn't want to wait
> > for the next sensorsd check when I plug a screen in. The srandrd daemon
> > switches immediately.
> > 
> > Thanks for the feedback!
> > - Stefan
> 
> 


srandrd.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/05 10:47:54

Modified files:
x11/gentoo : Makefile 

Log message:
use simpler pax(1) copy instead of "tar -c | tar -x" in post-install

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/05 10:45:21

Modified files:
x11/gentoo : Makefile distinfo 
x11/gentoo/patches: patch-Makefile_in patch-src_buttons_c 
x11/gentoo/pkg : PLIST 

Log message:
update to gentoo 0.20.7, gtk+2 -> gtk+3

Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs

[Thomas Frohwein]

On Sun, Nov 05, 2023 at 04:37:06PM +0100, Stefan Hagen wrote:

[...]

> > > SUBST_VARS =${WRKSRC}/Makefile

[...]

> > 
> > CFLAGS += -I${X11BASE}/include
> > LDFLAGS += -L${X11BASE}/lib
> 
> I mixed this up. This should have been:
> 
> post-patch:
> ${SUBST_CMD} ${WRKSRC}/Makefile
> 
> To replace X11BASE in the Makefile.
> 
> But I like your solution better and took it over. New version attached.

You now have the CFLAGS and LDFLAGS in both the port Makefile and the
Makefile in WRKSRC, the latter expanded to /usr/X11R6 in 2 places.

I was thinking of something like:

CFLAGS := $(CFLAGS) -Wall -g -pedantic -std=c99

My Makefile-fu isn't good enough to get this to work similarly for
LDFLAGS without resorting to renaming the variable in
${WRKSRC}/Makefile...

Either way, you should probably pass those include and link dirs only
in one place, and not both Makefiles.

> 
> > This makes it easier to amend in the future if the need arises.
> > 
> > Lastly, as this is a demon, should this come with an rc file and a
> > dedicated user, so that it can be run on system startup? With X11
> > applications, this makes it a bit weirder to launch before .xsession.
> > Not sure if that's worth a consideration, but I'm thinking of it
> > because of some contortions that I've done with sensorsd(8) and
> > something like in the sensorsd script:
> > 
> > su -l thfr -c "env DISPLAY=:0 $command"
> 
> srandrd needs to be started while X is running. If it can't connect to
> X, it will just print an error and quit. So a traditional daemon won't
> work.
> 
> I got it to work from xenodm/Xsetup_0. But when the switch to the
> user happens, the login session is closed and srandrd will quit.
> So you still need to add it to .xsession as well.
> 
> If you find a better solution, I'm all ears.

This makes sense... an rc file would not be useful at all then. Thanks
for the clarification!

> 
> If you want to switch from sensorsd, you could use the "srandrd list"
> output as check. This doesn't daemonize. But I wouldn't want to wait
> for the next sensorsd check when I plug a screen in. The srandrd daemon
> switches immediately.
> 
> Thanks for the feedback!
> - Stefan

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/05 10:24:31

Modified files:
net/ipv6calc   : Makefile distinfo 

Log message:
update to ipv6calc 4.1.0

Re: firefox graphics acceleration broken - missing libva

[Landry Breuil]

Le Sun, Nov 05, 2023 at 03:08:54AM +, unnamed_maker...@aleeas.com a écrit :
> (sorry for the duplicate post - it seems the first attempt was not in plain 
> text - oops)
> 
> On the latest OpenBSD amd64 release, since Firefox 117 (I think), graphics 
> acceleration has been broken and the following error messages are produced 
> when firefox is launched:
> 
> Crash Annotation GraphicsCriticalError: |[0][GFX1-]: vaapitest: ERROR 
> (t=0.780224) [GFX1-]: vaapitest: ERROR
> Crash Annotation GraphicsCriticalError: |[0][GFX1-]: vaapitest: ERROR 
> (t=0.780224) |[1][GFX1-]: vaapitest: VA-API test failed: libva-drm.so.2 is 
> missing.
>  (t=0.780376) [GFX1-]: vaapitest: VA-API test failed: libva-drm.so.2 is 
> missing.
> 
> Does anyone have any idea how to fix this?  I haven't been able to find a 
> package for libva nor have I been able to compile it just yet.

nothing is broken, it's just a harmless warning. at startup firefox runs
vaapitest, which tries to load libva-drm (see
https://github.com/intel/libva), which doesnt exist on OpenBSD. but if
you check about:support, you'll see that graphics acceleration actually
works.

iirc that stuff isnt for graphics acceleration but rather used for video
hardware decoding, which isnt supported on OpenBSD.

Landry

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/11/05 09:58:38

Modified files:
wayland/libinput-openbsd: Makefile 

Log message:
Document which libinput consumers have been explicitly deactivated.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/11/05 09:52:58

Modified files:
devel/openmpi  : Makefile 

Log message:
Prevent openmpi to detect libudev

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/11/05 09:50:35

Modified files:
misc/brltty: Makefile 

Log message:
Disable libinput support for now

Set ac_cv_header_linux_input_h=no in CONFIGURE_ENV

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/11/05 09:41:11

Modified files:
games/bzflag   : Makefile 
Added files:
games/bzflag/patches: patch-configure 

Log message:
Disable libinput support for now

- Disable linux rumble joystick support
- Disable linux force feedback joystick support
- Update WANTLIB

Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs

[Stefan Hagen]

Thomas Frohwein wrote (2023-11-05 15:37 CET):
> On Wed, Nov 01, 2023 at 09:01:48AM +0100, Stefan Hagen wrote:
> > Omar Polo wrote (2023-10-30 19:46 CET):
> > > On 2023/10/30 14:28:35 +0100, Stefan Hagen  
> > > wrote:
> > > > Stefan Hagen wrote (2023-10-30 13:56 CET):
> > > > > I was looking for a solution to invoke autorandr when a monitor
> > > > > gets attached/detached. Unfortunately this emits no event that our
> > > > > hotplugd(8) can catch.
> > > > > 
> > > > > Today I stumbled over srandrd, and it's solving this issue in a nice 
> > > > > and
> > > > > clean way.
> > > > > 
> > > > > $ cat pkg/DESCR
> > > > > -
> > > > > srandrd is a tool that executes a command on xrandr output change
> > > > > events, i.e. if a monitor is plugged or unplugged. By default srandrd
> > > > > forks to background and exits if the xserver exits.
> > > > > -
> > > > > 
> > > > > You can drop "srandrd some_script.sh" into .xsession and it will run 
> > > > > this
> > > > > script when X output changes happen.
> > > > > 
> > > > > Inside the script, you have variables available to filter and react to
> > > > > specific events. How that works is described in srandrd(1).
> 
> This has an example script, but it's probably very interesting to
> think of using x11/autorandr in there...

That's what I do. There's not much of a script needed.
Simply a wrapper around "autorandr -c" because "srandrd autorandr -c"
wouldn't execute it with the parameter.

> > > > > Comment/OK for import?
> > > > 
> > > > I noticed the CFLAGS weren't quite right. I adjusted the patch to
> > > > remove -Os and add the OpenBSD CFLAGS (-O2 -pipe).
> > > > 
> > > > Update attached.
> > > 
> > > Can't test it right now, but the port looks fine and seems useful.
> > > OK op@ to import
> > > 
> > > nits:
> > > 
> > >  - please remove the stray empty lines at the bottom of DESCR
> > >  - maybe I'd drop the "By default srandr forks to the background [...]"
> > >from the DESCR, doesn't seem the place to document such behaviour.
> > >Thankfully, this port ships a manual describing the tool.
> > >  - to save a few lines, you could consider using the shiny new DIST_TUPLE
> > >(just a suggestion)
> > 
> > Thanks. I removed the nits and added DIST_TUPLE. I haven't used it
> > before, so thanks for suggesting.
> > 
> > I'll import after one more OK.
> 
> The LICENSE calls itself MIT/X Consortium License in the LICENSE file:
> 
> - # IT/X Consortium License
> + # MIT/X Consortium License

Uh, nice catch. Copy pasta...

> > SUBST_VARS =${WRKSRC}/Makefile
> 
> This line doesn't make sense. Look at the result:
> 
> $ make show=SUBST_VARS
> /usr/ports/pobj/srandrd-0.6.3/srandrd-0.6.3/Makefile ARCH BASE_PKGPATH 
> FLAVOR_EXT FULLPKGNAME HOMEPAGE  LOCALBASE LOCALSTATEDIR MACHINE_ARCH 
> MAINTAINER  PREFIX RCDIR SYSCONFDIR TRUEPREFIX X11BASE PKGSTEM
> 
> SUBST_VARS is the list of variables that will be substituted. You may
> have meant to do what SUBST_CMD does, but as it isn't in your Makefile,
> you probably don't even need that. I recommend reading SUBST_* in
> bsd.port.mk(5).
> 
> Regarding the patch, I would lean towards just adding CFLAGS/LDFLAGS in
> there and then adding the likes of '-I${X11BASE}/include' and
> '-L${X11BASE}/lib' to the port Makefile with e.g.
> 
> CFLAGS += -I${X11BASE}/include
> LDFLAGS += -L${X11BASE}/lib

I mixed this up. This should have been:

post-patch:
${SUBST_CMD} ${WRKSRC}/Makefile

To replace X11BASE in the Makefile.

But I like your solution better and took it over. New version attached.

> This makes it easier to amend in the future if the need arises.
> 
> Lastly, as this is a demon, should this come with an rc file and a
> dedicated user, so that it can be run on system startup? With X11
> applications, this makes it a bit weirder to launch before .xsession.
> Not sure if that's worth a consideration, but I'm thinking of it
> because of some contortions that I've done with sensorsd(8) and
> something like in the sensorsd script:
> 
> su -l thfr -c "env DISPLAY=:0 $command"

srandrd needs to be started while X is running. If it can't connect to
X, it will just print an error and quit. So a traditional daemon won't
work.

I got it to work from xenodm/Xsetup_0. But when the switch to the
user happens, the login session is closed and srandrd will quit.
So you still need to add it to .xsession as well.

If you find a better solution, I'm all ears.

If you want to switch from sensorsd, you could use the "srandrd list"
output as check. This doesn't daemonize. But I wouldn't want to wait
for the next sensorsd check when I plug a screen in. The srandrd daemon
switches immediately.

Thanks for the feedback!
- Stefan


srandrd.tgz
Description: application/tar-gz

Re: update emulators/libretro-pcsx-rearmed r23

[Thomas Frohwein]

On Sat, Nov 04, 2023 at 08:10:35PM -0700, Nam Nguyen wrote:
> Nam Nguyen writes:
> 
> > Nam Nguyen writes:
> >
> >> Here is an inline diff for updating libretro-pcsx-rearmed to r23,
> >> released on March 14, 2022. r22 was released on Feb 4, 2015 so it has
> >> been a while.
> >
> > ping
> 
> ping

Builds fine. I haven't done anything with retroarch, so I haven't tested
runtime, but provided this works for you, I'm ok with this.

Seems logical for me to ask: why not add you as the maintainer?

> 
> >
> >>
> >> tag:
> >> https://github.com/notaz/pcsx_rearmed/releases/tag/r23
> >>
> >> One major change that r23 does is it now supports libchdr through git
> >> submodules. I tweaked the port to link against emulators/libchdr which
> >> provides -lchdr.
> >>
> >> see:
> >> https://github.com/notaz/pcsx_rearmed/issues/166
> >>
> >> To test, I used retroarch to load several games in chd and zip formats.
> >>
> >> Feedback and tests are welcome. OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/libretro-pcsx-rearmed/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- Makefile  11 Mar 2022 18:59:37 -  1.4
> +++ Makefile  10 May 2023 20:30:23 -
> @@ -1,8 +1,7 @@
>  COMMENT =Sony PlayStation core for retroarch
>  
> -V =  22
> +V =  23
>  DISTNAME =   libretro-pcsx-rearmed-$V
> -REVISION =   0
>  
>  GH_ACCOUNT = notaz
>  GH_PROJECT = pcsx_rearmed
> @@ -13,13 +12,18 @@ CATEGORIES =  emulators
>  # GPLv2+, LGPLv2.1+
>  PERMIT_PACKAGE = Yes
>  
> -WANTLIB += m pthread z
> +WANTLIB += chdr m pthread z
> +
> +LIB_DEPENDS =emulators/libchdr
>  
>  USE_GMAKE =  Yes
>  
>  NO_TEST =Yes
>  
>  MAKE_FILE =  Makefile.libretro
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/Makefile
>  
>  do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/lib/libretro
> Index: distinfo
> ===
> RCS file: /cvs/ports/emulators/libretro-pcsx-rearmed/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  19 Oct 2016 07:47:21 -  1.1.1.1
> +++ distinfo  10 May 2023 20:30:23 -
> @@ -1,2 +1,2 @@
> -SHA256 (libretro-pcsx-rearmed-22.tar.gz) = 
> Z7Nplj9OaHtXF5eBlUwse9IDYEcNYNTfC3UvJFmvS2o=
> -SIZE (libretro-pcsx-rearmed-22.tar.gz) = 1153355
> +SHA256 (libretro-pcsx-rearmed-23.tar.gz) = 
> iH6bXue4EV01CZxzA3K0FY/T4hWVWgbWjiCSizOWRq8=
> +SIZE (libretro-pcsx-rearmed-23.tar.gz) = 1129836
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/emulators/libretro-pcsx-rearmed/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-Makefile
> --- patches/patch-Makefile11 Mar 2022 18:59:37 -  1.2
> +++ patches/patch-Makefile10 May 2023 20:30:23 -
> @@ -1,10 +1,34 @@
>  Makefile.origMon Oct 17 00:33:15 2016
> -+++ Makefile Mon Oct 17 00:33:40 2016
> -@@ -240,9 +240,7 @@ libpcsxcore/gte_nf.o: libpcsxcore/gte.c
> +unbundle libchdr and link against emulators/libchdr
> +replace git usage with hardcoded revision
> +
> +Index: Makefile
> +--- Makefile.orig
>  Makefile
> +@@ -150,17 +150,9 @@ endif
> + # cdrcimg
> + OBJS += plugins/cdrcimg/cdrcimg.o
> + #ifeq "$(CHD_SUPPORT)" "1"
> +-OBJS += libchdr/src/libchdr_bitstream.o
> +-OBJS += libchdr/src/libchdr_cdrom.o
> +-OBJS += libchdr/src/libchdr_chd.o
> +-OBJS += libchdr/src/libchdr_flac.o
> +-OBJS += libchdr/src/libchdr_huffman.o
> +-OBJS += libchdr/deps/lzma-19.00/src/Alloc.o 
> libchdr/deps/lzma-19.00/src/Bra86.o libchdr/deps/lzma-19.00/src/BraIA64.o 
> libchdr/deps/lzma-19.00/src/CpuArch.o libchdr/deps/lzma-19.00/src/Delta.o
> +-OBJS += libchdr/deps/lzma-19.00/src/LzFind.o 
> libchdr/deps/lzma-19.00/src/Lzma86Dec.o libchdr/deps/lzma-19.00/src/LzmaDec.o 
> libchdr/deps/lzma-19.00/src/LzmaEnc.o libchdr/deps/lzma-19.00/src/Sort.o
> +-CFLAGS += -DHAVE_CHD -Ilibchdr/include
> ++CFLAGS += -DHAVE_CHD -I${LOCALBASE}/include
> + libpcsxcore/cdriso.o: CFLAGS += -Wno-unused-function
> +-libchdr/src/%.o: CFLAGS += -Wno-unused -Ilibchdr/deps/lzma-19.00/include
> +-libchdr/deps/lzma-19.00/src/%.o: CFLAGS += -Wno-unused -D_7ZIP_ST 
> -Ilibchdr/deps/lzma-19.00/include
> ++LDFLAGS += -L${LOCALBASE}/lib -lchdr
> + #endif
> + 
> + # dfinput
> +@@ -270,9 +262,7 @@ libpcsxcore/gte_nf.o: libpcsxcore/gte.c
>   $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
>   
>   frontend/revision.h: FORCE
> --@(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_
> +-@(git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > $@_
>  -@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
>  -@rm $@_
>  +@echo '#define REV "0"' > $@
> Index: patches/patch-libpcsxcore_cdriso_c
> ===
> RCS file: patches/patch-libpcsxcore_cdriso_c
> diff -N 

Re: build failure, games/cataclysm-dda (picks up abseil)

[Kirill Bychkov]

On Thu, November 2, 2023 17:35, Stuart Henderson wrote:
> cataclysm-dda's src/third-party/flatbuffers_int/base.h has this, which
> looks for a string_view implementation:

Hi!
cataclysm-tiles works fine for me on amd64.
OK kirby@

>
> 215 #ifndef FLATBUFFERS_HAS_STRING_VIEW
> 216   // Only provide flatbuffers::string_view if __has_include can be
> used
> 217   // to detect a header that provides an implementation
> 218   #if defined(__has_include)
> 219 // Check for std::string_view (in c++17)
> 220 #if __has_include() && (__cplusplus >= 201606 ||
> (defined(_HAS_CXX17) && _HAS_CXX17))
> 221   #include 
> 222   namespace flatbuffers {
> 223 typedef std::string_view string_view;
> 224   }
> 225   #define FLATBUFFERS_HAS_STRING_VIEW 1
> 226 // Check for std::experimental::string_view (in c++14,
> compiler-dependent)
> 227 #elif __has_include() && (__cplusplus >=
> 201411)
> 228   #include 
> 229   namespace flatbuffers {
> 230 typedef std::experimental::string_view string_view;
> 231   }
> 232   #define FLATBUFFERS_HAS_STRING_VIEW 1
> 233 // Check for absl::string_view
> 234 #elif __has_include("absl/strings/string_view.h")
> 235   #include "absl/strings/string_view.h"
> 236   namespace flatbuffers {
> 237 typedef absl::string_view string_view;
> 238   }
> 239   #define FLATBUFFERS_HAS_STRING_VIEW 1
> 240 #endif
> 241   #endif // __has_include
> 242 #endif // !FLATBUFFERS_HAS_STRING_VIEW
>
> I ran into a case where it looks like it may have picked up abseil which
> was then junked during build:
>
> FAILED: src/CMakeFiles/cataclysm-common.dir/overmap_connection.cpp.o
> /pobj/cataclysm-dda-0.G-no_x11/bin/c++ -DCMAKE -DDATA_DIR_PREFIX -DLOCALIZE
> -DPREFIX=/usr/local -DRELEASE -DUSE_HOME_DIR
> -I/pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src -isystem
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/third-party -O2 -pipe
> -I/usr/local/include -Werror -Wall -Wextra -Wformat-signedness -Wlogical-op
> -Wmissing-declarations -Wmissing-noreturn -Wnon-virtual-dtor -Wold-style-cast
> -Woverloaded-virtual -Wpedantic -Wsuggest-override -Wunused-macros
> -Wzero-as-null-pointer-constant -Wno-unknown-warning-option -Wredundant-decls
> -fsigned-char -DNDEBUG -std=c++14 -pthread -MD -MT
> src/CMakeFiles/cataclysm-common.dir/overmap_connection.cpp.o -MF
> src/CMakeFiles/cataclysm-common.dir/overmap_connection.cpp.o.d -o
> src/CMakeFiles/cataclysm-common.dir/overmap_connection.cpp.o -c
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/overmap_connection.cpp
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/overmap_connection.cpp:1:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/overmap_connection.h:11:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/omdata.h:16:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/assign.h:17:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/json.h:1600:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/flexbuffer_json.h:8:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/third-party/flatbuffers_int/flexbuffers.h:22:
> In file included from
> /pobj/cataclysm-dda-0.G-no_x11/Cataclysm-DDA-0.G/src/third-party/flatbuffers_int/base.h:235:
> /usr/local/include/absl/strings/string_view.h:39:10: fatal error:
> 'absl/base/attributes.h' file not found
> #include "absl/base/attributes.h"
>  ^~~~
> 1 error generated.
> ninja: build stopped: subcommand failed.
>
> I suppose junking must have happened right while the headers were being
> handled by the compiler (after it handled the __has_include and before
> getting as far as absl/base/attributes.h).
>
> I wonder if the simplest fix might actually be to switch to c++17
> so the standard library implementation can be used instead.
> Upstream already made that change:
>
> https://github.com/CleverRaven/Cataclysm-DDA/commit/0fa8e7e7447b5aee2296028c5245580842a6a6df
> https://github.com/CleverRaven/Cataclysm-DDA/commit/0b5dfd4e6ba47957fb2fe8aeb802c42c1d862d37
>
> Diff for that below. Build tested only.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- Makefile  23 Aug 2023 20:27:27 -  1.28
> +++ Makefile  2 Nov 2023 13:51:57 -
> @@ -6,7 +6,7 @@ GH_PROJECT=   Cataclysm-DDA
>  GH_TAGNAME=  0.G
>  DISTNAME=cataclysm-dda-${GH_TAGNAME}
>  EPOCH=   0
> -REVISION=0
> +REVISION=1
>
>  HOMEPAGE=https://cataclysmdda.org
>  MAINTAINER=  Kirill Bychkov 
> 

Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs

[Thomas Frohwein]

On Wed, Nov 01, 2023 at 09:01:48AM +0100, Stefan Hagen wrote:
> Omar Polo wrote (2023-10-30 19:46 CET):
> > On 2023/10/30 14:28:35 +0100, Stefan Hagen  
> > wrote:
> > > Stefan Hagen wrote (2023-10-30 13:56 CET):
> > > > I was looking for a solution to invoke autorandr when a monitor
> > > > gets attached/detached. Unfortunately this emits no event that our
> > > > hotplugd(8) can catch.
> > > > 
> > > > Today I stumbled over srandrd, and it's solving this issue in a nice and
> > > > clean way.
> > > > 
> > > > $ cat pkg/DESCR
> > > > -
> > > > srandrd is a tool that executes a command on xrandr output change
> > > > events, i.e. if a monitor is plugged or unplugged. By default srandrd
> > > > forks to background and exits if the xserver exits.
> > > > -
> > > > 
> > > > You can drop "srandrd some_script.sh" into .xsession and it will run 
> > > > this
> > > > script when X output changes happen.
> > > > 
> > > > Inside the script, you have variables available to filter and react to
> > > > specific events. How that works is described in srandrd(1).

This has an example script, but it's probably very interesting to
think of using x11/autorandr in there...

> > > > Comment/OK for import?
> > > 
> > > I noticed the CFLAGS weren't quite right. I adjusted the patch to
> > > remove -Os and add the OpenBSD CFLAGS (-O2 -pipe).
> > > 
> > > Update attached.
> > 
> > Can't test it right now, but the port looks fine and seems useful.
> > OK op@ to import
> > 
> > nits:
> > 
> >  - please remove the stray empty lines at the bottom of DESCR
> >  - maybe I'd drop the "By default srandr forks to the background [...]"
> >from the DESCR, doesn't seem the place to document such behaviour.
> >Thankfully, this port ships a manual describing the tool.
> >  - to save a few lines, you could consider using the shiny new DIST_TUPLE
> >(just a suggestion)
> 
> Thanks. I removed the nits and added DIST_TUPLE. I haven't used it
> before, so thanks for suggesting.
> 
> I'll import after one more OK.

The LICENSE calls itself MIT/X Consortium License in the LICENSE file:

- # IT/X Consortium License
+ # MIT/X Consortium License

> SUBST_VARS =${WRKSRC}/Makefile

This line doesn't make sense. Look at the result:

$ make show=SUBST_VARS
/usr/ports/pobj/srandrd-0.6.3/srandrd-0.6.3/Makefile ARCH BASE_PKGPATH 
FLAVOR_EXT FULLPKGNAME HOMEPAGE  LOCALBASE LOCALSTATEDIR MACHINE_ARCH 
MAINTAINER  PREFIX RCDIR SYSCONFDIR TRUEPREFIX X11BASE PKGSTEM

SUBST_VARS is the list of variables that will be substituted. You may
have meant to do what SUBST_CMD does, but as it isn't in your Makefile,
you probably don't even need that. I recommend reading SUBST_* in
bsd.port.mk(5).

Regarding the patch, I would lean towards just adding CFLAGS/LDFLAGS in
there and then adding the likes of '-I${X11BASE}/include' and
'-L${X11BASE}/lib' to the port Makefile with e.g.

CFLAGS += -I${X11BASE}/include
LDFLAGS += -L${X11BASE}/lib

This makes it easier to amend in the future if the need arises.

Lastly, as this is a demon, should this come with an rc file and a
dedicated user, so that it can be run on system startup? With X11
applications, this makes it a bit weirder to launch before .xsession.
Not sure if that's worth a consideration, but I'm thinking of it
because of some contortions that I've done with sensorsd(8) and
something like in the sensorsd script:

su -l thfr -c "env DISPLAY=:0 $command"

Re: (DIST_TUPLE) - Re: Update from Maintainer: games/mvdsv -> 0.36

[Thomas Frohwein]

On Wed, Nov 01, 2023 at 07:28:46AM +, Stuart Henderson wrote:

[...]

> (I wonder if DIST_TUPLE/bsd.port.mk can be wrangled into allowing
> truncated commit hashes somehow... would need explicit signalling for
> tags vs hash rather than implying based on whether the 4th argument
> looks like a hash but that might be possible... anyway that's a
> possible future direction and not for this diff)

Do you mean something like using 53af547 instead of
53af547d0608a1507895fc1629cdc3f4820fc0af ? Like here:

https://github.com/QW-Group/qwprot/commit/53af547d0608a1507895fc1629cdc3f4820fc0af

CVS: cvs.openbsd.org: ports

[Thomas Frohwein]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2023/11/05 06:56:52

Modified files:
devel/sdl2 : Makefile distinfo 

Log message:
stable bugfix update to SDL 2.28.5, build and runtime tested with multiple 
consumers

Re: Update from Maintainer: games/ezquake to 3.6.4

[Thomas Frohwein]

On Thu, Nov 02, 2023 at 09:27:21AM +, Tom Murphy wrote:
> On Thu, Nov 02, 2023 at 01:59:53AM -0700, Nam Nguyen wrote:
> > Tom Murphy writes:
> > 
> > > Hi again,
> > >
> > >   Apologies, in the Makefile shuffle I took out PKGNAME by mistake.
> > >   Updated diff below. Thanks!
> > >
> > > -Tom
> > >
> > 
> > Please find two diffs: an attached diff for -stable and an inline diff
> > for -current with some additional tweaks on top of tom's diff:
> > 
> > - stable diff backports the security fix preventing download of .so
> >   files and bumps REVISION
> > see:
> > https://github.com/QW-Group/ezquake-source/commit/df38450a75ef7492c51c6e9f3012235521a01b98
> > https://github.com/QW-Group/ezquake-source/issues/857
> > 
> > - Break up DIST_TUPLE to 80 char long lines and add license markers.
> > - Add a second ${GAMEDIR} substition in EX_browser_sources.c patch. With
> >   this, server browser now successfully reads from
> >   /usr/local/share/ezquake/na-sv.txt. The lists are outdated by 12 years
> >   so I will try to add some servers upstream.
> > - when resizing in cwm or xmonad, I get a black window. This is caused
> >   by vid_software_palette changing from 0 to 1 default. I have a patch
> >   to revert this to 0, which should be a good default for
> >   users. Alternatively, you can specify "vid_software_palette 0" in your
> >   config and we can not use this patch.
> > 
> >   see:
> >   https://github.com/QW-Group/ezquake-source/issues/858
> > 
> > Tom asked me to test runtime. I tested -stable and -current and gameplay
> > was good other than the black window upon resizing in cwm or xmonad,
> > which is addressed by the patch.
> > 
> > OK?

Tested the 3.6.4 update and everything works as expected. ok thfr@

> 
> 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/ezquake/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -u -p -r1.15 Makefile
> > --- Makefile6 Mar 2023 13:37:15 -   1.15
> > +++ Makefile2 Nov 2023 08:27:35 -
> > @@ -1,30 +1,32 @@
> > -N =ezquake
> > -V =3.6.1
> >  COMMENT =  modern QuakeWorld client
> >  
> > -PKGNAME =  ${N}-${V}
> > -GH_ACCOUNT =   QW-Group
> > -GH_PROJECT =   ${N}-source
> > -GH_TAGNAME =   ${V}
> > -
> >  CATEGORIES =   games
> >  
> > -HOMEPAGE = https://ezquake.github.io/
> > -MAINTAINER =   Tom Murphy 
> > +N =ezquake
> > +V =3.6.4
> > +PKGNAME =  ${N}-${V}
> > +DIST_TUPLE +=  github QW-Group ${N}-source ${V} . # GPLv2+
> > +DIST_TUPLE +=  github QW-Group qwprot \
> > +   53af547d0608a1507895fc1629cdc3f4820fc0af src/qwprot # GPLv2+
> >  
> >  # GPLv2+
> >  PERMIT_PACKAGE =   Yes
> >  
> > -WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m pcre png pthread
> > -WANTLIB += sndfile speex speexdsp z
> > +MAINTAINER =   Tom Murphy 
> > +
> > +HOMEPAGE = https://ezquake.github.io/
> > +
> > +WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m minizip pcre2-8 png
> > +WANTLIB += pthread sndfile speex speexdsp z
> >  
> > -LIB_DEPENDS =  audio/libsndfile \
> > +LIB_DEPENDS =  archivers/minizip \
> > +   audio/libsndfile \
> > audio/speex \
> > graphics/jpeg \
> > graphics/png \
> > +   devel/pcre2 \
> > devel/sdl2 \
> > devel/jansson \
> > -   devel/pcre \
> > net/curl
> >  
> >  USE_GMAKE =Yes
> > @@ -36,7 +38,7 @@ GAMEDIR = ${PREFIX}/share/ezquake
> >  SUBST_VARS +=  GAMEDIR
> >  
> >  do-configure:
> > -   ${SUBST_CMD} ${WRKSRC}/EX_browser_sources.c
> > +   ${SUBST_CMD} ${WRKSRC}/src/EX_browser_sources.c
> >  
> >  do-install:
> > ${INSTALL_PROGRAM}  ${WRKSRC}/ezquake ${PREFIX}/bin
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/games/ezquake/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -u -p -r1.9 distinfo
> > --- distinfo29 Nov 2022 15:03:53 -  1.9
> > +++ distinfo2 Nov 2023 08:27:35 -
> > @@ -1,2 +1,4 @@
> > -SHA256 (ezquake-source-3.6.1.tar.gz) = 
> > u2+D8QD+6h4ld2gE5J/79UjXh3wPR9XiuZ8+ShdnX/4=
> > -SIZE (ezquake-source-3.6.1.tar.gz) = 23503412
> > +SHA256 (QW-Group-ezquake-source-3.6.4.tar.gz) = 
> > BvKf049WKRxMr/GTyLJUF6DBjlj6JrwOWOBjl//tmTM=
> > +SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 
> > +nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
> > +SIZE (QW-Group-ezquake-source-3.6.4.tar.gz) = 1920426
> > +SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 
> > 8815
> > Index: patches/patch-EX_browser_sources_c
> > ===
> > RCS file: patches/patch-EX_browser_sources_c
> > diff -N patches/patch-EX_browser_sources_c
> > --- patches/patch-EX_browser_sources_c  11 Mar 2022 19:04:20 -  
> > 1.2
> > 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 05:45:06

Modified files:
textproc/gron  : Makefile distinfo 
Added files:
textproc/gron/patches: patch-go_mod patch-go_sum 

Log message:
patch gron modules list to use newer go-colorable/go-isatty; the
newer version of go-isatty uses newer x/sys/unix and ioctl() rather
syscall(SYS_ioctl)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 05:38:10

ports/textproc/gron/patches

Update of /cvs/ports/textproc/gron/patches
In directory cvs.openbsd.org:/tmp/cvs-serv87078/patches

Log Message:
Directory /cvs/ports/textproc/gron/patches added to the repository

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:54:18

Modified files:
graphics/py-Pillow: Makefile distinfo 

Log message:
update to py3-Pillow-10.1.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:47:56

Modified files:
textproc/py-css-parser: Makefile distinfo 

Log message:
update to py3-css-parser-1.0.10

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:47:52

Modified files:
textproc/py-charset-normalizer: Makefile distinfo 

Log message:
update to py3-charset-normalizer-3.3.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:47:44

Modified files:
print/ocrmypdf : Makefile distinfo 
print/ocrmypdf/pkg: PLIST 

Log message:
update to ocrmypdf-15.4.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:42:00

Modified files:
mail/neomutt   : Makefile distinfo 
mail/neomutt/patches: patch-main_c 

Log message:
update to neomutt-20231103

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:41:53

Modified files:
devel/py-wheel : Makefile distinfo 

Log message:
update to py3-wheel-0.41.3

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:41:48

Modified files:
devel/py-wcmatch: Makefile distinfo 

Log message:
update to py3-wcmatch-8.5

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/11/05 04:37:26

Modified files:
multimedia/get_iplayer: Makefile distinfo 

Log message:
update to get_iplayer-3.34

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2023/11/05 03:28:59

Modified files:
databases/bbolt: Makefile distinfo 

Log message:
Update bbolt to 1.3.8, tested & ok pvk

This version includes jrick's fix to avoid syscall(2) use.

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2023/11/05 03:14:29

Modified files:
sysutils/consul: Makefile distinfo 
Added files:
sysutils/consul/patches: patch-logging_logfile_bsd_go 
 
patch-vendor_github_com_mitchellh_go-ps_process_openbsd_go 
 
patch-vendor_github_com_mitchellh_go-ps_process_openbsd_h 

Log message:
Update consul 1.16.1 -> 1.16.3
Changelog: https://github.com/hashicorp/consul/releases/tag/v1.16.3
ok ajacoutot@

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2023/11/05 03:10:25

Modified files:
net/zabbix : Makefile distinfo 
net/zabbix/pkg : PLIST-proxy PLIST-server 
Added files:
net/zabbix/patches: patch-include_zbx_dbversion_constants_h 

Log message:
Update zabbix 6.4.7 -> 6.4.8
Changelog: https://raw.githubusercontent.com/zabbix/zabbix/master/ChangeLog
Release notes: https://www.zabbix.com/rn/rn6.4.8
ok robert@

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Sun, Nov 05, 2023 at 01:55:40AM -0700, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2023/11/05 01:55:40
> 
> Modified files:
>   net/syncthing  : Makefile 
>   net/syncthing/pkg: PLIST 
> Added files:
>   net/syncthing/pkg: syncthing_discovery.rc syncthing_relay.rc 
> 
> Log message:
> add rc files for relay and discovery services
> 
> ok edd@ (maintainer)

Hi.

daemon_flags="" in pkg/syncthing_discovery.rc is not needed, it's the default
Also, the daemon path is hardcoded in pkg/syncthing_relay.rc and 
pkg/syncthing_discovery.rc; it should use ${TRUEPREFIX}

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2023/11/05 01:55:40

Modified files:
net/syncthing  : Makefile 
net/syncthing/pkg: PLIST 
Added files:
net/syncthing/pkg: syncthing_discovery.rc syncthing_relay.rc 

Log message:
add rc files for relay and discovery services

ok edd@ (maintainer)

Re: bulk without syscall(2) results

[Theo Buehler]

On Wed, Nov 01, 2023 at 10:31:39PM +0100, Theo Buehler wrote:
> I ran a bulk with the full diff removing syscall from libc and kernel
> applied. Here's what broke or threw a warning. Running nm on .o files
> in WRKDIR didn't find any unexpected 'syscall U'.
> 
> Non-Go ports with warnings or build failures. Some details at the end:

Fix from jca pending in this thread:

> net/torsocks  probably BROKEN

Fixed:

> print/luametatex  easy fix
> x11/qt{5,6}/qtwebengine   easy fix

As far as I'm aware, this means the remaining work is to fix Go ports,
which involves figuring out how to patch them one way or the other.

To identify which Go ports need fixing, jsing suggested I add the patch
attached at the end to force external linking (and suppress a noisy
warning). This looks as follows:

ld: error: undefined symbol: syscall
>>> referenced by go.go
>>>   
>>> /tmp/pobj/influxdb-2.7.1/build-amd64/go-link-350984573/go.o:(syscall.libc_syscall_trampoline.abi0)
cc: error: linker command failed with exit code 1 (use -v to see invocation)

databases/bbolt
databases/influx-cli
databases/influxdb
databases/mongo-tools
databases/victoriametrics
devel/git-lfs
devel/github-cli
devel/hub
devel/promu
devel/reposurgeon
devel/tea
editors/micro
games/clidle
mail/aerc
mail/opensmtpd-filters/rspamd
minio/server
net/amfora
net/bombadillo
net/dendrite
net/dt
net/eduvpn/vpn-daemon
net/gomuks
net/headscale
net/irtt
net/mattermost-server
net/minio/client
net/sping
net/stayrtr
net/syncthing
net/tailscale
net/termshark
net/wormhole-william
net/yggdrasil-go
security/cfssl
security/gopass
security/keybase
security/nuclei
security/ogvt
security/sops
security/step-ca
security/step-cli
security/vault
shells/elvish
sysutils/alertmanager
sysutils/amazon-ecs-cli
sysutils/amazon-ssm-agent
sysutils/beats/filebeat
sysutils/beats/heartbeat
sysutils/beats/metricbeat
sysutils/beats/packetbeat
sysutils/blackbox_exporter
sysutils/consul
sysutils/dep
sysutils/direnv
sysutils/docker-cli
sysutils/duf
sysutils/exoscale-cli
sysutils/fleetctl
sysutils/fzf
sysutils/gitlab-runner
sysutils/hcloud
sysutils/kopia
sysutils/lf
sysutils/loki
sysutils/node_exporter
sysutils/nomad
sysutils/oc
sysutils/packer
sysutils/promscale
sysutils/rclone
sysutils/serf
sysutils/snmp_exporter
sysutils/stripe-cli
sysutils/telegraf
sysutils/terraform
sysutils/terragrunt
textproc/gron
textproc/pup
textproc/terraform-docs
textproc/uni
www/gitea
www/gotosocial
www/shiori

Index: patches/patch-src_cmd_link_internal_ld_config_go
===
RCS file: patches/patch-src_cmd_link_internal_ld_config_go
diff -N patches/patch-src_cmd_link_internal_ld_config_go
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_cmd_link_internal_ld_config_go2 Nov 2023 23:24:43 
-
@@ -0,0 +1,12 @@
+Index: src/cmd/link/internal/ld/config.go
+--- src/cmd/link/internal/ld/config.go.orig
 src/cmd/link/internal/ld/config.go
+@@ -173,7 +173,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason st
+   return true, fmt.Sprintf("some packages could not be built to 
support internal linking (%v)", dynimportfail)
+   }
+ 
+-  return false, ""
++  return true, ""
+ }
+ 
+ // determineLinkMode sets ctxt.LinkMode.
Index: patches/patch-src_cmd_link_internal_ld_lib_go
===
RCS file: /cvs/ports/lang/go/patches/patch-src_cmd_link_internal_ld_lib_go,v
diff -u -p -r1.22 patch-src_cmd_link_internal_ld_lib_go
--- patches/patch-src_cmd_link_internal_ld_lib_go   17 Oct 2023 03:52:18 
-  1.22
+++ patches/patch-src_cmd_link_internal_ld_lib_go   2 Nov 2023 23:24:33 
-
@@ -1,6 +1,15 @@
 Index: src/cmd/link/internal/ld/lib.go
 --- src/cmd/link/internal/ld/lib.go.orig
 +++ src/cmd/link/internal/ld/lib.go
+@@ -446,7 +446,7 @@ func loadinternal(ctxt *Link, name string) *sym.Librar
+   if pname := ctxt.PackageFile[name]; pname != "" {
+   return addlibpath(ctxt, "internal", "internal", pname, 
name, "", zerofp)
+   }
+-  ctxt.Logf("loadinternal: cannot find %s\n", name)
++  // ctxt.Logf("loadinternal: cannot find %s\n", name)
+   return nil
+   }
+ 
 @@ -1428,6 +1428,7 @@ func (ctxt *Link) hostlink() {
}
case objabi.Hopenbsd:

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/05 01:37:35

Modified files:
x11/xarchiver  : Makefile distinfo 
x11/xarchiver/pkg: PLIST 

Log message:
previous out to be to 0.5.4.21 not same .17;  thanks aja

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/05 01:20:38

Modified files:
textproc/unicode/cldr: Makefile distinfo 
textproc/unicode/cldr/pkg: PLIST-annotations PLIST-main 

Log message:
Update to unicode-cldr-44.0.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2023/11/05 02:18:28

ports/mail/opensmtpd-filters/spamassassin/patches

Update of /cvs/ports/mail/opensmtpd-filters/spamassassin/patches
In directory cvs.openbsd.org:/tmp/cvs-serv80198/patches

Log Message:
Directory /cvs/ports/mail/opensmtpd-filters/spamassassin/patches added to the 
repository

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/05 01:17:08

Modified files:
geo: Makefile 

Log message:
Drop geocode-glib,soup3.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/05 01:04:52

Modified files:
mail/evolution : Makefile 
x11/gnome/clocks: Makefile 
x11/gnome/initial-setup: Makefile 
x11/gnome/libgweather4: Makefile 
x11/gnome/maps : Makefile 
x11/gnome/photos: Makefile 
x11/gnome/settings-daemon: Makefile 

Log message:
Fix geo/geocode-glib dependency.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/05 01:04:37

Modified files:
geo/geocode-glib: Makefile 
Added files:
geo/geocode-glib/pkg: DESCR PLIST 
Removed files:
geo/geocode-glib/pkg: DESCR-icons DESCR-main PFRAG.no-soup3-main 
  PFRAG.soup3-main PLIST-icons PLIST-main 

Log message:
Drop the soup3 FLAVOR; nothing uses the unFLAVORED soup2 anymore.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/05 01:29:48

Modified files:
x11/gnome/text-editor: Makefile distinfo 

Log message:
Update to gnome-text-editor-45.1.

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Sat, Nov 04, 2023 at 02:47:58AM -0600, Klemens Nanni wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2023/11/04 02:47:58
> 
> Modified files:
>   x11/xarchiver  : Makefile distinfo 
> 
> Log message:
> update to xarchiver 0.5.4.17 using DIST_TUPLE

It was already at version 0.5.4.17, REVISION 2.
Now it moved backward (since REVISION was removed).

-- 
Antoine