commit netsniff-ng for openSUSE:Factory

19 Nov 2018

Hello community,

here is the log from the commit of package netsniff-ng for openSUSE:Factory checked in at 2018-11-19 23:30:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netsniff-ng (Old)
 and      /work/SRC/openSUSE:Factory/.netsniff-ng.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "netsniff-ng"

Mon Nov 19 23:30:38 2018 rev:3 rq:649353 version:0.6.4

Changes:
--------

--- /work/SRC/openSUSE:Factory/netsniff-ng/netsniff-ng.changes	2018-01-09 14:53:53.413841577 +0100
+++ /work/SRC/openSUSE:Factory/.netsniff-ng.new/netsniff-ng.changes	2018-11-19 23:30:41.931280161 +0100
@@ -1,0 +2,6 @@
+Thu Nov 15 19:18:00 UTC 2018 - Cristian Rodríguez <crrodriguez@opensuse.org>
+
+-  netsniff-ng-ncursesw.patch replaces netsniff-ng-fix-ncurses.diff
+   choose ncurses6w and not ncurses5 for build.
+
+-------------------------------------------------------------------

Old:
----
  netsniff-ng-fix-ncurses.diff

New:
----
  netsniff-ng-ncursesw.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ netsniff-ng.spec ++++++
--- /var/tmp/diff_new_pack.FXhymF/_old	2018-11-19 23:30:42.615279373 +0100
+++ /var/tmp/diff_new_pack.FXhymF/_new	2018-11-19 23:30:42.623279364 +0100
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,11 +21,10 @@
 Version:        0.6.4
 Release:        0
 Summary:        Network Sniffer for Packet Inspection
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Productivity/Networking/Diagnostic
 Url:            http://netsniff-ng.org/
 Source:         http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-%{version}.tar.xz
-Patch0:         netsniff-ng-fix-ncurses.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -42,13 +41,10 @@
 BuildRequires:  libtool
 BuildRequires:  liburcu-devel
 BuildRequires:  make
-%if 0%{?suse_version} > 1320
-BuildRequires:  ncurses5-devel
-%else
-BuildRequires:  ncurses-devel
-%endif
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(ncursesw)
+Patch0:         netsniff-ng-ncursesw.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description

++++++ netsniff-ng-ncursesw.patch ++++++
Index: netsniff-ng-0.6.4/flowtop/Makefile
===================================================================
--- netsniff-ng-0.6.4.orig/flowtop/Makefile
+++ netsniff-ng-0.6.4/flowtop/Makefile
@@ -1,6 +1,6 @@
 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 PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncursesw 2> /dev/null \
 			|| echo '-lncurses') \
 		$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs tinfo 2> /dev/null ) \
 		-lpthread
@@ -30,7 +30,7 @@ flowtop-objs +=	geoip.o \
 		ioops.o
 endif
 
-flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncurses) \
+flowtop-eflags = $(shell $(PKG_CONFIG) --cflags ncursesw) \
                  $(shell $(PKG_CONFIG) --cflags libnetfilter_conntrack)
 
 flowtop-confs =	tcp.conf \
Index: netsniff-ng-0.6.4/ifpps/Makefile
===================================================================
--- netsniff-ng-0.6.4.orig/ifpps/Makefile
+++ netsniff-ng-0.6.4/ifpps/Makefile
@@ -1,4 +1,4 @@
-ifpps-libs =	$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncurses 2> /dev/null \
+ifpps-libs =	$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncursesw 2> /dev/null \
 			|| echo '-lncurses') \
 		$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs tinfo 2> /dev/null )
 
@@ -14,6 +14,6 @@ ifpps-objs =	xmalloc.o \
 		sysctl.o \
 		ifpps.o
 
-ifpps-eflags = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags ncurses 2> /dev/null)
+ifpps-eflags = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags ncursesw 2> /dev/null)
 
 ifpps-confs =
Index: netsniff-ng-0.6.4/configure
===================================================================
--- netsniff-ng-0.6.4.orig/configure
+++ netsniff-ng-0.6.4/configure
@@ -428,9 +428,9 @@ int main(void)
 EOF
 
 	$CC \
-		$($PKG_CONFIG --cflags ncurses 2>> config.log) \
+		$($PKG_CONFIG --cflags ncursesw 2>> config.log) \
 		-o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
-		$($PKG_CONFIG --libs ncurses 2>> config.log \
+		$($PKG_CONFIG --libs ncursesw 2>> config.log \
 	          || echo '-lncurses' ) \
 			>> config.log 2>&1
 	if [ ! -x $TMPDIR/ncursestest ] ; then

    

root

tags

participants (1)