Merge branch 'develop'

Author: salcock

.github/workflows/dpdk.yaml

@@ -33,8 +33,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        dpdk_version: [dpdk-20.11, dpdk-20.02, dpdk-19.11.5, dpdk-18.11.10, dpdk-17.11.10, dpdk-16.11.11]
+        os: [ubuntu-22.04, ubuntu-20.04]
+        dpdk_version: [dpdk-21.11, dpdk-20.11, dpdk-20.02, dpdk-19.11.5, dpdk-18.11.10, dpdk-17.11.10, dpdk-16.11.11]
         exclude:
           - os: ubuntu-16.04
             dpdk_version: dpdk-20.11

.github/workflows/pkg-build.yaml

@@ -19,9 +19,9 @@ jobs:
            - "debian:stretch"
            - "debian:buster"
            - "debian:bullseye"
-           - "ubuntu:xenial"
            - "ubuntu:bionic"
            - "ubuntu:focal"
+           - "ubuntu:jammy"
 
      steps:
       - name: Checkout repo

.github/workflows/rpm-build.yaml

@@ -18,9 +18,9 @@ jobs:
         target:
           - "centos:7"
           - "fedora:35"
-          - "fedora:34"
+          - "fedora:36"
           - "rockylinux:8.5"
-          - "almalinux:8.4"
+          - "almalinux:8.5"
 
 
     steps:

AUTHORS

@@ -45,6 +45,7 @@ In no particular order, we would like to recognise:
  * Brendon Jones for creating the original Windows DLLs and writing bits of
    code here and there
  * Ryan Cai for patching a bunch of locking bugs.
+ * Sam James for fixing some issues with our build system.
 
 Apologies to anyone that we've missed out or forgotten. If you're really
 offended, fire one of us an email and we'll make sure you are added to the

INSTALL

@@ -6,6 +6,7 @@ Requirements:
 
 Optional:
  * DAG libraries (both 2.4 and 2.5 versions are supported)
+ * libyaml (required for traceanon)
  * libcrypto (required for CryptoPAN anonymisation in traceanon)
  * libncurses (required for tracetop)
  * libwandder (required for ETSI LI decoding --
@@ -31,6 +32,26 @@ You may need to add the library location (e.g. /usr/local/lib) to your
 
 ----------------------------------
 
+FreeBSD Notes
+-------------
+
+Installing with DPDK support:
+
+1. Install DPDK libraries on your system (DPDK version will differ depending
+   on which version of FreeBSD you are running):
+
+  sudo pkg install dpdk20.11 gmake
+
+2. Compile and install libtrace using gmake:
+
+   ./bootstrap.sh
+   ./configure --with-dpdk LDFLAGS=-L/usr/local/lib CPPFLAGS=-I/usr/local/lib
+       MAKE="gmake"
+   gmake
+   sudo gmake install
+
+----------------------------------
+
 Installation FAQ:
 
 Q. I've installed libpcap but I'm still getting the following error:

README

@@ -1,4 +1,4 @@
-libtrace 4.0.18
+libtrace 4.0.19
 
 ---------------------------------------------------------------------------
 Copyright (c) 2007-2022 The University of Waikato, Hamilton, New Zealand.

bootstrap.sh

@@ -1,10 +1,19 @@
 #! /bin/sh
 
+ACLOCAL_DIRS="-I m4"
+if [ -d /usr/local/share/aclocal ]; then
+  ACLOCAL_DIRS="${ACLOCAL_DIRS} -I /usr/local/share/aclocal"
+fi
+
+if [ -d /usr/share/aclocal ]; then
+  ACLOCAL_DIRS="${ACLOCAL_DIRS} -I /usr/share/aclocal"
+fi
+
 set -x
 # Prefer aclocal 1.9 if we can find it
-aclocal-1.11 -I m4 ||
-	aclocal-1.9 -I m4 || 
-	aclocal  -I m4
+aclocal-1.11 ${ACLOCAL_DIRS} ||
+	aclocal-1.9 ${ACLOCAL_DIRS} || 
+	aclocal ${ACLOCAL_DIRS}
 
 # Darwin bizarrely uses glibtoolize
 libtoolize --force --copy ||

configure.in

@@ -3,11 +3,11 @@
 # Now you only need to update the version number in two places - below,
 # and in the README
 
-AC_INIT([libtrace],[4.0.18],[contact@wand.net.nz],[libtrace])
+AC_INIT([libtrace],[4.0.19],[contact@wand.net.nz],[libtrace])
 
 LIBTRACE_MAJOR=4
 LIBTRACE_MID=0
-LIBTRACE_MINOR=18
+LIBTRACE_MINOR=19
 
 # OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
 # searched by default - add it to LDFLAGS so we at least have a chance of 
@@ -79,6 +79,8 @@ AC_PROG_INSTALL
 AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) 
 AM_PROG_LEX
 
+PKG_PROG_PKG_CONFIG
+
 # All our source files for function replacements are in lib/
 AC_CONFIG_LIBOBJ_DIR(lib)
 
@@ -305,7 +307,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support),
 
 if test "$want_xdp" != no; then
     AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0)
-    if test "$elffound" == 1; then
+    if test "$elffound" = 1; then
         # check for libbpf
         AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf)
 
@@ -518,7 +520,23 @@ AC_CHECK_DECL([PACKET_FANOUT],
         [[#include <linux/if_packet.h>]])
 
 # If we use DPDK we might be able to use libnuma
-AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
+AC_ARG_WITH(numa,
+	AS_HELP_STRING(--without-numa,disable NUMA support),
+[
+	if test "$withval" = no
+	then
+		want_numa=no
+	else
+		want_numa=yes
+	fi
+],[
+	# Default to building with NUMA
+	want_numa=yes
+])
+
+if test "$want_numa" != no; then
+	AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
+fi
 
 # Need libwandder for ETSI live decoding
 AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0)
@@ -900,6 +918,8 @@ if (test "$use_llvm" != "no"); then
 	fi
 fi
 
+PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)
+
 AC_ARG_WITH([ncurses],
 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
 

debian/changelog

@@ -1,3 +1,10 @@
+libtrace4 (4.0.19-1) unstable; urgency=medium
+
+  * Fixed issues with compiling against DPDK 21.11
+  * Incorporate build system fixes from Gentoo
+
+ -- Shane Alcock <shane.alcock@waikato.ac.nz>  Mon, 13 Jun 2022 11:17:29 +1200
+
 libtrace4 (4.0.18-1) unstable; urgency=medium
 
   * Packets received via `etsilive:` can now be converted to pcap format.

debpkg-setup.sh

@@ -11,7 +11,7 @@ export SOURCENAME=`echo ${GITHUB_REF##*/} | cut -d '-' -f 1`
 apt-get update
 apt-get install -y equivs devscripts dpkg-dev quilt curl apt-transport-https \
     apt-utils ssl-cert ca-certificates gnupg lsb-release debhelper git \
-    pkg-config sed
+    pkg-config sed clang
 
 curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandio/cfg/setup/bash.deb.sh' | bash
 curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandder/cfg/setup/bash.deb.sh' | bash