--- postgrey-1.32.orig/debian/compat +++ postgrey-1.32/debian/compat @@ -0,0 +1 @@ +7 --- postgrey-1.32.orig/debian/changelog +++ postgrey-1.32/debian/changelog @@ -0,0 +1,448 @@ +postgrey (1.32-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix encoding of Czech debconf translation. + + -- Christian Perrier Tue, 11 Jan 2011 22:13:00 +0100 + +postgrey (1.32-6) unstable; urgency=low + + * Drop preinst and thus dependency on dbutil-4.7. (Closes: #594451) + + patch provided by Stefano Rivera (stefano@rivera.za.net), thanks! + + -- Antonio Radici Wed, 08 Dec 2010 01:23:48 +0000 + +postgrey (1.32-5) unstable; urgency=low + + [ Antonio Radici ] + * debian/postgrey.logcheck.*: client_name is now optional (Closes: 518987) + * debian/control: + + added exim4 to Recommends (Closes: 547413) + + Standards-Version bumped to 3.8.4 (nothing changed) + + [ Christian Perrier ] + * Explicitly mention "1.0" as source format + * Add $remote_fs to dependencies for init script as + it is using /usr which could be located on a distant machine + * Fix pending l10n issues. Debconf translations: + - Japanese (Hideki Yamane (Debian-JP)). Closes: #546685 + - Czech (Martin Sin). Closes: #575955 + - Norwegian Bokmål (Bjørn Steensrud). Closes: #576028 + - Vietnamese (Clytie Siddall). Closes: #576123 + + -- Antonio Radici Wed, 07 Apr 2010 22:25:23 +0100 + +postgrey (1.32-4) unstable; urgency=low + + [ Antonio Radici ] + * debian/postgrey.{postrm,postinst} scripts renamed to {postrm,postinst} + * upgrade the .db files if we are upgrading from an old postgrey version + (Closes: 519707): + + added debian/preinst to perform the upgrade + + debian/control: added a dependency on db4.7-util + * debian/control: + + added myself as maintainer (see Adrian's changelog) + + removed Adrian as Uploader, keeping Jon Daley + + added Vcs-Git, Vcs-Browser, DMUA + + bumped Standards-Version to 3.8.3 + + added ${misc:Depends} to Depends + + bumping debhelper version to 7 in B-D + + quilt add to B-D because it runs in the clean target + + bumped dep to libberkeleydbperl >= 0.39-1 + * debian/rules: + + removing deprecated dh_clean -k in favour of dh_prep + + removing any reference to patches.mk, using the standard quilt process + * debian/copyright: + + added myself as adopter + + changed the short version of the license to refer to GPL-2+ + + added a versioned reference to GPL-2 in common-licenses + * README.Source removed, added a more extensive README.source from quilt docs + * debian/patches + + added a description to all patches + + added postgreyreport-poderrors to fix two POD errors + * Debconf templates and debian/control reviewed by the debian-l10n-english + team as part of the Smith review project. Closes: #520482 + * [Debconf translation updates]: + + Swedish. Closes: #521069 + + Italian. Closes: #521247 + + German. Closes: #518330 + + Spanish. Closes: #522392 + + Portuguese. Closes: #522494 + + French. Closes: #522735 + + Russian. Closes: #522821 + + Finnish. Closes: #522822 + + Japanese. Closes: #520023 + + Czech. Closes: #533278 + + Basque. Closes: #544014 + + [Adrian von Bidder] + * postgrey isn't orphaned anymore (closes: #544176) + + [Jon Daley] + * LSB-compliant initscript, thanks to Vaclav Ovsik (closes: #523488) + + -- Antonio Radici Sun, 06 Sep 2009 11:00:16 +0100 + +postgrey (1.32-3) unstable; urgency=low + + * debconf warning of the port change. + (Seems NEWS.Debian is not enough. closes: #506122) + + -- Adrian von Bidder Fri, 27 Feb 2009 22:07:24 +0100 + +postgrey (1.32-2) unstable; urgency=low + + * Should test with the config file as shipped. (closes: #504343, #504667) + * Widened google whitelist entry (closes: #504382) + + -- Adrian von Bidder Fri, 07 Nov 2008 16:50:38 +0100 + +postgrey (1.32-1) unstable; urgency=low + + * New upstream version + - syslog facility patch now included upstream + * Completely new packaging (move from svn to hg) + * Change the default port from 60000 to postgrey's default 10023. + + -- Adrian von Bidder Thu, 30 Oct 2008 11:16:51 +0100 + +postgrey (1.31-3) unstable; urgency=low + + * added eBay whitelist entry (reported by peterS) + * fix recipient whitelist (closes: #487485) + * admit that I don't know how postfix generates queue ids (closes: #480778) + * allow specifying the syslog facility to report to (closes: #446489) + * include changes from NMU and kill the statoverride, thanks Marcin + + -- Adrian von Bidder Fri, 18 Jul 2008 08:29:49 +0200 + +postgrey (1.31-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * postinst: decouple directory creation from registering a statoverride, + making the script idempotent (closes: #478821) + + -- Marcin Owsiany Wed, 07 May 2008 19:22:19 +0100 + +postgrey (1.31-2) unstable; urgency=low + + * Thanks to bug and patch submitters. + * Conflict with old libsys-syslog-perl versions (closes: #425060) + * Proposed fixes from the logcheck police force (closes: #443909) + * Fix bashism in debian/rules (closes: #457680) + * Download has moved, fix debia/watch (closes: #453538) + + -- Adrian von Bidder Thu, 24 Jan 2008 21:08:59 +0100 + +postgrey (1.31-1) unstable; urgency=low + + * New upstream version + - Socket now gets 0666 permissions (closes: #376910) + + -- Adrian von Bidder Sun, 9 Sep 2007 15:33:18 +0200 + +postgrey (1.30-2) unstable; urgency=low + + * Logcheck: sender is optional, too. + + -- Adrian von Bidder Sun, 26 Aug 2007 09:13:11 +0200 + +postgrey (1.30-1) unstable; urgency=low + + * New upstream version + - Sys::Syslog version handling (closes: #425060) + * Missed something when updating logcheck patterns (closes: #439207) + * logging of unknown host: svn r236 from upstream (closes: #436644) + + -- Adrian von Bidder Sat, 25 Aug 2007 20:35:21 +0200 + +postgrey (1.29-1) unstable; urgency=low + + * New upstream version + * updated logcheck patterns (closes: #434184, #408447) + (See #425060, though, which is really a Sys::Syslog bug) + + -- Adrian von Bidder Tue, 24 Jul 2007 22:14:32 +0200 + +postgrey (1.28-2) unstable; urgency=low + + * Stupid md5sums ... + + -- Adrian von Bidder Thu, 12 Jul 2007 10:26:07 +0200 + +postgrey (1.28-1) unstable; urgency=low + + * This release is dedicated to Luk Claes + * New upstream release (closes: #432048) + - whitelist additions (closes: #409851, #406774) + - typo & documentation error (closes: #427298) + - changed and improved log messages (closes: #208447, #411087) + * some more Debian-related machines to whitelist (closes: #404971) + + -- Adrian von Bidder Sat, 7 Jul 2007 10:29:28 +0200 + +postgrey (1.27-4) unstable; urgency=medium + + * Try to catch etch... + * exim documentation fix (closes: #380257) + * init script: don't fail in stop (closes: #401902) + + -- Adrian von Bidder Thu, 7 Dec 2006 08:08:37 +0100 + +postgrey (1.27-3) unstable; urgency=medium + + * The "I should really pay attention" release + * really fix ucf handling. (closes: #38779 - RC) + + -- Adrian von Bidder Sat, 23 Sep 2006 12:49:17 +0200 + +postgrey (1.27-2) unstable; urgency=medium + + * The "Your very personal RC bug" release + * ucf handling in prerm instead of postrm (closes: #388779 - RC) + * Recommend Net::RBLClient (closes: #359073) + * logcheck pattern updated (closes: #387536) + Thanks to all bug reporters! + + -- Adrian von Bidder Sat, 23 Sep 2006 10:29:20 +0200 + +postgrey (1.27-1) unstable; urgency=low + + * The "That man is just too fast for me" release + * New upstream release + - socket permissions 0666 (closes: #376910) + well, there goes your "but that's probably not a good default." + - integrate exim support (closes: #377517) + + -- Adrian von Bidder Mon, 17 Jul 2006 20:17:34 +0200 + +postgrey (1.25-1) unstable; urgency=low + + * The "madduck can file bugs now that he isn't comaint anymore" release + * New upstream version + . Fixes --privacy (closes: #351588) + * Remove madduck as uploader on his request. Since he helped me along + getting a DD, I owe him quite a bit, thanks a lot. + * Improve README.Debian (closes: #357292) + * Improve the logcheck data files (closes: #368784, #376922) + + -- Adrian von Bidder Sun, 9 Jul 2006 21:46:42 +0200 + +postgrey (1.24-2) unstable; urgency=low + + * Must remember: ucf needs md5sum for each changed version of the file... + + -- Adrian von Bidder Mon, 16 Jan 2006 21:44:44 +0100 + +postgrey (1.24-1) unstable; urgency=low + + * The "Let's Actually Do Something For Debian Today" Release + * new upstream version: + - don't use DB_TXN_NOSYNC (causes hangs - closes: #334430) + - --privacy option (closes: #320487) + - netsolmail was added to the whitelist (closes: #342464) + (thanks to David Schweikert for solving all my problems) + + -- Adrian von Bidder Mon, 16 Jan 2006 21:17:19 +0100 + +postgrey (1.23-2) unstable; urgency=low + + * remove migration of upstream default installation to Debian package + installation: postgrey has now been in Debian for some time. This + gets rid of all debconf stuff. + * use dpkg-statoverride instead of directly calling chmod/chown + * create group postgrey instead of using nogroup (closes: #277551) + + -- Adrian von Bidder Wed, 7 Dec 2005 09:22:00 +0100 + +postgrey (1.23-1) unstable; urgency=low + + * New upstream version + - include arcor in whitelist (closes: #340140) + + -- Adrian von Bidder Fri, 25 Nov 2005 18:20:49 +0100 + +postgrey (1.22-1) unstable; urgency=low + + * New upstream version + - fixes --dbdir (closes: #309499) + * Swedish debconf translation, thanks to Daniel Nylander (closes: #338670) + + -- Adrian von Bidder Sat, 12 Nov 2005 15:38:42 +0100 + +postgrey (1.21-3) unstable; urgency=low + + * The "Adrian can't upload right now so I'll merge his patches" release. + * Pushed standards version to 3.6.2: no changes required. + * Removed bashisms from debian/postgrey.config and debian/postgrey.init + (closes: #314238). + * Updated/fixed logcheck patterns (closes: #313735). + * Updated debconf dependency for cdebconf transition. + * Clarified debian/copyright. + * Added adduser to dependencies (it's used in the postinst script). + * l10n changes: + - added Vietnamese translation; thanks to Clytie Siddall (closes: #317121) + + -- martin f. krafft Fri, 19 Aug 2005 09:54:15 +0200 + +postgrey (1.21-2) unstable; urgency=low + + * Debconf translations: + * cz, thanks to Miroslav Kure (closes: #308381) + * ru, thanks to Yuriy Talakan (closes: #313140) + * sarge has postfix 2.1, and Conflicts: wasn't strictly necessary anyway + (closes: #265856) + * allow passing --greylist-text with spaces (closes: #309515) + thanks to Sven Müller for providing an easy solution + + -- Adrian von Bidder Sun, 12 Jun 2005 13:42:15 +0200 + +postgrey (1.21-1) unstable; urgency=high + + * New upstream version + - SECURITY: fixes remote DoS vulnerability (closes: #304749) + + - Typo in manpage (closes: #303943) + * New maintainer email. + * log '%' as '%' + + + -- Adrian von Bidder Sat, 16 Apr 2005 11:46:26 +0200 + +postgrey (1.18-2) unstable; urgency=medium + + * medium so we should certainly make sarge + * logcheck: properly ignore bounces (closes: #300988) + + -- Adrian von Bidder Wed, 23 Mar 2005 09:07:15 +0100 + +postgrey (1.18-1) unstable; urgency=low + + * new upstream version (closes: #298401) + * default/postgrey: --delay with plain numbers, no units (closes: #294189) + * ucf support (thanks to Martin Lohmeier; closes: #296192) + * also, clean up more thoroughly on purge (same) + * use dh_installlogcheck (debhelper >= 4.1.46) + NOTE: this is not really what Martin Lohmeier wishes, but (as per #288357) + is apparently the official way (logcheck maintainer). Hence + closes: #296215 - if you disagree please reopen and reassign to debhelper. + * ... where we learn about the 'getent' shell command (postinst) + + -- Adrian von Bidder Mon, 7 Mar 2005 16:28:22 +0100 + +postgrey (1.17-2) unstable; urgency=low + + * ignore 'rm log.0000000003' style messages + * Japanese debconf translation. Thanks to Hideki Yamane. (closes: #290139) + * add postgrey_clients_dump script + + -- Adrian von Bidder Thu, 27 Jan 2005 15:02:57 +0100 + +postgrey (1.17-1) unstable; urgency=low + + * New upstream version + * be pedantic in logcheck file + * Add Martin as co-maintainer; he's still sponsoring my uploads. + * change argv[0], enables killall, pidof, ... (closes: #281631) + * missed reference to upstream config file location (closes: #284908) + + -- Adrian von Bidder Tue, 14 Dec 2004 09:13:47 +0100 + +postgrey (1.16-2) unstable; urgency=low + + * README: use man, not perldoc + * logcheck: ignore database housekeeping (closes: #271850) + * versioned dependency on libnet-server-perl (closes: #268064) + * explicitly run as 'nogroup' (closes: #276870) + + -- Adrian von Bidder Mon, 18 Oct 2004 17:10:40 +0200 + +postgrey (1.16-1) unstable; urgency=low + + * New upstream version + * Adapt logcheck file to changed message + + -- Adrian von Bidder Mon, 13 Sep 2004 15:00:40 +0200 + +postgrey (1.15-2) unstable; urgency=low + + * whitelist_clients: Debian hosts (closes: #268852) + * actually working logcheck file (closes: #269452) + + -- Adrian von Bidder Thu, 2 Sep 2004 13:25:51 +0200 + +postgrey (1.15-1) unstable; urgency=low + + * New upstream version + * Conflict: postfix (<< 2.1) (closes: #265856) + * logcheck file added (closes: #263428) + * pt_BR debconf translation, thanks to André Luí Lopes (closes: #262566) + + -- Adrian von Bidder Tue, 24 Aug 2004 20:31:26 +0200 + +postgrey (1.14-2) unstable; urgency=low + + * Relax libberkeley-db dep: ARM has an older version which should still work. + * Default port in Debian package is 60000 - correct in manpage + * integrate postgreyreport 1.14.2 (bugfixes) + * French debconf translation, thanks to Jean-Luc Coulon (closes: #259569) + + -- Adrian von Bidder Fri, 16 Jul 2004 14:19:49 +0200 + +postgrey (1.14-1) unstable; urgency=low + + * New upstream version + * Fix --retry-window=xxh bug from upstream 1.14 + + -- Adrian von Bidder Tue, 13 Jul 2004 14:05:12 +0200 + +postgrey (1.13-6) unstable; urgency=low + + * check if /var/lib/postgrey exists before rmdir + * Need at least libberkeleydb-perl from testing (should close #258793, but + don't close it until it is confirmed) + * Dependency: libnet-dns-perl (closes: #258862) + + -- Adrian von Bidder Mon, 12 Jul 2004 07:59:29 +0200 + +postgrey (1.13-5) unstable; urgency=low + + * no 'empty' prerm in source pkg + * db in /var/lib/postgrey; config in /etc/postgrey + * Sponsored upload by madduck@debian.org (closes Bug#256969) + + -- Adrian von Bidder Thu, 8 Jul 2004 13:45:42 +0200 + +postgrey (1.13-4) unstable; urgency=low + + * corrected watch file + * spurious /usr/share/postgrey directory removed + * utf8->ascii in postgrey.{default,init} + * don't delete user + * upstream email in copyright + * database is nobody's business (chmod) + + -- Adrian von Bidder Wed, 7 Jul 2004 22:34:30 +0200 + +postgrey (1.13-3) unstable; urgency=low + + * move default whitelists back to default (upstream) locations. + * move installation/init.d/default files into debian/; upstream + thinks they should not be included when they are Debian specific. + * use debhelper for init script handling + + -- Adrian von Bidder Tue, 6 Jul 2004 22:27:37 +0200 + +postgrey (1.13-2) unstable; urgency=low + + * The lintian check release. + * fix postinst/postrm: db directory permissions; update-rc.d; invoke-rc.d + * invoke-rc.d in prerm + + -- Adrian von Bidder Tue, 6 Jul 2004 11:39:46 +0200 + +postgrey (1.13-1) unstable; urgency=low + + * Initial Release. + + -- Adrian von Bidder Mon, 5 Jul 2004 21:47:54 +0200 --- postgrey-1.32.orig/debian/postgrey.init +++ postgrey-1.32/debian/postgrey.init @@ -0,0 +1,102 @@ +#! /bin/sh +# +# postgrey start/stop the postgrey greylisting deamon for postfix +# (priority should be smaller than that of postfix) +# +# Author: (c)2004-2006 Adrian von Bidder +# Based on Debian sarge's 'skeleton' example +# Distribute and/or modify at will. +# +# Version: $Id: postgrey.init 1436 2006-12-07 07:15:03Z avbidder $ +# +### BEGIN INIT INFO +# Provides: postgrey +# Required-Start: $syslog $local_fs $remote_fs +# Required-Stop: $syslog $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop the postgrey daemon +### END INIT INFO + +set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/postgrey +NAME=postgrey +DESC="postfix greylisting daemon" + +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +# Read config file if it is present. +if [ -r /etc/default/$NAME ] +then + . /etc/default/$NAME +fi + +POSTGREY_OPTS="--pidfile=$PIDFILE --daemonize $POSTGREY_OPTS" +if [ -z "$POSTGREY_TEXT" ]; then + POSTGREY_TEXT_OPT="" +else + POSTGREY_TEXT_OPT="--greylist-text=$POSTGREY_TEXT" +fi + +ret=0 +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + if start-stop-daemon --start --oknodo --quiet \ + --pidfile $PIDFILE --name $NAME \ + --startas $DAEMON -- $POSTGREY_OPTS "$POSTGREY_TEXT_OPT" + then + log_end_msg 0 + else + ret=$? + log_end_msg 1 + fi + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --stop --oknodo --quiet \ + --pidfile $PIDFILE --name $NAME + then + log_end_msg 0 + else + ret=$? + log_end_msg 1 + fi + rm -f $PIDFILE + ;; + reload|force-reload) + log_action_begin_msg "Reloading $DESC configuration..." + if start-stop-daemon --stop --signal 1 --quiet \ + --pidfile $PIDFILE --name $NAME + then + log_action_end_msg 0 + else + ret=$? + log_action_end_msg 1 + fi + ;; + restart) + $0 stop + $0 start + ret=$? + ;; + status) + status_of_proc -p $PIDFILE $DAEMON "$NAME" 2>/dev/null + ret=$? + ;; + + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit $ret --- postgrey-1.32.orig/debian/postgrey.logcheck.violations.ignore +++ postgrey-1.32/debian/postgrey.logcheck.violations.ignore @@ -0,0 +1,3 @@ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postfix/smtpd\[[0-9]+\]: (NOQUEUE|[0-9A-F]+): reject: RCPT from .+\[[0-9.]{7,15}\]: 450 <.+>: Recipient address rejected: Greylisted, see http://isg\.ee\.ethz\.ch/tools/postgrey/help/.+\.html; from=<.*> to=<.+> proto=E?SMTP helo=<.+>$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?:( [0-9A-F]+:)? action=.+, reason=.+,( delay=.+,)?( client_name=.+,)? client_address=.+,( sender=.*,)? recipient=.+ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: delayed [0-9]+ seconds: client=.+, from=.*, to= --- postgrey-1.32.orig/debian/watch +++ postgrey-1.32/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://postgrey.schweikert.ch/pub/postgrey-(.*)\.tar\.gz --- postgrey-1.32.orig/debian/postrm +++ postgrey-1.32/debian/postrm @@ -0,0 +1,46 @@ +#! /bin/sh +# postrm script for postgrey + +set -e + +#DEBHELPER# + +[ -e /usr/share/debconf/confmodule ] && . /usr/share/debconf/confmodule + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + purge) + if [ -d /var/lib/postgrey ]; then + rm -f /var/lib/postgrey/__db.* \ + /var/lib/postgrey/log.* \ + /var/lib/postgrey/postgrey* + rmdir /var/lib/postgrey || true + # clean up from 1.31-2 and older + dpkg-statoverride --remove /var/lib/postgrey || true + fi + + if [ -x /usr/bin/ucf ]; then + ucf --purge /etc/postgrey/whitelist_clients + ucf --purge /etc/postgrey/whitelist_recipients + ucf --purge /etc/default/postgrey + fi + + if [ -d /etc/postgrey ];then + rm -f /etc/postgrey/*~ \ + /etc/postgrey/*.dpkg-* \ + /etc/postgrey/whitelist_clients \ + /etc/postgrey/whitelist_recipients + rmdir /etc/postgrey || true + fi + rm -f /etc/default/postgrey /etc/default/postgrey.dpkg-* + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +exit 0 --- postgrey-1.32.orig/debian/postgrey-default.md5sum +++ postgrey-1.32/debian/postgrey-default.md5sum @@ -0,0 +1,6 @@ +a70914f5b41e93bd2e6359c2d8ce1da2 1.13-3/debian/postgrey.default +61a9e63d0d924572069f3cc8945d4553 1.14-1/debian/postgrey.default +e4cd64e57fad00de19c2f322063aefc6 1.18-1/debian/postgrey.default +066c132146f55fcb33496ea116f000f8 1.28-1/debian/postgrey-default +2eda3737596b2a631b3a08270fbc0c0f 1.32-1/debian/postgrey-default +8010045560915e38bf8fc216d1e2b678 1.32-2/debian/postgrey-default --- postgrey-1.32.orig/debian/control +++ postgrey-1.32/debian/control @@ -0,0 +1,29 @@ +Source: postgrey +Section: mail +Priority: optional +Maintainer: Antonio Radici +Uploaders: Jon Daley +Build-Depends: debhelper (>= 7), quilt +Build-Depends-Indep: po-debconf +Standards-Version: 3.8.4 +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 +DM-Upload-Allowed: yes + +Package: postgrey +Architecture: all +Depends: adduser, debconf, libberkeleydb-perl (>= 0.39-1), libnet-dns-perl, + libnet-server-perl (>= 0.87), perl, ucf (>= 0.28), ${misc:Depends} +Conflicts: libsys-syslog-perl (<< 0.21) +Recommends: libdigest-sha1-perl, libnet-rblclient-perl, libparse-syslog-perl, + postfix | exim4 +Description: greylisting implementation for Postfix + This package provides a policy server for Postfix to implement "greylisting". + . + Greylisting is a spam filtering method that rejects email from external + servers on the first try. Spammers don't usually retry sending their + messages, whereas legitimate mail servers do. + . + While Postgrey is designed for use with Postfix, it can also be used + with Exim. --- postgrey-1.32.orig/debian/postgrey.logcheck.ignore.server +++ postgrey-1.32/debian/postgrey.logcheck.ignore.server @@ -0,0 +1,11 @@ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: Binding to TCP port [0-9]+ on host [0-9.]+$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: Binding to UNIX socket file .+ using SOCK_STREAM$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: Process Backgrounded$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: Setting gid to "[0-9]+ [0-9]+"$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: Setting uid to "[0-9]+"$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?:( [0-9A-F]+:)? action=.+, reason=.+,( delay=.+,)?( client_name=.+,)? client_address=.+,( sender=.*,)? recipient=.+ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: cleaning up old logs\.\.\.$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: cleaning up old entries\.\.\.$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: cleaning (clients|main) database finished\. before: [0-9]+, after: [0-9]+$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: delayed [0-9]+ seconds: client=.+, from=.*, to= +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ postgrey(\[[0-9]+\])?: rm /var/lib/postgrey/log\.[0-9]{10}$ --- postgrey-1.32.orig/debian/TODO +++ postgrey-1.32/debian/TODO @@ -0,0 +1 @@ +* Before squeeze release: remove note about new packaging from NEWS.Debian --- postgrey-1.32.orig/debian/postgrey.config +++ postgrey-1.32/debian/postgrey.config @@ -0,0 +1,18 @@ +#! /bin/sh +# debconf notice + +set -e + +. /usr/share/debconf/confmodule + +if [ "$1" != "configure" ]; then + exit 0; +fi + +if dpkg --compare-versions "$2" lt-nl "1.32-1" && \ + [ -e /etc/postfix/main.cf ] && \ + grep -q 'inet:127.0.0.1:60000' /etc/postfix/main.cf; then + + db_input critical postgrey/1.32-3_changeport || true + db_go || true +fi --- postgrey-1.32.orig/debian/README.source +++ postgrey-1.32/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- postgrey-1.32.orig/debian/copyright +++ postgrey-1.32/debian/copyright @@ -0,0 +1,22 @@ +This Debian package was prepared by Adrian von Bidder in +July 2004, then the package was adopted by Antonio Radici +in Sept 2009 + +It was downloaded from http://postgrey.schweikert.ch/ + +Upstream Author: David Schweikert + postgreyreport by tbaker@bakerfl.org + +Copyright: postgrey is copyright © 2004-2006 ETH Zürich + © 2007 Open Systems AG, Switzerland + postgreyreport is copyright © 2004 tbaker@bakerfl.org + +License: + + 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. + + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. --- postgrey-1.32.orig/debian/NEWS +++ postgrey-1.32/debian/NEWS @@ -0,0 +1,28 @@ +postgrey (1.32-1) unstable; urgency=low + + Postgrey is now listening to port 10023 and not 60000. The latter was an + unnecessary Debian specific modification. You will need to adjust your + configuration (usually /etc/postfix/main.cf) accordingly. + + -- Adrian von Bidder Thu, 30 Oct 2008 10:58:37 +0100 + +postgrey (1.17-1) unstable; urgency=low + + This version of postgrey introduces the --auto-whitelist-clients option + (enabled by default, use --auto-whitelist-clients=0 to disable): after + several (5 by default) emails from a client have passed through regular + greylisting, it is assumed that this client is a legitimate source of + email and is added to the whitelist: further emails from the same client + are not subject to greylisting. + + -- Adrian von Bidder Tue, 13 Dec 2004 11:33:26 +0100 + +postgrey (1.14-1) unstable; urgency=low + + With 1.14, the default is now --lookup-by-subnet, so you have to specify + --lookup-by-host to get the old behaviour. Because of this, some entries + were deleted from /etc/postgrey/whitelist_clients. + + Also, the --max-age default was changed from 14 to 30 days. + + -- Adrian von Bidder Tue, 13 Jul 2004 14:03:36 +0200 --- postgrey-1.32.orig/debian/docs +++ postgrey-1.32/debian/docs @@ -0,0 +1 @@ +README --- postgrey-1.32.orig/debian/postgrey.templates +++ postgrey-1.32/debian/postgrey.templates @@ -0,0 +1,17 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + +Template: postgrey/1.32-3_changeport +Type: error +_Description: Default TCP port change + Postgrey is now listening on port 10023 (rather than 60000), which + brings its behavior closer to the default upstream settings. + . + You will need to adjust its configuration (usually in + /etc/postfix/main.cf) accordingly. --- postgrey-1.32.orig/debian/postgrey_whitelist_clients.md5sum +++ postgrey-1.32/debian/postgrey_whitelist_clients.md5sum @@ -0,0 +1,17 @@ +b37cb253ab86196beceacadf656a24c4 1.13-6/postgrey_whitelist_clients +803fbb0de6f7ab3496a69e1ddad28662 1.14-2/postgrey_whitelist_clients +f7edfab912241a64be7bab54aecb0b56 1.15-1/postgrey_whitelist_clients +60e849455b54d6675fba70394130b3b2 1.15-2/postgrey_whitelist_clients +6160af81bf025110a7cc3791d990c5eb 1.16-2/postgrey_whitelist_clients +3c85e4b6b113b3b14ef81603a5a506cd 1.17-2/postgrey_whitelist_clients +5205e94614a4a6e6639b08b24ae240bd 1.18/postgrey_whitelist_clients +722f969d4ac96826fb2a5c7744ccc52c 1.22/postgrey_whitelist_clients +9b5adb39a44ff53d6e50ab218e919523 1.23/postgrey_whitelist_clients +c88f84531c5859cb784264d2c2aeb970 1.24/postgrey_whitelist_clients +dc1f99f09b466898b26dc66469f2aa20 1.25/postgrey_whitelist_clients +332c07297e3f642d3faf8dbd5354a6c6 1.28-1/postgrey_whitelist_clients +d556a0643dcc5046abb278318643d01b 1.29-1/postgrey_whitelist_clients +9cd8e0e9d4d8f5bf609de1f26e4fead2 1.30-1/postgrey_whitelist_clients +50848c8868cdc595592881c83f6b2250 1.31-1/postgrey_whitelist_clients +cb7f6e25df39e1e05317a6dd344fc2c2 1.31-3/postgrey_whitelist_clients +5163854ff699ed1cf00c3049b6d431b0 1.32-1/postgrey_whitelist_clients --- postgrey-1.32.orig/debian/rules +++ postgrey-1.32/debian/rules @@ -0,0 +1,77 @@ +#!/usr/bin/make -f +# dh_make-originated rules file +# ©2004,2005 Adrian von Bidder +# Distribute and/or modify at will. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +# installation base directory +BASE=$(CURDIR)/debian/postgrey + +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs etc/postgrey + + # for lack of an upstream Makefile + install -D postgrey $(BASE)/usr/sbin/postgrey + install -D policy-test $(BASE)/usr/sbin/policy-test + install -D contrib/postgreyreport $(BASE)/usr/bin/postgreyreport + install -m 0644 -D postgrey_whitelist_clients \ + $(BASE)/usr/share/postgrey/whitelist_clients + install -m 0644 -D postgrey_whitelist_recipients \ + $(BASE)/usr/share/postgrey/whitelist_recipients + install -m 0644 -D debian/postgrey-default \ + $(BASE)/usr/share/postgrey/postgrey-default + install -m 0644 -D debian/postgrey_whitelist_clients.md5sum \ + $(BASE)/usr/share/postgrey/whitelist_clients.md5sum + install -m 0644 -D debian/postgrey_whitelist_recipients.md5sum \ + $(BASE)/usr/share/postgrey/whitelist_recipients.md5sum + install -m 0644 -D debian/postgrey-default.md5sum \ + $(BASE)/usr/share/postgrey/postgrey-default.md5sum + mkdir -p $(BASE)/usr/share/man/man1 + mkdir -p $(BASE)/usr/share/man/man8 + + pod2man --section=8 postgrey > $(BASE)/usr/share/man/man8/postgrey.8 + pod2man --section=8 policy-test \ + > $(BASE)/usr/share/man/man8/policy-test.8 + pod2man --section=1 contrib/postgreyreport \ + > $(BASE)/usr/share/man/man1/postgreyreport.1 + +# Build architecture-dependent files here. +binary-arch: build install +# arch:all package! + +# Build architecture-dependent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs Changes + dh_installlogcheck + dh_installdocs contrib/postgrey_clients_dump README.exim + dh_installdebconf + dh_installinit -- defaults 19 + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- postgrey-1.32.orig/debian/postgrey-default +++ postgrey-1.32/debian/postgrey-default @@ -0,0 +1,12 @@ +# postgrey startup options, created for Debian + +# you may want to set +# --delay=N how long to greylist, seconds (default: 300) +# --max-age=N delete old entries after N days (default: 35) +# see also the postgrey(8) manpage + +POSTGREY_OPTS="--inet=10023" + +# the --greylist-text commandline argument can not be easily passed through +# POSTGREY_OPTS when it contains spaces. So, insert your text here: +#POSTGREY_TEXT="Your customized rejection message here" --- postgrey-1.32.orig/debian/postinst +++ postgrey-1.32/debian/postinst @@ -0,0 +1,48 @@ +#! /bin/sh +# postinst script for postgrey + +set -e + +# lintian: postinst-does-not-load-confmodule +. /usr/share/debconf/confmodule + +case "$1" in + configure) + DBDIR='/var/lib/postgrey' + + getent passwd postgrey > /dev/null || \ + adduser --system --home "$DBDIR" --no-create-home \ + --disabled-password --group postgrey + # migration from old 'nogroup' postgrey (1.23-1 and earlier): + getent group postgrey > /dev/null || \ + addgroup --system postgrey + + install -d -o postgrey -g postgrey -m 0700 "$DBDIR" + + ucf --debconf-ok --three-way \ + /usr/share/postgrey/whitelist_clients \ + /etc/postgrey/whitelist_clients + ucf --debconf-ok --debconf-ok --three-way \ + /usr/share/postgrey/whitelist_recipients \ + /etc/postgrey/whitelist_recipients + ucf --debconf-ok --three-way \ + /usr/share/postgrey/postgrey-default \ + /etc/default/postgrey + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +# without this, debconf hangs after end of postinst. +db_stop + +exit 0 --- postgrey-1.32.orig/debian/README.Debian +++ postgrey-1.32/debian/README.Debian @@ -0,0 +1,25 @@ +Postgrey for Debian +------------------- +(These instructions assume you use Postfix. See README.exim for how to use +Postgrey with Exim.) + +To use Postgrey, put something along the lines of + + smtpd_recipient_restrictions = + permit_mynetworks, + reject_unauth_destination, + check_policy_service inet:127.0.0.1:10023 + +in your /etc/postfix/main.cf (Postfix 2.1 or newer is required.) + +Mailservers will usually have more complex smtpd restriction parameters, please +read the Postfix documentation if you're not familiar with those. + +Since some mailservers don't work well with greylisting, exceptions are defined +in whitelist files. The default whitelists are in /etc/postgrey; by default +additional *.local files are read if they exist in that directory. If you +specify any whitelist files on the commandline, the default locations are *not* +used at all. Read the postgrey manpage for more information. + +The postgrey package does not depend on postfix, as you can run it on a +dedicated machine separate from your mailserver. --- postgrey-1.32.orig/debian/postgrey_whitelist_recipients.md5sum +++ postgrey-1.32/debian/postgrey_whitelist_recipients.md5sum @@ -0,0 +1,2 @@ +a4db015e1db1ebcb64fe52ae1daca875 1.16-2/postgrey_whitelist_recipients +6fc7a7b6c899bffd97c65af329837cee 1.17-2/postgrey_whitelist_recipients --- postgrey-1.32.orig/debian/source/format +++ postgrey-1.32/debian/source/format @@ -0,0 +1 @@ +1.0 --- postgrey-1.32.orig/debian/po/fr.po +++ postgrey-1.32/debian/po/fr.po @@ -0,0 +1,42 @@ +# French translation for the postgrey package +# Copyright (C) 2009 debian-l10n-french +# This file is distributed under the same license as the postgrey package. +# Adrian von Bidder , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: 1.32-3\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-03-24 01:18+0100\n" +"Last-Translator: Steve Petruzzello \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Modification du port TCP par défaut" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey est dorénavant à l'écoute sur le port 10023 (au lieu de 60000) ce " +"qui rend son comportement plus proche de la configuration par défaut." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Vous devrez adapter la configuration du fichier « /etc/postfix/main.cf » en " +"conséquence." --- postgrey-1.32.orig/debian/po/it.po +++ postgrey-1.32/debian/po/it.po @@ -0,0 +1,43 @@ +# ITALIAN TRANSLATION OF POSTGREY'S.PO-DEBCONF FILE +# COPYRIGHT (C) 2009 THE POSTGREY'S COPYRIGHT HOLDER +# This file is distributed under the same license as the postgrey package. +# +# Vincenzo Campanella , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-03-24 16:32+0100\n" +"Last-Translator: Vincenzo Campanella \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Modifica della porta TCP predefinita" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey è ora in ascolto sulla porta 10023 (anziché sulla 60000), ciò che " +"porta il suo comportamento più vicino alle impostazioni predefinite." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Sarà necessario modificarne di conseguenza il file di configurazione " +"(normalmente in «/etc/postfix.main.cf»)." --- postgrey-1.32.orig/debian/po/templates.pot +++ postgrey-1.32/debian/po/templates.pot @@ -0,0 +1,39 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" --- postgrey-1.32.orig/debian/po/vi.po +++ postgrey-1.32/debian/po/vi.po @@ -0,0 +1,43 @@ +# Vietnamese translation for PostGrey. +# Copyright © 2010 Free Software Foundation, Inc. +# Clytie Siddall , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: postgrey\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2010-04-01 14:45+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.8\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Thay đổi cổng TCP mặc định" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey giờ lắng nghe trên cổng 10023 (thay cho 60000) mà gần hơn thiết lập " +"mặc định của dự án gốc." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Bạn cũng cần phải điều chỉnh cấu hình của nó (bình thường nằm trong « /etc/" +"postfix/main.cf ») một cách tương ứng." --- postgrey-1.32.orig/debian/po/fi.po +++ postgrey-1.32/debian/po/fi.po @@ -0,0 +1,43 @@ +# Copyright (C) 2009 +# This file is distributed under the same license as the postgrey package. +# +# Esko Arajärvi , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-04-06 22:04+0300\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "TCP-portin oletusarvo muuttui" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey kuuntelee nykyään portin 60000 sijaan porttia 10023, joka on " +"alkuperäisen version oletusarvo." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Postgreyn asetuksia, jotka ovat yleensä tiedostossa /etc/postfix/main.cf, " +"täytyy muuttaa vastaavasti." --- postgrey-1.32.orig/debian/po/ru.po +++ postgrey-1.32/debian/po/ru.po @@ -0,0 +1,45 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-03-29 11:31+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Изменён TCP порт по умолчанию" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Теперь Postgrey ожидает запросы на порту 10023 (а не 60000); данное значение " +"ближе к авторским настройкам по умолчанию." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Вам нужно изменить имеющиеся настройки (обычно, в /etc/postfix/main.cf) " +"соответствующим образом." --- postgrey-1.32.orig/debian/po/ja.po +++ postgrey-1.32/debian/po/ja.po @@ -0,0 +1,42 @@ +# Copyright (C) 2009 Adrian von Bidder +# This file is distributed under the same license as postgrey package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-12 10:31+0200\n" +"PO-Revision-Date: 2009-09-13 22:20+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "デフォルトの TCP ポート番号の変更" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"postgrey は現在 ポート 60000 ではなく 10023 を listen しており、開発元の" +"デフォルト設定に近くなっています。" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"設定 (通常は /etc/postfix/main.cf) に従って調整する必要があります。" + + --- postgrey-1.32.orig/debian/po/nb.po +++ postgrey-1.32/debian/po/nb.po @@ -0,0 +1,43 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Bjørn Steensrud , 2010. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2010-03-31 16:24+0200\n" +"Last-Translator: Bjørn Steensrud \n" +"Language-Team: Norwegian Bokmål \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Standard TCP-port er endret" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey lytter nå på port 10023 ( i stedet for 60000), slik at den oppfører " +"seg mer likt standardinnstillingene fra utviklerne." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Du må rette opp postgrey-innstillingene i samsvar med dette (som regel i /" +"etc/postfix/main.cf)." --- postgrey-1.32.orig/debian/po/sv.po +++ postgrey-1.32/debian/po/sv.po @@ -0,0 +1,44 @@ +# translation of postgrey.po to swedish +# translation of postgrey debconf to Swedish +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the postgrey package. +# +# Martin Bagge , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-03-24 21:45+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Förändring av standard-tcp-port" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey lyssnar numera på port 10023 (istället för 60000), detta för att " +"närma sig beteendet som finns i originalinställningarna hos huvudutvecklaren." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Du måste ändra dina inställningar på grund av denna ändring (de finns " +"vanligen i filen /etc/postfix/main.cf)." --- postgrey-1.32.orig/debian/po/POTFILES.in +++ postgrey-1.32/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] postgrey.templates --- postgrey-1.32.orig/debian/po/pt.po +++ postgrey-1.32/debian/po/pt.po @@ -0,0 +1,43 @@ +# translation of postgrey debconf to Portuguese +# Copyright (C) 2009 The postgrey's copyright holder +# This file is distributed under the same license as the postgrey package. +# +# Américo Monteiro , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-04-04 09:21+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "O porto TCP predefinido mudou" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"O postgrey agora escuta no porto 10023 (em vez do 60000), o que trás o seu " +"comportamento para mais junto das predefinições originais." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Você vai precisar de ajustar a sua configuração (normalmente em /etc/postfix/" +"main.cf) de acordo com a nova definição." --- postgrey-1.32.orig/debian/po/de.po +++ postgrey-1.32/debian/po/de.po @@ -0,0 +1,43 @@ +# Translation of po-debconf template to German +# This file is distributed under the same license as the postgrey package. +# Copyright (C): +# +# Matthias Julius , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-03-24 07:32-0400\n" +"Last-Translator: Matthias Julius \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Änderung des voreingestellten TCP-Ports" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey nimmt Verbindungen nun an Port 10023 entgegen (und nicht 60000). " +"Dies bringt sein Verhalten näher an die Voreinstellungen der Programmautoren." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Sie müssen seine Konfiguration entsprechend anpassen (normalerweise /etc/" +"postfix/main.cf)." --- postgrey-1.32.orig/debian/po/eu.po +++ postgrey-1.32/debian/po/eu.po @@ -0,0 +1,48 @@ +# translation of postgrey-eu.po to Euskara +# postgrey po-debconf translation to Spanish +# Copyright (C) 2009 Software in the Public Interest +# This file is distributed under the same license as the postgrey package. +# +# Changes: +# - Initial translation +# +# Piarres Beobide , 2009. +msgid "" +msgstr "" +"Project-Id-Version: postgrey-eu\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-08-28 09:10+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Aldatu lehenetsiriko TCP ataka" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey orain 10023 ataka entzuten ari da (60000 beharrean), honek bere " +"portamoldea garapen nagusiko ezarpenetara hurbiltzen du." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Konfigurazioa dagokion moduan doitu beharko duzu (normalean /etc/postfix/" +"main.cf) fitxategian." --- postgrey-1.32.orig/debian/po/cs.po +++ postgrey-1.32/debian/po/cs.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the postgrey package. +# Martin Sin , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4.1\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2010-03-30 21:45+0200\n" +"Last-Translator: Martin Sin \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Změna výchozího portu TCP" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Postgrey nyní poslouchá na portu 10023 (oproti 60000) a tím se více blíží " +"výchozímu nastavení tvůrců programu." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Nastavení programu můžete provést také přímo (obvykle v /etc/postfix/main." +"cf)." + +#~ msgid "" +#~ "Postgrey is now listening to port 10023 and not 60000. The latter was an " +#~ "unnecessary Debian specific modification. You will need to adjust your " +#~ "configuration (usually /etc/postfix/main.cf) accordingly." +#~ msgstr "" +#~ "Postgrey nyní poslouchá na portu 10023 (původně to byl port 60000). " +#~ "Předchozí nastavení bylo typické pro Debian, ale nebylo nutné. Novému " +#~ "nastavení je třeba přizpůsobit také vaše aktuální nastavení (obvykle " +#~ "uložené v souboru /etc/postfix/main.cf)." --- postgrey-1.32.orig/debian/po/es.po +++ postgrey-1.32/debian/po/es.po @@ -0,0 +1,64 @@ +# postgrey po-debconf translation to Spanish +# Copyright (C) 2009 Software in the Public Interest +# This file is distributed under the same license as the postgrey package. +# +# Changes: +# - Initial translation +# Francisco Javier Cuadrado , 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: postgrey 1.32-4\n" +"Report-Msgid-Bugs-To: postgrey@packages.debian.org\n" +"POT-Creation-Date: 2010-03-30 06:40+0200\n" +"PO-Revision-Date: 2009-03-24 09:02+0100\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "Default TCP port change" +msgstr "Cambio del puerto TCP predeterminado" + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"Postgrey is now listening on port 10023 (rather than 60000), which brings " +"its behavior closer to the default upstream settings." +msgstr "" +"Ahora postgrey escucha en el puerto 10023 (en lugar del 60000), lo que " +"acerca su comportamiento a la configuración predeterminada del desarrollo " +"principal." + +#. Type: error +#. Description +#: ../postgrey.templates:2001 +msgid "" +"You will need to adjust its configuration (usually in /etc/postfix/main.cf) " +"accordingly." +msgstr "" +"Necesitará ajustar su configuración (normalmente en el archivo «/etc/postfix/" +"main.cf») de la forma adecuada." --- postgrey-1.32.orig/debian/patches/series +++ postgrey-1.32/debian/patches/series @@ -0,0 +1,3 @@ +imported-upstream-diff +whitelist-google +postgreyreport-poderrors --- postgrey-1.32.orig/debian/patches/whitelist-google +++ postgrey-1.32/debian/patches/whitelist-google @@ -0,0 +1,14 @@ +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) --- postgrey-1.32.orig/debian/patches/imported-upstream-diff +++ postgrey-1.32/debian/patches/imported-upstream-diff @@ -0,0 +1,249 @@ +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 @@ + + See POD documentation in postgrey. Execute: + +- perldoc postgrey ++ man postgrey + + See also Postgrey's homepage: + +diff --git a/README.exim b/README.exim +--- a/README.exim ++++ b/README.exim +@@ -12,7 +12,7 @@ + in Exim's config file: + + defer log_message = greylisted host $sender_host_address +- set acl_m0 = request=smtpd_access_policy\nprotocol_state=RCPT\nprotocol_name=${uc:$received_protocol}\nhelo_name=$sender_helo_name\nclient_address=$sender_host_address\nclient_name=$sender_host_name\nsender=$sender_address\nrecipient=$local_part@$domain\n\n ++ set acl_m0 = request=smtpd_access_policy\nprotocol_state=RCPT\nprotocol_name=${uc:$received_protocol}\nhelo_name=$sender_helo_name\nclient_address=$sender_host_address\nclient_name=$sender_host_name\nsender=$sender_address\nrecipient=$local_part@$domain\ninstance=$sender_host_address/$sender_address/$local_part@$domain\n\n + 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 @@ ++#!/usr/bin/perl -w ++ ++# written by David Schweikert and adapted to Debian by Adrian von Bidder ++# this script is in the public domain ++# ++# This script will output all clients that were automatically whitelisted ++# by postgrey's --auto-whitelist-clients option. The default number of ++# mails required (5) is hardcoded below! ++ ++use BerkeleyDB; ++use Socket; ++ ++my $dbdir = '/var/lib/postgrey'; ++ ++sub resolv($) { ++ my $host = shift; ++ my $iaddr = inet_aton($host); ++ return gethostbyaddr($iaddr, AF_INET) || $host; ++} ++ ++sub dbopen($) ++{ ++ my ($dbdir) = @_; ++ my %db; ++ ++ my $dbenv = BerkeleyDB::Env->new( ++ -Home => $dbdir, ++ -Flags => DB_INIT_TXN|DB_INIT_MPOOL|DB_INIT_LOG, ++ ) or die "ERROR: can't open DB environment: $!\n"; ++ ++ tie(%db, 'BerkeleyDB::Btree', ++ -Filename => "postgrey_clients.db", ++ -Flags => DB_RDONLY, ++ -Env => $dbenv, ++ ) or die "ERROR: can't open database $dbdir/postgrey_clients.db: $!\n"; ++ ++ return \%db; ++} ++ ++sub main() ++{ ++ # go through the database ++ my $db = dbopen($dbdir); ++ while (my ($key, $value) = each %$db) { ++ my ($c,$l) = split(/,/,$value); ++ $c >= 5 or next; ++ my $host = resolv($key); ++ print "$host ($c)\n"; ++ } ++} ++ ++main; ++ ++# vim: sw=4 +diff --git a/contrib/postgreyreport b/contrib/postgreyreport +--- a/contrib/postgreyreport ++++ b/contrib/postgreyreport +@@ -24,7 +24,7 @@ + # default options, override via command line + my %opt = ( + user => 'postgrey', +- dbdir => '/var/spool/postfix/postgrey', ++ dbdir => '/var/lib/postgrey', + delay => 300, + return_string => 'Greylisted', # match on this string + +@@ -583,7 +583,7 @@ + --version display version and exit + + --user=USER run as USER (default: postgrey) +- --dbdir=PATH find db files in PATH (default: /var/spool/postfix/postgrey) ++ --dbdir=PATH find db files in PATH (default: /var/lib/postgrey) + --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 $DEFAULT_DBDIR = '/var/spool/postfix/postgrey'; +-my $CONFIG_DIR = '/etc/postfix'; ++my $DEFAULT_DBDIR = '/var/lib/postgrey'; ++my $CONFIG_DIR = '/etc/postgrey'; + + sub cidr_parse($) + { +@@ -575,7 +575,7 @@ + port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ], + proto => $opt{inet} ? 'tcp' : 'unix', + user => $opt{user} || 'postgrey', +- group => $opt{group} || 'nogroup', ++ group => $opt{group} || 'postgrey', + dbdir => $opt{dbdir} || $DEFAULT_DBDIR, + setsid => $opt{daemonize} ? 1 : undef, + pid_file => $opt{daemonize} ? $opt{pidfile} : undef, +@@ -599,10 +599,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'} || +- [ "$CONFIG_DIR/postgrey_whitelist_clients" , +- "$CONFIG_DIR/postgrey_whitelist_clients.local" ], ++ [ "$CONFIG_DIR/whitelist_clients" , ++ "$CONFIG_DIR/whitelist_clients.local" ], + whitelist_recipients_files => $opt{'whitelist-recipients'} || +- [ "$CONFIG_DIR/postgrey_whitelist_recipients" ], ++ [ "$CONFIG_DIR/whitelist_recipients" , ++ "$CONFIG_DIR/whitelist_recipients.local" ], + privacy => defined $opt{'privacy'}, + hostname => defined $opt{hostname} ? $opt{hostname} : hostname, + exim => defined $opt{'exim'}, +@@ -783,8 +784,8 @@ + -d, --daemonize run in the background + --pidfile=PATH put daemon pid into this file + --user=USER run as USER (default: postgrey) +- --group=GROUP run as group GROUP (default: nogroup) +- --dbdir=PATH put db files in PATH (default: /var/spool/postfix/postgrey) ++ --group=GROUP run as group GROUP (default: postgrey) ++ --dbdir=PATH put db files in PATH (default: /var/lib/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 @@ + --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) +- --whitelist-clients=FILE default: /etc/postfix/postgrey_whitelist_clients +- --whitelist-recipients=FILE default: /etc/postfix/postgrey_whitelist_recipients ++ --whitelist-clients=FILE default: /etc/postgrey/whitelist_clients ++ --whitelist-recipients=FILE default: /etc/postgrey/whitelist_recipients + --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 + + Note that the --whitelist-x options can be specified multiple times, +- and that per default /etc/postfix/postgrey_whitelist_clients.local is +- also read, so that you can put there local entries. ++ and that per default /etc/postgrey/whitelist_clients.local and ++ /etc/postgrey/whitelist_recipients.local are also read, so that you can put ++ there local entries. + + =head1 DESCRIPTION + +@@ -834,7 +836,7 @@ + =item * + + Create a C user and the directory where to put the database I +-(default: C) ++(default: C) + + =item * + +@@ -854,12 +856,12 @@ + + =item * + +-Install the provided postgrey_whitelist_clients and +-postgrey_whitelist_recipients in /etc/postfix. ++Install the provided whitelist_clients and whitelist_recipients in ++/etc/postgrey. + + =item * + +-Put in /etc/postfix/postgrey_whitelist_recipients users that do not want ++Put in /etc/postgrey/whitelist_recipients users that do not want + greylisting. + + =back +@@ -870,9 +872,10 @@ + which no greylisting should be done. Per default postgrey will read the + following files: + +- /etc/postfix/postgrey_whitelist_clients +- /etc/postfix/postgrey_whitelist_clients.local +- /etc/postfix/postgrey_whitelist_recipients ++ /etc/postgrey/whitelist_clients ++ /etc/postgrey/whitelist_clients.local ++ /etc/postgrey/whitelist_recipients ++ /etc/postgrey/whitelist_recipients.local + + 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 @@ + # 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 +--- 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@ --- postgrey-1.32.orig/debian/patches/postgreyreport-poderrors +++ postgrey-1.32/debian/patches/postgreyreport-poderrors @@ -0,0 +1,21 @@ +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. + ++=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 + :============================================================================================ + ++=back + + =head1 HISTORY +