[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/lenny-volatile, updated. debian/0.95+dfsg-1-200-g288f487
Stephen Gran
steve at lobefin.net
Thu Jul 2 21:13:32 UTC 2009
The following commit has been merged in the debian/lenny-volatile branch:
commit 40b870927a476049ff492c7f80246f44f0da1e6b
Author: Stephen Gran <steve at lobefin.net>
Date: Thu Jul 2 22:06:59 2009 +0100
(Hopefully) clean up variable usage
Signed-off-by: Stephen Gran <steve at lobefin.net>
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 015e821..c5046d1 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -39,59 +39,59 @@ case "$1" in
db_metaget clamav-milter/debconf value || true
if [ "$RET" = "true" ]; then
db_metaget clamav-milter/MilterSocket value || true
- MilterSocket="$RET"
+ miltersocket="$RET"
db_metaget clamav-milter/FixStaleSocket value || true
- FixStaleSocket="$RET"
+ fixstalesocket="$RET"
db_metaget clamav-milter/User value || true
- User="$RET"
+ user="$RET"
db_metaget clamav-milter/AddGroups value || true
- AddGroups="$RET"
+ addgroups="$RET"
db_metaget clamav-milter/ReadTimeout value || true
- ReadTimeout="$RET"
+ readtimeout="$RET"
db_metaget clamav-milter/Foreground value || true
- Foreground="$RET"
+ foreground="$RET"
db_metaget clamav-milter/Chroot value || true
- Chroot="$RET"
+ chroot="$RET"
db_metaget clamav-milter/PidFile value || true
- PidFile="$RET"
+ pidfile="$RET"
db_metaget clamav-milter/TemporaryDirectory value || true
- TemporaryDirectory="$RET"
+ temporarydirectory="$RET"
db_metaget clamav-milter/ClamdSocket value || true
- ClamdSocket="$RET"
+ clamdsocket="$RET"
db_metaget clamav-milter/LocalNet value || true
- LocalNet="$RET"
+ localnet="$RET"
db_metaget clamav-milter/Whitelist value || true
- Whitelist="$RET"
+ whitelist="$RET"
db_metaget clamav-milter/OnInfected value || true
- OnInfected="$RET"
+ oninfected="$RET"
db_metaget clamav-milter/OnFail value || true
- OnFail="$RET"
+ onfail="$RET"
db_metaget clamav-milter/RejectMsg value || true
- RejectMsg="$RET"
+ rejectmsg="$RET"
db_metaget clamav-milter/AddHeader value || true
- AddHeader="$RET"
+ addheader="$RET"
db_metaget clamav-milter/LogFile value || true
- LogFile="$RET"
+ logfile="$RET"
db_metaget clamav-milter/LogFileUnlock value || true
- LogFileUnlock="$RET"
+ logfileunlock="$RET"
db_metaget clamav-milter/LogFileMaxSize value || true
- LogFileMaxSize="${RET}M"
+ logfilemaxsize="${RET}M"
db_metaget clamav-milter/LogTime value || true
- LogTime="$RET"
+ logtime="$RET"
db_metaget clamav-milter/LogSyslog value || true
- LogSyslog="$RET"
+ logsyslog="$RET"
db_metaget clamav-milter/LogFacility value || true
- LogFacility="$RET"
+ logfacility="$RET"
db_metaget clamav-milter/LogVerbose value || true
- LogVerbose="$RET"
+ logverbose="$RET"
db_metaget clamav-milter/LogInfected value || true
- LogInfected="$RET"
+ loginfected="$RET"
db_metaget clamav-milter/MaxFileSize value || true
maxfilesize="`echo $RET | sed -e s/M//g`"
- MaxFileSize="${maxfilesize}M"
+ MaxFSize="${maxfilesize}M"
- if [ -z "$LogFile" ] || [ "$LogFile" = 'none' ]; then
- LogSyslog=true
+ if [ -z "$logfile" ] || [ "$logfile" = 'none' ]; then
+ logsyslog=true
fi
slurp_config "$CLAMAVMILTERCONF"
@@ -118,23 +118,23 @@ case "$1" in
[ -z "$MaxFileSize" ] && MaxFileSize="25M"
cat >> $DEBCONFFILE << EOF
-MilterSocket $MilterSocket
-FixStaleSocket $FixStaleSocket
-User $User
-AllowSupplementaryGroups $AllowSupplementaryGroups
-ReadTimeout $ReadTimeout
-Foreground $Foreground
-PidFile $PidFile
-ClamdSocket $ClamdSocket
-OnClean $OnClean
-OnInfected $OnInfected
-OnFail $OnFail
-AddHeader $AddHeader
-LogSyslog $LogSyslog
-LogFacility $LogFacility
-LogVerbose $LogVerbose
-LogInfected $LogInfected
-MaxFileSize $MaxFileSize
+MilterSocket $milterSocket
+FixStaleSocket $fixstalesocket
+User $user
+AllowSupplementaryGroups $allowsupplementarygroups
+ReadTimeout $readtimeout
+Foreground $foreground
+PidFile $pidfile
+ClamdSocket $clamdsocket
+OnClean $onclean
+OnInfected $oninfected
+OnFail $onfail
+AddHeader $addheader
+LogSyslog $logsyslog
+LogFacility $logfacility
+LogVerbose $logverbose
+LogInfected $loginfected
+MaxFileSize $MaxFSize
EOF
if [ -n "$SkipAuthenticated" ]; then
cat >> $DEBCONFFILE << EOF
@@ -142,33 +142,33 @@ SkipAuthenticated $SkipAuthenticated
EOF
fi
- if [ -n "$Chroot" ]; then
+ if [ -n "$chroot" ]; then
cat >> $DEBCONFFILE << EOF
-Chroot $Chroot
+Chroot $chroot
EOF
fi
- if [ -n "$LocalNet" ]; then
+ if [ -n "$localnet" ]; then
cat >> $DEBCONFFILE << EOF
-LocalNet $LocalNet
+LocalNet $localnet
EOF
fi
- if [ -n "$Whitelist" ]; then
+ if [ -n "$whitelist" ]; then
cat >> $DEBCONFFILE << EOF
-Whitelist $Whitelist
+Whitelist $whitelist
EOF
fi
- if [ -n "$RejectMsg" ]; then
+ if [ -n "$rejectmsg" ]; then
cat >> $DEBCONFFILE << EOF
-RejectMsg $RejectMsg
+RejectMsg $rejectmsg
EOF
fi
- if [ -n "$TemporaryDirectory" ]; then
+ if [ -n "$temporarydirectory" ]; then
cat >> $DEBCONFFILE << EOF
-TemporaryDirectory $TemporaryDirectory
+TemporaryDirectory $temporarydirectory
EOF
else
cat >> $DEBCONFFILE << EOF
@@ -177,11 +177,11 @@ EOF
EOF
fi
- if [ -n "$LogFile" ] && [ "$LogFile" != 'none' ]; then
- echo "LogFile $LogFile" >> $DEBCONFFILE
- echo "LogTime $LogTime" >> $DEBCONFFILE
- echo "LogFileUnlock $LogFileUnlock" >> $DEBCONFFILE
- echo "LogFileMaxSize $LogFileMaxSize" >> $DEBCONFFILE
+ if [ -n "$logfile" ] && [ "$logfile" != 'none' ]; then
+ echo "LogFile $logfile" >> $DEBCONFFILE
+ echo "LogTime $logtime" >> $DEBCONFFILE
+ echo "LogFileUnlock $logfileunlock" >> $DEBCONFFILE
+ echo "LogFileMaxSize $logfilemaxsize" >> $DEBCONFFILE
fi
ucf_cleanup "$CLAMAVMILTERCONF"
@@ -202,17 +202,15 @@ EOF
chmod 644 $CLAMAVMILTERCONF || true
chown root:root $CLAMAVMILTERCONF || true
- slurp_config "$CLAMAVMILTERCONF"
-
- if [ -n "$LogFile" ] && [ "$LogFile" != 'none' ]; then
- if echo "$LogFile" | grep -q '^/dev/'; then
+ if [ -n "$logfile" ] && [ "$logfile" != 'none' ]; then
+ if echo "$logfile" | grep -q '^/dev/'; then
make_logrotate=false
else
make_logrotate=true
fi
[ -n "$User" ] || User=clamav
if [ "$make_logrotate" = 'true' ]; then
- echo "$LogFile {" > $DEBROTATEFILE
+ echo "$logfile {" > $DEBROTATEFILE
echo " rotate 12" >> $DEBROTATEFILE
echo " weekly" >> $DEBROTATEFILE
echo " compress" >> $DEBROTATEFILE
@@ -222,9 +220,9 @@ EOF
echo " /etc/init.d/clamav-milter restart > /dev/null" >> $DEBROTATEFILE
echo " endscript" >> $DEBROTATEFILE
echo " }" >> $DEBROTATEFILE
- touch "$LogFile"
- chown "$User":adm "$LogFile"
- chmod 0640 "$LogFile"
+ touch "$logfile"
+ chown "$user":adm "$logfile"
+ chmod 0640 "$logfile"
ucf_cleanup "$CLAMAVROTATEFILE"
ucf_upgrade_check "$CLAMAVROTATEFILE" "$DEBROTATEFILE" /var/lib/ucf/cache/:etc:logrotate.d:clamav-milter
rm -f $DEBROTATEFILE
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list