nfdump: update to 1.7.7

Remove patch, which is now upstream.

Signed-off-by: W. Michael Petullo <mike@flyn.org>
This commit is contained in:
W. Michael Petullo
2026-01-08 08:11:10 -06:00
committed by Josef Schlehofer
parent 57a24cd825
commit 1227b19ca6
2 changed files with 2 additions and 26 deletions

View File

@@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nfdump PKG_NAME:=nfdump
PKG_VERSION:=1.7.6 PKG_VERSION:=1.7.7
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/phaag/nfdump PKG_SOURCE_URL:=https://github.com/phaag/nfdump
PKG_MIRROR_HASH:=a14613902a14935cb83832d877285e7f9adf0cd8a12ddb1e2717d860b2a9e890 PKG_MIRROR_HASH:=9b0b0c3f44e2a70f44684f3f87d248870901cf8a47275a2c6bee5884e9734884
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

View File

@@ -1,24 +0,0 @@
--- 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
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