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

[Michael Meskes]

The following commit has been merged in the debian/unstable branch:
commit a51f92c8380c789dc0608e649d4872e5135a6f0b
Author: Michael Meskes <meskes at debian.org>
Date:   Thu Sep 18 15:17:57 2008 +0200

    Keep TemporaryDirectory in clamd.conf if present.

diff --git a/debian/changelog b/debian/changelog
index c82143f..9a3683d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ 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.
+  * Do not configure temporary directory in clamd.conf anymore unless it is
+    already configured there.
 
   [ 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 bcb9501..49ceef8 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -239,9 +239,18 @@ case "$1" in
     [ -z "$HeuristicScanPrecedence" ] && HeuristicScanPrecedence=false
     [ -z "$StructuredDataDetection" ] && StructuredDataDetection=false
 
-    cat >> $DEBCONFFILE << EOF
+    if [ -n "$TemporaryDirectory" ]; then
+	cat >> $DEBCONFFILE << EOF
+TemporaryDirectory $TemporaryDirectory
+EOF
+    else
+	cat >> $DEBCONFFILE << EOF
 # TemporaryDirectory is no set to its default /tmp here to make overriding
 # the default with environment variables TMPDIR/TMP/TEMP possible
+EOF
+    fi
+
+    cat >> $DEBCONFFILE << EOF
 User $user
 AllowSupplementaryGroups $AllowSupplementaryGroups
 ScanMail $scanmail

-- 
Debian repository for ClamAV