summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Radici <antonio@dyne.org>2011-05-06 15:47:06 +0000
committerAntonio Radici <antonio@dyne.org>2011-05-06 15:47:06 +0000
commitda2f8adec819c63a8b4c5d12b7b7889854e85d2b (patch)
tree24bdf6a484a0dafa841c6b47d2458658d07fc0f5
parent7b9e19279de8bd03476a7a851c2e26cdd00d70a9 (diff)
debian/patches/imported-upstream-diff refreshed
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/imported-upstream-diff44
2 files changed, 24 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index d2ab1bd..ab9b208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ postgrey (1.34-1) unstable; urgency=low
* debian/control:
+ drop libdigest-sha1-perl dependency (Closes: 625697)
+ Standards-Version bumped to 3.9.2, no change required
+ * debian/patches/imported-upstream-diff refreshed
-- Antonio Radici <antonio@dyne.org> Fri, 06 May 2011 15:25:23 +0000
diff --git a/debian/patches/imported-upstream-diff b/debian/patches/imported-upstream-diff
index f233294..c20330d 100644
--- a/debian/patches/imported-upstream-diff
+++ b/debian/patches/imported-upstream-diff
@@ -4,7 +4,7 @@ was written by Adrian von Bidder
--- a/README
+++ b/README
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
See POD documentation in postgrey. Execute:
@@ -106,7 +106,7 @@ was written by Adrian von Bidder
@@ -23,8 +23,8 @@
@ISA = qw(Net::Server::Multiplex);
- my $VERSION = '1.33';
+ my $VERSION = '1.34';
-my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey';
-my $CONFIG_DIR = '/etc/postfix';
+my $DEFAULT_DBDIR = '/var/lib/postgrey';
@@ -114,7 +114,7 @@ was written by Adrian von Bidder
sub cidr_parse($)
{
-@@ -581,7 +581,7 @@
+@@ -586,7 +586,7 @@
port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ],
proto => $opt{inet} ? 'tcp' : 'unix',
user => $opt{user} || 'postgrey',
@@ -123,7 +123,7 @@ was written by Adrian von Bidder
dbdir => $opt{dbdir} || $DEFAULT_DBDIR,
setsid => $opt{daemonize} ? 1 : undef,
pid_file => $opt{daemonize} ? $opt{pidfile} : undef,
-@@ -605,10 +605,11 @@
+@@ -610,10 +610,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'} ||
@@ -138,7 +138,7 @@ was written by Adrian von Bidder
privacy => defined $opt{'privacy'},
hostname => defined $opt{hostname} ? $opt{hostname} : hostname,
exim => defined $opt{'exim'},
-@@ -790,8 +791,8 @@
+@@ -795,8 +796,8 @@
-d, --daemonize run in the background
--pidfile=PATH put daemon pid into this file
--user=USER run as USER (default: postgrey)
@@ -149,7 +149,7 @@ was written by Adrian von Bidder
--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)
-@@ -805,8 +806,8 @@
+@@ -810,8 +811,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)
@@ -160,7 +160,7 @@ was written by Adrian von Bidder
--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)
-@@ -816,8 +817,9 @@
+@@ -821,8 +822,9 @@
default: X-Greylist: delayed <seconds> seconds by postgrey-<version> at <server>; <date>
Note that the --whitelist-x options can be specified multiple times,
@@ -172,7 +172,7 @@ was written by Adrian von Bidder
=head1 DESCRIPTION
-@@ -843,7 +845,7 @@
+@@ -848,7 +850,7 @@
=item *
Create a C<postgrey> user and the directory where to put the database I<dbdir>
@@ -181,7 +181,7 @@ was written by Adrian von Bidder
=item *
-@@ -866,12 +868,12 @@
+@@ -871,12 +873,12 @@
=item *
@@ -197,7 +197,7 @@ was written by Adrian von Bidder
greylisting.
=back
-@@ -882,9 +884,10 @@
+@@ -887,9 +889,10 @@
which no greylisting should be done. Per default postgrey will read the
following files:
@@ -211,14 +211,26 @@ was written by Adrian von Bidder
You can specify alternative paths with the --whitelist-x options.
+--- a/postgrey_whitelist_recipients
++++ b/postgrey_whitelist_recipients
+@@ -1,6 +1,6 @@
+ # postgrey whitelist for mail recipients
+ # --------------------------------------
+-# put this file in /etc/postfix or specify its path
++# put this file in /etc/postgrey or specify its path
+ # with --whitelist-recipients=xxx
+
+ postmaster@
--- a/postgrey_whitelist_clients
+++ b/postgrey_whitelist_clients
-@@ -1,8 +1,15 @@
+@@ -1,10 +1,17 @@
# 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
+ #
+ # postgrey version: 1.34, build date: 2011-05-04
+# Debian-specific additions
+# I *know* they run real mail queues, so greylisting only creates
@@ -230,13 +242,3 @@ was written by Adrian von Bidder
# greylisting.org: Southwest Airlines (unique sender, no retry)
southwest.com
# greylisting.org: isp.belgacom.be (wierd retry pattern)
---- a/postgrey_whitelist_recipients
-+++ b/postgrey_whitelist_recipients
-@@ -1,6 +1,6 @@
- # postgrey whitelist for mail recipients
- # --------------------------------------
--# put this file in /etc/postfix or specify its path
-+# put this file in /etc/postgrey or specify its path
- # with --whitelist-recipients=xxx
-
- postmaster@