From 5122a7f00d133c9e7f01aa3609064787a5c63b754c1a7fd307ea810ca63dda50 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Wed, 28 Sep 2016 09:09:52 +0000 Subject: [PATCH] Accepting request 430715 from home:posophe:branches:security update OBS-URL: https://build.opensuse.org/request/show/430715 OBS-URL: https://build.opensuse.org/package/show/security/argus?expand=0&rev=20 --- argus-3.0.8.1.tar.gz | 3 --- argus-3.0.8.2.tar.gz | 3 +++ argus.changes | 7 ++++++ argus.spec | 56 ++++++++++++++++++++++---------------------- 4 files changed, 38 insertions(+), 31 deletions(-) delete mode 100644 argus-3.0.8.1.tar.gz create mode 100644 argus-3.0.8.2.tar.gz diff --git a/argus-3.0.8.1.tar.gz b/argus-3.0.8.1.tar.gz deleted file mode 100644 index b210fc3..0000000 --- a/argus-3.0.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 -size 523375 diff --git a/argus-3.0.8.2.tar.gz b/argus-3.0.8.2.tar.gz new file mode 100644 index 0000000..75be68b --- /dev/null +++ b/argus-3.0.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff +size 524749 diff --git a/argus.changes b/argus.changes index 0527cca..5246bc5 100644 --- a/argus.changes +++ b/argus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 28 09:09:08 UTC 2016 - p.drouand@gmail.com + +- Update to version 3.0.8.2 + * Upstream doesn't publish a short changelog; please read the + ChangeLog file + ------------------------------------------------------------------- Thu Aug 27 12:17:28 UTC 2015 - p.drouand@gmail.com diff --git a/argus.spec b/argus.spec index e1a93b2..60f0151 100644 --- a/argus.spec +++ b/argus.spec @@ -1,7 +1,7 @@ # # spec file for package argus # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,67 +17,67 @@ Name: argus -BuildRequires: bison -BuildRequires: flex -BuildRequires: libpcap-devel -BuildRequires: tcpd-devel -BuildRequires: tcsh +Version: 3.0.8.2 +Release: 0 Summary: Network Monitoring Tool License: GPL-2.0 and LGPL-2.1 and BSD-3-Clause and MIT Group: Productivity/Networking/Diagnostic -Version: 3.0.8.1 -Release: 0 Url: http://www.qosient.com/argus/ Source: http://qosient.com/argus/src/%{name}-%{version}.tar.gz Source3: README.SUSE Source4: argus_linux.8.gz Source5: argus.service Patch1: %{name}-3.0.6.1-libpcap.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: bison +BuildRequires: flex +BuildRequires: libpcap-devel BuildRequires: systemd-rpm-macros +BuildRequires: tcpd-devel +BuildRequires: tcsh +BuildRoot: %{_tmppath}/%{name}-%{version}-build %package server Summary: Daemon for Network Monitoring Tool Group: Productivity/Networking/Diagnostic Requires: argus +Provides: argus:%{_sbindir}/argus %{?systemd_requires} -Provides: argus:/usr/sbin/argus %description Argus is a network monitoring tool. -Documentation can be found in /usr/share/doc/packages/argus. +Documentation can be found in %{_docdir}/argus. %description server Daemon for Argus network monitoring tool. %prep -%setup -n argus-%{version} +%setup -q -n argus-%{version} %patch1 -p1 -cp %{S:3} . -cp %{S:4} man/man8/ +cp %{SOURCE3} . +cp %{SOURCE4} man/man8/ %build #autoreconf -fiv -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure --with-pic make %{?_smp_mflags} %install -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 755 $RPM_BUILD_ROOT{/etc,%{_prefix}/{sbin,bin,share/man},%{_docdir}} +install -m 700 bin/argus %{buildroot}%{_sbindir}/argus +install -m 700 bin/arg* %{buildroot}%{_bindir}/ install -D -m 0644 %{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 +rm -f %{buildroot}%{_bindir}/argus +rm -f %{buildroot}%{_bindir}/argus_linux ( cd man - cp -a man* $RPM_BUILD_ROOT%{_mandir} - chmod a-x $RPM_BUILD_ROOT%{_mandir}/*/* ) -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tcpdump.1* + cp -a man* %{buildroot}%{_mandir} + chmod a-x %{buildroot}%{_mandir}/*/* ) +rm -f %{buildroot}%{_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 -m 600 support/Config/argus.conf %{buildroot}%{_sysconfdir}/argus.conf +install -m 755 support/Archive/argusarchive %{buildroot}%{_bindir}/ find support -type f -exec chmod 0644 {} \; #chmod a+x support/{Archive/argusarchive,Startup/argus,System/magic} chmod a+x support/{Archive/argusarchive,Startup/argus} @@ -101,9 +101,9 @@ chmod a+x support/{Archive/argusarchive,Startup/argus} %files server %defattr(-,root,root) %doc doc COPYING MANIFEST README.* support -%doc %{_mandir}/man*/* -%config /etc/argus.conf +%{_mandir}/man*/* +%config %{_sysconfdir}/argus.conf %{_unitdir}/argus.service %{_sbindir}/* -%changelog +%changelog \ No newline at end of file