Accepting request 178640 from home:worldcitizen:branches:network:utilities

update to 0.5.7 OBS-URL: https://build.opensuse.org/request/show/178640 OBS-URL: https://build.opensuse.org/package/show/network:utilities/netsniff-ng?expand=0&rev=13
2013-06-12 12:43:29 +00:00 · 2013-06-12 12:43:29 +00:00 · 263e1d5530
commit 263e1d5530
parent 15b0370328
5 changed files with 54 additions and 44 deletions
--- a/netsniff-ng-0.5.6.tar.gz
+++ b/netsniff-ng-0.5.6.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64b06725a19d2103aeefa1b60d166657ed3008f8a94691a6ec883708348de227
-size 3575834
--- a/netsniff-ng-0.5.7.tar.gz
+++ b/netsniff-ng-0.5.7.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab4e1ef6aadb00b998349aff66e4e1cec53910113344c53ac8eb947fd46b5e89
+size 2957112
--- a/netsniff-ng-optflags.patch
+++ b/netsniff-ng-optflags.patch
@ -1,5 +1,6 @@
--- src/CMakeLists.txt.orig	2012-03-30 06:51:48.795695591 +0200
-+++ src/CMakeLists.txt	2012-03-30 06:52:25.829694273 +0200
+diff -Naur netsniff-ng-0.5.7.orig/src/CMakeLists.txt netsniff-ng-0.5.7/src/CMakeLists.txt
+--- netsniff-ng-0.5.7.orig/src/CMakeLists.txt	2012-06-29 20:07:57.000000000 +0200
+++ netsniff-ng-0.5.7/src/CMakeLists.txt	2013-06-10 09:43:32.014721956 +0200
@@ -15,12 +15,8 @@
 INCLUDE(Pod2Man)
 
@ -11,13 +12,13 @@
 -	-fno-strict-aliasing
 -	-D_FORTIFY_SOURCE=2
 	-D_REENTRANT
- 	-Wall
- 	-Wundef
-@@ -55,6 +51,7 @@
+ 	-march=native
+ 	-mtune=native
+@@ -57,6 +53,7 @@
 	-Wfloat-equal
 	-Wunknown-pragmas
 	-Wunused-function
-+    ${OPTFLAGS}
+	${OPTFLAGS}
 )
 
 IF (CMAKE_BUILD_TYPE STREQUAL profile)
--- a/netsniff-ng.changes
+++ b/netsniff-ng.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 12 10:52:05 UTC 2013 - joop.boonen@opensuse.org
+
+- update to 0.5.7
+
 -------------------------------------------------------------------
 Thu Mar 29 10:43:00 UTC 2012 - pascal.bleser@opensuse.org

--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@ -1,4 +1,7 @@
-# vim: set ts=4 sw=4 et:
+#
+# spec file for package netsniff-ng
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@ -11,41 +14,45 @@
 # published by the Open Source Initiative.

 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#

-%define bison_version %(rpm -q --qf='%{VERSION}' bison | %__perl -n -e 'print $1 * 100 + $2 if /^(\d+)\.(\d+)/')

 Name:           netsniff-ng
-Version:        0.5.6
+Version:        0.5.7
 Release:        0
 Summary:        High Performance Network Sniffer for Packet Inspection
-Source:         http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz
-Patch1:         netsniff-ng-cmake_pod2man_without_stderr.patch
-Patch2:         netsniff-ng-optflags.patch
-URL:            http://code.google.com/p/netsniff-ng/
-Group:          Productivity/Networking/Diagnostic
 License:        GPL-2.0+
-BuildRoot:      %{_tmppath}/build-%{name}-%{version}
-BuildRequires:  ncurses-devel
+Group:          Productivity/Networking/Diagnostic
+Url:            http://netsniff-ng.org/
+Source:         http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz
+# PATCH-FIX-SUSE netsniff-ng-cmake_pod2man_without_stderr.patch
+Patch1:         netsniff-ng-cmake_pod2man_without_stderr.patch
+# PATCH-FIX-SUSE netsniff-ng-optflags.patch
+Patch2:         netsniff-ng-optflags.patch
 BuildRequires:  libGeoIP-devel
+BuildRequires:  ncurses-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1130
 BuildRequires:  libnetfilter_conntrack-devel
 BuildRequires:  liburcu-devel
+BuildRequires:  nacl-devel
 %define with_nf 1
 %else
 %define with_nf 0
 %endif
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison
-%if 0%{?bison_version} >= 250
-BuildRequires:  bison >= 2.5
-BuildRequires:  flex
-%define with_bison 1
-%else
-BuildConflicts: flex
-%define with_bison 0
-%endif
 BuildRequires:  cmake >= 2.8
-BuildRequires:  gcc make glibc-devel
-BuildRequires:  autoconf automake libtool
+BuildRequires:  flex
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  libcli-devel
+BuildRequires:  libnetfilter_conntrack-devel
+BuildRequires:  libnl-1_1-devel
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  nacl-devel

 %description
 netsniff-ng is a high performance Linux network sniffer for packet inspection.
@ -62,43 +69,40 @@ firewalls.
 %if 0%{?suse_version} < 1140
 %patch1
 %endif
-%patch2
+%patch2 -p1

 %build
-%__install -d build
+install -d build
 pushd build
 cmake \
-    -DCMAKE_INSTALL_PREFIX="%{_usr}" \
-    -DOPTFLAGS="%{optflags}" \
+    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+    -DOPTFLAGS="%{optflags}"  -DNACL_INCLUDE_DIR=%{_includedir}/nacl -DNACL_LIB_DIR=%{_libdir} \
    ../src/
-%__make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags} VERBOSE=1
 popd

 %install
 pushd build
-%__make DESTDIR="%{buildroot}" install
+make DESTDIR=%{buildroot} install
 popd

-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING MAINTAINER PROJECTS README REPORTING-BUGS
-%doc THANKS Documentation
+%doc AUTHORS COPYING README REPORTING-BUGS
+%doc Documentation
 %config %{_sysconfdir}/netsniff-ng
 %{_sbindir}/ashunt
+%{_sbindir}/bpfc
+%{_sbindir}/curvetun
 %{_sbindir}/ifpps
 %{_sbindir}/netsniff-ng
 %{_sbindir}/trafgen
 %doc %{_mandir}/man8/ashunt.8*
+%doc %{_mandir}/man8/bpfc.8*
+%doc %{_mandir}/man8/curvetun.8*
 %doc %{_mandir}/man8/ifpps.8*
 %doc %{_mandir}/man8/netsniff-ng.8*
 %doc %{_mandir}/man8/trafgen.8*
-%if %with_bison
-%{_sbindir}/bpfc
-%doc %{_mandir}/man8/bpfc.8*
-%endif
 %if %with_nf
 %{_sbindir}/flowtop
 %doc %{_mandir}/man8/flowtop.8*