main/clamav: Split OpenRC, add check, fix tabs

1 files changed, 48 insertions, 30 deletions

diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 028e83fc7d..5cdc847e90 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=clamav
 pkgver=0.99.3
-pkgrel=2
+pkgrel=3
 pkgusers="clamav"
 pkggroups="clamav"
 pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
@@ -19,6 +19,7 @@ makedepends="ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers $depends_dev
 	libmilter-dev fts-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-lib $pkgname-libunrar
 	$pkgname-daemon $pkgname-scanner $pkgname-db::noarch freshclam
+	$pkgname-daemon-openrc:daemon_rc:noarch freshclam-openrc:fresh_rc:noarch
 	$pkgname-milter"
 source="http://www.clamav.net/downloads/production/$pkgname-$pkgver.tar.gz
 	clamd.initd
@@ -70,29 +71,34 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# set proper defaults
 	sed -i -e "s:^\(Example\):\# \1:" \
-                -e "s:.*\(PidFile\) .*:\1 /run/clamav/freshclam.pid:" \
-                -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-                -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-                -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
-                -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-                -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-                "$pkgdir"/etc/clamav/freshclam.conf.sample
+		-e "s:.*\(PidFile\) .*:\1 /run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"$pkgdir"/etc/clamav/freshclam.conf.sample
 
 	# set proper defaults
-        sed -i -e "s:^\(Example\):\# \1:" \
-                -e "s:.*\(PidFile\) .*:\1 /run/clamav/clamd.pid:" \
-                -e "s:.*\(LocalSocket\) .*:\1 /run/clamav/clamd.sock:" \
-                -e "s:.*\(User\) .*:\1 clamav:" \
-                -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-                -e "s:^\#\(LogTime\).*:\1 yes:" \
-               -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-                "$pkgdir"/etc/clamav/clamd.conf.sample
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 /run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+	       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"$pkgdir"/etc/clamav/clamd.conf.sample
 }
 
 check() {
@@ -102,7 +108,6 @@ check() {
 
 lib() {
 	pkgdesc="ClamAV library"
-	depends=""
 	replaces="clamav"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libclamav.so.* \
@@ -111,7 +116,6 @@ lib() {
 
 libunrar() {
 	pkgdesc="ClamAV unrar libraries"
-	depends=""
 	replaces="clamav"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libclamunrar* \
@@ -120,27 +124,33 @@ libunrar() {
 
 freshclam() {
 	pkgdesc="Auto-updater for the Clam Antivirus scanner data-files"
-	depends="logrotate"
 	replaces="clamav clamav-db"
 	mkdir -p "$subpkgdir"/usr/bin \
-		"$subpkgdir"/etc/init.d \
-		"$subpkgdir"/etc/conf.d \
-		"$subpkgdir"/etc/clamav \
+		"$subpkgdir"/etc/clamav
 
-        mv "$pkgdir"/usr/bin/freshclam "$subpkgdir"/usr/bin
-        mv "$pkgdir"/etc/clamav/freshclam.conf.sample \
+	mv "$pkgdir"/usr/bin/freshclam "$subpkgdir"/usr/bin
+	mv "$pkgdir"/etc/clamav/freshclam.conf.sample \
 		"$subpkgdir"/etc/clamav/freshclam.conf
 
 	install -d -m755 -o clamav -g clamav \
 		"$subpkgdir"/var/log/clamav \
 		"$subpkgdir"/var/lib/clamav
 
+	install -m644 -D "$srcdir"/freshclam.logrotate \
+		"$subpkgdir"/etc/logrotate.d/freshclam
+}
+
+freshclam_rc() {
+	pkgdesc="Auto-updater for the Clam Antivirus scanner data-files (OpenRC init scripts)"
+	install_if="freshclam=$pkgver-r$pkgrel openrc"
+	replaces="clamav freshclam"
+	mkdir -p "$subpkgdir"/etc/init.d \
+		"$subpkgdir"/etc/conf.d
+
 	install -m755 -D "$srcdir"/freshclam.initd \
 		"$subpkgdir"/etc/init.d/freshclam
 	install -m644 -D "$srcdir"/freshclam.confd \
 		"$subpkgdir"/etc/conf.d/freshclam
-	install -m644 -D "$srcdir"/freshclam.logrotate \
-		"$subpkgdir"/etc/logrotate.d/freshclam
 }
 
 db() {
@@ -171,8 +181,8 @@ scanner() {
 daemon() {
 	pkgdesc="ClamAV daemon scanner"
 	replaces="clamav"
-	depends="freshclam logrotate"
-        mkdir -p "$subpkgdir"/usr/bin \
+	depends="freshclam"
+	mkdir -p "$subpkgdir"/usr/bin \
 		"$subpkgdir"/usr/sbin \
 		"$subpkgdir"/etc/clamav
 	install -d -m 755 -o clamav -g clamav \
@@ -188,12 +198,20 @@ daemon() {
 		"$subpkgdir"/usr/bin/
 	mv "$pkgdir"/etc/clamav/clamd.conf.sample \
 		"$subpkgdir"/etc/clamav/clamd.conf
+	install -m644 -D "$srcdir"/clamd.logrotate \
+		"$subpkgdir"/etc/logrotate.d/clamd
+}
+
+daemon_rc() {
+	pkgdesc="ClamAV anti-virus scanner daemon (OpenRC init scripts)"
+	replaces="clamav"
+	depends="freshclam-openrc"
+	install_if="$pkgname-daemon=$pkgver-r$pkgrel openrc"
+
 	install -m755 -D "$srcdir"/clamd.initd \
 		"$subpkgdir"/etc/init.d/clamd
 	install -m644 -D "$srcdir"/clamd.confd \
 		"$subpkgdir"/etc/conf.d/clamd
-	install -m644 -D "$srcdir"/clamd.logrotate \
-		"$subpkgdir"/etc/logrotate.d/clamd
 }
 
 milter() {