From: Johannes Thyssen Tishman <jtt@openbsd.org>
Subject: [revision] net/soju: set default config path and tweak pkg/README
To: ports@openbsd.org
Date: Sun, 16 Aug 2026 12:40:59 +0000

Please find below a revision for net/soju that configures the default
config path at build time. This avoids having to specify it as a flag in
the rc file and when running soju{db,ctl}.

Additionally, modify the path for the key and cert used in the
pkg/README to a path that's actually readable by the _soju user.

Index: net/soju/Makefile
===================================================================
RCS file: /cvs/ports/net/soju/Makefile,v
diff -u -p -r1.7 Makefile
--- net/soju/Makefile	17 Nov 2025 09:06:14 -0000	1.7
+++ net/soju/Makefile	16 Aug 2026 12:32:04 -0000
@@ -3,6 +3,7 @@ COMMENT =		user-friendly IRC bouncer
 MODGO_MODNAME =		codeberg.org/emersion/soju
 MODGO_VERSION =		v0.10.1
 DISTNAME =		soju-${MODGO_VERSION}
+REVISION =		0
 
 CATEGORIES =		net
 HOMEPAGE =		https://soju.im/
Index: net/soju/patches/patch-config_config_go
===================================================================
RCS file: /cvs/ports/net/soju/patches/patch-config_config_go,v
diff -u -p -r1.2 patch-config_config_go
--- net/soju/patches/patch-config_config_go	23 May 2024 18:59:54 -0000	1.2
+++ net/soju/patches/patch-config_config_go	16 Aug 2026 12:32:04 -0000
@@ -1,11 +1,13 @@
 Index: config/config.go
 --- config/config.go.orig
 +++ config/config.go
-@@ -14,7 +14,7 @@ import (
+@@ -13,8 +13,8 @@ import (
+ )
  
  var (
- 	DefaultPath          string
+-	DefaultPath          string
 -	DefaultUnixAdminPath = "/run/soju/admin"
++	DefaultPath          = "/etc/soju/config"
 +	DefaultUnixAdminPath = "/var/run/soju/admin"
  )
  
Index: net/soju/pkg/README
===================================================================
RCS file: /cvs/ports/net/soju/pkg/README,v
diff -u -p -r1.1.1.1 README
--- net/soju/pkg/README	17 Dec 2023 21:24:54 -0000	1.1.1.1
+++ net/soju/pkg/README	16 Aug 2026 12:32:04 -0000
@@ -8,7 +8,7 @@ Creating a database
 soju requires a database to be created before starting the daemon.
 This can be done as follows:
 
-$ doas -u _soju sojudb -config ${SYSCONFDIR}/soju/config create-user <username> -admin
+$ doas -u _soju sojudb create-user <username> -admin
 
 This will create the database under ${LOCALSTATEDIR}/soju/main.db or as specified
 in ${SYSCONFDIR}/soju/config.
@@ -23,7 +23,7 @@ under ${SYSCONFDIR}/soju/config e.g.:
 
 ...
 listen ircs://
-tls ${SYSCONFDIR}/ssl/example.com.fullchain.pem ${SYSCONFDIR}/ssl/private/example.com.key
+tls ${SYSCONFDIR}/soju/example.com.fullchain.pem ${SYSCONFDIR}/soju/example.com.key
 ...
 
 Note that certificate and key should be readable by the _soju user.
Index: net/soju/pkg/soju.rc
===================================================================
RCS file: /cvs/ports/net/soju/pkg/soju.rc,v
diff -u -p -r1.1.1.1 soju.rc
--- net/soju/pkg/soju.rc	17 Dec 2023 21:24:54 -0000	1.1.1.1
+++ net/soju/pkg/soju.rc	16 Aug 2026 12:32:04 -0000
@@ -1,7 +1,7 @@
 #!/bin/ksh
 
 daemon="${TRUEPREFIX}/bin/soju"
-daemon_flags="-config ${SYSCONFDIR}/soju/config"
+daemon_flags=""
 daemon_logger=daemon.info
 daemon_user=_soju