mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-09 07:51:59 -09:00
package/netsniff-ng: bump to 0.6.9
Changes: https://github.com/netsniff-ng/netsniff-ng/releases/tag/v0.6.9 Remove now upstreamed patch 0001-Detect-libpcap-dependencies-using-pkg-config.patch. Fixes also: https://patchwork-proxy.ozlabs.org/project/buildroot/patch/20240829075015.39164-1-fede@evolware.org/ Signed-off-by: Federico Pellegrin <fede@evolware.org> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
3c312f149b
commit
d9d99eae4d
@@ -828,7 +828,6 @@ package/netplug/0002-add-missing-time-include.patch lib_patch.Upstream
|
||||
package/netplug/0003-remove-assert-fail.patch lib_patch.Upstream
|
||||
package/netplug/S29netplug Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/netplug/netplug-script Shellcheck lib_shellscript.ConsecutiveEmptyLines
|
||||
package/netsniff-ng/0001-Detect-libpcap-dependencies-using-pkg-config.patch lib_patch.Upstream
|
||||
package/netsnmp/S59snmpd Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/netsurf/0001-avoid-system-perl-dependencies.patch lib_patch.Upstream
|
||||
package/netsurf/0002-do-not-cross-compile-nsgenbind.patch lib_patch.Upstream
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
From 194ec61843b9598ce90873c812b817c4b96e2e0d Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 2 Sep 2021 12:56:00 +0300
|
||||
Subject: [PATCH] Detect libpcap dependencies using pkg-config
|
||||
|
||||
When building statically the link command line must include all
|
||||
dependencies of all libraries. libpcap can optionally depend on libnl.
|
||||
mausezahn can't build statically in this case.
|
||||
|
||||
Use pkg-config in configure and in the link command to construct the
|
||||
library flags we need to link with libpcap.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
||||
---
|
||||
Upstream status: commit 194ec61843b9598ce90873c812b817c4b96e2e0d
|
||||
|
||||
configure | 4 +++-
|
||||
mausezahn/Makefile | 2 +-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 510826a798f5..598ae2433a7a 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -588,7 +588,9 @@ int main(void)
|
||||
}
|
||||
EOF
|
||||
|
||||
- $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1
|
||||
+ $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c \
|
||||
+ $($PKG_CONFIG --libs libpcap 2>> config.log) \
|
||||
+ >> config.log 2>&1
|
||||
if [ ! -x $TMPDIR/pcaptest ] ; then
|
||||
echo "[NO]"
|
||||
echo "CONFIG_LIBPCAP=0" >> Config
|
||||
diff --git a/mausezahn/Makefile b/mausezahn/Makefile
|
||||
index ca16b6579583..9544565355cc 100644
|
||||
--- a/mausezahn/Makefile
|
||||
+++ b/mausezahn/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
mausezahn-libs = -lcli \
|
||||
-lnet \
|
||||
- -lpcap \
|
||||
+ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libpcap 2> /dev/null ) \
|
||||
-lrt \
|
||||
-lpthread \
|
||||
-lm
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking signature
|
||||
sha256 77d17d4158faf1d93c7d922a1bd7f093a8b437bd658292c830708540e10894ba netsniff-ng-0.6.8.tar.xz
|
||||
sha256 027840fa3c4e11abfe4fd0fffe9909c5c4ed1428d4b9397fb6d2f5ea69325918 netsniff-ng-0.6.9.tar.xz
|
||||
# Locally computed
|
||||
sha256 b353349ba51e0d4b59cf2f188f0c285296e154ce8c58954bc5e0dc0282a4db2d README
|
||||
sha256 8f6d85366f3763557d6ddd0637988b9ba11edef354e3c9302fff4262a235c387 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETSNIFF_NG_VERSION = 0.6.8
|
||||
NETSNIFF_NG_VERSION = 0.6.9
|
||||
NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng
|
||||
NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz
|
||||
NETSNIFF_NG_LICENSE = GPL-2.0
|
||||
|
||||
Reference in New Issue
Block a user