From bd6c6324afece01e26fee76405624ef4c5d0c1a9 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 5 Jun 2025 09:15:47 +0200 Subject: Modify pernet_operations check Check for 'int \*id' in the pernet_operations struct fails for some later versions of kernels as the declaration is now 'int * const id'. Kernel Commit 768e4bb6a75e3c6a034df7c67edac20bd222857e changed the variable declaration that ipset uses to ensure presence of the pernet ops id. Modify the pattern match to include both the newer change while still supporting the original declaration. Reported and original patch submitted by Mike Pagano , single pattern suggested by Jeremy Sowden Signed-off-by: Jozsef Kadlecsik --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b8e9433..f6e1c36 100644 --- a/configure.ac +++ b/configure.ac @@ -401,7 +401,7 @@ fi AC_MSG_CHECKING([kernel source for id in struct pernet_operations]) if test -f $ksourcedir/include/net/net_namespace.h && \ - $AWK '/^struct pernet_operations /,/^}/' $ksourcedir/include/net/net_namespace.h | $GREP -q 'int \*id;'; then + $AWK '/^struct pernet_operations /,/^}/' $ksourcedir/include/net/net_namespace.h | $GREP -qE 'int \*( const )?id;'; then AC_MSG_RESULT(yes) AC_SUBST(HAVE_NET_OPS_ID, define) else -- cgit v1.2.3