Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=5408967a60cb707a49ad808c85ebc85640255a74

commit 5408967a60cb707a49ad808c85ebc85640255a74
Author: Miklos Vajna <[email protected]>
Date:   Sat Jun 9 17:51:33 2012 +0200

clamav-0.97.4-3-x86_64

- add systemd support

diff --git a/source/apps-extra/clamav/FrugalBuild 
b/source/apps-extra/clamav/FrugalBuild
index 180c2dd..a9e12ea 100644
--- a/source/apps-extra/clamav/FrugalBuild
+++ b/source/apps-extra/clamav/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=clamav
pkgver=0.97.4
-pkgrel=2
+pkgrel=3
pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX"
depends=('gmp>=5.0.1' 'bzip2' 'curl>=7.19.0')
rodepends=('shadow')
@@ -11,12 +11,12 @@ backup=(etc/{freshclam,clamd}.conf)
groups=('apps-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
-source=($source rc.clamav rc.clamav-hu.po clamav-0.95-cliopts.patch 
llvm-glibc.patch)
+source=($source clamav-0.95-cliopts.patch llvm-glibc.patch clamav.service 
freshclam.service)
sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' \
-          '90b22c99927b56992ac05042029d2702db79a8b0' \
-          '57d36966c45adfd6b3ebd10b91874194924ab2c3' \
'a9d3c548a23935a31f783a0aeec3373c784fd40c' \
-          '79080dd02903aa0463a1e837e8c0afaa9cf4348b')
+          '79080dd02903aa0463a1e837e8c0afaa9cf4348b' \
+          'f50298cd957cd322c9a47384bbec0076fe059490' \
+          'acc22c8def14d7dea1c781da347f5765196726b9')

build()
{
@@ -35,7 +35,8 @@ build()
cat > $Fdestdir/etc/tmpfiles.d/clamav.conf << EOF
d $Flocalstatedir/run/clamav 0755 clamav clamav -
EOF
-       Frcd2
+       Ffile /lib/systemd/system/clamav.service
+       Ffile /lib/systemd/system/freshclam.service
}

# optimization OK
diff --git a/source/apps-extra/clamav/clamav.service 
b/source/apps-extra/clamav/clamav.service
new file mode 100644
index 0000000..97d0f62
--- /dev/null
+++ b/source/apps-extra/clamav/clamav.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=clamd scanner daemon
+After=syslog.target nss-lookup.target network.target
+
+[Service]
+ExecStart=/usr/sbin/clamd --nofork=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/source/apps-extra/clamav/freshclam.service 
b/source/apps-extra/clamav/freshclam.service
new file mode 100644
index 0000000..ae6382e
--- /dev/null
+++ b/source/apps-extra/clamav/freshclam.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=freshclam service
+After=syslog.target nss-lookup.target network.target
+
+[Service]
+ExecStart=/usr/bin/freshclam -d --checks=12 --user=clamav
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/source/apps-extra/clamav/rc.clamav 
b/source/apps-extra/clamav/rc.clamav
deleted file mode 100644
index 3d4412c..0000000
--- a/source/apps-extra/clamav/rc.clamav
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl <[email protected]>
-# (c) 2003 Vajna Miklos <[email protected]>
-# rc.clamav for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 50 50
-# description: Start/stop Clam AntiVirus && DB-Updater Daemon
-
-source /lib/initscripts/functions
-TEXTDOMAIN=clamav
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart start status stop)
-daemon=$"Clam AntiVirus and DB-Updater"
-
-pid="pidof clamd 2> /dev/null"
-pid2="pidof freshclam 2> /dev/null"
-
-rc_start()
-{
-       start_msg
-        if test ! -e /var/lib/clamav/daily.cvd ; then
-                freshclam --user=clamav 2> /dev/null
-        fi
-       if [[ "$(eval ${pid})" == "" ]] && [[ "$(eval ${pid2})" == "" ]] ; then
-               [ -f /tmp/clamd ] && rm -f /tmp/clamd
-               /usr/sbin/clamd
-               /usr/bin/freshclam -d --checks=12 --user=clamav
-               ok $?
-       else
-               ok 999
-       fi
-}
-
-rc_stop()
-{
-       stop_msg
-       if [[ "$(eval ${pid})" != "" ]] || [[ "$(eval ${pid2})" != "" ]] ; then
-               killall clamd 2> /dev/null
-               killall freshclam 2> /dev/null
-               ok $?
-       else
-               ok 999
-       fi
-}
-
-rc_exec $1
-
-# vim: ft=sh
diff --git a/source/apps-extra/clamav/rc.clamav-hu.po 
b/source/apps-extra/clamav/rc.clamav-hu.po
deleted file mode 100644
index e4b465a..0000000
--- a/source/apps-extra/clamav/rc.clamav-hu.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# rc.clamav.
-# Copyright (C) 2006 THE rc.clamav'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.clamav package.
-#  <[email protected]>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.clamav\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:44+0100\n"
-"PO-Revision-Date: 2006-01-12 23:10+0100\n"
-"Last-Translator:  <[email protected]>\n"
-"Language-Team: Hungarian <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: rc.clamav:15
-msgid "Clam AntiVirus and DB-Updater"
-msgstr "Clam Antivírus és DB-Frissítõ"
diff --git a/source/apps-extra/clamav/rc.clamav.pot 
b/source/apps-extra/clamav/rc.clamav.pot
deleted file mode 100644
index c634ed5..0000000
--- a/source/apps-extra/clamav/rc.clamav.pot
+++ /dev/null
@@ -1,21 +0,0 @@
-# rc.clamav.
-# Copyright (C) YEAR THE rc.clamav'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.clamav package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.clamav\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:44+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.clamav:15
-msgid "Clam AntiVirus"
-msgstr ""
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to