From bad58fb5a6e318e33a5be150bb6d0c0482b0a2d6 Mon Sep 17 00:00:00 2001 From: Serhey Popovych Date: Sun, 18 Nov 2018 21:08:23 +0200 Subject: configure.ac: Fix build regression on RHEL/CentOS/SL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was introduced with commit 0f82228387ae ("Use more robust awk patterns to check for backward compatibility") on RHEL 7.3+ because it's kernel contains backported upstream commit 633c9a840d0b ("netfilter: nfnetlink: avoid recurrent netns lookups in call_batch") that introduces @net of @struct net type parameter matched with $GREP after $AWK returns whole @struct nfnl_callback. This causes incorrect IPSET_CBFN() prototype choose for ->call() of @struct nfnl_callback producing following warnings during the build: .../ipset/ip_set_core.c:2007:3: warning: initialization from incompatible pointer type [enabled by default] .call = ip_set_destroy, ^ ../ipset/ip_set_core.c:2007:3: warning: (near initialization for ‘ip_set_netlink_subsys_cb[3].call’) [enabled by default] Fix by matching pattern to the end of first function pointer in @struct nfnl_callback instead of end of struct. Signed-off-by: Serhey Popovych Signed-off-by: Jozsef Kadlecsik --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5a74e6e..f570591 100644 --- a/configure.ac +++ b/configure.ac @@ -496,9 +496,9 @@ else AC_SUBST(HAVE_NLA_PUT_IN_ADDR, undef) fi -AC_MSG_CHECKING([kernel source for struct net in struct nfnl_callback]) +AC_MSG_CHECKING([kernel source for struct net in the call() function in struct nfnl_callback]) if test -f $ksourcedir/include/linux/netfilter/nfnetlink.h && \ - $AWK '/^struct nfnl_callback /,/^}/' $ksourcedir/include/linux/netfilter/nfnetlink.h | \ + $AWK '/^struct nfnl_callback /,/\);$/' $ksourcedir/include/linux/netfilter/nfnetlink.h | \ $GREP -q 'struct net'; then AC_MSG_RESULT(yes) AC_SUBST(HAVE_NET_IN_NFNL_CALLBACK_FN, define) -- cgit v1.2.3