1566da19d8
- Update to version 0.6.4
* DNS header generation in trafgen
* Support for dumping proto headers in trafgen
* Fixes for dinc()/ddec() to properly respect min/max range and
avoid counter corruption
* Fixes for NULL pointer dereferences and resource leaks in trafgen
* Build fixes for various compiler versions, libc implementations
and distributions
- Rebase patch:
* netsniff-ng-fix-ncurses.diff
OBS-URL: https://build.opensuse.org/request/show/562056
OBS-URL: https://build.opensuse.org/package/show/network:utilities/netsniff-ng?expand=0&rev=26
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
diff --git a/configure b/configure
|
|
index d5fe7e6..56148ac 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -428,9 +428,9 @@ int main(void)
|
|
EOF
|
|
|
|
$CC \
|
|
- $($PKG_CONFIG --cflags ncurses 2>> config.log) \
|
|
+ $(ncurses5-config --cflags 2>> config.log) \
|
|
-o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
|
|
- $($PKG_CONFIG --libs ncurses 2>> config.log \
|
|
+ $(ncurses5-config --libs 2>> config.log \
|
|
|| echo '-lncurses' ) \
|
|
>> config.log 2>&1
|
|
if [ ! -x $TMPDIR/ncursestest ] ; then
|
|
diff --git a/flowtop/Makefile b/flowtop/Makefile
|
|
index e001ce8..bffd86e 100644
|
|
--- a/flowtop/Makefile
|
|
+++ b/flowtop/Makefile
|
|
@@ -1,8 +1,7 @@
|
|
flowtop-libs = -lurcu \
|
|
$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnetfilter_conntrack 2> /dev/null ) \
|
|
- $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncurses 2> /dev/null \
|
|
+ $(shell ncurses5-config --libs 2> /dev/null \
|
|
|| echo '-lncurses') \
|
|
- $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs tinfo 2> /dev/null ) \
|
|
-lpthread
|
|
|
|
ifeq ($(CONFIG_GEOIP), 1)
|
|
@@ -30,7 +29,7 @@ flowtop-objs += geoip.o \
|
|
ioops.o
|
|
endif
|
|
|
|
-flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncurses) \
|
|
+flowtop-eflags = $(shell ncurses5-config --cflags) \
|
|
$(shell $(PKG_CONFIG) --cflags libnetfilter_conntrack)
|
|
|
|
flowtop-confs = tcp.conf \
|