Merge commit 'origin/master' into debian-master

[deb/packages.git] / cron.d / 050checkinst

diff --git a/cron.d/050checkinst b/cron.d/050checkinst
index ad6397a20526e8d32047dc4724c182f036fa558d..559de6a914b4aa5fd2777279225206cf5d226f8c 100755 (executable)
--- a/cron.d/050checkinst
+++ b/cron.d/050checkinst
@@ -1,31 +1,19 @@
 #! /bin/sh
 
+. `dirname $0`/../config.sh
+
 # Test whether all required packages are installed and generate a mail
 # if they aren't, so that the admin is informed.
 
-required="subversion gettext locales rsync dpkg-dev procmail"
-required="$required libcompress-zlib-perl"
-required="$required libhtml-parser-perl libio-stringy-perl"
-required="$required liblocale-gettext-perl libmldbm-perl"
-required="$required libtext-iconv-perl libhtml-template-perl"
-required="$required libclass-accessor-perl"
-required="$required liburi-perl libxml-rss-perl"
-required="$required libtemplate-perl libi18n-acceptlanguage-perl"
-
-locales="de_DE.UTF-8 en_US.UTF-8 nl_NL fr_FR.UTF-8"
+locales="de_DE.UTF-8 en_US.UTF-8 nl_NL fr_FR.UTF-8 uk_UA.UTF-8"
 
 packages=`tempfile`
 locs=`tempfile`
+cache=`tempfile`
 trap "rm -f $packages $locs" INT EXIT
 
-for p in $required
-do
-    if [ -z "$(dpkg -l $p|grep ^ii)" ]
-    then
-       echo "Package $p missing." >> $packages
-       echo >> $packages
-    fi
-done
+cd $topdir
+dpkg-checkbuilddeps >> $packages 2>&1
 
 for l in $locales
 do
@@ -36,7 +24,22 @@ do
     fi
 done
 
-if [ -s $packages -o -s $locs ]
+if [ -n "$cachedir" ]
+then
+    if [ ! -d "$cachedir" ]
+    then
+       echo "cachedir missing." >> $cache
+    else
+       perm=$(ls -ld "$cachedir" | perl -ne 'print "ok" if /^drwxrws--- \d+ www-data/')
+        if [ -z "$perm" ]
+       then
+           echo "cachedir has wrong permissions." >> $cache
+           echo "make sure it is writable by the web server." >> $cache
+       fi
+    fi
+fi
+
+if [ -s $packages -o -s $locs -o -s $cache ]
 then
     (
        echo "Subject: Problem packages.debian.org on `hostname -s`"
@@ -56,6 +59,11 @@ then
            echo
            cat $locs
        fi
-    ) | /usr/sbin/sendmail -t
+       if [ -s $cache ]
+       then
+           echo "Problems with cachedir:"
+           echo
+           cat $cache
+       fi
+    ) | tee /dev/stderr | /usr/sbin/sendmail -t
 fi
-