1
0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-18 05:13:56 +02:00

nfdump: update to 1.7.4

Add patch fixing compilation with GCC14.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-05-15 18:31:57 -07:00
parent 1e1f368659
commit 06ae2a9318
2 changed files with 39 additions and 6 deletions

View File

@ -6,12 +6,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nfdump
PKG_VERSION:=1.7.3
PKG_RELEASE:=2
PKG_VERSION:=1.7.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/phaag/nfdump/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=9ea7e1ded34a81839b73e66cb62c9bc11a8070210584f9a508798d7bd6058c89
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/phaag/nfdump
PKG_MIRROR_HASH:=83eacf974c0ca9e81df1bcac9e5fcfa89e520d0bd002fcebeee93390e2a3f55e
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
@ -27,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/nfdump
SECTION:=net
CATEGORY:=Network
DEPENDS:= +flex +libbz2 +USE_MUSL:musl-fts +libatomic +libzstd
DEPENDS:= +flex +libbz2 +USE_MUSL:musl-fts +libatomic +libzstd +liblz4
TITLE:= nfdump
URL:=https://github.com/phaag/nfdump/
endef

View File

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