Restore the correct From address by adding additional headers.

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>

diff --git a/config/debian-security/cron.hourly b/config/debian-security/cron.hourly
index f96d8c63a20be863db706666ebb861d6bade518b..ce692b013880f25f0b85f887102031718e00b0ce 100755 (executable)
--- a/config/debian-security/cron.hourly
+++ b/config/debian-security/cron.hourly
@@ -39,6 +39,6 @@ done
 exec >>/dev/null 2>&1
 
 DATE=$(date -Is)
 exec >>/dev/null 2>&1
 
 DATE=$(date -Is)

-cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" buildd-keys@ftp-master.debian.org
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" buildd-keys@ftp-master.debian.org

 
 rm -f "${BUILDDFUN}"
 
 rm -f "${BUILDDFUN}"

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 64169a344edf295c626379fa7eec7dd6f384e400..dcf26f43df55cb8a1ed405bb0155f34aebf1ee4c 100755 (executable)
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -46,7 +46,7 @@ fi
 
 for queue in embargoed unembargoed; do
     echo "$timestamp: processing ${queue}" >> ${report}
 
 for queue in embargoed unembargoed; do
     echo "$timestamp: processing ${queue}" >> ${report}

-    dak process-policy ${queue} | mail -a "X-Debian: DAK" -e -s "Automatically accepted from ${queue}" team@security.debian.org
+    dak process-policy ${queue} | mail -a "X-Debian: DAK" -e -s "Automatically accepted from ${queue}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" team@security.debian.org

 done
 accepted=$(find ${queuedir}/accepted -type f -name "*.changes")
 if [ -n "${accepted}" ]; then
 done
 accepted=$(find ${queuedir}/accepted -type f -name "*.changes")
 if [ -n "${accepted}" ]; then

diff --git a/config/debian/common b/config/debian/common
index 63d8900e6829408c157f6c4014ea616033ab92ec..e06d760b56d98e5d44773f10a95bca1379a46479 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -12,7 +12,7 @@ function log () {
 function log_error () {
         log "$@"
         if [ -z "${MAILTO}" ]; then
 function log_error () {
         log "$@"
         if [ -z "${MAILTO}" ]; then

-                echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO}
+                echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" ${MAILTO}

         fi
 }
 
         fi
 }
 


@@ -52,7 +52,7 @@ function punew_do() {
     local to="${3}"
 
     date -u -R >> REPORT
     local to="${3}"
 
     date -u -R >> REPORT

-    dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" "${to}"
+    dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" "${to}"

     echo >> REPORT
 
     dak generate-packages-sources2 -s "${queue}"
     echo >> REPORT
 
     dak generate-packages-sources2 -s "${queue}"


@@ -115,9 +115,9 @@ function do_new () {
     if [ "${PROGRAM}" = "dinstall" ]; then
        log "Doing NEW processing"
     fi
     if [ "${PROGRAM}" = "dinstall" ]; then
        log "Doing NEW processing"
     fi

-    (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" ftpmaster@ftp-master.debian.org
+    (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" ftpmaster@ftp-master.debian.org

 
 

-    dak process-policy backports-new | mail -a "X-Debian: DAK" -e -s "NEW processing for backports-new" backports-team@debian.org
+    dak process-policy backports-new | mail -a "X-Debian: DAK" -e -s "NEW processing for backports-new" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" backports-team@debian.org

 
     dak clean-suites -a new,backports-new
 }
 
     dak clean-suites -a new,backports-new
 }


@@ -148,13 +148,13 @@ function clean_debbugs () {
 function reports() {
     # Send a report on NEW/BYHAND packages
     log "Nagging ftpteam about NEW/BYHAND packages"
 function reports() {
     # Send a report on NEW/BYHAND packages
     log "Nagging ftpteam about NEW/BYHAND packages"

-    dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
-    dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" backports-team@debian.org
+    dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" ftpmaster@ftp-master.debian.org
+    dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" backports-team@debian.org

     # and one on crufty packages
     log "Sending information about crufty packages"
     dak cruft-report -R > $webdir/cruft-report-daily.txt
     dak cruft-report -R -s experimental >> $webdir/cruft-report-daily.txt
     # and one on crufty packages
     log "Sending information about crufty packages"
     dak cruft-report -R > $webdir/cruft-report-daily.txt
     dak cruft-report -R -s experimental >> $webdir/cruft-report-daily.txt

-    cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
+    cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" ftpmaster@ftp-master.debian.org

 }
 
 function pg_timestamp() {
 }
 
 function pg_timestamp() {

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 37ddf92c30ebe33a4283770de6cd9c5e6a8a7887..a037ee92b130e728b3a2a7e391d6c633c2fbb828 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -58,7 +58,7 @@ $scriptsdir/generate-d-i
 # Update backports ACL
 sudo -u dak-unpriv cat /srv/backports-master.debian.org/etc/acl \
     | dak acl set-fingerprints backports \
 # Update backports ACL
 sudo -u dak-unpriv cat /srv/backports-master.debian.org/etc/acl \
     | dak acl set-fingerprints backports \

-    | mail -a "X-Debian: DAK" -e -s "backports: acl changes" backports-team@debian.org
+    | mail -a "X-Debian: DAK" -e -s "backports: acl changes" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" backports-team@debian.org

 
 # do the buildd key updates
 BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
 
 # do the buildd key updates
 BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)


@@ -73,6 +73,6 @@ done
 exec >>/dev/null 2>&1
 
 DATE=$(date -Is)
 exec >>/dev/null 2>&1
 
 DATE=$(date -Is)

-cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" buildd-keys@ftp-master.debian.org
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" buildd-keys@ftp-master.debian.org

 
 rm -f "${BUILDDFUN}"
 
 rm -f "${BUILDDFUN}"

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 1d902298eceab44c8f31ad99a5c79772a02e76b0..57ea18dbbe637b9afa8a382930690da8b63a5a74 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -35,7 +35,7 @@ function onerror() {
         cat "${STAGEFILE}.log"
     else
         echo "file ${STAGEFILE}.log does not exist, sorry"
         cat "${STAGEFILE}.log"
     else
         echo "file ${STAGEFILE}.log does not exist, sorry"

-    fi | mail -s "${subject}" -a "X-Debian: DAK" cron@ftp-master.debian.org
+    fi | mail -s "${subject}" -a "X-Debian: DAK" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" cron@ftp-master.debian.org

 }
 
 ########################################################################
 }
 
 ########################################################################


@@ -85,15 +85,15 @@ function i18n1() {
                 done
             else
                 echo "ARRRR, bad guys, wrong files, ARRR"
                 done
             else
                 echo "ARRRR, bad guys, wrong files, ARRR"

-                echo "Arf, Arf, Arf, bad guys, wrong files, arf, arf, arf" | mail -a "X-Debian: DAK" -s "Don't you kids take anything. I'm watching you. I've got eye implants in the back of my head." debian-l10n-devel@lists.alioth.debian.org
+                echo "Arf, Arf, Arf, bad guys, wrong files, arf, arf, arf" | mail -a "X-Debian: DAK" -s "Don't you kids take anything. I'm watching you. I've got eye implants in the back of my head." -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" debian-l10n-devel@lists.alioth.debian.org

             fi
         else
             echo "ARRRR, missing the timestamp ${TSTAMP} directory, not updating i18n, ARRR"
             fi
         else
             echo "ARRRR, missing the timestamp ${TSTAMP} directory, not updating i18n, ARRR"

-            echo "Arf, Arf, Arf, missing the timestamp ${TSTAMP} directory, not updating i18n, arf, arf, arf" | mail -a "X-Debian: DAK" -s "Lisa, if you don't like your job you don't strike. You just go in every day and do it really half-assed. That's the American way." debian-l10n-devel@lists.alioth.debian.org
+            echo "Arf, Arf, Arf, missing the timestamp ${TSTAMP} directory, not updating i18n, arf, arf, arf" | mail -a "X-Debian: DAK" -s "Lisa, if you don't like your job you don't strike. You just go in every day and do it really half-assed. That's the American way." -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" debian-l10n-devel@lists.alioth.debian.org

         fi
     else
         echo "ARRRRRRR, could not verify our timestamp signature, ARRR. Don't mess with our files, i18n guys, ARRRRR."
         fi
     else
         echo "ARRRRRRR, could not verify our timestamp signature, ARRR. Don't mess with our files, i18n guys, ARRRRR."

-        echo "Arf, Arf, Arf, could not verify our timestamp signature, arf. Don't mess with our files, i18n guys, arf, arf, arf" | mail -a "X-Debian: DAK" -s "You can't keep blaming yourself. Just blame yourself once, and move on." debian-l10n-devel@lists.alioth.debian.org
+        echo "Arf, Arf, Arf, could not verify our timestamp signature, arf. Don't mess with our files, i18n guys, arf, arf, arf" | mail -a "X-Debian: DAK" -s "You can't keep blaming yourself. Just blame yourself once, and move on." -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" debian-l10n-devel@lists.alioth.debian.org

     fi
 }
 
     fi
 }
 


@@ -556,7 +556,7 @@ function savetimestamp() {
 }
 
 function maillogfile() {
 }
 
 function maillogfile() {

-    cat "$LOGFILE" | mail -a "X-Debian: DAK" -s "Log for dinstall run of ${NOW}" cron@ftp-master.debian.org
+    cat "$LOGFILE" | mail -a "X-Debian: DAK" -s "Log for dinstall run of ${NOW}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" cron@ftp-master.debian.org

 }
 
 function renamelogfile() {
 }
 
 function renamelogfile() {