[dak/security] Add X-Debian: DAK headers to mails
---
ChangeLog | 32 ++++++++++++++++++++
dak/override.py | 2 +-
dak/rm.py | 2 +-
templates/override.bug-close | 1 +
templates/process-accepted.install | 1 +
templates/process-accepted.unaccept | 1 +
templates/process-new.bxa_notification | 1 +
templates/process-new.prod | 1 +
templates/process-unchecked.accepted | 1 +
templates/process-unchecked.announce | 1 +
templates/process-unchecked.bug-close | 1 +
templates/process-unchecked.bug-experimental-fixed | 1 +
templates/process-unchecked.bug-nmu-fixed | 1 +
templates/process-unchecked.new | 1 +
templates/process-unchecked.override-disparity | 3 ++
templates/queue.rejected | 1 +
templates/reject-proposed-updates.rejected | 1 +
templates/rm.bug-close | 1 +
tools/debianqueued-0.9/ChangeLog | 3 ++
tools/debianqueued-0.9/debianqueued | 2 +-
20 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b6a48bc..6f476a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2008-05-08 Joerg Jaspert <joerg@debian.org>
+
+ * templates/rm.bug-close: dito
+
+ * templates/reject-proposed-updates.rejected: dito
+
+ * templates/queue.rejected: dito
+
+ * templates/process-unchecked.override-disparity: dito, but also
+ mention that people should include the package lists with the
+ override disparities.
+
+ * templates/process-unchecked.new: dito
+
+ * templates/process-unchecked.bug-nmu-fixed: dito
+
+ * templates/process-unchecked.bug-experimental-fixed: dito
+
+ * templates/process-unchecked.bug-close: dito
+
+ * templates/process-unchecked.announce: dito
+
+ * templates/process-unchecked.accepted: dito
+
+ * templates/process-new.prod: dito
+
+ * templates/process-accepted.unaccept: dito
+
+ * templates/process-accepted.install: dito
+
+ * templates/override.bug-close: Add X-Debian header
+
2008-05-06 Joerg Jaspert <joerg@debian.org>
* config/debian/cron.dinstall: Put the timestamp stuff into an own
diff --git a/dak/override.py b/dak/override.py
index 89bac5b..108d019 100755
--- a/dak/override.py
+++ b/dak/override.py
@@ -247,7 +247,7 @@ def main ():
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia $Revision: 1.6$"
+ Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia"
Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
Subst["__WHOAMI__"] = utils.whoami()
diff --git a/dak/rm.py b/dak/rm.py
index 7bc6cce..7535562 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -511,7 +511,7 @@ def main ():
Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
else:
Subst["__BCC__"] = "X-Filler: 42"
- Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $"
+ Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie"
if carbon_copy:
Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
Subst["__SUITE_LIST__"] = suites_list
diff --git a/templates/override.bug-close b/templates/override.bug-close
index 95599f4..6efff8b 100644
--- a/templates/override.bug-close
+++ b/templates/override.bug-close
@@ -2,6 +2,7 @@ From: __OVERRIDE_ADDRESS__
To: __BUG_NUMBER__-close@__BUG_SERVER__
__CC__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-accepted.install b/templates/process-accepted.install
index bf0c20e..533b84d 100644
--- a/templates/process-accepted.install
+++ b/templates/process-accepted.install
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
diff --git a/templates/process-accepted.unaccept b/templates/process-accepted.unaccept
index 0d77be1..c07d486 100644
--- a/templates/process-accepted.unaccept
+++ b/templates/process-accepted.unaccept
@@ -2,6 +2,7 @@ From: __REJECTOR_ADDRESS__
To: __MAINTAINER_TO__
__CC__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-new.bxa_notification b/templates/process-new.bxa_notification
index 438e843..8fafaa9 100644
--- a/templates/process-new.bxa_notification
+++ b/templates/process-new.bxa_notification
@@ -2,6 +2,7 @@ From: Ben Collins <bxa@ftp-master.debian.org>
X-Not-Really-To: crypt@bis.doc.gov, enc@nsa.gov, web_site@bis.doc.gov
To: bxa@ftp-master.debian.org
__BCC__
+X-Debian: DAK
Precedence: junk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
diff --git a/templates/process-new.prod b/templates/process-new.prod
index 78276b7..23d67a4 100644
--- a/templates/process-new.prod
+++ b/templates/process-new.prod
@@ -1,6 +1,7 @@
From: __FROM_ADDRESS__
To: __MAINTAINER_TO__
__CC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-unchecked.accepted b/templates/process-unchecked.accepted
index c8b62d2..d5f5160 100644
--- a/templates/process-unchecked.accepted
+++ b/templates/process-unchecked.accepted
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
diff --git a/templates/process-unchecked.announce b/templates/process-unchecked.announce
index 421495b..91b4f1e 100644
--- a/templates/process-unchecked.announce
+++ b/templates/process-unchecked.announce
@@ -1,6 +1,7 @@
From: __MAINTAINER_FROM__
To: __ANNOUNCE_LIST_ADDRESS__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-unchecked.bug-close b/templates/process-unchecked.bug-close
index 0bb9ed0..2d0dd40 100644
--- a/templates/process-unchecked.bug-close
+++ b/templates/process-unchecked.bug-close
@@ -1,6 +1,7 @@
From: __MAINTAINER_FROM__
To: __BUG_NUMBER__-close@__BUG_SERVER__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-unchecked.bug-experimental-fixed b/templates/process-unchecked.bug-experimental-fixed
index af52958..6596322 100644
--- a/templates/process-unchecked.bug-experimental-fixed
+++ b/templates/process-unchecked.bug-experimental-fixed
@@ -2,6 +2,7 @@ From: __MAINTAINER_FROM__
To: control@__BUG_SERVER__
Cc: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-unchecked.bug-nmu-fixed b/templates/process-unchecked.bug-nmu-fixed
index 8ff215e..d13d72b 100644
--- a/templates/process-unchecked.bug-nmu-fixed
+++ b/templates/process-unchecked.bug-nmu-fixed
@@ -2,6 +2,7 @@ From: __MAINTAINER_FROM__
To: control@__BUG_SERVER__
Cc: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/templates/process-unchecked.new b/templates/process-unchecked.new
index d5cd677..5b02e67 100644
--- a/templates/process-unchecked.new
+++ b/templates/process-unchecked.new
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
diff --git a/templates/process-unchecked.override-disparity b/templates/process-unchecked.override-disparity
index 5259080..aee1bb8 100644
--- a/templates/process-unchecked.override-disparity
+++ b/templates/process-unchecked.override-disparity
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
+X-Debian: DAK
Precedence: junk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
@@ -15,6 +16,8 @@ Either the package or the override file is incorrect. If you think
the override is correct and the package wrong please fix the package
so that this disparity is fixed in the next upload. If you feel the
override is incorrect then please reply to this mail and explain why.
+Please INCLUDE the list of packages as seen above, or we won't be able
+to deal with your mail due to missing information.
[NB: this is an automatically generated mail; if you replied to one
like it before and have not received a response yet, please ignore
diff --git a/templates/queue.rejected b/templates/queue.rejected
index 35a6ede..140401a 100644
--- a/templates/queue.rejected
+++ b/templates/queue.rejected
@@ -2,6 +2,7 @@ From: __REJECTOR_ADDRESS__
To: __MAINTAINER_TO__
__BCC__
__CC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
diff --git a/templates/reject-proposed-updates.rejected b/templates/reject-proposed-updates.rejected
index fb32f03..cac2f45 100644
--- a/templates/reject-proposed-updates.rejected
+++ b/templates/reject-proposed-updates.rejected
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
To: __MAINTAINER_TO__
__CC__
__BCC__
+X-Debian: DAK
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
diff --git a/templates/rm.bug-close b/templates/rm.bug-close
index 6b29c0c..353d3cc 100644
--- a/templates/rm.bug-close
+++ b/templates/rm.bug-close
@@ -2,6 +2,7 @@ From: __RM_ADDRESS__
To: __BUG_NUMBER__-close@__BUG_SERVER__
__CC__
__BCC__
+X-Debian: DAK
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
diff --git a/tools/debianqueued-0.9/ChangeLog b/tools/debianqueued-0.9/ChangeLog
index 8bd3cf9..d979a50 100644
--- a/tools/debianqueued-0.9/ChangeLog
+++ b/tools/debianqueued-0.9/ChangeLog
@@ -1,3 +1,6 @@
+2008-05-08 Joerg Jaspert <joerg@debian.org>
+
+ * debianqueued: added header X-Debian: DAK
-- Version 0.9 released
diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index d6f2afd..72b718a 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -2077,7 +2077,7 @@ sub init_mail(;$) {
my $file = shift;
$main::mail_addr = "";
- $main::mail_text = "";
+ $main::mail_text = "X-Debian: DAK\n";
$main::mail_subject = $file ? "Processing of $file" : "";
}
--
1.5.6.5
Reply to: