Merge ~michal-maloszewski99/ubuntu/+source/amavisd-new:merge-1.2.13.0-3_mantic into ubuntu/+source/amavisd-new:debian/sid

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/ppa-merge-amavisd-new-ppa6 (ppa1010)

[Christian Ehrhardt  (paelzer)]

some pre review

[Michał Małoszewski (michal-maloszewski99)]

execute_after_dh_auto_install:
- mv debian/amavisd-new/usr/bin debian/amavisd-new/usr/sbin

This chunk caused the FTBFS.
There is no debian/amavisd-new/ neither in Ubuntu nor in Debian.

The log that failed says:

   debian/rules execute_after_dh_auto_install
make[1]: Entering directory '/<<PKGBUILDDIR>>'
mv debian/amavisd-new/usr/bin debian/amavisd-new/usr/sbin
mv: cannot stat 'debian/amavisd-new/usr/bin': No such file or directory
make[1]: *** [debian/rules:14: execute_after_dh_auto_install] Error 1
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:7: binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2
--------------------------------------------------------------------------------
Build finished at 2023-07-24T14:13:40Z

Finished
--------

+------------------------------------------------------------------------------+
| Cleanup |
+------------------------------------------------------------------------------+

Purging /<<BUILDDIR>>
Not removing build depends: as requested
E: Build failure (dpkg-buildpackage died)

So it is quite explicit message from the logs.

[Michał Małoszewski (michal-maloszewski99)]

No autopkgtests for that package.

[Michał Małoszewski (michal-maloszewski99)]

Moreover, FYI the debian/rules from the original source package of amavisd-new (apt-get source amavisd-new;dpkg-source -x amavisd-new_2.11.0-6.1ubuntu1.dsc; nano amavisd-new-2.11.0/debian/rules) is different than the one here: https://salsa.debian.org/debian/amavisd-new/-/blob/master/debian/rules, so I think I shouldn't blindly follow debian/rules from debian salsa and to avoid FTBFS I deleted the part mentioned in the 2nd comment from the top.

[Michał Małoszewski (michal-maloszewski99)]

In general as we are outdated, I think we should review the changes in the delta and update them to work with the latest version of the amavisd-new package. I mean, applying the necessary changes from the old delta to the new version of the package.

[Christian Ehrhardt  (paelzer)]

We re-did the merge together

Theories and findings and differences:
- d/control: dh-apparmor should be ordered right
- d/control: indent before unrar and altermine is different
- d/rules: as mentioned before do not drop the mv (unless we understand why)
- d/rules: do not drop distzilla added in Debian

Underlying issue is that th emv fails, but not because the mv is wrong.
In Debian [1] auto_install does
Installing /<<PKGBUILDDIR>>/debian/amavisd-new/usr/bin/amavisd-submit
In our build it does:
Installing /<<PKGBUILDDIR>>/debian/tmp/usr/bin/amavisd-submit

Due to this, the later mv fails.
removing the mv isn't the solution, understanding what is wrong here is.

Debian:
   dh_auto_install -D .build/debian-build --destdir=debian/amavisd-new/ -i
 cd .build/debian-build && make -j4 install DESTDIR=/<<PKGBUILDDIR>>/debian/amavisd-new AM_UPDATE_INFO_DIR=no PREFIX=/usr
Ubuntu:
   dh_auto_install -D .build/debian-build
 cd .build/debian-build && make -j4 install DESTDIR=/<<PKGBUILDDIR>>/debian/tmp AM_UPDATE_INFO_DIR=no PREFIX=/usr

DESTDIR is different - that is the problem.
I do not see yet why that is the case :-/
This ^^ is what you have to find out and fix.

You also might want to re-use my branch merge-2.13.0-3-mantic-CE which fixes some issues in the changelog as we discussed.

[1]: https://buildd.debian.org/status/fetch.php?pkg=amavisd-new&arch=all&ver=1%3A2.13.0-3&stamp=1683851020&raw=1

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

FYI, I rebuilt the Debian (none of our delta in case we cause it somehow) in unstable and mantic

Essentially:
$ DEB_BUILD_OPTIONS="parallel=4" sbuild --purge=never -Admantic-proposed-amd64 amavisd-new_2.13.0-3.dsc
$ DEB_BUILD_OPTIONS="parallel=4" sbuild --purge=never -Adunstable-amd64 amavisd-new_2.13.0-3.dsc

Both! had:
  DESTDIR=/<<PKGBUILDDIR>>/debian/amavisd-new

So while I do not yet see where/how exactly, it seems to be in our Delta.

[Christian Ehrhardt  (paelzer)]

Hah, I do know ...

We do have this delta "New package amavisd-new-postfix".

But this implies a change, quoted from [1]:
"For earlier compat levels then unless --destdir option is specified, the files are installed into debian/package/ if there is only one binary package. In the multiple binary package case, the files are instead installed into debian/tmp/, and should be moved from there to the appropriate package build directory using dh_install(1) or similar tools."

So the existence of amavisd-new-postfix is what changes the behavior.
From there some Debian changes do not apply well to the Ubuntu build anymore.

That amavisd-new-postfix is part of an "custom ubuntu mail stack" which to admit hasn't got much attention in years and mostly carried forward as-is. In this case it is actually mostly an empty package that does its changes to postfix in the postinst maintainer script.
So it does - itself - not need to install anything of the build in dh_auto_install.

Therefore we should be able to set --destdir

[1]: https://manpages.debian.org/testing/debhelper/dh_auto_install.1.de.html

[Michał Małoszewski (michal-maloszewski99)]

Updated. can be re-reviewed.

[Bryce Harrington (bryce)]

Leaving the formal review to Christian since he owns the review slot, but since he's on PTO today I can give some drive-by review comments:

- In the debian/changelog the first line should include the merge bug number, LP: #2018057

- 0c5c7cf: In changelog entries, I strongly recommend stating *what* was changed and/or *why* it was changed. In this case, "Add information to the README.Debian about Ubuntu specific changes" is too vague. I know you didn't write this and are simply carrying forward the delta (correctly), but especially for longstanding delta it is worth adding some clarity. Sometimes in doing that it gives yourself or future mergers a clue about how the delta can eventually be retired.

  So in this case, look at the change applied to the README.Debian, and update the changelog entry to mention that the Ubuntu specific change was something to do with DKIM. In doing this, you may also find this change goes along with one of the other commits that actually implements the described change, and can be squashed to that one.

- f2f64b5: The changelog entry for this can also be made less vague by mentioning the packages by name (this can help future mergers who may be grepping through the changelog), and by stating the reason for *why* they are missing. In this case because the packages in question aren't provided by Debian or were removed in Debian. It would also be useful to annotate this commit (using the "--CL--" marker trick) and mention this delta is waiting on Debian to resolve, with a link to the Debian bug in question.

- cbb4bb1: This changelog entry is also a bit generic, and would be better to state that it's enabling dkim verification and reducing verbosity about sending mail. There's a couple other settings to undef but I can't tell if those are actually needed or if they actually cause a behavioral change (if they don't, why are they there?) You might also investigate if the dkim verification change should go with the other dkim commit(s).

  Oh, also small misspelling, "insure" should be "ensure".

- 630f928: The commit message here is great! It explains what was changed and why, and identifies actions for future mergers. Two minor suggestions, one would be to clarify the changelog entry to "d/rules: fix build with (empty) amavisd-new-postfix", second would be that this would be another good place to use the "--CL--" trick to separate out the annotation from the changelog entry so you don't have to hand-edit the changelog after the reconstruct-changelog step.

- 2405aa1: Instead of saying "after discussion with the server team" state what the rationale actually was. No one will remember that conversation, and it doesn't really matter where something is discussed, what matters is the decision and rationale. In this case I'm guessing the rationale was that altermime and ripole are universe packages?

I verified the package debuild's successfully locally. There are no DEP8 tests so I did no testing beyond that.

I didn't review the apport hook nor the postinst/postrm changes since while those are part of the Ubuntu delta, those aren't listed as part of the MP's Unmerged commits. (Actually I did quickl...

review: Needs Fixing

[Michał Małoszewski (michal-maloszewski99)]

"Leaving the formal review to Christian since he owns the review slot, but since he's on PTO today I can give some drive-by review comments:"

Due to that sentence, I haven't addressed fixes from Bryce's comment (it does not mean that I do not agree), but there might be situations where reviewers have different perspectives on something (what is obvious), and I would like to apply fixes after two people review it (if applicable).

Long story short, I do not want the situation where I add fixes after Bryce's review, then let's suppose specific thing is not okay according to the second reviewer, and then I would have to fix it again.

I would want to see comments from two reviewers, then do a kind of tradeoff, discuss if I wouldn't agree with any point, etc., and then apply changes once.

[Christian Ehrhardt  (paelzer)]

Well, 07-26 fixed what I wanted - which was mostly how to overcome the FTBFS in a better way.
You have taken over my WIP suggestion, which I assume that means worked well in your tests as you said it it is ready for re-review.

Then on 08-02 Bryce was so kind to beat me in giving this a second look - thanks.

I ack to all of Bryce suggestions, but I also see your reason for hesitation - let me explain.

First time you presented the delta re-split in a different way and re-ordered its appearance in changelog - that made it hard to compare and match.
Then after my work with you we re-ordered it so that old=new (in regard to order) which helped a lot - but we didn't touch the text of the messages as we were both quite exhausted at that time already from all the shuffling.
Now Bryce asks you to change the texts and I can understand thinking "uh, wasn't this what I tried before" :-)
But he is not asking you to change order again, everything stays in place and just gets a nice improvement in wording.
I'm +1 with that and encourage you to do that so that I can final-review and final-approve it then.

One thing Bryce asked was to not say "after discussion with the server team" which I agree.
But then, you just carried forward this - and the discussion is from 2012 let me help a bit :-)
When you go back in the past enough in the CL you see:
  [6aa7cfb] Recommend altermime and ripole (Closes: #665469)
And as a consequence of that
  * debian/control: drop altermime and ripole to Suggests after discussions
    with the server team. (LP: 992879)

So there you at least have a bug ref.
And since then no one complained about those being missing, so the decision seems to have been right :-)

A good message might therefore
1. would state that as the reason
2. still reference the old bug (which was lost in CL a few years later)
So a good message could be:
 * d/control: drop altermime and ripole to Suggests as they are optional and universe dependencies (LP: 992879)

But no problem would be good without being a never ending rabbit whole - right?
In looking at this I've seen ripole doesn't exist since >Bionic.
Which means it is wrong in Debian (and known https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971896)
So you can change this to:
1. just move altermime, keep ripole a recommends as it is a no-op due to not existing
2. the commit and changelog text then could be
 * d/control: drop altermime to Suggests as it is an optional universe dependency (LP: 992879)

Oh and a last comment - as this is the repo with so many similar branches.
You could maybe delete the wrong old branches in your LP repo to make this easier?

Once this is all ready, ping me for a final check and sponsoring

[Michał Małoszewski (michal-maloszewski99)]

Things from the comments fixed, old wrong branches deleted. It can be re-reviewed.

"In looking at this I've seen ripole doesn't exist since >Bionic."
(Btw the d/control in that MP does not contain ripole in Recommends. -> commit: 09e3edf)

[Bryce Harrington (bryce)]

Uploaded:

triage-mantic+23.10: ~/pkg/AmavisdNew/review-lp2018057/amavisd-new-gu$ grep ^Vcs ../amavisd-new_2.13.0-3ubuntu1_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/amavisd-new
Vcs-Git-Commit: ed81258882dd9ad914456947cd74ee81b375473e
Vcs-Git-Ref: refs/heads/merge-1.2.13.0-3_mantic
triage-mantic+23.10: ~/pkg/AmavisdNew/review-lp2018057/amavisd-new-gu$ dput ubuntu ../amavisd-new_2.13.0-3ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../amavisd-new_2.13.0-3ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../amavisd-new_2.13.0-3ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading amavisd-new_2.13.0-3ubuntu1.dsc: done.
  Uploading amavisd-new_2.13.0-3ubuntu1.debian.tar.xz: done.
  Uploading amavisd-new_2.13.0-3ubuntu1_source.buildinfo: done.
  Uploading amavisd-new_2.13.0-3ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/README.Debian b/debian/README.Debian
index 4f58e0d..575c0ae 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,6 +24,8 @@ Read-write conffiles: /etc/amavis/conf.d/
   15-av_scanners:		AV scanner interface configuration
   15-content_filter_mode:	Use this to re-enable spamassassin/av checks
   20-debian_defaults:		Commonly modified settings
+  21-ubuntu_defaults:		Additional Ubuntu specific changes
+  40-policy_banks:		DKIM whitelist
   50-user:			Place your overrides here, if you want
 
 If the package detects legacy config files, it renames them adding a
@@ -131,3 +133,18 @@ system.
 You can change the backend in /etc/default/amavisd-snmp-subagent.
 
  -- Your amavisd-new maintainers (and contributors)
+
+Ubuntu Changes
+--------------
+
+The Ubuntu variant of this package is generally very similar to the standard
+Debian package.  The major difference is that we enable DKIM verification by
+default and provide an additional config file, 40-policy_banks, to for easy
+DKIM based whitelisting.  Domains recommended by upstream are whitelisted by
+default.  You can over-ride DKIM verification in 50-user if you don't want it.
+
+At any given moment there may be bug fixes applied in the Ubuntu package, but
+not yet in Debian.  It is the goal of Ubuntu to feed these back to Debian.
+
+
+ -- Scott Kitterman <[e-mail]>  
diff --git a/debian/amavisd-new-postfix.dirs b/debian/amavisd-new-postfix.dirs
 new file mode 100644
index 0000000..d13e1a4
--- /dev/null
+++ b/debian/amavisd-new-postfix.dirs
@@ -0,0 +1,3 @@
+var/lib/amavisd-new-postfix
+var/lib/amavisd-new-postfix/backups
+etc/amavis/conf.d
diff --git a/debian/amavisd-new-postfix.postinst b/debian/amavisd-new-postfix.postinst
 new file mode 100644
index 0000000..07221b4
--- /dev/null
+++ b/debian/amavisd-new-postfix.postinst
@@ -0,0 +1,93 @@
+#! /bin/sh
+# postinst script for amavisd-new-postfix
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+POSTFIX_BCKFILE="/var/lib/amavisd-new-postfix/backups/main.cf-backup"
+POSTFIX_MASTER_BCKFILE="/var/lib/amavisd-new-postfix/backups/master.cf-backup"
+
+set_postfix_option() {
+       opt="$1"
+       # Backup the existion value of the option
+       postconf $(echo ${opt} | cut -d= -f1) >> ${POSTFIX_BCKFILE} || true
+       # Set the new value of the option
+               postconf -e "${opt}"
+}
+
+case "$1" in
+    configure)
+       if [ -f "/etc/postfix/main.cf" ]; then
+		if [ -z "$2" -o ! -e "$POSTFIX_BCKFILE" ]; then
+			if which postconf >/dev/null; then
+				# Setup postfix
+				set_postfix_option "content_filter = smtp-amavis:[localhost]:10024"
+				set_postfix_option "policy-spf_time_limit = 3600s"
+				SMTPD_RECIP_RESTR=`postconf smtpd_recipient_restrictions`
+				set_postfix_option "$SMTPD_RECIP_RESTR, check_policy_service unix:private/policy-spf"
+			fi
+		cp /etc/postfix/master.cf  $POSTFIX_MASTER_BCKFILE
+		postfix-add-policy policy-spf nobody /usr/bin/policyd-spf
+		postfix-add-filter smtp-amavis 10025
+		fi
+       else
+                echo ""
+                echo "Postfix not configured. Run"
+                echo "sudo dpkg-reconfigure postfix and choose"
+                echo "the type of mail server. Then run"
+                echo "sudo dpkg-reconfigure amavisd-new-postfix to"
+                echo "finish amavisd-new-postfix installation."
+                echo ""
+       fi
+       if [ -x "/etc/init.d/postfix" ]; then
+               if [ -x /usr/sbin/invoke-rc.d ]; then
+                       invoke-rc.d postfix restart
+               else
+                       /etc/init.d/postfix restart
+	       fi
+       fi
+       if [ -x "/etc/init.d/amavis" ]; then
+               if [ -x /usr/sbin/invoke-rc.d ]; then
+                       invoke-rc.d amavis restart
+               else
+                       /etc/init.d/amavis restart
+	       fi
+       fi
+
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/amavisd-new-postfix.postrm b/debian/amavisd-new-postfix.postrm
 new file mode 100644
index 0000000..7f8a40d
--- /dev/null
+++ b/debian/amavisd-new-postfix.postrm
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+POSTFIX_BCKFILE="/var/lib/amavisd-new-postfix/backups/main.cf-backup"
+
+if [ "$1" = "remove" ]; then
+               if which postconf >/dev/null && [ -f "${POSTFIX_BCKFILE}" ]; then
+                       while read line; do
+                               postconf -e "$line"
+                       done < "${POSTFIX_BCKFILE}"
+                       rm -f "${POSTFIX_BCKFILE}"
+               fi
+       if [ -x "/etc/init.d/postfix" ]; then
+               if [ -x /usr/sbin/invoke-rc.d ]; then
+                       invoke-rc.d postfix reload
+               else
+                       /etc/init.d/postfix reload
+               fi
+       fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/amavisd-new.apport b/debian/amavisd-new.apport
 new file mode 100644
index 0000000..69fbdcf
--- /dev/null
+++ b/debian/amavisd-new.apport
@@ -0,0 +1,30 @@
+'''Apport package hook for amavisd-new.
+
+(c) 2019 Canonical Ltd.
+Contributors:
+Christian Ehrhardt <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+import re
+import apport
+import apport.hookutils
+
+def add_info(report, ui):
+    out = apport.hookutils.command_output(['systemctl', 'status',
+                                           'amavis']).strip()
+    fqdnbug = re.search("You must explicitly assign a FQDN of this host", out)
+    if fqdnbug:
+        ui.information("Your amavisd service fails to start as you have not \n"
+                       "configured hostname to be a Fully Qualified Domain \n"
+                       "Name. You will see the same reported by amavis, see \n"
+                       " $ systemctl status amavis\n"
+                       "Consider fixing either your hostname or set the \n"
+                       "desired value at /etc/amavis/conf.d/05-node_id")
+        report['UnreportableReason'] = 'Known local configuation issue'
+        return
diff --git a/debian/amavisd-new.dirs b/debian/amavisd-new.dirs
 new file mode 100644
index 0000000..bbe54c6
--- /dev/null
+++ b/debian/amavisd-new.dirs
@@ -0,0 +1 @@
+usr/share/apport/package-hooks
diff --git a/debian/changelog b/debian/changelog
index f5076ce..8e53e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+amavisd-new (1:2.13.0-3ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018057). Remaining changes:
+    - d/README.Debian: Add information about the Ubuntu variant of
+      amavisd-new and the major differences between that package in
+      Ubuntu and Debian to raise awareness about the additional config
+      file which is 40-policy_banks.
+    - d/README.Debian, d/etc/conf.d/21-ubuntu_defaults: Enable DKIM
+      verification and reducing verbosity about sending mail.
+      + Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default.
+      + Enable DKIM checking by default.
+    - d/README.Debian, d/etc/conf.d/40-policy_banks: Include policy-bank
+      of known good domains for DKIM whitelisting in 40-policy_banks.
+    - d/control: Drop altermime and ripole to Suggests as they are
+      optional and universe dependencies (LP: 992879).
+    - d/control, d/amavisd-new-postfix.*: New package amavisd-new-postfix,
+      configuration for anti-spam/virus.
+    - do not report FQDN misconfiguration through apport.
+      (LP #1587695).
+      + d/control: b-dep on dh_apparmor.
+      + d/rules: enable dh_apparmor.
+      + d/amavisd-new.apport: apport script
+      + d/amavisd-new.dirs: layout required dirs
+  * New Changes:
+    - d/control: Delete packages ripole and dspam - which are missing -
+      from Suggests to not mislead anyone who would want to make use of
+      those (LP: #1891643).
+    - d/rules: fix build with (empty) amavisd-new-postfix
+
+ -- Michal Maloszewski <[e-mail]>  Mon, 17 Jul 2023 23:17:01 +0200
+
 amavisd-new (1:2.13.0-3) unstable; urgency=medium
 
   * Fix failure to purge without adduser. Closes: #1035841.
@@ -26,6 +58,56 @@ amavisd-new (1:2.13.0-1) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Thu, 23 Feb 2023 16:00:54 +1100
 
+amavisd-new (1:2.12.2-1.1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable (LP: #1993383). Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes.
+    - d/README.Debian, d/etc/conf.d/21-ubuntu_defaults: Ubuntu
+      configuration changes in 21-ubuntu_defaults.
+      + Reduce email responses for virus/blocked mail so as not to be
+        a backscatter source by default.
+      + Enable DKIM checking by default.
+    - d/README.Debian,d/etc/conf.d/40-policy_banks: Include
+      policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks.
+    - d/control: drop altermime and ripole to Suggests after
+      discussions with the server team.
+    - d/control,d/amavisd-new-postfix.*: new package
+      amavisd-new-postfix, configuration for anti-spam/virus.
+    - do not report FQDN misconfiguration through apport.
+      (LP #1587695).
+      + d/control: b-dep on dh_apparmor
+      + d/rules: enable dh_apparmor
+      + d/amavisd-new.apport: apport script
+      + d/amavisd-new.dirs: layout required dirs
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 18 Nov 2022 14:23:22 -0500
+
+amavisd-new (1:2.12.2-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946841). Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes.
+    - d/README.Debian, d/etc/conf.d/21-ubuntu_defaults: Ubuntu
+      configuration changes in 21-ubuntu_defaults.
+      + Reduce email responses for virus/blocked mail so as not to be
+        a backscatter source by default.
+      + Enable DKIM checking by default.
+    - d/README.Debian,d/etc/conf.d/40-policy_banks: Include
+      policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks.
+    - d/control: drop altermime and ripole to Suggests after
+      discussions with the server team.
+    - d/control,d/amavisd-new-postfix.*: new package
+      amavisd-new-postfix, configuration for anti-spam/virus.
+    - do not report FQDN misconfiguration through apport.
+      (LP #1587695).
+      + d/control: b-dep on dh_apparmor
+      + d/rules: enable dh_apparmor
+      + d/amavisd-new.apport: apport script
+      + d/amavisd-new.dirs: layout required dirs
+
+ -- Miriam España Acebal <[e-mail]>  Fri, 18 Feb 2022 13:14:20 +0100
+
 amavisd-new (1:2.12.2-1) unstable; urgency=medium
 
   [ Sergio Durigan Junior ]
@@ -42,12 +124,61 @@ amavisd-new (1:2.12.2-1) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Wed, 09 Feb 2022 09:00:48 +1100
 
+amavisd-new (1:2.11.1-5ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes.
+    - Ubuntu configuration changes in 21-ubuntu_defaults.
+      + Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      + Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks.
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus.
+    - do not report FQDN misconfiguration through apport. (LP #1587695)
+      + d/amavisd-new.apport: apport script
+      + d/amavisd-new.dirs: layout required dirs
+      + d/control: b-dep on dh_apparmor
+      + d/rules: enable dh_apparmor
+  * Added:
+    - d/amavisd-new-postfix.postrm: add #DEBHELPER# to the end of the script.
+      [squash this change with "amavisd-new-postfix configuration for
+       anti-spam/virus" (4e84c665522d1be) in the next merge]
+    - d/amavisd-new-postfix.*: use a FHS compliant dir to store backup files.
+      [squash this change with "amavisd-new-postfix configuration for
+       anti-spam/virus" (4e84c665522d1be) in the next merge]
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 14 Jul 2021 17:22:39 -0300
+
 amavisd-new (1:2.11.1-5) unstable; urgency=medium
 
   * Add missing dependency on libnet-snmp-perl. Closes: #936052.
 
  -- Brian May <[e-mail]>  Tue, 08 Jun 2021 08:51:44 +1000
 
+amavisd-new (1:2.11.1-4ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes.
+    - Ubuntu configuration changes in 21-ubuntu_defaults.
+      + Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      + Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks.
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus.
+    - do not report FQDN misconfiguration through apport. (LP #1587695)
+      + d/amavisd-new.apport: apport script
+      + d/amavisd-new.dirs: layout required dirs
+      + d/control: b-dep on dh_apparmor
+      + d/rules: enable dh_apparmor
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 18 Nov 2020 17:39:15 -0300
+
 amavisd-new (1:2.11.1-4) unstable; urgency=low
 
   [ Debian Janitor ]
@@ -66,6 +197,27 @@ amavisd-new (1:2.11.1-4) unstable; urgency=low
 
  -- Brian May <[e-mail]>  Tue, 15 Sep 2020 07:47:11 +1000
 
+amavisd-new (1:2.11.1-2ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes.
+    - Ubuntu configuration changes in 21-ubuntu_defaults.
+      + Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      + Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks.
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus.
+    - do not report FQDN misconfiguration through apport. (LP #1587695)
+      + d/amavisd-new.apport: apport script
+      + d/amavisd-new.dirs: layout required dirs
+      + d/control: b-dep on dh_apparmor
+      + d/rules: enable dh_apparmor
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 11 May 2020 17:36:35 -0300
+
 amavisd-new (1:2.11.1-2) unstable; urgency=medium
 
   * Ensure RuntimeDirectory is set. Closes: #955247.
@@ -79,6 +231,30 @@ amavisd-new (1:2.11.1-1) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Tue, 04 Feb 2020 07:58:33 +1100
 
+amavisd-new (1:2.11.0-6.1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - do not report FQDN misconfiguration through apport (LP #1587695)
+      - d/amavisd-new.apport: apport script
+      - d/amavisd-new.dirs: layout required dirs
+      - d/control: b-dep on dh_apparmor
+      - d/rules: enable dh_apparmor
+  * Dropped Changes:
+    - Fix DKIM signing in 2.11.0 (LP: 1770532)
+      [in Debian for #882324]
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 26 Apr 2019 09:10:13 +0200
+
 amavisd-new (1:2.11.0-6.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -93,6 +269,33 @@ amavisd-new (1:2.11.0-6) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Wed, 13 Feb 2019 17:48:10 +1100
 
+amavisd-new (1:2.11.0-5ubuntu2) eoan; urgency=medium
+
+  * do not report FQDN misconfiguration through apport (LP: #1587695)
+    - d/amavisd-new.apport: apport script
+    - d/amavisd-new.dirs: layout required dirs
+    - d/control: b-dep on dh_apport
+    - d/rules: enable dh_apport
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 08 Apr 2019 16:48:34 +0200
+
+amavisd-new (1:2.11.0-5ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1814900). Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - Fix DKIM signing in 2.11.0 (LP #1770532)
+
+ -- Karl Stenerud <[e-mail]>  Wed, 06 Feb 2019 17:02:57 +0100
+
 amavisd-new (1:2.11.0-5) unstable; urgency=medium
 
   * Apply updated patch to left brace in regex. Closes: #920720.
@@ -110,6 +313,29 @@ amavisd-new (1:2.11.0-4) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Mon, 28 Jan 2019 13:19:51 +1300
 
+amavisd-new (1:2.11.0-3ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1811400). Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - Fix DKIM signing in 2.11.0 (LP #1770532)
+  * Dropped Changes:
+    - d/p/100_more_amavisd_helpers_fixes: Fix Debian/Ubuntu pathing in
+      amavisd-release (LP #1792293)
+      [Fixed in 1:2.11.0-3]
+    - disabled Norman Virus Control (LP 1582318)
+      [Fixed in 1:2.11.0-2]
+
+ -- Karl Stenerud <[e-mail]>  Fri, 18 Jan 2019 13:20:09 +0100
+
 amavisd-new (1:2.11.0-3) unstable; urgency=medium
 
   * Update Vcs-* control headers for salsa repository.
@@ -124,6 +350,33 @@ amavisd-new (1:2.11.0-2) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Sat, 25 Nov 2017 17:41:46 +1100
 
+amavisd-new (1:2.11.0-1ubuntu2) cosmic; urgency=medium
+
+  * d/p/100_more_amavisd_helpers_fixes: Fix Debian/Ubuntu pathing in
+    amavisd-release (LP: #1792293)
+  * d/p/105_amavisd_fix_originating_dkim_signing.patch: Fix DKIM signing
+    in 2.11.0 (LP: #1770532)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 24 Sep 2018 14:05:01 +0200
+
+amavisd-new (1:2.11.0-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - disabled Norman Virus Control (LP 1582318)
+      Debian incorrectly states it fixed at the moment, delta still needed.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 16 Nov 2017 11:51:19 +0100
+
 amavisd-new (1:2.11.0-1) unstable; urgency=medium
 
   * Disable Norman Virus Control by default. Closes: #832511.
@@ -134,6 +387,28 @@ amavisd-new (1:2.11.0-1) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Fri, 14 Jul 2017 12:16:01 +1000
 
+amavisd-new (1:2.10.1-4ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    + Add information in README.Debian about Ubuntu specific changes
+    + Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    + Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    + debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    + amavisd-new-postfix configuration for anti-spam/virus
+  * Dropped changes:
+    + 22-amavisd-new-postfix which was forgotten since 2.6.5-0ubuntu1.
+  * Added changes:
+    + fix whitespace damage in d/control at amavisd-new-postfix
+    + d/etc/conf.d/15-av_scanners disabled Norman Virus Control as it conflicts
+      with packaged /usr/bin/nvcc of nvidia-cuda-toolkit (LP: #1582318)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 25 Jul 2016 16:11:53 +0200
+
 amavisd-new (1:2.10.1-4) unstable; urgency=medium
 
   * Fix typo in recommends.
@@ -144,12 +419,52 @@ amavisd-new (1:2.10.1-4) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Mon, 16 May 2016 08:50:17 +1000
 
+amavisd-new (1:2.10.1-2ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    + Add information in README.Debian about Ubuntu specific changes
+    + Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a 
+        backscatter source by default
+      - Enable DKIM checking by default
+    + Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    + debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    + amavisd-new-postfix configuration for anti-spam/virus
+    + debian/rules: Add some comments about 22-amavisd-new-postfix file being forgotten 
+      since 2.6.5-0ubuntu1. Decision has been made to keep this state, by commenting out, 
+      to avoid a different behavior which could disturb various configuration tools
+      assumptions, and also because we expect to remove the delta in Xenial +1.
+
+ -- Pierre-André MOREY <[e-mail]>  Mon, 15 Feb 2016 17:47:52 +0100
+
 amavisd-new (1:2.10.1-2) unstable; urgency=medium
 
   * Set LC_ALL before running daemon. Closes: #812325.
 
  -- Brian May <[e-mail]>  Fri, 29 Jan 2016 11:00:58 +1100
 
+amavisd-new (1:2.10.1-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian stable, (LP: #1357424) remaining changes:
+    + Add information in README.Debian about Ubuntu specific changes
+    + Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    + Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    + debian/control: drop altermime and ripole to Suggests after discussions
+      with the server team.
+    + amavisd-new-postfix configuration for anti-spam/virus
+  * debian/rules: Add some comments about 22-amavisd-new-postfix file being forgotten 
+      since 2.6.5-0ubuntu1. Decision has been made to keep this state, by commenting out,
+      to avoid a different behavior which could disturb various configuration tools
+      assumptions, and also because we expect to remove the delta in Xenial +1.
+
+ -- Pierre-André MOREY <[e-mail]>  Tue, 12 Jan 2016 15:40:02 +0100
+
 amavisd-new (1:2.10.1-1) unstable; urgency=medium
 
   * [486e81e] Update watchfile
@@ -202,12 +517,57 @@ amavisd-new (1:2.9.0-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Sat, 10 May 2014 22:51:45 +0200
 
+amavisd-new (1:2.7.1-2ubuntu3) quantal; urgency=low
+
+  * debian/control: drop altermime and ripole to Suggests after discussions
+    with the server team. (LP: 992879)
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 21 Sep 2012 10:23:40 -0500
+
+amavisd-new (1:2.7.1-2ubuntu2) quantal; urgency=low
+
+  * Fix invalid 'spf-policyd_time_limit' parametere in
+    amavisd-new-postifx (LP: #996569)
+
+ -- Ante Karamatic <[e-mail]>  Sun, 29 Jul 2012 10:31:31 +0200
+
+amavisd-new (1:2.7.1-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - Drop use of hardening-wrapper, since we're no longer compiling
+      anything.
+
+ -- Logan Rosen <[e-mail]>  Tue, 10 Jul 2012 22:05:35 -0400
+
 amavisd-new (1:2.7.1-2) unstable; urgency=low
 
   * [02ccf50] Add free lha decompresser (Closes: #677692)
 
  -- Alexander Wirt <[e-mail]>  Sat, 16 Jun 2012 19:04:24 +0200
 
+amavisd-new (1:2.7.1-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+  * Drop use of hardening-wrapper, since we're no longer compiling anything.
+
+ -- Steve Langasek <[e-mail]>  Tue, 01 May 2012 05:40:33 +0000
+
 amavisd-new (1:2.7.1-1) unstable; urgency=low
 
   * [a1fea9f] Imported Upstream version 2.7.1
@@ -251,6 +611,39 @@ amavisd-new (1:2.7.0-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Sun, 18 Dec 2011 20:08:41 +0100
 
+amavisd-new (1:2.6.5-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/00patch-opts: "-U" option to patch is obsolete, replaced
+    with --reject-format=unified.
+
+ -- Steve Langasek <[e-mail]>  Tue, 16 Aug 2011 23:24:31 -0700
+
+amavisd-new (1:2.6.5-0ubuntu2) natty; urgency=low
+
+  * Fix amavisd-new-postfix to be arch all since it has no arch specific
+    content
+
+ -- Scott Kitterman <[e-mail]>  Thu, 07 Apr 2011 18:46:45 -0400
+
+amavisd-new (1:2.6.5-0ubuntu1) natty; urgency=low
+
+  * New upstream bugfix release
+    - Update 65_fixtldcheck.dpatch to match upstream changes
+    - Remove 90_do_not_send_dsn_if_D_REJECT.dpatch, was cherrypicked, included
+      upstream
+  * Merge from Debian unstable.  Remaining Ubuntu changes:
+    - amavisd-new-postfix configuration for anti-spam/virus
+    - Add and enable hardened build for PIE
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+
+ -- Scott Kitterman <[e-mail]>  Thu, 07 Apr 2011 16:23:22 -0400
+
 amavisd-new (1:2.6.4-4) unstable; urgency=low
 
   [ Alexander Wirt ]
@@ -291,6 +684,59 @@ amavisd-new (1:2.6.4-2) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Tue, 26 Jan 2010 11:31:00 +0100
 
+amavisd-new (1:2.6.4-1ubuntu6) maverick; urgency=low
+
+  * Initial amavisd-new-postfix configuration:
+    - AntiSpam: Amavis, Spamassassin, SPF
+    - AntiVirus: Amavis, ClamAV
+
+ -- Ante Karamatic <[e-mail]>  Mon, 02 Aug 2010 21:24:32 +0200
+
+amavisd-new (1:2.6.4-1ubuntu5) lucid; urgency=low
+
+  * debian/amavisd-new.cron.daily: Fail gracefully if package has been removed
+    (LP: #428814)
+
+ -- Thierry Carrez <[e-mail]>  Mon, 29 Mar 2010 12:05:32 +0200
+
+amavisd-new (1:2.6.4-1ubuntu4) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <[e-mail]>  Fri, 05 Mar 2010 03:09:16 +0100
+
+amavisd-new (1:2.6.4-1ubuntu3) karmic; urgency=low
+
+  * debian/{control,rules}: add and enable hardened build for PIE
+    (Debian bug 542722).
+
+ -- Kees Cook <[e-mail]>  Thu, 20 Aug 2009 17:23:07 -0700
+
+amavisd-new (1:2.6.4-1ubuntu2) karmic; urgency=low
+
+  * Add libcompress-raw-zlib-perl (> 2.020) to Recommends so zip files can be
+    extracted
+
+ -- Scott Kitterman <[e-mail]>  Thu, 09 Jul 2009 09:39:44 -0400
+
+amavisd-new (1:2.6.4-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - Bump required version of libconvert-uulib-perl to (>= 1.0.8)
+    - Version depends on libmail-dkim-perl to (>= 0.31) and do not also
+      suggest it
+    - Retain depends on libcompress-zlib-perl for backports
+
+ -- Scott Kitterman <[e-mail]>  Thu, 09 Jul 2009 01:29:14 -0400
+
 amavisd-new (1:2.6.4-1) unstable; urgency=low
 
   * New upstream release
@@ -308,6 +754,22 @@ amavisd-new (1:2.6.4-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Fri, 03 Jul 2009 15:50:52 +0200
 
+amavisd-new (1:2.6.3-3ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #379979
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - libmail-dkim-perl (>= 0.31) recommends instead of suggests
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - Add missing ; to default hostname option in debian/etc/conf.d/05-node_id
+    - Bump required version of libconvert-uulib-perl to (>= 1.0.8)
+
+ -- Bhavani Shankar <[e-mail]>  Mon, 25 May 2009 19:01:04 +0530
+
 amavisd-new (1:2.6.3-3) unstable; urgency=low
 
   * Fix socketpath for clamav in 15-avscanners
@@ -323,6 +785,22 @@ amavisd-new (1:2.6.3-2) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Sat, 23 May 2009 11:34:09 +0200
 
+amavisd-new (1:2.6.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - libmail-dkim-perl (>= 0.31) recommends instead of suggests
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - Add missing ; to default hostname option in debian/etc/conf.d/05-node_id
+    - Bump required version of libconvert-uulib-perl to (>= 1.0.8)
+
+ -- Scott Kitterman <[e-mail]>  Fri, 01 May 2009 01:17:03 -0400
+
 amavisd-new (1:2.6.3-1) unstable; urgency=low
 
   * New upstream version (Closes: #525375)
@@ -335,6 +813,31 @@ amavisd-new (1:2.6.3-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Fri, 24 Apr 2009 09:40:23 +0200
 
+amavisd-new (1:2.6.2-2ubuntu2) jaunty; urgency=low
+
+  * fix default config to not send bounce mail to sender for
+    banned filenames in mail (LP: #360689)
+    - debian/etc/conf.d/21-ubuntu_defaults
+
+ -- Imre Gergely <[e-mail]>  Mon, 13 Apr 2009 23:02:24 +0300
+
+amavisd-new (1:2.6.2-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - Ubuntu configuration changes in 21-ubuntu_defaults
+      - Reduce email responses for virus/blocked mail so as not to be a
+        backscatter source by default
+      - Enable DKIM checking by default
+    - libmail-dkim-perl (>= 0.31) recommends instead of suggests
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - Add missing ; to default hostname option in debian/etc/conf.d/05-node_id
+    - Add ${misc:Depends} for amavisd-new and amavisd-new-milter
+    - Bump required version of libconvert-uulib-perl to (>= 1.0.8)
+
+ -- Scott Kitterman <[e-mail]>  Tue, 10 Mar 2009 10:30:03 -0400
+
 amavisd-new (1:2.6.2-2) unstable; urgency=medium
 
   * Update antivirusscanner definitions. This is security relevant since
@@ -366,6 +869,43 @@ amavisd-new (1:2.6.2-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Mon, 02 Mar 2009 22:20:39 +0100
 
+amavisd-new (1:2.6.2-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release
+    - Tarball no longer needs to be repackaged because non-free IETF RFC has
+      been removed by upstream
+  * Add ${misc:Depends} for amavisd-new and amavisd-new-milter
+
+ -- Scott Kitterman <[e-mail]>  Mon, 15 Dec 2008 10:21:14 -0500
+
+amavisd-new (1:2.6.2~rc2.dfsg-0ubuntu1) jaunty; urgency=low
+
+  * New upstream RC release
+    - Bump required version of libconvert-uulib-perl to (>= 1.0.8~)
+  * Drop $warnbannedsender and $warnbadhsender from Ubuntu specific config
+    - They are unset by default and should be left that way to keep the
+      default configuration from being a backscatter source
+
+ -- Scott Kitterman <[e-mail]>  Sat, 06 Dec 2008 00:55:44 -0500
+
+amavisd-new (1:2.6.1.dfsg-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add information in README.Debian about Ubuntu specific changes
+    - libmail-dkim-perl (>= 0.31) recommends instead of suggests and
+      enable DKIM checking by default
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks
+    - Add unrar-free to 01-debian config so it will be used if intstalled and
+      also add it as an alternate suggests to unrar
+    - Updated logcheck/ignore.d.server/amavisd-new
+  * Consolidate Ubuntu configuration changes in 21-ubuntu_defaults
+    - Reduce email responses for virus/blocked mail so as not to be a
+      backscatter source by default
+  * Add missing ; to default hostname option in debian/etc/conf.d/05-node_id 
+
+ -- Scott Kitterman <[e-mail]>  Fri, 10 Oct 2008 23:58:30 -0400
+
 amavisd-new (1:2.6.1.dfsg-2) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -376,6 +916,29 @@ amavisd-new (1:2.6.1.dfsg-2) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Sat, 27 Sep 2008 09:27:55 +0200
 
+amavisd-new (1:2.6.1.dfsg-1ubuntu2) intrepid; urgency=low
+
+  * Fix all the comments in debian/etc/conf.d/40-policy_banks so they
+    are actually comments (LP: #255251)
+  * Add information in README.Debian about Ubuntu specific changes	
+
+ -- Scott Kitterman <[e-mail]>  Wed, 06 Aug 2008 22:39:06 -0400
+
+amavisd-new (1:2.6.1.dfsg-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - libmail-dkim-perl (>= 0.31) recommends instead of suggests and
+      enable DKIM checking by default 
+    - Include policy-bank of known good domains for DKIM whitelisting
+      in 40-policy_banks instead of 20-debian_defaults (previous Ubuntu
+      location) to minimize user prompts during upgrades
+    - Add unrar-free to 01-debian config so it will be used if intstalled and
+      also add it as an alternate suggests to unrar
+    - Updated logcheck/ignore.d.server/amavisd-new 
+  * Other Ubuntu changes incorporated by Debian
+
+ -- Scott Kitterman <[e-mail]>  Fri, 01 Aug 2008 22:34:17 -0400
+
 amavisd-new (1:2.6.1.dfsg-1) unstable; urgency=low
 
   * New upstream release
@@ -386,6 +949,32 @@ amavisd-new (1:2.6.1.dfsg-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Thu, 24 Jul 2008 20:56:32 +0200
 
+amavisd-new (1:2.6.0.dfsg-2ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Updated logcheck/ignore.d.server/amavisd-new (LP: #188754)
+    - Add libmail-dkim-perl (>= 0.31) to recommends for new DKIM based
+      whitelisting
+    - Added 81_fqdn-warning.dpatch so that correct config file path for
+      Debian/Ubuntu is displayed if it needs to be set manually
+      - Renumbered from 71 to put it after the new Debian patch
+      - Added patch description
+    - Add commented out $myhostname definition to debian/etc/conf.d05-node_id
+      so that it will be easier for people who don't know Perl syntax to set
+    - Updated debian/patches/40_fix_paths.dpatch to use the new path
+      (/var/lib) for amavis-release
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+  * Drop previous Ubuntu changes in debian/control and debian/rules to remove
+    amavisd-new-milter package for transition to Main
+      - No longer needed now that libmilter is in Main
+  * Added unrar-free to 01-debian config so it will be used if intstalled
+    (Closes: #442010)
+  * Enable DKIM verification by default along with policy-bank whitelist
+    of good domains recommended in upstream documentation
+
+ -- Scott Kitterman <[e-mail]>  Thu, 03 Jul 2008 01:56:39 -0400
+
 amavisd-new (1:2.6.0.dfsg-2) unstable; urgency=low
 
   * Remove rfc4871 from upstream tarball (Closes: #484881)
@@ -394,6 +983,27 @@ amavisd-new (1:2.6.0.dfsg-2) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Wed, 02 Jul 2008 22:30:43 +0200
 
+amavisd-new (1:2.6.0-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Updated logcheck/ignore.d.server/amavisd-new (LP: #188754)
+    - Add libmail-dkim-perl (>= 0.31) to recommends for new DKIM based
+      whitelisting
+    - Added 81_fqdn-warning.dpatch so that correct config file path for
+      Debian/Ubuntu is displayed if it needs to be set manually
+      - Renumbered from 71 to put it after the new Debian patch
+      - Added patch description
+    - Add commented out $myhostname definition to debian/etc/conf.d05-node_id
+      so that it will be easier for people who don't know Perl syntax to set
+    - Updated debian/patches/40_fix_paths.dpatch to use the new path
+      (/var/lib) for amavis-release
+    - Remove amavisd-new-milter package for transition to Main
+      - Remove libmilter-dev from build-dep
+      - Comment out debian/rules related to amavisd-new-milter
+    - Change maintainer to Ubuntu Core Developers
+
+ -- Scott Kitterman <[e-mail]>  Wed, 11 Jun 2008 21:07:08 -0400
+
 amavisd-new (1:2.6.0-1) unstable; urgency=low
 
   * New upstream version
@@ -407,6 +1017,34 @@ amavisd-new (1:2.6.0-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Tue, 20 May 2008 18:57:16 +0200
 
+amavisd-new (1:2.5.3-1ubuntu3) hardy; urgency=low
+
+  * Update debian/patches/40_fix_paths.dpatch to use the new path (/var/lib)
+    for amavis-release (LP: #199124)
+
+ -- Scott Kitterman <[e-mail]>  Tue, 11 Mar 2008 00:13:51 -0400
+
+amavisd-new (1:2.5.3-1ubuntu2) hardy; urgency=low
+
+  * Remove amavisd-new-milter package for transition to Main
+  * Remove libmilter-dev from build-dep
+  * Comment out debian/rules related to amavisd-new-milter
+  * Change maintainer to Ubuntu Core Developers
+
+ -- Scott Kitterman <[e-mail]>  Fri, 08 Feb 2008 07:41:52 -0500
+
+amavisd-new (1:2.5.3-1ubuntu1) hardy; urgency=low
+
+
+  * Merge from debian unstable, remaining changes:
+    - Added 71_fqdn-warning.dpatch so that correct config file path for 
+      Debian/Ubuntu is displayed if it needs to be set manually.
+    - Add commented out $myhostname definition to debian/etc/conf.d05-node_id
+      so that it will be easier for people who don't know Perl syntax to set
+    - Change maintainer to MOTU
+
+ -- Scott Kitterman <[e-mail]>  Tue, 15 Jan 2008 14:14:32 -0500
+
 amavisd-new (1:2.5.3-1) unstable; urgency=low
 
   * Enable quarantine hashing (Closes: #447240)
@@ -416,6 +1054,16 @@ amavisd-new (1:2.5.3-1) unstable; urgency=low
 
  -- Alexander Wirt <[e-mail]>  Thu, 20 Dec 2007 13:54:21 +0100
 
+amavisd-new (1:2.5.2-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian Unstable.  Remaining Ubuntu changes:
+    - Freshend and renumbered 71_fqdn-warning.dpatch
+    - Add commented out $myhostname definition to debian/etc/conf.d05-node_id
+      so that it will be easier for people who don't know Perl syntax to set
+    - Change maintainer to MOTU
+
+ -- Scott Kitterman <[e-mail]>  Sun, 04 Nov 2007 01:18:46 -0400
+
 amavisd-new (1:2.5.2-2) unstable; urgency=low
 
   *  Make milter tempdir group writeable (Closes: #442372)
@@ -483,6 +1131,22 @@ amavisd-new (1:2.4.3-1) unstable; urgency=low
 
  -- Henrique de Moraes Holschuh <[e-mail]>  Sat,  4 Nov 2006 01:40:27 -0300
 
+amavisd-new (1:2.4.2-6.2ubuntu1) gutsy; urgency=low
+
+  * Add dpatch to debian/rules, add build-dep on dpatch, add debian/patches,
+    and add debian/patches/00list
+  * Add 01fqdn-warning.dpatch so that correct config file path for Debian/
+    Ubuntu is displayed if it needs to be set manually.
+  * Change default MTA to Postfix in debian/control
+  * Add commented out $myhostname definition to debian/etc/conf.d05-node_id
+    so that it will be easier for people who don't know Perl syntax to set
+  * Change maintainer to MOTU
+  * Add debian/compat and bump to 5, adjust debhelper version in build-dep
+  * Add [ ! -f Makefile ] || to clean in debian/rules to avoid trapping all
+    errors.
+
+ -- Scott Kitterman <[e-mail]>  Thu, 04 Oct 2007 14:57:45 -0400
+
 amavisd-new (1:2.4.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -1757,3 +2421,4 @@ amavis (0.3.12pre5.20020310-1) unstable; urgency=low
   * Initial Release.
 
  -- Brian May <[e-mail]>  Fri,  8 Mar 2002 15:31:24 +1100
+
diff --git a/debian/control b/debian/control
index 98c276d..8f24a1c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,13 @@
 Source: amavisd-new
 Section: mail
 Priority: optional
-Maintainer: Brian May <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Brian May <[e-mail]>
 Uploaders: Henrique de Moraes Holschuh <[e-mail]>,
            Alexander Wirt <[e-mail]>
 Build-Depends:
     debhelper-compat (= 13),
+    dh-apport,
     dh-dist-zilla,
     dh-exec,
     libberkeleydb-perl,
@@ -60,7 +62,6 @@ Suggests: apt-listchanges,
           clamav,
           clamav-daemon,
           cpio,
-          dspam,
           lhasa,
           libauthen-sasl-perl,
           libdbi-perl,
@@ -75,8 +76,9 @@ Suggests: apt-listchanges,
           p7zip,
           rpm,
           spamassassin,
-          unrar
-Recommends: altermime, libnet-patricia-perl, ripole
+	  unrar,
+	  altermime,
+Recommends: libnet-patricia-perl
 Description: Interface between MTA and virus scanner/content filters
  AMaViSd-new is a script that interfaces a mail transport agent (MTA) with
  zero or more virus scanners, and spamassassin (optional).
@@ -90,3 +92,22 @@ Description: Interface between MTA and virus scanner/content filters
  filter mode than using the AMaViS pipe client.  It supports sendmail milter
  through the amavisd-new-milter package.
 
+Package: amavisd-new-postfix
+Architecture: all
+Depends: ${shlibs:Depends}, amavisd-new (= ${source:Version}), ${misc:Depends}, postfix, postfix-policyd-spf-python, spamassassin
+Recommends: clamav-daemon, clamav-freshclam, zoo, unzip, unarj, bzip2
+Description: part of Ubuntu mail stack provided by Ubuntu server team
+ AMaViSd-new is a script that interfaces a mail transport agent (MTA) with
+ zero or more virus scanners, and spamassassin (optional).
+ .
+ It supports all common virus scanners (more than 20 different AVs), with
+ direct talk-to-daemon support for ClamAV, OpenAntiVirus, Trophie, AVG,
+ f-prot, and Sophos AVs.
+ .
+ AMaViSd-new supports all MTAs through its generic SMTP/LMTP filter mode
+ (ideal for postfix and exim).  It is faster and safer to use the SMTP/LMTP
+ filter mode than using the AMaViS pipe client.  It supports sendmail milter
+ through this package.
+ .
+ This package contains configuration files for amavis and alters postfix
+ configuration to utilize amavisd-new.
diff --git a/debian/etc/conf.d/21-ubuntu_defaults b/debian/etc/conf.d/21-ubuntu_defaults
 new file mode 100644
index 0000000..83b755f
--- /dev/null
+++ b/debian/etc/conf.d/21-ubuntu_defaults
@@ -0,0 +1,19 @@
+use strict;
+
+#
+# These are Ubuntu specific defaults for amavisd-new configuration
+#
+# DOMAIN KEYS IDENTIFIED MAIL (DKIM)
+$enable_dkim_verification = 1;
+# Don't be verbose about sending mail:
+@whitelist_sender_acl = qw( .$mydomain );
+$final_virus_destiny      = D_DISCARD; # (defaults to D_BOUNCE)
+$final_banned_destiny     = D_DISCARD;  # (defaults to D_BOUNCE)
+$final_spam_destiny       = D_DISCARD;  # (defaults to D_REJECT)
+$final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
+
+$virus_admin = undef;
+$spam_admin = undef;
+
+#------------ Do not modify anything below this line -------------
+1;  # ensure a defined return
diff --git a/debian/etc/conf.d/40-policy_banks b/debian/etc/conf.d/40-policy_banks
 new file mode 100644
index 0000000..dad8caf
--- /dev/null
+++ b/debian/etc/conf.d/40-policy_banks
@@ -0,0 +1,33 @@
+# DKIM signing domain whitelist. The domain to use is the domain after
+# d= in the DKIM header. 
+
+@author_to_policy_bank_maps = ( {
+  # 'friends.example.net'     => 'WHITELIST,NOBANNEDCHECK',
+  # '[e-mail]'  => 'WHITELIST,NOBANNEDCHECK',
+    '.ebay.com'               => 'WHITELIST',
+    '.ebay.co.uk'             => 'WHITELIST',
+    'ebay.at'                 => 'WHITELIST',
+    'ebay.ca'                 => 'WHITELIST',
+    'ebay.de'                 => 'WHITELIST',
+    'ebay.fr'                 => 'WHITELIST',
+    '.paypal.co.uk'           => 'WHITELIST',
+    '.paypal.com'             => 'WHITELIST',  # author signatures
+    './@paypal.com'           => 'WHITELIST',  # 3rd-party sign. by paypal.com
+    'alert.bankofamerica.com' => 'WHITELIST',
+    'amazon.com'              => 'WHITELIST',
+    'cisco.com'               => 'WHITELIST',
+    '.cnn.com'                => 'WHITELIST',
+    'skype.net'               => 'WHITELIST',
+    'welcome.skype.com'       => 'WHITELIST',
+    'cc.yahoo-inc.com'        => 'WHITELIST',
+    'cc.yahoo-inc.com/@yahoo-inc.com' => 'WHITELIST',
+  # 'google.com'              => 'MILD_WHITELIST',
+  # 'googlemail.com'          => 'MILD_WHITELIST',
+  # './@googlegroups.com'     => 'MILD_WHITELIST',
+  # './@yahoogroups.com'      => 'MILD_WHITELIST',
+  # './@yahoogroups.co.uk'    => 'MILD_WHITELIST',
+  # './@yahoogroupes.fr'      => 'MILD_WHITELIST',
+  # 'yousendit.com'           => 'MILD_WHITELIST',
+  # 'meetup.com'              => 'MILD_WHITELIST',
+  # '[e-mail]' => 'MILD_WHITELIST',
+  } );
diff --git a/debian/rules b/debian/rules
index d800045..56ccc3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,16 @@
 #export DH_OPTIONS=-v
 
 %:
-	dh $@ --with dist-zilla
+	dh $@ --with dist-zilla,apport
 
 execute_after_dh_installinit:
 	dh_installsysusers
 
+# Due to the presence of amavisd-new-postfix - which is empty except postinst
+# magic - this is needed to behave as expected by other parts of the build
+override_dh_auto_install:
+	dh_auto_install -D .build/debian-build --destdir=debian/amavisd-new
+
 execute_after_dh_auto_install:
 	mv debian/amavisd-new/usr/bin debian/amavisd-new/usr/sbin