From 3ec03000008f631bca689e5d1473b01010f8a036 Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 9 Aug 2009 11:25:35 +0000 Subject: [PATCH] - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration - fixed clamav-milter sysv initscript to use bash interpreter and to be disabled by default --- clamav-milter.sysv | 4 ++-- clamav.spec | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/clamav-milter.sysv b/clamav-milter.sysv index c0fad96..693d4ee 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: 345 99 1 +# chkconfig: - 99 1 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4452722..c070641 100644 --- a/clamav.spec +++ b/clamav.spec @@ -321,15 +321,18 @@ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} sed -ri \ - -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g' \ - -e 's!^(#?LocalSocket ).*!\1/var/run/clamd./clamd.sock!g' \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd./clamd.sock!g' \ -e 's!^(#?PidFile ).*!\1/var/run/clamd./clamd.pid!g' \ -e 's!^#?(User ).*!\1!g' \ -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ -e 's! /usr/local/share/clamav,! %homedir,!g' \ etc/clamd.conf -sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf ## ------------------------------------------------------------ @@ -468,7 +471,7 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +%triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) ! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : @@ -691,6 +694,12 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Aug 9 2009 Enrico Scholz - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + * Sat Aug 8 2009 Enrico Scholz - 0.95.2-4 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner