[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6626-gf69a8a4

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit f69a8a49408e93b3a275db53888096dcb615419c
Author: Stephen Gran <steve at lobefin.net>
Date:   Tue Dec 14 19:46:42 2010 +0000

    don't do chowns on symlinks (possibly racy)
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-daemon.postinst.in b/debian/clamav-daemon.postinst.in
index a75d2c6..4218f5e 100644
--- a/debian/clamav-daemon.postinst.in
+++ b/debian/clamav-daemon.postinst.in
@@ -53,8 +53,10 @@ case "$1" in
       echo "     endscript" >> $DEBROTATEFILE
       echo "     }" >> $DEBROTATEFILE
       touch "$LogFile"
-      chown "$User":adm "$LogFile"
-      chmod 0640 "$LogFile"
+      if [ -f "$LogFile" ] && [ ! -L "$LogFile" ]; then
+        chown "$User":adm "$LogFile"
+        chmod 0640 "$LogFile"
+      fi
       ucf_cleanup "$CLAMAVROTATEFILE"
       ucf_upgrade_check "$CLAMAVROTATEFILE" "$DEBROTATEFILE" /var/lib/ucf/cache/:etc:logrotate.d:clamav-daemon
       rm -f $DEBROTATEFILE
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index be26371..68f7cea 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -122,8 +122,10 @@ case "$1" in
       echo "     endscript" >> $DEBROTFILE
       echo "     }" >> $DEBROTFILE
       touch "$udlogfile"
-      chown "$User":adm "$udlogfile"
-      chmod 0640 "$udlogfile"
+      if [ -f "$udlogfile" ] && [ ! -L "$udlogfile" ]; then
+        chown "$User":adm "$udlogfile"
+        chmod 0640 "$udlogfile"
+      fi
       ucf_cleanup "$LOGROTFILE"
       ucf_upgrade_check "$LOGROTFILE" "$DEBROTFILE" /var/lib/ucf/cache/:etc:logrotate.d:clamav-freshclam
       rm -f $DEBROTFILE
@@ -278,17 +280,21 @@ EOF
     fi
   done
   touch $FRESHCLAMLOGFILE
-  chmod 640 $FRESHCLAMLOGFILE
-  chown "$dbowner":adm $FRESHCLAMLOGFILE
-  
-  # Tighten the permissions up if it contains a password
-  if [ -n "$ppass" ]; then
-    chmod 400 $FRESHCLAMCONFFILE
-  else
-    chmod 444 $FRESHCLAMCONFFILE
+  if [ -f "$FRESHCLAMLOGFILE" ] && [ ! -L "$FRESHCLAMLOGFILE" ]; then
+    chmod 640 $FRESHCLAMLOGFILE
+    chown "$dbowner":adm $FRESHCLAMLOGFILE
   fi
+  
+  if [ -f "$FRESHCLAMCONFFILE" ] && [ ! -L "$FRESHCLAMCONFFILE" ]; then
+    # Tighten the permissions up if it contains a password
+    if [ -n "$ppass" ]; then
+      chmod 400 $FRESHCLAMCONFFILE
+    else
+      chmod 444 $FRESHCLAMCONFFILE
+    fi
 
-  chown "$dbowner":adm $FRESHCLAMCONFFILE
+    chown "$dbowner":adm $FRESHCLAMCONFFILE
+  fi
   
   if [ "$runas" = 'daemon' ]; then
     if [ -x "/etc/init.d/clamav-freshclam" ]; then
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 2f32ad6..0183740 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -226,8 +226,10 @@ EOF
     ucf_upgrade_check "$CLAMAVMILTERCONF" /usr/share/doc/clamav-milter/examples/clamav-milter.conf /var/lib/ucf/cache/:etc:clamav:clamav-milter.conf
   fi
 
-  chmod 644 $CLAMAVMILTERCONF || true
-  chown root:root $CLAMAVMILTERCONF || true
+  if [ -f "$CLAMAVMILTERCONF" ] && [ ! -L "$CLAMAVMILTERCONF" ]; then
+    chmod 644 $CLAMAVMILTERCONF || true
+    chown root:root $CLAMAVMILTERCONF || true
+  fi
   
   if [ -n "$logfile" ] && [ "$logfile" != 'none' ]; then
     if echo "$logfile" | grep -q '^/dev/'; then
@@ -248,8 +250,10 @@ EOF
       echo "     endscript" >> $DEBROTATEFILE
       echo "     }" >> $DEBROTATEFILE
       touch "$logfile"
-      chown "$user":adm "$logfile"
-      chmod 0640 "$logfile"
+      if [ -f "$logfile" ] && [ ! -L "$logfile" ]; then
+        chown "$user":adm "$logfile"
+        chmod 0640 "$logfile"
+      fi
       ucf_cleanup "$CLAMAVROTATEFILE"
       ucf_upgrade_check "$CLAMAVROTATEFILE" "$DEBROTATEFILE" /var/lib/ucf/cache/:etc:logrotate.d:clamav-milter
       rm -f $DEBROTATEFILE

-- 
Debian repository for ClamAV