diff -u amavisd-new-2.5.2/debian/changelog amavisd-new-2.5.2/debian/changelog --- amavisd-new-2.5.2/debian/changelog +++ amavisd-new-2.5.2/debian/changelog @@ -1,3 +1,13 @@ +amavisd-new (1:2.5.2-2ubuntu2) hardy; urgency=low + + * debian/amavisd-new-cronjob: + - fix output redirect to /dev/null, if the script is being called + by SUUSER + - Also redirect STDERR to /dev/null, because sa-learn complains + there when it is disabled (LP: #165184) + + -- dAniel hAhler Sat, 29 Dec 2007 08:13:54 +0100 + amavisd-new (1:2.5.2-2ubuntu1) hardy; urgency=low * Merge from Debian Unstable. Remaining Ubuntu changes: diff -u amavisd-new-2.5.2/debian/amavisd-new-cronjob amavisd-new-2.5.2/debian/amavisd-new-cronjob --- amavisd-new-2.5.2/debian/amavisd-new-cronjob +++ amavisd-new-2.5.2/debian/amavisd-new-cronjob @@ -21,18 +21,18 @@ if [ "$(id -u -n)" != "${SUUSER}" ]; then exec /bin/su - "${SUUSER}" -c "$*" else - # to get the same quoting level as the su path - CMD="$*" - exec ${CMD} + # Use "/bin/sh -c" so that the output redirect works: + # (and to get the same quoting level as the su path) + exec /bin/sh -c "$*" fi } case $1 in sa-sync) - do_amavis_cmd "/usr/bin/sa-learn --sync >/dev/null" + do_amavis_cmd "/usr/bin/sa-learn --sync >/dev/null 2>&1" ;; sa-clean) - do_amavis_cmd "/usr/bin/sa-learn --sync --force-expire >/dev/null" + do_amavis_cmd "/usr/bin/sa-learn --sync --force-expire >/dev/null 2>&1" ;; *) echo "$0: unknown cron routine $1" >&2