[netsniff-ng/el6/master] Update to 0.5.5.0 stable.
James Findley
sixy at fedoraproject.org
Wed Nov 3 12:13:27 UTC 2010
commit 58cfbd65b92c3d1c37de911837e0ba378e19f4d7
Author: James Findley <jfindley at f13-guest.(none)>
Date: Thu Oct 28 15:16:55 2010 +0100
Update to 0.5.5.0 stable.
.gitignore | 1 +
check_packets.patch | 50 -------------------
netsniff-ng-help_text.patch | 49 ------------------
netsniff-ng-uds_server.patch | 14 -----
netsniff-ng.init | 111 ------------------------------------------
netsniff-ng.spec | 79 ++++++------------------------
netsniff-ng.syscfg | 9 ---
sources | 3 +-
8 files changed, 18 insertions(+), 298 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbe9db3..602dc9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
netsniff-ng-0.5.3.tar.gz
netsniff-ng-0.5.5.0.tar.gz
+/netsniff-ng-0.5.5.0.tar.gz
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index 2ada2be..892f11f 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -1,27 +1,11 @@
Name: netsniff-ng
Version: 0.5.5.0
-Release: 0.4.211svn%{?dist}
+Release: 1
Summary: A high performance network sniffer for packet inspection
Group: Applications/Internet
License: GPLv2+
URL: http://code.google.com/p/netsniff-ng/
-# We cannot get the source directly, due to bugs on 0.5.4.x, but later
-# revisions than 211 break the UDS functionality, and the replacement
-# is not yet complete. When the replacement, which will be a netlink
-# multicast group, is stable, this workaround will be removed.
-#
-# svn export -r 211 http://netsniff-ng.googlecode.com/svn/trunk/ netsniff-ng_0.5.5.0
-# tar -czvf netsniff-ng-0.5.5.0.tar.gz netsniff-ng_0.5.5.0
-Source0: netsniff-ng-%{version}.tar.gz
-Source1: netsniff-ng.init
-Source2: netsniff-ng.syscfg
-# To read from the UDS socket, a client app is needed which is not provided
-# So we grab the client app, check_packets, from an older source
-# Something about this particular URL upsets rpmlint, but it is valid.
-Source3: http://netsniff-ng.googlecode.com/files/%{name}-0.5.3.tar.gz
-Patch0: netsniff-ng-uds_server.patch
-Patch1: netsniff-ng-help_text.patch
-Patch2: check_packets.patch
+Source0: http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -37,43 +21,28 @@ This tool is useful for debugging your network, measuring performance
throughput or creating network statistics of incoming packets on central
network nodes like routers or firewalls.
-By providing an unix domain socket client, you're able to integrate your
-statistics into the nagios framework.
+#We no longer need the service stuff as daemon mode has gone away.
+%pre
+if [ $1 -gt 1 ]; then
+ /sbin/service %{name} stop >/dev/null 2>&1
+ /sbin/chkconfig --del %{name}
+fi
%prep
-%setup -q -n %{name}_%{version}
-
-mkdir check_packets
-tar -C check_packets -xzf %{SOURCE3}
-
-%patch0 -p1
-%patch1 -p1
-
-pushd check_packets
-%patch2 -p1
-popd
+%setup -q -n %{name}
%build
-#Main app
pushd src
-make %{?_smp_mflags} \
- CC="%{__cc}" \
- CFLAGS="%{optflags} -Wno-format" \
+make %{?_smp_mflags} \
+ CFLAGS="%{optflags}" \
BINDIR="%{_sbindir}" \
ETCDIR="%{_sysconfdir}" \
MANDIR="%{_mandir}/man8"
popd
-#check_packets client
-pushd check_packets/src
-#Remove the prebuilt binaries
-rm -f check_packets check_packets.o
-make %{?_smp_mflags}
-popd
%install
rm -rf $RPM_BUILD_ROOT
-#Main app
pushd src
make DESTDIR="$RPM_BUILD_ROOT" install \
CC="%{__cc}" \
@@ -81,42 +50,26 @@ make DESTDIR="$RPM_BUILD_ROOT" install \
BINDIR="%{_sbindir}" \
ETCDIR="%{_sysconfdir}" \
MANDIR="%{_mandir}/man8"
-install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
-install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
chmod 0644 $RPM_BUILD_ROOT/%{_mandir}/man8/%{name}.8*
popd
-#check_packets client
-pushd check_packets/src
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-/sbin/chkconfig --add %{name}
-
-%preun
-if [ $1 = 0 ] ; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
-fi
-
%files
%defattr(-, root, root, -)
-%doc AUTHORS Changelog COPYING CREDITS README TODO
-%doc examples
+%doc AUTHORS CHANGELOG COPYING CREDITS README TODO
%{_sbindir}/%{name}
-%{_bindir}/check_packets
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/rules
-%{_initrddir}/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/rules/*.bpf
%{_mandir}/man8/%{name}.8*
%changelog
+* Tue Nov 02 2010 James Findley <sixy at gmx.com> - 0.5.5.0-1
+- Updated to 0.5.5.0 stable
+- This version has major changes, including the removal of daemon mode.
+
* Tue Feb 23 2010 James Findley <sixy at gmx.com> - 0.5.5.0-0.4.211svn
- Improved the way sources are provided
- Used the upstream copy of 0.5.3 for check_packets, with a patch
diff --git a/sources b/sources
index ed24fed..9764d98 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c89567d9976357fe6bb76f9e3f961367 netsniff-ng-0.5.3.tar.gz
-d379500ec4cd72457ad3835215fcf3d2 netsniff-ng-0.5.5.0.tar.gz
+d92382187518bc0c6b6dfef98100b4be netsniff-ng-0.5.5.0.tar.gz
More information about the scm-commits
mailing list