libpfring: Update to 7.4.0

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2018-12-26 08:54:49 -08:00
parent 596f8dc5e9
commit 433f882cd6
5 changed files with 8 additions and 39 deletions
@@ -1,7 +1,7 @@
--- a/userland/configure
+++ b/userland/configure
@@ -3745,12 +3745,6 @@ fi
if test "$IS_FREEBSD" != "1"; then
@@ -3718,12 +3718,6 @@ fi
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 :
@@ -13,7 +13,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3763,7 +3757,7 @@ else
@@ -3736,7 +3730,7 @@ else
_ACEOF
@@ -22,7 +22,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -3777,7 +3771,6 @@ $as_echo "no" >&6; }
@@ -3750,7 +3744,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
@@ -1,16 +1,6 @@
--- a/userland/configure
+++ b/userland/configure
@@ -3296,14 +3296,16 @@ fi
done
-MACHINE=`uname -m`
+if test -z "$MACHINE"; then
+ MACHINE=`uname -m`
+fi
CFLAGS=""
SYS_LIBS=""
@@ -3291,7 +3291,7 @@ SYS_LIBS=""
VER=`cat ../kernel/linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2`
MAJOR_VER=`cat ../kernel/linux/pf_ring.h | grep RING_VERSION | head -1 | cut -d '"' -f 2 | cut -d '.' -f 1`
@@ -1,10 +0,0 @@
--- a/userland/lib/pfring_mod.c
+++ b/userland/lib/pfring_mod.c
@@ -24,6 +24,7 @@
#include <ifaddrs.h>
#ifdef ENABLE_BPF
+#include <string.h>
#include <pcap/pcap.h>
#include <pcap/bpf.h>
#include <pcap-int.h>
@@ -1,10 +0,0 @@
diff --git a/userland/nbpf/Makefile.in b/userland/nbpf/Makefile.in
index b0d8181..8221e41 100644
--- a/userland/nbpf/Makefile.in
+++ b/userland/nbpf/Makefile.in
@@ -1,4 +1,4 @@
-LEX = lex
+LEX = flex
YACC = bison
INCLUDE = -I../lib -I../../kernel
LIBS=`../lib/pfring_config --libs` -lpthread #@NDPI_LIB@