Date: Fri, 3 Jan 2025 21:38:26 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e52c0c3ca587 - main - net/ocserv: Do not check for Linux-style /proc filesystem Message-ID: <202501032138.503LcQjs015095@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=e52c0c3ca587f71e6918ec57741932d420d631ff commit e52c0c3ca587f71e6918ec57741932d420d631ff Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2025-01-03 21:33:10 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2025-01-03 21:33:10 +0000 net/ocserv: Do not check for Linux-style /proc filesystem Otherwise it may fail to run when linprocfs is mounted on /proc. Reported by: Ivan Brawley <ivan@brawley.id.au> --- net/ocserv/Makefile | 2 +- net/ocserv/files/patch-configure.ac | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index c32e17ad7d9a..26d041299708 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -1,6 +1,6 @@ PORTNAME= ocserv DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-vpn security MASTER_SITES= https://www.infradead.org/ocserv/download/ diff --git a/net/ocserv/files/patch-configure.ac b/net/ocserv/files/patch-configure.ac index 68267a953766..4f7745af0262 100644 --- a/net/ocserv/files/patch-configure.ac +++ b/net/ocserv/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2023-12-14 11:45:13 UTC +--- configure.ac.orig 2024-05-05 19:06:59 UTC +++ configure.ac -@@ -16,7 +16,7 @@ AM_PROG_CC_C_O +@@ -19,7 +19,7 @@ if test "$GCC" = "yes" && ! expr "$CC" : clang >/dev/n AC_PROG_SED if test "$GCC" = "yes" && ! expr "$CC" : clang >/dev/null 2>&1;then @@ -8,8 +8,8 @@ + CFLAGS="$CFLAGS -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers" fi - AC_PATH_PROG(CTAGS, ctags, [:]) -@@ -219,7 +219,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind + AC_CHECK_PROGS([IPCALC], [ipcalc ipcalc-ng], [:]) +@@ -231,7 +231,7 @@ have_readline=no fi have_readline=no @@ -18,3 +18,12 @@ #include <stdio.h> #include <readline/readline.h>], [rl_replace_line(0,0);]) if test x$ac_cv_libreadline = xyes; then +@@ -675,8 +675,6 @@ AM_CONDITIONAL(ENABLE_OIDC_AUTH_TESTS, test "x$enable_ + + AM_CONDITIONAL(ENABLE_OIDC_AUTH, test "x$enable_oidc_auth" = xyes) + AM_CONDITIONAL(ENABLE_OIDC_AUTH_TESTS, test "x$enable_oidc_auth" = xyes) +- +-AC_CHECK_FILE(/proc/self/exe, AC_DEFINE([PROC_FS_SUPPORTED],[1], [procfs supported]), []) + + uid=$(id -u) + gid=$(id -g)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501032138.503LcQjs015095>