libpfring: update to 9.2.0

libs/libpfring/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=libpfring
-PKG_VERSION:=8.6.1
-PKG_RELEASE:=2
+PKG_VERSION:=9.2.0
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ntop/PF_RING
-PKG_MIRROR_HASH:=2c4623e4a3cd601a94cfdaf748e0cd7aa93e8ec850d3cd4c2ec5d33419e45fbb
+PKG_MIRROR_HASH:=08a6cbe389ab6637fde2dc96b840d676abcd25b9feb54c44caadf1ec18b162c3
 
 PKG_MAINTAINER:=Banglang Huang <[email protected]>
 

libs/libpfring/patches/0001-fix-cross-compiling.patch

@@ -1,32 +1,43 @@
 --- a/userland/configure
 +++ b/userland/configure
-@@ -3873,12 +3873,6 @@ $as_echo "no" >&6; }
+@@ -3942,13 +3942,6 @@ printf "%s\n" "no" >&6; }
          if test "$IS_FREEBSD" != "1" && test "$cross_compiling" != "yes" ; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if r/w locks are supported" >&5
- $as_echo_n "checking if r/w locks are supported... " >&6; }
--      if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if r/w locks are supported" >&5
+ printf %s "checking if r/w locks are supported... " >&6; }
+-      if test "$cross_compiling" = yes
+-then :
+-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 -as_fn_error $? "cannot run test program while cross compiling
 -See \`config.log' for more details" "$LINENO" 5; }
--else
+-else $as_nop
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 
-@@ -3891,7 +3885,7 @@ else
+@@ -3961,8 +3954,6 @@ else $as_nop
 
 
  _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- cat >>confdefs.h <<_ACEOF
-@@ -3905,7 +3899,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+-if ac_fn_c_try_run "$LINENO"
+-then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+ printf "%s\n" "#define HAVE_RW_LOCK 1" >>confdefs.h
+@@ -3978,8 +3969,6 @@ fi
+
+     fi
 
+-    fi
+-
+     MOD_FIBERBLAZE_LIB="libs/libpfring_fiberblaze_$MACHINE$LIBARCH.a"
+   if test -f "lib/$MOD_FIBERBLAZE_LIB"; then
+     FIBERBLAZE_LIB="-lm -ldl"
+@@ -4009,8 +3998,6 @@ printf "%s\n" "no" >&6; }
      fi
+   fi
 
+-fi
+-
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Mellanox support (x64 and aarch64)" >&5
+ printf %s "checking Mellanox support (x64 and aarch64)... " >&6; }
+ MOD_MLX_LIB="libs/libpfring_mlx_${MACHINE}${LIBARCH}.a"

libs/libpfring/patches/010-gcc14.patch

@@ -1,6 +1,6 @@
 --- a/kernel/pf_ring.c
 +++ b/kernel/pf_ring.c
-@@ -4772,8 +4772,8 @@ void reserve_memory(unsigned long base,
+@@ -4986,8 +4986,8 @@ void reserve_memory(unsigned long base,
  {
    struct page *page, *page_end;
 
@@ -11,7 +11,7 @@
      SetPageReserved(page);
  }
 
-@@ -4781,8 +4781,8 @@ void unreserve_memory(unsigned long base
+@@ -4995,8 +4995,8 @@ void unreserve_memory(unsigned long base
  {
    struct page *page, *page_end;
 

libs/libpfring/patches/100-fix-compilation-warning.patch

@@ -1,6 +1,6 @@
 --- a/kernel/pf_ring.c
 +++ b/kernel/pf_ring.c
-@@ -3962,7 +3962,7 @@ static int hash_pkt_cluster(ring_cluster
+@@ -4138,7 +4138,7 @@ static int hash_pkt_cluster(ring_cluster
        break;
      }
      /* else, fall through, because it's like 2-tuple for non-TCP packets */

libs/libpfring/patches/200-net-s-dev_get_flags-netif_get_flags.patch

@@ -0,0 +1,29 @@
+--- a/kernel/pf_ring.c
++++ b/kernel/pf_ring.c
+@@ -5527,7 +5527,7 @@ static int is_netdev_promisc(struct net_
+   debug_printk(1, "checking promisc for %s\n", netdev->name);
+
+   rtnl_lock();
+-  if_flags = (short) dev_get_flags(netdev);
++  if_flags = (short) netif_get_flags(netdev);
+   rtnl_unlock();
+
+   return !!(if_flags & IFF_PROMISC);
+@@ -5542,7 +5542,7 @@ static void set_netdev_promisc(struct ne
+
+   rtnl_lock();
+
+-  if_flags = (short) dev_get_flags(netdev);
++  if_flags = (short) netif_get_flags(netdev);
+   if(!(if_flags & IFF_PROMISC)) {
+     if_flags |= IFF_PROMISC;
+ #if(LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) && \
+@@ -5565,7 +5565,7 @@ static void unset_netdev_promisc(struct
+
+   rtnl_lock();
+
+-  if_flags = (short) dev_get_flags(netdev);
++  if_flags = (short) netif_get_flags(netdev);
+   if(if_flags & IFF_PROMISC) {
+     if_flags &= ~IFF_PROMISC;
+ #if(LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) && \