Hello,
Here is an update for net/ocserv 1.6.0
Many things have changed and it seems the former version
is not able to start anymore on 8.0.
I tested this patch against -current and 8.0-stable on
amd64
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
diff -u -p -r1.65 Makefile
--- Makefile 18 Jun 2026 00:15:07 -0000 1.65
+++ Makefile 23 Oct 2026 11:47:57 -0000
@@ -1,8 +1,7 @@
COMMENT= server implementing the AnyConnect SSL VPN protocol
-VERSION = 1.4.0
+VERSION = 1.6.0
DISTNAME= ocserv-${VERSION}
-REVISION= 0
EXTRACT_SUFX= .tar.gz
CATEGORIES= net
@@ -18,16 +17,17 @@ PERMIT_PACKAGE= Yes
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
-WANTLIB+= c curses ev gnutls llhttp lz4 m nettle oath pam protobuf-c
+WANTLIB+= c ev gnutls llhttp lz4 nettle oath pam protobuf-c
WANTLIB+= radcli readline talloc
SITES= https://gitlab.com/openconnect/ocserv/-/archive/${VERSION}/
-MODULES= lang/ruby
+MODULES= devel/meson \
+ lang/ruby
+MODRUBY_RUNDEP= No
BUILD_DEPENDS= devel/gperf \
textproc/groff \
- textproc/gsed \
textproc/ruby-ronn
LIB_DEPENDS= archivers/lz4 \
devel/libev \
@@ -43,52 +43,40 @@ TEST_DEPENDS= net/openconnect \
sysutils/coreutils \
textproc/gsed
-USE_GMAKE= Yes
-
-CONFIGURE_STYLE= autoreconf
-CONFIGURE_ARGS= --disable-namespaces \
- --without-docker-tests \
- --without-geoip \
- --without-http-parser \
- --without-maxmind \
- --without-nuttcp-tests \
- --without-pcl-lib
+CONFIGURE_ARGS= -Dgeoip=disabled \
+ -Dgssapi=disabled \
+ -Dlibnl=disabled \
+ -Dlocal-llhttp=false \
+ -Dmaxmind=disabled \
+ -Dnamespaces=disabled \
+ -Dseccomp=disabled \
+ -Dsock-diag=disabled \
+ -Dsystemd=disabled
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-# autoconf requires this (it's used in tests), but the ipcalc we
-# have in ports is not compatible with the one that ocserv wants.
-CONFIGURE_ENV+= IPCALC=false
-
-AUTOCONF_VERSION= 2.71
-AUTOMAKE_VERSION= 1.16
+TEST_ENV= OPENCONNECT=${LOCALBASE}/sbin/openconnect
post-extract:
find ${WRKSRC}/tests -type f -perm -+x -exec \
sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' {} +
- sed -i 's,/usr/sbin/openconnect,${LOCALBASE}/sbin/openconnect,' \
- ${WRKSRC}/tests/common.sh
sed -i 's,/etc/ocserv,${SYSCONFDIR}/ocserv,' \
+ ${WRKSRC}/doc/ocpasswd.8.md \
${WRKSRC}/doc/ocserv.8.md \
${WRKSRC}/doc/sample.config \
${WRKSRC}/src/ocpasswd/ocpasswd.c
- sed -i 's,/usr/bin/ocserv-fw,${SYSCONFDIR}/ocserv/ocserv-fw,g' \
- ${WRKSRC}/src/main-user.c \
- ${WRKSRC}/doc/sample.config
+
+# the man page embeds sample.config, so substitute it before the build
+pre-configure:
+ ln -sf ${LOCALBASE}/bin/ronn${MODRUBY_BINREV} ${WRKDIR}/bin/ronn
+ ${SUBST_CMD} ${WRKSRC}/doc/sample.config
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ocserv
- cd ${WRKSRC}/doc; ${INSTALL_DATA} profile.xml sample.passwd \
- ${PREFIX}/share/examples/ocserv/
+ cd ${WRKSRC}/doc; ${INSTALL_DATA} profile.xml sample.config \
+ sample.passwd ${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
- cd ${WRKSRC}/doc; \
- gsed -i -e '/@CONFIGFILE@/{r sample.config' -e 'd}' ocserv.8.md; \
- for i in *.8.md; do ronn${MODRUBY_BINREV} -r $$i; done
- ${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/man/man8/
# XXX server-cert-ed25519, server-cert-rsa-pss, owasp-headers are known to
fail.
# These tests use socket_wrapper, which is not in ports.
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ocserv/distinfo,v
diff -u -p -r1.38 distinfo
--- distinfo 23 Jan 2026 08:27:41 -0000 1.38
+++ distinfo 23 Oct 2026 11:47:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (ocserv-1.4.0.tar.gz) = aNMiF/MK9GC1M1i5naYrF0eQ2Lf/8uU+Fk3s7OkHeMI=
-SIZE (ocserv-1.4.0.tar.gz) = 613326
+SHA256 (ocserv-1.6.0.tar.gz) = 54k+h4GAHfHsdRmWAF93t9uIQwW0LiwatBz1bBdRbMo=
+SIZE (ocserv-1.6.0.tar.gz) = 942100
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 23 Jan 2026 08:27:41 -0000 1.17
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -243,7 +243,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind
- fi
-
- have_readline=no
--AC_LIB_HAVE_LINKFLAGS(readline,, [
-+AC_LIB_HAVE_LINKFLAGS(readline,ncurses, [
- #include <stdio.h>
- #include <readline/readline.h>], [rl_replace_line(0,0);])
- if test x$ac_cv_libreadline = xyes; then
Index: patches/patch-doc_gen-ocserv8-md_sh
===================================================================
RCS file: patches/patch-doc_gen-ocserv8-md_sh
diff -N patches/patch-doc_gen-ocserv8-md_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_gen-ocserv8-md_sh 23 Oct 2026 11:47:57 -0000
@@ -0,0 +1,9 @@
+Index: doc/gen-ocserv8-md.sh
+--- doc/gen-ocserv8-md.sh.orig
++++ doc/gen-ocserv8-md.sh
+@@ -11,4 +11,4 @@ tmp_config=$(mktemp)
+ trap 'rm -f "$tmp_config"' EXIT
+
+ sed 's/^/ /' "$config" >"$tmp_config"
+-sed -e "/@CONFIGFILE@/{r $tmp_config" -e 'd}' "$md" >"$out"
++sed -e "/@CONFIGFILE@/{r $tmp_config" -e 'd' -e '}' "$md" >"$out"
Index: patches/patch-doc_meson_build
===================================================================
RCS file: patches/patch-doc_meson_build
diff -N patches/patch-doc_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_meson_build 23 Oct 2026 11:47:57 -0000
@@ -0,0 +1,23 @@
+Index: doc/meson.build
+--- doc/meson.build.orig
++++ doc/meson.build
+@@ -12,7 +12,8 @@ if ronn.found()
+ ocserv8_manpage = custom_target('ocserv.8',
+ input: ocserv_md,
+ output: 'ocserv.8',
+- command: [ronn, '--roff', '@INPUT@', '-o', '@OUTDIR@'],
++ command: [ronn, '--roff', '--pipe', '@INPUT@'],
++ capture: true,
+ install: true,
+ install_dir: get_option('mandir') / 'man8',
+ )
+@@ -27,7 +28,8 @@ foreach page : ['occtl.8', 'ocpasswd.8']
+ custom_target(page,
+ input: page + '.md',
+ output: page,
+- command: [ronn, '--roff', '@INPUT@', '-o', '@OUTDIR@'],
++ command: [ronn, '--roff', '--pipe', '@INPUT@'],
++ capture: true,
+ install: true,
+ install_dir: get_option('mandir') / 'man8',
+ )
Index: patches/patch-doc_sample_config
===================================================================
RCS file: /cvs/ports/net/ocserv/patches/patch-doc_sample_config,v
diff -u -p -r1.28 patch-doc_sample_config
--- patches/patch-doc_sample_config 22 Nov 2024 15:33:04 -0000 1.28
+++ patches/patch-doc_sample_config 23 Oct 2026 11:47:57 -0000
@@ -1,13 +1,12 @@
-no seccomp, gssapi
+No seccomp, gssapi
Index: doc/sample.config
--- doc/sample.config.orig
+++ doc/sample.config
-@@ -35,15 +35,6 @@
- # Acct-Interim-Interval, and Session-Timeout values.
+@@ -44,15 +44,6 @@
#
# See doc/README-radius.md for the supported radius configuration attributes.
--#
+ #
-#
gssapi[keytab=/etc/key.tab,require-local-user-map=true,tgt-freshness-time=900]
-# The gssapi option allows one to use authentication methods supported by
GSSAPI,
-# such as Kerberos tickets with ocserv. It should be best used as an
alternative
@@ -16,39 +15,32 @@ Index: doc/sample.config
-# is true. The 'tgt-freshness-time' if set, it would require the TGT tickets
presented
-# to have been issued within the provided number of seconds. That option is
used to
-# restrict logins even if the KDC provides long time TGT tickets.
-
- #auth = "pam"
- #auth = "pam[gid-min=1000]"
-@@ -58,8 +49,6 @@ auth = "plain[passwd=./sample.passwd]"
- # When multiple options are present, they are OR composed (any of them
+-#
+ # oidc[config=/etc/ocserv/oidc.json,mode=bearer]
+ # The oidc option authenticates users against an OpenID Connect provider.
+ # The 'mode' suboption selects how: with 'bearer', the default, it validates
+@@ -81,8 +72,6 @@ auth = "plain[passwd=./sample.passwd]"
# succeeding allows login).
+ # [scope: vhost (non-reloadable)]
#enable-auth = "certificate"
-#enable-auth = "gssapi"
-#enable-auth =
"gssapi[keytab=/etc/key.tab,require-local-user-map=true,tgt-freshness-time=900]"
# Accounting methods available:
# radius: can be combined with any authentication method, it provides
-@@ -96,8 +85,8 @@ udp-port = 443
- # The user the worker processes will be run as. This should be a dedicated
- # unprivileged user (e.g., 'ocserv') and no other services should run as this
+@@ -130,9 +119,9 @@ udp-port = 443
# user.
+ # These settings are global and cannot be set at vhost level.
+ # [scope: global (non-reloadable)]
-run-as-user = nobody
--run-as-group = daemon
+run-as-user = _ocserv
+ # [scope: global (non-reloadable)]
+-run-as-group = daemon
+run-as-group = _ocserv
# socket file used for IPC with occtl. You only need to set that,
# if you use more than a single server.
-@@ -106,7 +95,7 @@ run-as-group = daemon
- # socket file used for server IPC (worker-main), will be appended with .PID
- # It must be accessible within the chroot environment (if any), so it is best
- # specified relatively to the chroot directory.
--socket-file = /var/run/ocserv-socket
-+socket-file = ${LOCALSTATEDIR}/run/ocserv-socket
-
- # The default server directory. Does not require any devices present.
- #chroot-dir = /var/lib/ocserv
-@@ -172,16 +161,6 @@ ca-cert = ../tests/certs/ca.pem
+@@ -222,18 +211,6 @@ ca-cert = ../tests/certs/ca.pem
### failures during the reloading time.
@@ -60,15 +52,17 @@ Index: doc/sample.config
-# 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/openconnect/ocserv/issues
+-# This option is global and cannot be set at vhost level.
+-# [scope: global]
-isolate-workers = true
-
- # A banner to be displayed on clients after connection
- #banner = "Welcome"
-
-@@ -347,10 +326,9 @@ min-reauth-time = 300
+ # Apply a per-worker heap cap (RLIMIT_DATA) as defense-in-depth against
+ # memory-exhaustion attacks. The limit is computed at worker startup as
+ # the observed data-segment baseline plus 64 MB headroom. Enabled by
+@@ -443,10 +420,9 @@ auth-timeout = 240
# Banning clients in ocserv works with a point system. IP addresses
# that get a score over that configured number are banned for
- # min-reauth-time seconds. By default a wrong password attempt is 10 points,
+ # ban-time seconds. By default a wrong password attempt is 10 points,
-# a KKDCP POST is 1 point, and a connection is 1 point. Note that
-# due to different processes being involved the count of points
-# will not be real-time precise. Local subnet IPs are exempt to allow
@@ -76,40 +70,32 @@ Index: doc/sample.config
+# and a connection is 1 point. Note that due to different processes being
+# involved the count of points will not be real-time precise. Local subnet
+# IPs are exempt to allow services that check for process health.
+ # The banning system is IP-based; therefore, all ban-related settings
+ # are global and cannot be set at vhost level.
#
- # Set to zero to disable.
- max-ban-score = 80
-@@ -361,7 +339,6 @@ ban-reset-time = 1200
- # In case you'd like to change the default points.
+@@ -468,8 +444,6 @@ ban-reset-time = 1200
#ban-points-wrong-password = 10
+ # [scope: global]
#ban-points-connection = 1
+-# [scope: global]
-#ban-points-kkdcp = 1
# Cookie timeout (in seconds)
# Once a client is authenticated he's provided a cookie with
-@@ -436,7 +413,7 @@ rekey-method = ssl
- use-occtl = true
-
- # PID file. It can be overridden in the command line.
--pid-file = /var/run/ocserv.pid
-+pid-file = ${LOCALSTATEDIR}/run/ocserv.pid
-
- # Log Level. Ocserv sends the logging messages to standard error
- # as well as the system log. The log level can be overridden in the
-@@ -570,6 +547,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
/usr/libexec/ocserv-fw
- # --removeall. This option can be set globally or in the per-user
configuration.
+@@ -752,6 +726,11 @@ no-route = 192.168.5.0/255.255.255.0
+ #
+ # Note: the ocserv-fw script requires either nft (nftables) or iptables at
runtime,
+ # depending on the backend selected with -Dfirewall-script= at build time.
+#
+# OpenBSD package notes:
+# to use this with PF, you will need to supply your own ocserv-fw script,
+# probably the best approach would be to add via a table or an anchor.
+#
+ # [scope: vhost user]
#restrict-user-to-routes = true
- # This option implies restrict-user-to-routes set to true. If set, the
-@@ -655,23 +637,6 @@ no-route = 192.168.5.0/255.255.255.0
- # and '%{G}', if present will be replaced by the username and group name.
+@@ -852,24 +831,6 @@ no-route = 192.168.5.0/255.255.255.0
+ # [scope: vhost]
#proxy-url = http://example.com/
#proxy-url = http://example.com/%{U}/
-
@@ -125,6 +111,7 @@ Index: doc/sample.config
-#
-# The following option is available in ocserv, when compiled with GSSAPI
support.
-
+-# [scope: vhost]
-#kkdcp = "SERVER-PATH KERBEROS-REALM PROTOCOL@SERVER:PORT"
-#kkdcp = "/KdcProxy KERBEROS.REALM [email protected]:88"
-#kkdcp = "/KdcProxy KERBEROS.REALM [email protected]:88"
Index: patches/patch-src_common_common_c
===================================================================
RCS file: patches/patch-src_common_common_c
diff -N patches/patch-src_common_common_c
--- patches/patch-src_common_common_c 22 May 2026 15:19:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-From: Dimitri Papadopoulos
<[email protected]>
-Date: Mon, 18 May 2026 21:53:53 +0200
-Subject: [PATCH] Build against GNU Nettle 4
-
-Index: src/common/common.c
---- src/common/common.c.orig
-+++ src/common/common.c
-@@ -33,6 +33,7 @@
- #include <limits.h>
- #include <assert.h>
- #include <nettle/sha1.h>
-+#include <nettle/version.h>
- #include "common.h"
- #include "defs.h"
- #include "common/base64-helper.h"
-@@ -59,7 +60,11 @@ static void safe_hash(const uint8_t *data, unsigned in
- sha1_init(&ctx);
-
- sha1_update(&ctx, data_size, data);
-+#if NETTLE_VERSION_MAJOR >= 4
-+ sha1_digest(&ctx, output);
-+#else
- sha1_digest(&ctx, 20, output);
-+#endif
- }
-
- char *calc_safe_id(const uint8_t *data, unsigned int size, char *output,
Index: patches/patch-src_common_hmac_c
===================================================================
RCS file: patches/patch-src_common_hmac_c
diff -N patches/patch-src_common_hmac_c
--- patches/patch-src_common_hmac_c 22 May 2026 15:19:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-From: Dimitri Papadopoulos
- <[email protected]> Date: Mon, 18 May 2026
21:53:53 +0200
-Subject: [PATCH] Build against GNU Nettle 4
-
-Index: src/common/hmac.c
---- src/common/hmac.c.orig
-+++ src/common/hmac.c
-@@ -26,6 +26,7 @@
- #include <gnutls/crypto.h>
- #include <gnutls/abstract.h>
- #include <nettle/hmac.h>
-+#include <nettle/version.h>
- #include <common.h>
- #include <hmac.h>
- #include <stdbool.h>
-@@ -51,7 +52,11 @@ void generate_hmac(size_t key_length, const uint8_t *k
- }
- }
-
-+#if NETTLE_VERSION_MAJOR >= 4
-+ hmac_sha256_digest(&ctx, digest);
-+#else
- hmac_sha256_digest(&ctx, HMAC_DIGEST_SIZE, digest);
-+#endif
-
- safe_memset(&ctx, 0, sizeof(ctx));
- }
Index: patches/patch-src_main-ban_c
===================================================================
RCS file: /cvs/ports/net/ocserv/patches/patch-src_main-ban_c,v
diff -u -p -r1.4 patch-src_main-ban_c
--- patches/patch-src_main-ban_c 23 Jan 2026 08:27:41 -0000 1.4
+++ patches/patch-src_main-ban_c 23 Oct 2026 11:47:57 -0000
@@ -1,7 +1,7 @@
Index: src/main-ban.c
--- src/main-ban.c.orig
+++ src/main-ban.c
-@@ -447,10 +447,10 @@ static bool test_local_ipv6(struct sockaddr_in6 *remot
+@@ -453,10 +453,10 @@ static bool test_local_ipv6(struct sockaddr_in6 *remot
unsigned int index = 0;
for (index = 0; index < 4; index++) {
Index: patches/patch-src_occtl_occtl_c
===================================================================
RCS file: /cvs/ports/net/ocserv/patches/patch-src_occtl_occtl_c,v
diff -u -p -r1.8 patch-src_occtl_occtl_c
--- patches/patch-src_occtl_occtl_c 23 Jan 2026 08:27:41 -0000 1.8
+++ patches/patch-src_occtl_occtl_c 23 Oct 2026 11:47:57 -0000
@@ -1,7 +1,7 @@
Index: src/occtl/occtl.c
--- src/occtl/occtl.c.orig
+++ src/occtl/occtl.c
-@@ -262,7 +262,7 @@ static int handle_reset_cmd(CONN_TYPE *conn, const cha
+@@ -266,7 +266,7 @@ static int handle_reset_cmd(CONN_TYPE *conn, const cha
cmd_params_st *params)
{
rl_reset_terminal(NULL);
Index: patches/patch-src_tun_c
===================================================================
RCS file: patches/patch-src_tun_c
diff -N patches/patch-src_tun_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tun_c 23 Oct 2026 11:47:57 -0000
@@ -0,0 +1,12 @@
+Index: src/tun.c
+--- src/tun.c.orig
++++ src/tun.c
+@@ -514,6 +514,8 @@ fail:
+ close(fd);
+
+ return ret;
++#else
++ return 0;
+ #endif
+ }
+
Index: patches/patch-src_worker-tun_h
===================================================================
RCS file: patches/patch-src_worker-tun_h
diff -N patches/patch-src_worker-tun_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_worker-tun_h 23 Oct 2026 11:47:57 -0000
@@ -0,0 +1,11 @@
+Index: src/worker-tun.h
+--- src/worker-tun.h.orig
++++ src/worker-tun.h
+@@ -20,6 +20,7 @@
+ #define OC_WORKER_TUN_H
+
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#include <net/if.h>
+ #include <net/if_var.h>
+ #include <netinet/in_var.h>
+ #endif
Index: patches/patch-src_worker-vpn_c
===================================================================
RCS file: patches/patch-src_worker-vpn_c
diff -N patches/patch-src_worker-vpn_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_worker-vpn_c 23 Oct 2026 11:47:57 -0000
@@ -0,0 +1,26 @@
+Index: src/worker-vpn.c
+--- src/worker-vpn.c.orig
++++ src/worker-vpn.c
+@@ -1897,8 +1897,8 @@ static int tun_mainloop(struct worker_st *ws, struct t
+ tnow->tv_sec >
+ ws->udp_recv_time + WSRCONFIG(ws)->switch_to_tcp_timeout) {
+ oclog(ws, LOG_DEBUG,
+- "No UDP data received for %li seconds, using TCP instead",
+- tnow->tv_sec - ws->udp_recv_time);
++ "No UDP data received for %lld seconds, using TCP
instead",
++ (long long)(tnow->tv_sec - ws->udp_recv_time));
+ DTLS_ACTIVE(ws)->udp_state = UP_INACTIVE;
+ }
+
+@@ -2557,9 +2557,9 @@ static int connect_handler(worker_st *ws)
+
+ ret = cstp_printf(ws,
+ "X-CSTP-Session-Timeout: %u\r\n"
+- "X-CSTP-Session-Timeout-Remaining: %ld\r\n",
++ "X-CSTP-Session-Timeout-Remaining: %lld\r\n",
+ ws->user_config->session_timeout_secs,
+- MAX(expiration - now, 0));
++ (long long)MAX(expiration - now, 0));
+ SEND_ERR(ret);
+ }
+
Index: patches/patch-tests_common_sh
===================================================================
RCS file: patches/patch-tests_common_sh
diff -N patches/patch-tests_common_sh
--- patches/patch-tests_common_sh 11 Mar 2022 19:46:33 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: tests/common.sh
---- tests/common.sh.orig
-+++ tests/common.sh
-@@ -23,7 +23,7 @@
-
- builddir=${builddir:-.}
-
--OPENCONNECT=${OPENCONNECT:-$(which openconnect)}
-+OPENCONNECT=${LOCALBASE}/sbin/openconnect
-
- if test -z "${OPENCONNECT}" || ! test -x ${OPENCONNECT};then
- echo "You need openconnect to run this test"
Index: patches/patch-tests_data_test1_passwd
===================================================================
RCS file: /cvs/ports/net/ocserv/patches/patch-tests_data_test1_passwd,v
diff -u -p -r1.3 patch-tests_data_test1_passwd
--- patches/patch-tests_data_test1_passwd 11 Mar 2022 19:46:33 -0000
1.3
+++ patches/patch-tests_data_test1_passwd 23 Oct 2026 11:47:57 -0000
@@ -1,7 +1,7 @@
Index: tests/data/test1.passwd
--- tests/data/test1.passwd.orig
+++ tests/data/test1.passwd
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,9 @@
-test:tost,group1, group2 ,
group3:$5$i6SNmLDCgBNjyJ7q$SZ4bVJb7I/DLgXo3txHBVohRFBjOtdbxGQZp.DOnrA.
-sp@c/al:*:$5$kDNrlGibUoktiQ0n$mE/ys1XehvvoWQiSqAfB.Aw1WbAYayMV/ZYTX/6IlkC
-test2:*:$5$QB3iB31ID49rW6kr$wSvbsDTzUPw51hqWTgvac9LyJ6HLv2HYyxh2Ud4v.x1
@@ -17,3 +17,4 @@ Index: tests/data/test1.passwd
+test5:*:$2b$08$XBZ6EzdfZeDKwCAKEhW1gOuk8KCHTP8H1DGV9jAbs5puoa1IwC8tS
+empty:*:$2b$08$zEZ353QW.QSDhZ28DCLzM.Wqg6QKEfODnvWIfOluoijAn8vI/37qK
locked:tost,group1, group2 ,
group3:!$5$i6SNmLDCgBNjyJ7q$SZ4bVJb7I/DLgXo3txHBVohRFBjOtdbxGQZp.DOnrA.
+
test6:../escape:$5$i6SNmLDCgBNjyJ7q$SZ4bVJb7I/DLgXo3txHBVohRFBjOtdbxGQZp.DOnrA.
Index: patches/patch-tests_multiple-routes
===================================================================
RCS file: /cvs/ports/net/ocserv/patches/patch-tests_multiple-routes,v
diff -u -p -r1.3 patch-tests_multiple-routes
--- patches/patch-tests_multiple-routes 11 Mar 2022 19:46:33 -0000 1.3
+++ patches/patch-tests_multiple-routes 23 Oct 2026 11:47:57 -0000
@@ -1,7 +1,7 @@
Index: tests/multiple-routes
--- tests/multiple-routes.orig
+++ tests/multiple-routes
-@@ -51,7 +51,7 @@ echo ok
+@@ -52,7 +52,7 @@ echo ok
echo -n "Checking number of routes... "
