[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Preparation of the next stable Debian GNU/Linux update (I)



This one time, at band camp, Martin Schulze said:
> These packages will be installed into the stable Debian distribution
> and will be part of the next revision.
> 
> clamav-base       stable    0.84-2          all
> clamav-base       updates   0.84-2.sarge.1  all
> clamav-daemon     stable    0.84-2          alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> clamav-daemon     updates   0.84-2.sarge.1  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> clamav-docs       stable    0.84-2          all
> clamav-docs       updates   0.84-2.sarge.1  all
> clamav-freshclam  stable    0.84-2          alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> clamav-freshclam  updates   0.84-2.sarge.1  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> clamav-milter     stable    0.84-2          alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> clamav-milter     updates   0.84-2.sarge.1  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> clamav-testfiles  stable    0.84-2          all
> clamav-testfiles  updates   0.84-2.sarge.1  all
> clamav            stable    0.84-2          alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source
> clamav            updates   0.84-2.sarge.1  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source
> libclamav-dev     stable    0.84-2          alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> libclamav-dev     updates   0.84-2.sarge.1  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> libclamav1        stable    0.84-2          alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> libclamav1        updates   0.84-2.sarge.1  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
> 
> 	DSA 737 clamav - remote DOS

I see that you are actually including .2 (which is great).  I would like
to get the following patch in as well, but I understand if you feel it
inapropriate for a stable update.  

The first 2 diff's fix #321440 and #315063, while the last fixes an
unreported bug in redirection, as well as a privately reported bug about
a hang on low entropy systems.  All of these changes have been in unstable
for some time, so I feel as though they have gotten at least some testing
to make sure they won't do additional harm.

Thanks for considering,

diff -u debian/clamav-freshclam.logrotate.old debian/clamav-freshclam.logrotate
--- debian/clamav-freshclam.logrotate.old   2005-08-20 18:54:28.000000000 -0400
+++ debian/clamav-freshclam.logrotate       2005-08-20 18:54:39.000000000 -0400
@@ -5,7 +5,7 @@
      delaycompress
      create 640 clamav adm
      postrotate
-     [ -f /var/run/clamav/freshclam.pid ] && kill -HUP `cat /var/run/clamav/freshclam.pid` > /dev/null
+     [ ! -f /var/run/clamav/freshclam.pid ] || kill -HUP `cat /var/run/clamav/freshclam.pid` > /dev/null
      endscript
      }

diff -u debian/clamav-daemon.postinst.in.old debian/clamav-daemon.postinst.in
--- debian/clamav-daemon.postinst.in.old    2005-08-20 18:55:06.000000000 -0400
+++ debian/clamav-daemon.postinst.in        2005-08-20 18:58:42.000000000 -0400
@@ -30,10 +30,10 @@

   UCFVER=`check_ucf`

-  . /usr/share/debconf/confmodule
   if [ -n "$2" ]; then
     if dpkg --compare-versions "$2" lt 0.82-2; then
       #loading debconf module
+      . /usr/share/debconf/confmodule
       db_purge || true
       db_stop  || true
     fi
@@ -60,7 +60,7 @@
       echo "     delaycompress" >> $DEBROTATEFILE
       echo "     create 640  $User adm" >> $DEBROTATEFILE
       echo "     postrotate" >> $DEBROTATEFILE
-      echo "     kill -HUP \`cat $PidFile\` > /dev/null" >> $DEBROTATEFILE
+      echo "     [ ! -f $PidFile ] || kill -HUP \`cat $PidFile\` > /dev/null" >> $DEBROTATEFILE
       echo "     endscript" >> $DEBROTATEFILE
       echo "     }" >> $DEBROTATEFILE
       touch "$LogFile"
diff -u debian/clamav-freshclam.postinst.in.old debian/clamav-freshclam.postinst.in
--- debian/clamav-freshclam.postinst.in.old 2005-08-20 18:52:54.000000000 -0400
+++ debian/clamav-freshclam.postinst.in     2005-08-20 18:53:39.000000000 -0400
@@ -161,7 +161,7 @@

   # Set up cron method
   if [ "$runas" = cron ]; then
-    min=$(( `od -A n -N 2 -l  < /dev/random`  %  3600 / 60 ))
+    min=$(( `od -A n -N 2 -l  < /dev/urandom`  %  3600 / 60 ))
     # min=`perl -e 'print int(rand(60))'`
     FRESHCLAMCRON=/etc/cron.d/clamav-freshclam
     FRESHCLAMTEMP=/var/lib/clamav/freshclam.cron
@@ -173,7 +173,7 @@
     if [ -e /etc/cron.d/clamav-freshclam ]; then
       echo -n "Disabling old cron script . . . "
       mv /etc/cron.d/clamav-freshclam /etc/cron.d/clamav-freshclam.dpkg-old
-      ucf -p /etc/cron.d/clamav-freshclam > /dev/null 2&1 || true
+      ucf -p /etc/cron.d/clamav-freshclam > /dev/null 2>&1 || true
       echo "done"
     fi
   fi

-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran@debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------

Attachment: signature.asc
Description: Digital signature


Reply to: