nfdump: update to 1.7.6

Upstream list of changes is available at
https://github.com/phaag/nfdump/releases/tag/v1.7.6.

Signed-off-by: W. Michael Petullo <[email protected]>

diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 407f53a804e517847df5fe1391134df9ec251301..c68162011d742680e18e8ae4f4063cb7ed054ed3 100644 (file)
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfdump
-PKG_VERSION:=1.7.4
+PKG_VERSION:=1.7.6
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/phaag/nfdump
-PKG_MIRROR_HASH:=83eacf974c0ca9e81df1bcac9e5fcfa89e520d0bd002fcebeee93390e2a3f55e
+PKG_MIRROR_HASH:=a14613902a14935cb83832d877285e7f9adf0cd8a12ddb1e2717d860b2a9e890
 
 PKG_MAINTAINER:=W. Michael Petullo <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
@@ -47,6 +47,7 @@ TARGET_LDFLAGS += -Wl,--as-needed $(if $(CONFIG_USE_MUSL),-lfts)
 define Package/nfdump/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnfdump-$(PKG_VERSION).so $(1)/usr/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnffile-$(PKG_VERSION).so $(1)/usr/lib/
 
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/

diff --git a/net/nfdump/patches/010-gcc14.patch b/net/nfdump/patches/010-gcc14.patch
deleted file mode 100644 (file)
index 6f3768f..0000000
--- a/net/nfdump/patches/010-gcc14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/lib/daemon.c
-+++ b/src/lib/daemon.c
-@@ -40,7 +40,9 @@
- #include <string.h>
- #include <sys/types.h>
- // some linux are picky
--#define __USE_GNU
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
- #include <unistd.h>
- 
- #include "util.h"
-@@ -151,4 +153,4 @@ void SetPriv(char *userid, char *groupid
-         }
-     }
- 
--}  // End of SetPriv
-\ No newline at end of file
-+}  // End of SetPriv
---- a/src/nfreplay/nfreplay.c
-+++ b/src/nfreplay/nfreplay.c
-@@ -73,8 +73,7 @@
- #undef FPURGE
- #ifdef HAVE___FPURGE
- #define FPURGE __fpurge
--#endif
--#ifdef HAVE_FPURGE
-+#elif defined(HAVE_FPURGE)
- #define FPURGE fpurge
- #endif
- 

diff --git a/net/nfdump/patches/010-musl-threads.patch b/net/nfdump/patches/010-musl-threads.patch
new file mode 100644 (file)
index 0000000..7deca09
--- /dev/null
+++ b/net/nfdump/patches/010-musl-threads.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -367,11 +367,12 @@ AM_COND_IF([BUILDNFPCAPD],
+ AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
+ 
+ OVS_CHECK_ATOMIC_LIBS
+-AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
+-
+-LIBS="$PTHREAD_LIBS $LIBS"
+-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-CC="$PTHREAD_CC"
++# Musl includes pthread functions in libc.
++# AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
++#
++# LIBS="$PTHREAD_LIBS $LIBS"
++# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++# CC="$PTHREAD_CC"
+ 
+ # Check for structures
+ AC_CHECK_MEMBER([struct sockaddr.sa_len],

diff --git a/net/nfdump/patches/020-musl-fixes.patch b/net/nfdump/patches/020-musl-fixes.patch
new file mode 100644 (file)
index 0000000..4d7c495
--- /dev/null
+++ b/net/nfdump/patches/020-musl-fixes.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -364,8 +364,6 @@ AM_COND_IF([BUILDNFPCAPD],
+               [AM_CONDITIONAL(BSDBPF, false) AM_CONDITIONAL(TPACKETV3, false) AM_CONDITIONAL(PLAINPCAP, false)],
+ )
+ 
+-AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
+-
+ OVS_CHECK_ATOMIC_LIBS
+ # Musl includes pthread functions in libc.
+ # AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found))
+--- a/src/nfpcapd/Makefile.am
++++ b/src/nfpcapd/Makefile.am
+@@ -29,10 +29,4 @@ if HAVEPCAPAPPEND
+ AM_CPPFLAGS += -DHAVEPCAPAPPEND
+ endif
+ 
+-if HAVEZLIB 
+-AM_CPPFLAGS += -DHAVEZLIB
+-nfpcapd_SOURCES += pcap_gzip.c pcap_gzip.h
+-nfpcapd_LDADD += -lz
+-endif
+-
+ CLEANFILES = *.gch