Merge branch 'develop'

LibtraceTeam · May 9, 2024 · f53dd56 · f53dd56
2 parents cc98f68 + ccca04c
commit f53dd56
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 92 deletions.
diff --git a/.github/workflows/libtrace.yaml b/.github/workflows/libtrace.yaml
@@ -66,7 +66,7 @@ jobs:
  sudo apt-get -y install pfring
  sudo ldconfig
  - name: Checkout libxdp
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: xdp-tools
  repository: xdp-project/xdp-tools
@@ -103,7 +103,7 @@ jobs:
  sudo make -j 3 libxdp_install
  sudo ldconfig
  - name: Checkout Libbpf
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: libbpf
  repository: libbpf/libbpf
@@ -115,7 +115,7 @@ jobs:
  echo "/usr/lib64" | sudo tee -a /etc/ld.so.conf.d/lib64.conf
  sudo ldconfig
  - name: Checkout Libtrace
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: libtrace
  submodules: recursive
@@ -162,31 +162,31 @@ jobs:
  matrix:
  os: [macos-latest]
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install Dependencies
  run: |
- brew install flex bison libpcap libtool autoconf automake m4 gcc uthash
+ brew install openssl flex bison libpcap libtool autoconf automake m4 gcc uthash
  - name: Build/Install Wandio
  run: |
  cd wandio
  ./bootstrap.sh
- ./configure
+ ./configure CFLAGS="-I/opt/homebrew/include" LDFLAGS="-L/opt/homebrew/lib"
  make -j 4
  sudo make install
  - name: Build/Install Libwandder
  run: |
  cd libwandder
  ./bootstrap.sh
- ./configure
+ ./configure CFLAGS="-I/opt/homebrew/include" LDFLAGS="-L/opt/homebrew/lib"
  make -j 3
  sudo make install
  - name: Build/Install Libtrace
  run: |
  ./bootstrap.sh
- ./configure
- make -j 4
+ ./configure CPPFLAGS="-I/opt/homebrew/include" CFLAGS="-I/opt/homebrew/include" LDFLAGS="-L/opt/homebrew/lib"
+ make V=1 -j 4
  sudo make install
  - name: Build Tests
  run: cd test; make -j 4

diff --git a/.github/workflows/pkg-build.yaml b/.github/workflows/pkg-build.yaml
@@ -19,12 +19,13 @@ jobs:
  - "debian:bookworm"
  - "debian:buster"
  - "debian:bullseye"
+ - "ubuntu:noble"
  - "ubuntu:focal"
  - "ubuntu:jammy"
 
  steps:
  - name: Checkout repo
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Install prereq packages
  run: ./debpkg-setup.sh
  - name: Build packages
