[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. ad624fd5ffea20378c521f89c1288adf8f94a46b

[Michael Meskes]

The following commit has been merged in the debian/unstable branch:
commit ad624fd5ffea20378c521f89c1288adf8f94a46b
Author: Michael Meskes <meskes at debian.org>
Date:   Wed Sep 17 10:57:36 2008 +0200

    Do not set TemporaryDirectory in clamd.conf.

diff --git a/debian/changelog b/debian/changelog
index e30e6a9..c82143f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ clamav (0.94.dfsg-2) unstable; urgency=low
   [ Michael Meskes ]
   * Added myself as uploader.
   * Changed watch file to account for dfsg extension.
+  * Do not configure temporary directory in clamd.conf anymore.
 
   [ Michael Tautschnig ]
   * Use lsb's status_of_proc function to determine the status of the process
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index dd3f1d7..bcb9501 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -202,7 +202,6 @@ case "$1" in
     [ -z "$LogFileMaxSize" ] && LogFileMaxSize=0
     [ -z "$LogClean" ] && LogClean=false
     [ -z "$LogVerbose" ] && LogVerbose=false
-    [ -z "$TemporaryDirectory" ] && TemporaryDirectory='/tmp'
     [ -z "$selfcheck" ] && selfcheck=1800
     [ -z "$Foreground" ] && Foreground=false
     [ -z "$Debug" ] && Debug=false
@@ -241,6 +240,8 @@ case "$1" in
     [ -z "$StructuredDataDetection" ] && StructuredDataDetection=false
 
     cat >> $DEBCONFFILE << EOF
+# TemporaryDirectory is no set to its default /tmp here to make overriding
+# the default with environment variables TMPDIR/TMP/TEMP possible
 User $user
 AllowSupplementaryGroups $AllowSupplementaryGroups
 ScanMail $scanmail
@@ -260,7 +261,6 @@ LogClean $LogClean
 LogVerbose $LogVerbose
 PidFile $PidFile
 DatabaseDirectory $DatabaseDirectory
-TemporaryDirectory $TemporaryDirectory
 SelfCheck $selfcheck
 Foreground $Foreground
 Debug $Debug

-- 
Debian repository for ClamAV