Accepting request 139868 from home:posophe:branches:security

Please see .changes; coolo upstream patch is no longer needed

OBS-URL: https://build.opensuse.org/request/show/139868
OBS-URL: https://build.opensuse.org/package/show/security/argus?expand=0&rev=10

argus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package argus
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,32 +16,29 @@
 #
 
 
+
 Name:           argus
-BuildRequires:  bison
-BuildRequires:  flex
-BuildRequires:  libpcap-devel
-BuildRequires:  tcpd-devel
-BuildRequires:  tcsh
-Summary:        Network Monitoring Tool
-License:        BSD-3-Clause and LGPL-2.1+ and MIT
+BuildRequires:  bison flex libpcap-devel tcpd-devel tcsh
+License:        BSD-3-Clause ; LGPL-2.1+ ; MIT
 Group:          Productivity/Networking/Diagnostic
-Version:        3.0.0
-Release:        0
+Summary:        Network Monitoring Tool
+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
-Patch0:         %{name}-%{version}-flex.diff
-Patch1:         %{name}-%{version}-libpcap.diff
+Source5:        argus.service
+Patch1:         %{name}-%{version}-libpcap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  systemd
 
 %package server
-PreReq:         %insserv_prereq %fillup_prereq
-Summary:        Daemon for Network Monitoring Tool
+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
@@ -54,8 +51,7 @@ Daemon for Argus network monitoring tool.
 
 %prep
 %setup -n argus-%{version}
-%patch0 -p1
-%patch1
+%patch1 -p1
 cp %{S:3} .
 cp %{S:4} man/man8/
 
@@ -66,9 +62,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 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
@@ -76,38 +73,35 @@ rm -f $RPM_BUILD_ROOT/usr/bin/argus_linux
   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