- updated to arcavir 2009

- removed package "bases"
- cron for arcaupdate
- arcad daemon
- vir database in /var/lib
- rel 1

Changed files:
    arcavir-bases-path.patch -> 1.1
    arcavir-init-chkconfig.patch -> 1.1
    arcavir.cron -> 1.1
    arcavir.spec -> 1.8

diff --git a/arcavir-bases-path.patch b/arcavir-bases-path.patch
new file mode 100644 (file)
index 0000000..6efc8ef
--- /dev/null
+++ b/arcavir-bases-path.patch
@@ -0,0 +1,54 @@
+diff -ru orig/etc/arcacmd-scanner.conf new/etc/arcacmd-scanner.conf
+--- orig/etc/arcacmd-scanner.conf      2009-01-15 10:11:44.000000000 +0100
++++ new/etc/arcacmd-scanner.conf       2009-05-09 14:22:43.609786250 +0200
+@@ -7,7 +7,7 @@
+ # page.
+ 
+ # [-bases] Bases path (must be slash-terminated)
+-#-Path-Bases /var/cache/arcabit/bases/
++-Path-Bases /var/lib/arcavir/bases/
+ 
+ # [-hosts] 0 - all, 1 - only masks from hmask
+ #-ScanFiles 0
+Only in new/etc: arcacmd-scanner.conf~
+diff -ru orig/etc/arcad-scanner.conf new/etc/arcad-scanner.conf
+--- orig/etc/arcad-scanner.conf        2009-01-15 10:12:19.000000000 +0100
++++ new/etc/arcad-scanner.conf 2009-05-09 14:22:52.903117813 +0200
+@@ -2,7 +2,7 @@
+ # Copyright (C) 2006-2008 ArcaBit Sp. z o.o.
+ 
+ # [-bases] Bases path (must be slash-terminated)
+-#-Path-Bases /var/cache/arcabit/bases/
++-Path-Bases /var/lib/arcavir/bases/
+ 
+ # [-hosts] 0 - all, 1 - only masks from hmask
+ #-ScanFiles 0
+Only in new/etc: arcad-scanner.conf~
+diff -ru orig/etc/arcascanner-default.conf new/etc/arcascanner-default.conf
+--- orig/etc/arcascanner-default.conf  2009-01-15 10:11:05.000000000 +0100
++++ new/etc/arcascanner-default.conf   2009-05-09 14:22:28.456489653 +0200
+@@ -7,7 +7,7 @@
+ # page.
+ 
+ # [-bases] Bases path (must be slash-terminated)
+--Path-Bases /var/cache/arcabit/bases/
++-Path-Bases /var/lib/arcavir/bases/
+ 
+ # [-hosts] 0 - all, 1 - only masks from hmask
+ -ScanFiles 0
+Only in new/etc: arcascanner-default.conf~
+diff -ru orig/usr/bin/arcaupdate new/usr/bin/arcaupdate
+--- orig/usr/bin/arcaupdate    2009-03-04 13:58:17.000000000 +0100
++++ new/usr/bin/arcaupdate     2009-05-09 14:11:45.276530894 +0200
+@@ -38,8 +38,8 @@
+ 
+ # directory with anti-virus databases
+ # ARCAVIR_BASES=/usr/local/bin/arcavir_bases
+-# ARCAVIR_BASES=/var/lib/arcavir/bases
+-ARCAVIR_BASES=/var/cache/arcabit/bases
++ARCAVIR_BASES=/var/lib/arcavir/bases
++# ARCAVIR_BASES=/var/cache/arcabit/bases
+ 
+ # path to PGP with public key
+ # comment out if you do not want verify data
+Only in new/usr/bin: arcaupdate~

diff --git a/arcavir-init-chkconfig.patch b/arcavir-init-chkconfig.patch
new file mode 100644 (file)
index 0000000..839b1fb
--- /dev/null
+++ b/arcavir-init-chkconfig.patch
@@ -0,0 +1,18 @@
+--- orig/etc/init.d/arcad      2008-12-11 17:02:12.000000000 +0100
++++ new/etc/init.d/arcad       2009-05-09 15:37:19.263305631 +0200
+@@ -1,6 +1,15 @@
+ #!/bin/bash
+ #
+ # This init script is used to start ArcaBit arcadaemon.
++#
++# chkconfig:  345 60 40
++#
++# description:        ArcaBit arcadaemon
++#
++# processname:        arcad
++# pidfile:    /var/run/arcad.pid
++#
++
+ 
+ ARCAD_BINARY=/usr/sbin/arcad
+ ARCAD_CONF=/etc/arcad.conf

diff --git a/arcavir.cron b/arcavir.cron
new file mode 100644 (file)
index 0000000..1c98502
--- /dev/null
+++ b/arcavir.cron
@@ -0,0 +1 @@
+17 6 * * * arcabit /usr/bin/arcaupdate get

diff --git a/arcavir.spec b/arcavir.spec
index 72724e130247dfc62d835b89877aa3502eea9cc5..7d803ea53d9c89a6d17692dafd81d86d691d395b 100644 (file)
--- a/arcavir.spec
+++ b/arcavir.spec
@@ -1,16 +1,15 @@
-# TODO:
-# - fix version information (2.6 is Linux version)
-# - move databases to /var/lib, fix paths in arcaupdate
-#
 Summary:       An anti-virus utility for Unix
 Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          arcacmd
