diff --git a/netsniff-ng-0.5.4.2.tar.bz2 b/netsniff-ng-0.5.4.2.tar.bz2 deleted file mode 100644 index 50e4a15..0000000 --- a/netsniff-ng-0.5.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06fb8285156d6b1846cb3e97dc13e5d542a6d0d0ffc54227c809efd283f485b3 -size 128379 diff --git a/netsniff-ng-0.5.5.0.tar.bz2 b/netsniff-ng-0.5.5.0.tar.bz2 new file mode 100644 index 0000000..506a1e8 --- /dev/null +++ b/netsniff-ng-0.5.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1730a62464b81ee6958a157eb106c127609750f853328428fd274cda2fb872e +size 218934 diff --git a/netsniff-ng-optflags.patch b/netsniff-ng-optflags.patch new file mode 100644 index 0000000..db7127c --- /dev/null +++ b/netsniff-ng-optflags.patch @@ -0,0 +1,57 @@ +--- src/definitions.mk.orig 2010-10-11 20:41:24.000000000 +0200 ++++ src/definitions.mk 2010-10-11 20:49:04.000000000 +0200 +@@ -2,12 +2,9 @@ + # Makefile definitions for netsniff-ng + # + +-LD_NORM = echo "LD $(target)"; \ +- gcc +-CC_NORM = echo "CC $<"; \ +- gcc +-CC_DEBUG = echo "DBG $<"; \ +- gcc ++LD_NORM = gcc ++CC_NORM = gcc ++CC_DEBUG = gcc + + LIBS = -lpthread -lrt + MAKEFLAGS += --no-print-directory +@@ -21,10 +18,12 @@ + $(if $(1:$(2)=),,$(if $(2:$(1)=),,T)) + endef + ++OPTFLAGS=-O2 ++ + ifneq ($(or $(call eq,$(MAKECMDGOALS),"all"), $(call eq,$(MAKECMDGOALS),"")),) + LD = $(LD_NORM) -o + CC = $(CC_NORM) -c +- CFLAGS = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common \ ++ CFLAGS = -fomit-frame-pointer -fno-strict-aliasing -fno-common \ + -fno-delete-null-pointer-checks -pedantic -std=gnu99 + CFLAGS += -Wall -Werror -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -Werror-implicit-function-declaration -Wno-format-security \ +@@ -50,5 +49,7 @@ + -Wcomments -Wendif-labels + endif + ++CFLAGS += $(OPTFLAGS) ++ + .PHONY: all + +--- src/Makefile.orig 2010-10-11 20:40:53.000000000 +0200 ++++ src/Makefile 2010-10-11 20:41:21.000000000 +0200 +@@ -20,12 +20,12 @@ + #----------------------------------------------------------------------------- + + build: $(lib-objs) $(core-objs) +- @$(LD) $(target) $(core-objs) $(lib-objs) $(LIBS) ++ $(LD) $(target) $(core-objs) $(lib-objs) $(LIBS) + + #----------------------------------------------------------------------------- + + %.o: %.c +- @$(CC) $(CFLAGS) $(INCLUDE) $< ++ $(CC) $(CFLAGS) $(INCLUDE) $< + + #----------------------------------------------------------------------------- + diff --git a/netsniff-ng.changes b/netsniff-ng.changes index fbd47f1..7ddd045 100644 --- a/netsniff-ng.changes +++ b/netsniff-ng.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Oct 11 18:29:13 UTC 2010 - pascal.bleser@opensuse.org + +- update to 0.5.5: + * the PCAP file format is supported, which enables netsniff-ng to dump, read, and replay traces to or from harddisk + * lots of new packet printing options were added, targeted for debugging and reverse engineering + * automatic NIC IRQ affinity adaption is done if netsniff-ng is bound to a specific CPU + * the possibility to manually set up ring size was added + * POSIX compatible extended regular expression based filtering of packet content was implemented + ------------------------------------------------------------------- Thu Feb 18 16:31:33 UTC 2010 - pascal.bleser@opensuse.org diff --git a/netsniff-ng.spec b/netsniff-ng.spec index 03058d3..f13b350 100644 --- a/netsniff-ng.spec +++ b/netsniff-ng.spec @@ -1,17 +1,19 @@ +# vim: set ts=4 sw=4 et: # norootforbuild -Name: netsniff-ng -Version: 0.5.4.2 -Release: 0 -Summary: High Performance Network Sniffer for Packet Inspection -# http://netsniff-ng.googlecode.com/files/netsniff-ng-%{version}.tar.gz -Source: netsniff-ng-%{version}.tar.bz2 -URL: http://code.google.com/p/netsniff-ng/ -Group: Productivity/Networking/Diagnostic -License: GNU General Public License version 2 or later (GPL v2 or later) -BuildRoot: %{_tmppath}/build-%{name}-%{version} -BuildRequires: gcc make glibc-devel -BuildRequires: autoconf automake libtool +Name: netsniff-ng +Version: 0.5.5.0 +Release: 0 +Summary: High Performance Network Sniffer for Packet Inspection +# http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz +Source: netsniff-ng-%{version}.tar.bz2 +Patch1: netsniff-ng-optflags.patch +URL: http://code.google.com/p/netsniff-ng/ +Group: Productivity/Networking/Diagnostic +License: GNU General Public License version 2 or later (GPL v2 or later) +BuildRoot: %{_tmppath}/build-%{name}-%{version} +BuildRequires: gcc make glibc-devel +BuildRequires: autoconf automake libtool %if 0%{?suse_version} >= 1030 BuildRequires: licenses Requires: licenses @@ -35,32 +37,26 @@ Authors: Daniel Borkmann Emmanuel Roullit -%if 0%{?opensuse_bs} -%debug_package -%endif %prep -%setup -q -n "%{name}_%{version}" +%setup -q -n "%{name}" +%patch1 %build -pushd src -%__make %{?jobs:-j%{jobs}} \ - CC="%__cc" \ - CFLAGS="-Wall %{optflags}" \ - BINDIR="%{_sbindir}" \ - ETCDIR="%{_sysconfdir}" \ - MANDIR="%{_mandir}/man8" -popd #src +%__make -C src \ + OPTFLAGS="%{optflags} -Wall" \ + LD_NORM="%__cc" \ + CC_NORM="%__cc" \ + CC_DEBUG="%__cc" \ + all %install -pushd src -# don't use the makeinstall macro as it's dumb on Fedora -%__make DESTDIR="%{buildroot}" install \ - CC="%__cc" \ - CFLAGS="-Wall %{optflags}" \ - BINDIR="%{_sbindir}" \ - ETCDIR="%{_sysconfdir}" \ - MANDIR="%{_mandir}/man8" -popd #src +%__make -C src \ + OPTFLAGS="%{optflags} -Wall" \ + LD_NORM="%__cc" \ + CC_NORM="%__cc" \ + CC_DEBUG="%__cc" \ + DESTDIR="%{buildroot}" \ + install %__chmod 0644 "%{buildroot}%{_mandir}"/*/* @@ -68,19 +64,12 @@ h=/usr/share/doc/licenses/md5/$(md5sum COPYING|cut -f1 -d" ") test -e "$h" && %__ln_s -f "$h" . %clean -%__rm -rf "%{buildroot}" +%{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) -%doc AUTHORS Changelog COPYING CREDITS README TODO -%doc examples +%doc AUTHORS CHANGELOG CODING COPYING CREDITS HACKING README TODO %config %{_sysconfdir}/netsniff-ng %{_sbindir}/netsniff-ng -%doc %{_mandir}/man8/netsniff-ng.8* +%doc %{_mandir}/man8/netsniff-ng.8%{ext_man} -%changelog -# vim: set sw=3 ts=3 noet: -# Local Variables: -# mode: rpm-spec -# tab-width: 3 -# End: