[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.6.4-4-16-gca0dfd2
Alexander Wirt
formorer at debian.org
Tue Aug 9 08:45:53 UTC 2011
The following commit has been merged in the master branch:
commit ca0dfd2bc7336987ef7f9b4bd09f55934b0949cd
Author: Alexander Wirt <formorer at debian.org>
Date: Tue Aug 9 10:44:29 2011 +0200
Add new l10n templates and update old ones
diff --git a/debian/etc/en_US/template-auto-response.txt b/debian/etc/en_US/template-auto-response.txt
new file mode 100644
index 0000000..5b50baf
--- /dev/null
+++ b/debian/etc/en_US/template-auto-response.txt
@@ -0,0 +1,23 @@
+#
+# =============================================================================
+# This is a template for the plain text part of an auto response (e.g.
+# vacation, out-of-office), see RFC 3834.
+#
+From: %f
+Date: %d
+To: [? %#T |undisclosed-recipients:;|[%T|, ]]
+[? %#C |#|Cc: [%C|, ]]
+Reply-To: postmaster@%h
+Message-ID: <ARE%i@%h>
+Auto-Submitted: auto-replied
+[:wrap|76||\t|Subject: Auto: autoresponse to: %s]
+[? %m |#|In-Reply-To: %m]
+Precedence: junk
+
+This is an auto-response to a message \
+[? %a |\nreceived on %d,|received from\nIP address \[%a\] on %d,]
+envelope sender: %s
+(author) From: [:rfc2822_from]
+[? %j |#|[:wrap|78|| |Subject: %j]]
+[?[:dkim|author]|#|
+A first-party DKIM or DomainKeys signature is valid, d=[:dkim|author].]
diff --git a/debian/etc/en_US/template-dsn.txt b/debian/etc/en_US/template-dsn.txt
index 1c3ac42..561d163 100644
--- a/debian/etc/en_US/template-dsn.txt
+++ b/debian/etc/en_US/template-dsn.txt
@@ -9,9 +9,9 @@
Subject: [?%#D|Undeliverable mail|Delivery status notification]\
[? [:ccat|major] |||, MTA-BLOCKED\
|, OVERSIZED message\
-|, invalid header[=explain_badh|1]\
+|, invalid header section[=explain_badh|1]\
[?[:ccat|minor]||: bad MIME|: unencoded 8-bit character\
-|: improper use of control char|: all-whitespace header field\
+|: improper use of control char|: all-whitespace header line\
|: header line longer than 998 characters|: header field syntax error\
|: missing required header field|: duplicate header field|]\
|, UNSOLICITED BULK EMAIL apparently from you\
@@ -39,8 +39,8 @@ Our internal reference code for your message is %n/%i]
|INVALID HEADER: BAD MIME HEADER SECTION OR BAD MIME STRUCTURE
|INVALID HEADER: INVALID 8-BIT CHARACTERS IN HEADER SECTION
|INVALID HEADER: INVALID CONTROL CHARACTERS IN HEADER SECTION
-|INVALID HEADER: FOLDED HEADER FIELD MADE UP ENTIRELY OF WHITESPACE
-|INVALID HEADER: HEADER LINE LONGER THAN RFC2822 LIMIT OF 998 CHARACTERS
+|INVALID HEADER: FOLDED HEADER FIELD LINE MADE UP ENTIRELY OF WHITESPACE
+|INVALID HEADER: HEADER LINE LONGER THAN RFC 5322 LIMIT OF 998 CHARACTERS
|INVALID HEADER: HEADER FIELD SYNTAX ERROR
|INVALID HEADER: MISSING REQUIRED HEADER FIELD
|INVALID HEADER: DUPLICATE HEADER FIELD
@@ -67,23 +67,23 @@ Our internal reference code for your message is %n/%i]
|# 2: 8-bit char
WHAT IS AN INVALID CHARACTER IN A MAIL HEADER SECTION?
- The RFC 2822 standard specifies rules for forming internet messages.
+ The RFC 5322 document specifies rules for forming internet messages.
It does not allow the use of characters with codes above 127 to be
used directly (non-encoded) in a mail header section.
If such characters (e.g. with diacritics) from ISO Latin or other
alphabets need to be included in a header section, these characters
- need to be properly encoded according to RFC 2047. Such encoding is
- often done transparently by mail reader (MUA), but if automatic
+ need to be properly encoded according to RFC 2047. Such encoding
+ is often done transparently by mail reader (MUA), but if automatic
encoding is not available (e.g. by some older MUA) it is a user's
responsibility to avoid using such characters in a header section,
or to encode them manually. Typically the offending header fields
in this category are 'Subject', 'Organization', and comment fields
- in e-mail addresses of 'From', 'To' or 'Cc' header fields.
+ or display names in e-mail addresses of 'From', 'To' or 'Cc'.
Sometimes such invalid header fields are inserted automatically
- by some MUA, MTA, content checker, or other mail handling service.
- If this is the case, that service needs to be fixed or properly
+ by some MUA, MTA, content filter, or other mail handling service.
+ If this is the case, such service needs to be fixed or properly
configured. Typically the offending header fields in this category
are 'Date', 'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc.
@@ -100,35 +100,35 @@ WHAT IS AN INVALID CHARACTER IN A MAIL HEADER SECTION?
|# 3: NUL/CR
IMPROPER USE OF CONTROL CHARACTER IN A MESSAGE HEADER SECTION
- The RFC 2822 standard specifies rules for forming internet messages.
+ The RFC 5322 document specifies rules for forming internet messages.
It does not allow the use of control characters NUL and bare CR
to be used directly in a mail header section.
|# 4: empty
-IMPROPER FOLDED HEADER FIELD MADE UP ENTIRELY OF WHITESPACE
+IMPROPERLY FOLDED HEADER FIELD LINE MADE UP ENTIRELY OF WHITESPACE
- The RFC 2822 standard specifies rules for forming internet messages.
- In section '3.2.3. Folding white space and comments' it explicitly
+ The RFC 5322 document specifies rules for forming internet messages.
+ In section '3.2.2. Folding white space and comments' it explicitly
prohibits folding of header fields in such a way that any line of a
folded header field is made up entirely of white-space characters
(control characters SP and HTAB) and nothing else.
|# 5: long
-HEADER LINE LONGER THAN RFC2822 LIMIT OF 998 CHARACTERS
+HEADER LINE LONGER THAN RFC 5322 LIMIT OF 998 CHARACTERS
- The RFC 2822 standard specifies rules for forming internet messages.
+ The RFC 5322 document specifies rules for forming internet messages.
Section '2.1.1. Line Length Limits' prohibits each line of a header
- to be more than 998 characters in length (excluding the CRLF).
+ section to be more than 998 characters in length (excluding the CRLF).
|# 6: syntax
|# 7: missing
MISSING REQUIRED HEADER FIELD
- The RFC 2822 standard specifies rules for forming internet messages.
- Section '3.6. Field definitions' specifies that certain header fields
- are required (origination date field and the originator address field).
+ The RFC 5322 document specifies rules for forming internet messages.
+ Section '3.6. Field Definitions' specifies that certain header fields
+ are required (origination date field and the "From:" originator field).
|# 8: multiple
DUPLICATE HEADER FIELD
- The RFC 2822 standard specifies rules for forming internet messages.
- Section '3.6. Field definitions' specifies that certain header fields
+ The RFC 5322 document specifies rules for forming internet messages.
+ Section '3.6. Field Definitions' specifies that certain header fields
must not occur more than once in a message header section.
|# other
]]#
diff --git a/debian/etc/en_US/template-problem-feedback.txt b/debian/etc/en_US/template-problem-feedback.txt
new file mode 100644
index 0000000..2f6b14e
--- /dev/null
+++ b/debian/etc/en_US/template-problem-feedback.txt
@@ -0,0 +1,37 @@
+#
+# =============================================================================
+# This is a template for the plain text part of a problem/feedback report,
+# with either the original message included in-line, or attached,
+# or the message is structured as a FEEDBACK REPORT NOTIFICATIONS format.
+# See RFC 5965 - "An Extensible Format for Email Feedback Reports".
+#
+From: %f
+Date: %d
+Subject: Fw: %j
+To: [? %#T |undisclosed-recipients:;|[%T|, ]]
+[? %#C |#|Cc: [%C|, ]]
+Message-ID: <ARF%i@%h>
+#Auto-Submitted: auto-generated
+
+This is an e-mail [:feedback_type] report for a message \
+[? %a |\nreceived on %d,|received from\nIP address [:client_addr_port] on %d,]
+
+[:wrap|78|| |Return-Path: %s]
+[:wrap|78|| |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|[:wrap|78|| |Sender: [:header_field|Sender]]]
+[? %m |#|[:wrap|78|| |Message-ID: %m]]
+[? %r |#|[:wrap|78|| |Resent-Message-ID: %r]]
+[? %j |#|[:wrap|78|| |Subject: [:header_field|Subject|100]]]
+[?[:dkim|author]|#|
+A first-party DKIM or DomainKeys signature is valid, d=[:dkim|author].]
+
+Reporting-MTA: %h
+Our internal reference code for the message is %n/%i
+
+[~[:report_format]|["^(arf|attach|dsn)$"]|["\
+A complete original message is attached.
+[~[:report_format]|["^arf$"]|\
+For more information on the ARF format please see RFC 5965.
+]"]|["\
+A complete original message in its pristine form follows:
+"]]#
diff --git a/debian/etc/en_US/template-release-quarantine.txt b/debian/etc/en_US/template-release-quarantine.txt
new file mode 100644
index 0000000..affd42e
--- /dev/null
+++ b/debian/etc/en_US/template-release-quarantine.txt
@@ -0,0 +1,45 @@
+#
+# =============================================================================
+# This is a template for the plain text part of a RELEASE FROM A QUARANTINE,
+# applicable if a chosen release format is 'attach' (not 'resend').
+#
+From: %f
+Date: %d
+Subject: \[released message\] %j
+To: [? %#T |undisclosed-recipients:;|[%T|, ]]
+[? %#C |#|Cc: [%C|, ]]
+Message-ID: <QRA%i@%h>
+
+Please find attached a message which was held in a quarantine,
+and has now been released.
+
+[:wrap|78|| |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
+[:wrap|78|| |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
+[? [:header_field|Sender]|#|\
+[:wrap|78|| |Sender: [:header_field|Sender]\
+[?[:dkim|sender]|| (dkim:SENDER)]]]
+# [? %m |#|[:wrap|78|| |Message-ID: %m]]
+# [? %r |#|[:wrap|78|| |Resent-Message-ID: %r]]
+# [? [:useragent] |#|[:wrap|78|| |[:useragent]]]
+[? %j |#|[:wrap|78|| |Subject: %j]]
+
+Our internal reference code for the message is %n/%i
+#
+[~[:report_format]|["^attach$"]|["[? [:attachment_password] |#|
+
+Contents of the attached mail message may pose a threat to your computer or
+could be a social engineering deception, so it should be handled cautiously.
+To prevent undesired automatic opening, the attached original mail message
+has been wrapped in a password-protected ZIP archive.
+
+Here is the password that allows opening of the attached archive:
+
+ [:attachment_password]
+
+Note that the attachment is not strongly encrypted and the password
+is not a strong secret (being displayed in this non-encrypted text),
+so this attachment is not suitable for guarding a secret contents.
+The sole purpose of this password protection it to prevent undesired
+accidental or automatic opening of a message, either by some filtering
+software, a virus scanner, or by a mail reader.
+]"]|]#
diff --git a/debian/etc/en_US/template-virus-admin.txt b/debian/etc/en_US/template-virus-admin.txt
index 912a89f..559b6d0 100644
--- a/debian/etc/en_US/template-virus-admin.txt
+++ b/debian/etc/en_US/template-virus-admin.txt
@@ -1,15 +1,15 @@
#
# =============================================================================
-# This is a template for non-spam (VIRUS,...) ADMINISTRATOR NOTIFICATIONS.
+# This is a template for non-spam (e.g. VIRUS,...) ADMINISTRATOR NOTIFICATIONS.
# For syntax and customization instructions see README.customize.
# Long header fields will be automatically wrapped by the program.
#
From: %f
Date: %d
Subject: [? [:ccat|major] |Clean mail|Clean mail|MTA-blocked mail|\
-OVERSIZED mail|INVALID HEADER in mail|spam|SPAM|UNCHECKED contents in mail|\
+OVERSIZED mail|INVALID HEADER in mail|Spammy|Spam|UNCHECKED contents in mail|\
BANNED contents (%F) in mail|VIRUS (%V) in mail]\
- FROM [?%l||LOCAL ][?%a||\[%a\] ][?%s|<>|[?%o|(?)|%s]]
+ FROM [?%l||LOCAL ][?%a||[:client_addr_port] ]%s
To: [? %#T |undisclosed-recipients:;|[%T|, ]]
[? %#C |#|Cc: [%C|, ]]
Message-ID: <VA%i@%h>
@@ -31,7 +31,7 @@ Internal reference code for the message is %n/%i
[? %a |#|[:wrap|78|| |First upstream SMTP client IP address: \[%a\] %g]]
[? %e |#|[:wrap|78|| |According to a 'Received:' trace,\
- the message originated at: \[%e\], %t]]
+ the message apparently originated at: \[%e\], %t]]
[:wrap|78|| |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
[:wrap|78|| |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
diff --git a/debian/etc/en_US/template-virus-recipient.txt b/debian/etc/en_US/template-virus-recipient.txt
index a878291..f8e579a 100644
--- a/debian/etc/en_US/template-virus-recipient.txt
+++ b/debian/etc/en_US/template-virus-recipient.txt
@@ -7,9 +7,8 @@
From: %f
Date: %d
Subject: [? [:ccat|major] |Clean mail|Clean mail|MTA-blocked mail|\
-OVERSIZED mail|INVALID HEADER in mail|SPAM|SPAM|UNCHECKED contents in mail|\
-BANNED contents (%F) in mail|VIRUS (%V) in mail]\
- TO YOU from [?%s|<>|[?%o|(?)|%s]]
+OVERSIZED mail|INVALID HEADER in mail|Spammy|Spam|UNCHECKED contents in mail|\
+BANNED contents (%F) in mail|VIRUS (%V) in mail] TO YOU from %s
[? [:header_field|To] |To: undisclosed-recipients:;|To: [:header_field|To]]
[? [:header_field|Cc] |#|Cc: [:header_field|Cc]]
Message-ID: <VR%i@%h>
@@ -21,9 +20,9 @@ Our content checker found
[? %#F |#|[:wrap|78| | |banned [?%#F|names|name|names]: %F]]
[? %#X |#|[[:wrap|78| | |%X]\n]]
-in an email to you [? %S |from unknown sender:|from:]
+in an email to you [? %#V |from:|from probably faked sender:]
%o
-[? %S |claiming to be: %s|#]
+[? %#V |#|claiming to be: %s]
Content type: [:ccat|name|main]#
[? [:ccat|is_blocked_by_nonmain] ||, blocked for [:ccat|name]]
@@ -31,7 +30,7 @@ Our internal reference code for your message is %n/%i
[? %a |#|[:wrap|78|| |First upstream SMTP client IP address: \[%a\] %g]]
[? %e |#|[:wrap|78|| |According to a 'Received:' trace,\
- the message originated at: \[%e\], %t]]
+ the message apparently originated at: \[%e\], %t]]
[:wrap|78|| |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
[:wrap|78|| |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
diff --git a/debian/etc/en_US/template-virus-sender.txt b/debian/etc/en_US/template-virus-sender.txt
index b6c7d2a..5f254c8 100644
--- a/debian/etc/en_US/template-virus-sender.txt
+++ b/debian/etc/en_US/template-virus-sender.txt
@@ -11,17 +11,17 @@ Subject: [? [:ccat|major]
|Clean message from you (MTA blocked)\
|OVERSIZED message from you\
|BAD-HEADER in message from you\
-|SPAM apparently from you\
-|SPAM apparently from you\
+|Spam claiming to be from you\
+|Spam claiming to be from you\
|A message with UNCHECKED contents from you\
-|BANNED message from you (%F)\
+|BANNED contents from you (%F)\
|VIRUS in message apparently from you (%V)\
]
[? %m |#|In-Reply-To: %m]
Message-ID: <VS%i@%h>
[? [:ccat|major] |Clean|Clean|MTA-BLOCKED|OVERSIZED|INVALID HEADER|\
-spam|SPAM|UNCHECKED contents|BANNED CONTENTS ALERT|VIRUS ALERT]
+Spammy|Spam|UNCHECKED contents|BANNED CONTENTS ALERT|VIRUS ALERT]
Our content checker found
[? %#V |#|[:wrap|78| | |[? %#V |viruses|virus|viruses]: %V]]
@@ -36,7 +36,7 @@ Our internal reference code for your message is %n/%i
[? %a |#|[:wrap|78|| |First upstream SMTP client IP address: \[%a\] %g]]
[? %e |#|[:wrap|78|| |According to a 'Received:' trace,\
- the message originated at: \[%e\], %t]]
+ the message apparently originated at: \[%e\], %t]]
[:wrap|78|| |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
[:wrap|78|| |From: [:header_field|From|100][?[:dkim|author]|| (dkim:AUTHOR)]]
diff --git a/debian/extract-upstream-en_US-templates.pl b/debian/extract-upstream-en_US-templates.pl
index f45b824..ef04ff3 100755
--- a/debian/extract-upstream-en_US-templates.pl
+++ b/debian/extract-upstream-en_US-templates.pl
@@ -16,7 +16,10 @@ my @knowntemplates = (
[ 'non-spam.*ADMINISTRATOR NOTIFICATIONS', 'template-virus-admin.txt' ],
[ 'VIRUS.*RECIPIENTS NOTIFICATIONS', 'template-virus-recipient.txt' ],
[ 'SPAM SENDER NOTIFICATIONS', 'template-spam-sender.txt' ],
- [ 'SPAM ADMINISTRATOR NOTIFICATIONS', 'template-spam-admin.txt' ]
+ [ 'SPAM ADMINISTRATOR NOTIFICATIONS', 'template-spam-admin.txt' ],
+ [ 'RELEASE FROM A QUARANTINE', 'template-release-quarantine.txt' ],
+ [ 'problem/feedback report', 'template-problem-feedback.txt' ],
+ [ 'text part of an auto response', 'template-auto-response.txt' ],
);
local($/) = "__DATA__\n";
@@ -31,7 +34,9 @@ while ($line = <STDIN>) {
print DATAOUT $line;
close(DATAOUT);
last;
- }
+ } else {
+ #print "Unknown template $line\n";
+ }
$i--;
}
}
--
Debian packaging for amavisd-new
More information about the Amavisd-new-commits
mailing list