-Version:       2.6
-Release:       0.1
+Version:       2009
+Release:       1
 License:       restricted or commercial (see COPYING* files)
 Group:         Applications
-Source0:       http://arcabit.pl/download/linux/%{name}-linux%{version}-bundle-20060731.tgz
-# Source0-md5: ffc56e252fbb05b60fa80255140a81d8
+Source0:       http://bugtraq.arcabit.com/devel/arcavir2009-server/arcavir%{version}-server-linux-i386.tar.gz
+# Source0-md5: 28f20af0e39a7ebacbc1e798dd51ce69
+Source1:       arcavir.cron
+Patch0:                arcavir-bases-path.patch
+Patch1:                arcavir-init-chkconfig.patch
 URL:           http://arcabit.pl/
 Requires:      libstdc++ >= 5:3.4
 ExclusiveArch: %{ix86}
@@ -22,18 +21,6 @@ Arcavir is anti-virus scanner for Unix.
 %description -l pl.UTF-8
 Arcavir jest skanerem antywirusowym dla systemów uniksowych.
 
-%package bases
-Summary:       Arcavir Antivirus databases
-Summary(pl.UTF-8):     Bazy antywirusowe arcavir
-Group:         Applications
-Requires:      %{name} = %{version}-%{release}
-
-%description bases
-This package contains antivirus databases.
-
-%description bases -l pl.UTF-8
-Pakiet ten zawiera bazy antywirusowe.
-
 %package updater
 Summary:       Arcavir Antivirus database updater
 Summary(pl.UTF-8):     Aktualizator baz antywirusowych arcavir
@@ -50,42 +37,68 @@ This package contains antivirus databases updater.
 Pakiet ten zawiera aktualizator baz antywirusowych.
 
 %prep
-%setup -q -n inst
+%setup -q -n arcavir%{version}-server
+tar xvf data.tar.gz
+
+%patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/arcacmd/bases/tmp,%{_bindir},%{_sbindir},%{_mandir}/man1,%{_sysconfdir}}
-
-cd files
-install arcacmd $RPM_BUILD_ROOT%{_bindir}
-install arcaupdate $RPM_BUILD_ROOT%{_sbindir}
-cd docs
-gzip -dc arcacmd.1.gz >$RPM_BUILD_ROOT%{_mandir}/man1/arcacmd.1
-cd ..
-install arcacmdg.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install arcacmdl.conf.template $RPM_BUILD_ROOT%{_sysconfdir}
-
-for f in lang/* bases/*; do
-       install $f $RPM_BUILD_ROOT%{_datadir}/%{name}
-done
+install -d $RPM_BUILD_ROOT{%{_datadir}/arcabit/lang/cmd,%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8},%{_sysconfdir}/rc.d/init.d,var/cache/arcabit/bases,var/spool/arcad,%{_libdir},%{_includedir}}
+install -d $RPM_BUILD_ROOT/var/lib/arcavir/bases $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
+
+install usr/lib/lib*.so* $RPM_BUILD_ROOT%{_libdir}
+install usr/sbin/arcad $RPM_BUILD_ROOT%{_sbindir}
+install usr/bin/* $RPM_BUILD_ROOT%{_bindir}
+install usr/share/arcabit/uninstall-data $RPM_BUILD_ROOT%{_datadir}/arcabit
+install usr/share/arcabit/lang/cmd/* $RPM_BUILD_ROOT%{_datadir}/arcabit/lang/cmd/
+install usr/include/* $RPM_BUILD_ROOT%{_includedir}
+install etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install etc/init.d/arcad $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+install usr/include/* $RPM_BUILD_ROOT%{_includedir}
+install usr/share/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+install usr/share/man/man5/* $RPM_BUILD_ROOT%{_mandir}/man5
+install usr/share/man/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/arcavir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%lang(fr) %doc files/docs/COPYING.{commercial,free}.fr
-%lang(pl) %doc files/docs/COPYING.{commercial,free}.pl
-%attr(755,root,root) %{_bindir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/arcacmdg.conf
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/pl_ascii.atr
+%attr(755,root,root) %{_libdir}/lib*.so*
+%attr(755,root,root) %{_sbindir}/arcad
+%attr(755,root,root) %{_bindir}/arcacompat
+%attr(755,root,root) %{_bindir}/arcad-scan
+%attr(755,root,root) %{_bindir}/arcacmd
+%doc %{_datadir}/arcabit/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/arcacmd-scanner.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/arcacmd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/arcad.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/arcad-scanner.conf
+%config %{_sysconfdir}/arcacmd-default.conf
+%config %{_sysconfdir}/arcascanner-default.conf
+%attr(754,root,root) /etc/rc.d/init.d/arcad
+%{_includedir}/arcadapi.h
 %{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%attr(755,arcabit,arcabit) %dir /var/lib/arcavir
+%attr(755,arcabit,arcabit) %dir /var/lib/arcavir/bases
 
-%files bases
-%defattr(644,root,root,755)
-%verify(not md5 mtime size) %{_datadir}/%{name}/abase?.dat
+#%files bases
+#%defattr(644,root,root,755)
+#%verify(not md5 mtime size) %{_datadir}/%{name}/abase?.dat
 
 %files updater
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/arcaupdate
+%attr(755,root,root) %{_bindir}/arcaupdate
+/etc/cron.d/arcavir
+
+%pre
+%groupadd -g 238 arcabit
+%useradd -u 238 -d /tmp -s /bin/false -c "Arcavir Anti Virus Checker" -g arcabit arcabit