netsniff-ng/netsniff-ng-fix-ncurses.diff
Marcus Meissner f6256a7c34 Accepting request 439074 from home:mnhauke
- update to 0.6.2
  - Many improvements to the trafgen protocol generation functions,
    e.g. the ability to increment/randomize protocol fields at runtime
    using dinc()/rnd(), new functions to generate IPv6, ICMPv4/v6, PFC,
    and IEEE 802.3X PAUSE headers. From Vadim Kochan and Tobias Klauser.
  - flowtop UI improvements. From Vadim Kochan.
  - Packet counting fixes, e.g. to not account for duplicate packets
    received over the loopüback interface. From Paolo Abeni.
  - Allow IPv6 ranges to be specified for source and dest addresses
    in mausezahn. From Tommy Beadle.
  - Build system improvements, allowing to specify more options to the
    configure script. See './configure --help' for details.
    From Vadim Kochan and Tobias Klauser.
  - Various compilation fixes, e.g. for warnings or build failure
    certain systems. From Yousong Zhou and arch3y.
  - Various documentation improvements and fixes. From Vadim Kochan,
    Hisao Tanabe, and Tobias Klauser.
  - add patch netsniff-ng-fix-ncurses.diff
    fix some ncurses related issues during compile time

OBS-URL: https://build.opensuse.org/request/show/439074
OBS-URL: https://build.opensuse.org/package/show/network:utilities/netsniff-ng?expand=0&rev=20
2016-11-17 17:20:50 +00:00

40 lines
1.2 KiB
Diff

diff --git a/configure b/configure
index 72bb574..44aa591 100755
--- a/configure
+++ b/configure
@@ -403,9 +403,9 @@ int main(void)
EOF
$CC \
- $($PKG_CONFIG --cflags ncurses 2>> config.log) \
+ $(ncurses5-config --cflags ncurses 2>> config.log) \
-o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
- $($PKG_CONFIG --libs ncurses 2>> config.log \
+ $(ncurses5-config --libs ncurses 2>> config.log \
|| echo '-lncurses' ) \
>> config.log 2>&1
if [ ! -x $TMPDIR/ncursestest ] ; then
diff --git a/flowtop/Makefile b/flowtop/Makefile
index effe7eb..ab49a51 100644
--- a/flowtop/Makefile
+++ b/flowtop/Makefile
@@ -1,8 +1,7 @@
flowtop-libs = -lurcu \
-lnetfilter_conntrack \
- $(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 \