summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Radici <antonio@dyne.org>2011-01-03 18:37:29 +0000
committerAntonio Radici <antonio@dyne.org>2011-01-03 18:37:52 +0000
commit3f328a8d7bf7b127e8cbdc7b6e3a15310ebbe960 (patch)
treefceaed35303930089dda9ec136003dc775e7427d
parent0ee4057ea9ec0c38359226250dfb8ef8c01a9ca6 (diff)
patches refreshed, whitelist_google dropped, Standards-Version bumped
-rw-r--r--debian/changelog11
-rw-r--r--debian/control2
-rw-r--r--debian/patches/imported-upstream-diff37
-rw-r--r--debian/patches/postgreyreport-poderrors14
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/whitelist-google14
6 files changed, 34 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 04d91c5..f810ae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+postgrey (1.33-1) experimental; urgency=low
+
+ * New upstream version
+ * debian/patches:
+ + patches refreshed
+ + whitelist-google dropped, it is integrated upstream
+ * debian/control:
+ + Standards-Version bumped to 3.9.1, no changes required
+
+ -- Antonio Radici <antonio@dyne.org> Mon, 03 Jan 2011 18:35:17 +0000
+
postgrey (1.32-6) unstable; urgency=low
* Drop preinst and thus dependency on dbutil-4.7. (Closes: #594451)
diff --git a/debian/control b/debian/control
index dda2795..df9cfd0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Antonio Radici <antonio@dyne.org>
Uploaders: Jon Daley <jondaley-guest@alioth.debian.org>
Build-Depends: debhelper (>= 7), quilt
Build-Depends-Indep: po-debconf
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://postgrey.schweikert.ch/
Vcs-Browser: http://git.debian.org/?p=collab-maint/postgrey.git
Vcs-Git: git://git.debian.org/git/collab-maint/postgrey.git
diff --git a/debian/patches/imported-upstream-diff b/debian/patches/imported-upstream-diff
index 4bb6b23..f233294 100644
--- a/debian/patches/imported-upstream-diff
+++ b/debian/patches/imported-upstream-diff
@@ -2,7 +2,6 @@ Various debian additions to the original postgrey, to adapt the package to
debian user/group and other things, see the patch for more comments, the patch
was written by Adrian von Bidder
-diff --git a/README b/README
--- a/README
+++ b/README
@@ -19,7 +19,7 @@
@@ -14,7 +13,6 @@ diff --git a/README b/README
See also Postgrey's homepage:
-diff --git a/README.exim b/README.exim
--- a/README.exim
+++ b/README.exim
@@ -12,7 +12,7 @@
@@ -26,8 +24,6 @@ diff --git a/README.exim b/README.exim
set acl_m0 = ${sg{${readsocket{/var/run/postgrey}{$acl_m0}{5s}{}{action=DUNNO}}}{action=}{}}
message = ${sg{$acl_m0}{^\\w+\\s*}{}}
condition = ${if eq{${uc:${substr{0}{5}{$acl_m0}}}}{DEFER}{true}{false}}
-diff --git a/contrib/postgrey_clients_dump b/contrib/postgrey_clients_dump
-new file mode 100644
--- /dev/null
+++ b/contrib/postgrey_clients_dump
@@ -0,0 +1,54 @@
@@ -85,7 +81,6 @@ new file mode 100644
+main;
+
+# vim: sw=4
-diff --git a/contrib/postgreyreport b/contrib/postgreyreport
--- a/contrib/postgreyreport
+++ b/contrib/postgreyreport
@@ -24,7 +24,7 @@
@@ -97,7 +92,7 @@ diff --git a/contrib/postgreyreport b/contrib/postgreyreport
delay => 300,
return_string => 'Greylisted', # match on this string
-@@ -583,7 +583,7 @@
+@@ -594,7 +594,7 @@
--version display version and exit
--user=USER run as USER (default: postgrey)
@@ -106,13 +101,12 @@ diff --git a/contrib/postgreyreport b/contrib/postgreyreport
--delay=N report triplets that did not try again after N seconds (default: 300)
--greylist-text=TXT text to match on for greylist maillog lines
-diff --git a/postgrey b/postgrey
--- a/postgrey
+++ b/postgrey
@@ -23,8 +23,8 @@
@ISA = qw(Net::Server::Multiplex);
- my $VERSION = '1.32';
+ my $VERSION = '1.33';
-my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey';
-my $CONFIG_DIR = '/etc/postfix';
+my $DEFAULT_DBDIR = '/var/lib/postgrey';
@@ -120,7 +114,7 @@ diff --git a/postgrey b/postgrey
sub cidr_parse($)
{
-@@ -575,7 +575,7 @@
+@@ -581,7 +581,7 @@
port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ],
proto => $opt{inet} ? 'tcp' : 'unix',
user => $opt{user} || 'postgrey',
@@ -129,7 +123,7 @@ diff --git a/postgrey b/postgrey
dbdir => $opt{dbdir} || $DEFAULT_DBDIR,
setsid => $opt{daemonize} ? 1 : undef,
pid_file => $opt{daemonize} ? $opt{pidfile} : undef,
-@@ -599,10 +599,11 @@
+@@ -605,10 +605,11 @@
greylist_action => $opt{'greylist-action'} || 'DEFER_IF_PERMIT',
greylist_text => $opt{'greylist-text'} || 'Greylisted, see http://postgrey.schweikert.ch/help/%r.html',
whitelist_clients_files => $opt{'whitelist-clients'} ||
@@ -144,7 +138,7 @@ diff --git a/postgrey b/postgrey
privacy => defined $opt{'privacy'},
hostname => defined $opt{hostname} ? $opt{hostname} : hostname,
exim => defined $opt{'exim'},
-@@ -783,8 +784,8 @@
+@@ -790,8 +791,8 @@
-d, --daemonize run in the background
--pidfile=PATH put daemon pid into this file
--user=USER run as USER (default: postgrey)
@@ -155,7 +149,7 @@ diff --git a/postgrey b/postgrey
--delay=N greylist for N seconds (default: 300)
--max-age=N delete entries older than N days since the last time
that they have been seen (default: 35)
-@@ -798,8 +799,8 @@
+@@ -805,8 +806,8 @@
--privacy store data using one-way hash functions
--hostname=NAME set the hostname (default: `hostname`)
--exim don't reuse a socket for more than one query (exim compatible)
@@ -166,8 +160,8 @@ diff --git a/postgrey b/postgrey
--auto-whitelist-clients=N whitelist host after first successful delivery
N is the minimal count of mails before a client is
whitelisted (turned on by default with value 5)
-@@ -807,8 +808,9 @@
- --listen-queue-size=N allow for N waiting connections to our socket
+@@ -816,8 +817,9 @@
+ default: X-Greylist: delayed <seconds> seconds by postgrey-<version> at <server>; <date>
Note that the --whitelist-x options can be specified multiple times,
- and that per default /etc/postfix/postgrey_whitelist_clients.local is
@@ -178,7 +172,7 @@ diff --git a/postgrey b/postgrey
=head1 DESCRIPTION
-@@ -834,7 +836,7 @@
+@@ -843,7 +845,7 @@
=item *
Create a C<postgrey> user and the directory where to put the database I<dbdir>
@@ -187,7 +181,7 @@ diff --git a/postgrey b/postgrey
=item *
-@@ -854,12 +856,12 @@
+@@ -866,12 +868,12 @@
=item *
@@ -203,7 +197,7 @@ diff --git a/postgrey b/postgrey
greylisting.
=back
-@@ -870,9 +872,10 @@
+@@ -882,9 +884,10 @@
which no greylisting should be done. Per default postgrey will read the
following files:
@@ -217,26 +211,25 @@ diff --git a/postgrey b/postgrey
You can specify alternative paths with the --whitelist-x options.
-diff --git a/postgrey_whitelist_clients b/postgrey_whitelist_clients
--- a/postgrey_whitelist_clients
+++ b/postgrey_whitelist_clients
-@@ -1,7 +1,14 @@
+@@ -1,8 +1,15 @@
# postgrey whitelist for mail client hostnames
# --------------------------------------------
-# put this file in /etc/postfix or specify its path
+# put this file in /etc/postgrey or specify its path
# with --whitelist-clients=xxx
-+
+
+# Debian-specific additions
+# I *know* they run real mail queues, so greylisting only creates
+# bigger load for them.
+debconf.org
+debian.org
+spi-inc.org
-
++
# greylisting.org: Southwest Airlines (unique sender, no retry)
southwest.com
-diff --git a/postgrey_whitelist_recipients b/postgrey_whitelist_recipients
+ # greylisting.org: isp.belgacom.be (wierd retry pattern)
--- a/postgrey_whitelist_recipients
+++ b/postgrey_whitelist_recipients
@@ -1,6 +1,6 @@
diff --git a/debian/patches/postgreyreport-poderrors b/debian/patches/postgreyreport-poderrors
index 6197985..aa670ba 100644
--- a/debian/patches/postgreyreport-poderrors
+++ b/debian/patches/postgreyreport-poderrors
@@ -2,20 +2,20 @@ fix two pod errors in postgreyreport
--- a/contrib/postgreyreport
+++ b/contrib/postgreyreport
-@@ -629,6 +629,8 @@
- ( you be the judge on how old is acceptable ). if you run the report against a live maillog you are
- not giving legit MTA's enough time to try again and you will have lots of inaccurate information.
+@@ -644,6 +644,8 @@
+
+ =over
+=over
+
=item * Ex usage:
zcat /var/log/maillog.0.gz | ./postgreyreport [options] > postgreyreport.log
-@@ -664,6 +666,7 @@
- MX legituser@mac.com user6@recipient7.com
- :============================================================================================
+@@ -683,6 +685,7 @@
+
+ =head1 HISTORY
+=back
- =head1 HISTORY
+ B<1.14.3 20100321>
diff --git a/debian/patches/series b/debian/patches/series
index ed7ffcb..8dd6947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
imported-upstream-diff
-whitelist-google
postgreyreport-poderrors
diff --git a/debian/patches/whitelist-google b/debian/patches/whitelist-google
deleted file mode 100644
index e1afc3b..0000000
--- a/debian/patches/whitelist-google
+++ /dev/null
@@ -1,14 +0,0 @@
-Extending the default whitelist for gogle servers do to a change in their PTR's
-
-diff --git a/postgrey_whitelist_clients b/postgrey_whitelist_clients
---- a/postgrey_whitelist_clients
-+++ b/postgrey_whitelist_clients
-@@ -156,6 +156,8 @@
- registrarmail.net
- # google.com (big pool, reported by Matthias Dyer)
- /^.*-out-.*\.google\.com$/
-+# see Debian #504382 (Marcin Owsiany)
-+/^mail.*\.google\.com$/
- # orange.fr (big pool, reported by Loc Le Loarer)
- /^smtp\d+\.orange\.fr$/
- # citigroup.com (slow retry, reported by Michael Monnerie)