![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package argus for openSUSE:Factory checked in at 2012-11-06 16:04:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/argus (Old)
and /work/SRC/openSUSE:Factory/.argus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "argus", Maintainer is "JMatejek@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/argus/argus.changes 2011-11-28 12:52:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.argus.new/argus.changes 2012-11-06 16:04:53.000000000 +0100
@@ -1,0 +2,24 @@
+Sun Oct 28 15:54:54 UTC 2012 - p.drouand@gmail.com
+
+- Remove argus-3.0.0-flex.diff from Coolo : argus_get_leng string
+ is no longer used since 3.0.6 release
+
+-------------------------------------------------------------------
+Sun Oct 28 14:00:36 UTC 2012 - p.drouand@gmail.com
+
+- - Update to 3.0.6.1 version :
+ Bugs fixed :
+ * Correct memory leak and deadlock issues for argus and radium;
+ * Argus and radium get some protection from port scanners;
+ * The client release also fixes a number of bugs with geolocation data,
+ especially country code aggregation and printing. We also fixed
+ meta-data label merging, multicast identification, and some minor
+ issues with variable namespace collisions.
+- Remove sysvinit support and improve systemd support
+
+-------------------------------------------------------------------
+Fri Oct 26 05:34:04 UTC 2012 - coolo@suse.com
+
+- remove prototypes for flex, they conflict with the real ones
+
+-------------------------------------------------------------------
Old:
----
argus-3.0.0-libpcap.diff
argus-3.0.0.tar.bz2
rc.argus
sysconfig.argus
New:
----
argus-3.0.6.1-libpcap.patch
argus-3.0.6.1.tar.bz2
argus.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ argus.spec ++++++
--- /var/tmp/diff_new_pack.MF3XQc/_old 2012-11-06 16:04:54.000000000 +0100
+++ /var/tmp/diff_new_pack.MF3XQc/_new 2012-11-06 16:04:54.000000000 +0100
@@ -19,27 +19,26 @@
Name: argus
BuildRequires: bison flex libpcap-devel tcpd-devel tcsh
-License: BSD3c ; LGPLv2.1+ ; MIT
+License: BSD-3-Clause ; LGPL-2.1+ ; MIT
Group: Productivity/Networking/Diagnostic
Summary: Network Monitoring Tool
-Version: 3.0.0
+Version: 3.0.6.1
Release: 3
Url: http://www.qosient.com/argus/
Source: %{name}-%{version}.tar.bz2
-Source1: rc.argus
-Source2: sysconfig.argus
Source3: README.SuSE
Source4: argus_linux.8.gz
-#Patch: %{name}-%{version}-fixes-1.patch
-Patch1: %{name}-%{version}-libpcap.diff
+Source5: argus.service
+Patch1: %{name}-%{version}-libpcap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: systemd
%package server
-License: BSD3c ; LGPLv2.1+ ; NON-OSI-COMPLIANT(Restricted Shareware) ; MIT
-PreReq: %insserv_prereq %fillup_prereq
+License: BSD-3-Clause ; LGPL-2.1+ ; NON-OSI-COMPLIANT(Restricted Shareware) ; MIT
Group: Productivity/Networking/Diagnostic
Summary: Daemon for Network Monitoring Tool
Requires: argus
+%{?systemd_requires}
Provides: argus:/usr/sbin/argus
%description
@@ -52,8 +51,7 @@
%prep
%setup -n argus-%{version}
-# %patch -p1
-%patch1
+%patch1 -p1
cp %{S:3} .
cp %{S:4} man/man8/
@@ -64,9 +62,10 @@
make %{?_smp_mflags}
%install
-install -d -m 755 $RPM_BUILD_ROOT{/etc/init.d,/sbin,/usr/{sbin,bin,share/man},%{_docdir}}
+install -d -m 755 $RPM_BUILD_ROOT{/etc,/usr/{sbin,bin,share/man},%{_docdir}}
install -m 700 bin/argus $RPM_BUILD_ROOT/usr/sbin/argus
install -m 700 bin/arg* $RPM_BUILD_ROOT/usr/bin/
+install -D -m 0755 %{SOURCE5} %{buildroot}/%{_unitdir}/argus.service
# alread in sbin
rm -f $RPM_BUILD_ROOT/usr/bin/argus
rm -f $RPM_BUILD_ROOT/usr/bin/argus_linux
@@ -74,38 +73,35 @@
cp -a man* $RPM_BUILD_ROOT%{_mandir}
chmod a-x $RPM_BUILD_ROOT%{_mandir}/*/* )
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tcpdump.1*
+rm -rf `find -type f -name ._*`
install -m 600 support/Config/argus.conf $RPM_BUILD_ROOT/etc/argus.conf
install -m 755 support/Archive/argusarchive $RPM_BUILD_ROOT/usr/bin/
-install -d -m 755 $RPM_BUILD_ROOT/etc/init.d
-install -m 755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/argus
-ln -sf ../etc/init.d/argus $RPM_BUILD_ROOT/sbin/rcargus
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.argus
find support -type f -exec chmod 0644 {} \;
chmod a+x support/{Archive/argusarchive,Startup/argus,System/magic}
+
+%pre server
+%service_add_pre argus.service
+
%post server
-%{fillup_and_insserv argus}
+%service_add_post argus.service
%preun server
-%stop_on_removal argus
+%service_del_preun argus.service
%postun server
-%restart_on_update argus
-%{insserv_cleanup}
+%service_del_postun argus.service
%files
%defattr(-,root,root)
-/usr/bin/argus*
+%{_bindir}/argus*
%files server
%defattr(-,root,root)
-%doc doc COPYING MANIFEST README.* support
+%attr(0644,root,root) %doc doc COPYING MANIFEST README.* support
%attr(0644,root,root) %doc %{_mandir}/man*/*
-%config /etc/init.d/argus
%config /etc/argus.conf
-/usr/sbin/*
-/sbin/rcargus
-/var/adm/fillup-templates/sysconfig.argus
+%config %{_unitdir}/argus.service
+%{_sbindir}/*
%changelog
++++++ argus-3.0.6.1-libpcap.patch ++++++
--- a/argus/ArgusSource.c 2012-06-20 15:11:43.000000000 +0200
+++ b/argus/ArgusSource.c 2012-10-24 11:14:47.425282905 +0200
@@ -48,7 +48,7 @@
#if defined(__APPLE_CC__) || defined(__APPLE__)
#define PCAP_DONT_INCLUDE_PCAP_BPF_H
#include