gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfdump: update to 1.7.6

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

Signed-off-by: W. Michael Petullo <mike@flyn.org>
This commit is contained in:
W. Michael Petullo
2025-05-30 21:26:24 -05:00
committed by Hannu Nyman
parent 73821b26e5
commit 05957c2de2
4 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/nfdump/Makefile
View File

@@ -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 <mike@flyn.org>
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/

32
net/nfdump/patches/010-gcc14.patch
View File

@@ -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

20
net/nfdump/patches/010-musl-threads.patch Normal file
View File

@@ -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],

24
net/nfdump/patches/020-musl-fixes.patch Normal file
View File

@@ -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