@@ -36,7 +37,7 @@ jobs:
  mkdir -p packages/${DIRNAME}
  cp ../*.deb packages/${DIRNAME}/
  - name: Store packages
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: packages-${{ env.DIRNAME }}
  path: packages/${{ env.DIRNAME }}/*.deb
@@ -56,13 +57,14 @@ jobs:
  - "debian:bullseye"
  - "ubuntu:focal"
  - "ubuntu:jammy"
+ - "ubuntu:noble"
  - "debian:bookworm"
  needs: build
  steps:
  - name: Set environment variables for download
  run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
  - name: Download artifact
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: packages-${{ env.DIRNAME }}
  - name: Add repositories
@@ -98,20 +100,21 @@ jobs:
  - "debian:bookworm"
  - "ubuntu:focal"
  - "ubuntu:jammy"
+ - "ubuntu:noble"
  needs: test
  steps:
  - name: Set environment variables for download
  run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
  - name: Download artifact
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: packages-${{ env.DIRNAME }}
  - name: Copy packages
  run: |
  mkdir -p packages/${DIRNAME}
  find . -name "*.deb" | xargs cp -t packages/${DIRNAME}/
  - name: Publish package to cloudsmith
- uses: wanduow/action-cloudsmith-upload-packages@v1
+ uses: salcock/action-cloudsmith-upload-packages@v1.8
  with:
  path: packages/
  repo: ${{ secrets.CLOUDSMITH_OWNER }}/libtrace

diff --git a/.github/workflows/rpm-build.yaml b/.github/workflows/rpm-build.yaml
@@ -20,11 +20,10 @@ jobs:
  - "rockylinux:9"
  - "fedora:39"
  - "fedora:38"
- - "centos:7"
 
  steps:
  - name: Checkout repo
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Install prereq packages
  run: ./rpmpkg-setup.sh ${{ matrix.target }}
  - name: Build packages
@@ -36,7 +35,7 @@ jobs:
  mkdir -p packages/${DIRNAME}
  cp ~/rpmbuild/RPMS/x86_64/*.rpm packages/${DIRNAME}/
  - name: Store packages
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: packages-${{ env.DIRNAME }}
  path: packages/${{ env.DIRNAME }}/*.rpm
@@ -56,13 +55,12 @@ jobs:
  - "rockylinux:9"
  - "fedora:39"
  - "fedora:38"
- - "centos:7"
  needs: build
  steps:
  - name: Set environment variables for download
  run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
  - name: Download artifact
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: packages-${{ env.DIRNAME }}
  - name: Add repositories
@@ -71,9 +69,6 @@ jobs:
  run: |
  curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandio/cfg/setup/bash.rpm.sh' | bash
  curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandder/cfg/setup/bash.rpm.sh' | bash
- if [ "${TARGET}" == "centos:7" ]; then
- yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm || true
- fi
  if [[ "${TARGET}" =~ rocky* ]]; then
  dnf install -y dnf-plugins-core epel-release || true
  dnf config-manager --set-enabled powertools || true
@@ -106,13 +101,12 @@ jobs:
  - "rockylinux:9"
  - "fedora:39"
  - "fedora:38"
- - "centos:7"
  needs: test
  steps:
  - name: Set environment variables for download
  run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
  - name: Download artifact
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: packages-${{ env.DIRNAME }}
  - name: Copy packages
@@ -121,7 +115,7 @@ jobs:
  yum install -y findutils
  find . -name "*.rpm" | xargs cp -t packages/${DIRNAME}/
  - name: Publish package to cloudsmith
- uses: wanduow/action-cloudsmith-upload-packages@v1
+ uses: salcock/action-cloudsmith-upload-packages@v1.8
  with:
  path: packages/
  repo: ${{ secrets.CLOUDSMITH_OWNER }}/libtrace

diff --git a/README b/README
@@ -1,7 +1,7 @@
-libtrace 4.0.24
+libtrace 4.0.25
 
 Code and documentation added since version 4.0.20 is
-Copyright (c) 2023 Shane Alcock and has been contributed as per
+Copyright (c) 2023-2024 Shane Alcock and has been contributed as per
 the terms of the GNU Lesser General Public License version 3.
 All rights reserved.
 

diff --git a/configure.in b/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.24],[[email protected]],[libtrace])
+AC_INIT([libtrace],[4.0.25],[[email protected]],[libtrace])
 
 LIBTRACE_MAJOR=4
 LIBTRACE_MID=0
-LIBTRACE_MINOR=24
+LIBTRACE_MINOR=25
 
 # 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 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+libtrace4 (4.0.25-1) unstable; urgency=medium
+
+ * ndag: fix issue where the most recently received packets may not
+ be delivered to libtrace if the multicast source stops sending.
+
+ -- Shane Alcock <[email protected]> Thu, 9 May 2024 10:16:36 +1200
+
 libtrace4 (4.0.24-1) unstable; urgency=medium
 
  * ndagtcp: fix miscalculation of ERF header length that would

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -146,7 +146,7 @@ endif
 
 AM_CPPFLAGS= @ADD_INCLS@
 libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@ $(DPDKLIBS)
-libtrace_la_LDFLAGS=-version-info 7:8:0 @ADD_LDFLAGS@
+libtrace_la_LDFLAGS=-version-info 7:9:0 @ADD_LDFLAGS@
 dagapi.c:
  cp @DAG_TOOLS_DIR@/dagapi.c .