Clean up versioning for libtalloc and libkqueue, add rule to install libpcap (#4858)

Signed-off-by: Stephen Blackwell <sblackwell@networkradius.com>
Signed-off-by: Stephen Blackwell <sblackwell@networkradius.com>

diff --git a/scripts/build/redhat b/scripts/build/redhat
index 47d11337e05eaf8b204404f330a10b3f60b9e71c..874ba7fda12629f375ef84e4536f597b48c5ccf5 100644 (file)
--- a/scripts/build/redhat
+++ b/scripts/build/redhat
@@ -31,8 +31,8 @@ mkdir -p libkqueue
 cd libkqueue
 
 wget https://github.com/mheily/libkqueue/archive/v${LIBKQUEUE_VERSION}.tar.gz
-tar -xvzf v${VERSION}.tar.gz
-cd ./libkqueue-${VERSION}
+tar -xvzf v${LIBKQUEUE_VERSION}.tar.gz
+cd ./libkqueue-${LIBKQUEUE_VERSION}
 cmake3 -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
 make
 
@@ -46,7 +46,7 @@ cd $BASE_DIR
 #
 # Install libtalloc-devel
 #
-LIBTALLOC_VERSION=${LIBTALLOC_VERSION:-2.6.1}
+LIBTALLOC_VERSION=${LIBTALLOC_VERSION:-2.4.0}
 
 cd build
 mkdir -p libtalloc
@@ -61,3 +61,25 @@ cd talloc-${LIBTALLOC_VERSION}
 ./configure
 
 make
+
+#
+# Install libpcap-devel
+#
+LIBPCAP_VERSION=${LIBPCAP_VERSION:-1.10.3}
+
+# libpcap specific deps
+sudo yum install -y flex bison
+
+cd build
+mkdir -p libpcap
+cd libpcap
+
+wget https://www.tcpdump.org/release/libpcap-${LIBPCAP_VERSION}.tar.gz
+
+tar zxvf libpcap-${LIBPCAP_VERSION}.tar.gz
+
+cd libpcap-${LIBPCAP_VERSION}
+
+./configure
+
+make