head	1.5;
access;
symbols
	pkgsrc-2021Q3:1.4.0.18
	pkgsrc-2021Q3-base:1.4
	pkgsrc-2021Q2:1.4.0.16
	pkgsrc-2021Q2-base:1.4
	pkgsrc-2021Q1:1.4.0.14
	pkgsrc-2021Q1-base:1.4
	pkgsrc-2020Q4:1.4.0.12
	pkgsrc-2020Q4-base:1.4
	pkgsrc-2020Q3:1.4.0.10
	pkgsrc-2020Q3-base:1.4
	pkgsrc-2020Q2:1.4.0.8
	pkgsrc-2020Q2-base:1.4
	pkgsrc-2020Q1:1.4.0.4
	pkgsrc-2020Q1-base:1.4
	pkgsrc-2019Q4:1.4.0.6
	pkgsrc-2019Q4-base:1.4
	pkgsrc-2019Q3:1.4.0.2
	pkgsrc-2019Q3-base:1.4
	pkgsrc-2014Q1:1.2.0.6
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.4
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.2
	pkgsrc-2013Q3-base:1.2;
locks; strict;
comment	@# @;


1.5
date	2021.10.20.16.15.52;	author tm;	state dead;
branches;
next	1.4;
commitid	9tNCflpHyvl7fzdD;

1.4
date	2019.09.06.09.58.26;	author jperkin;	state Exp;
branches;
next	1.3;
commitid	32GAOhfw9qhC3WBB;

1.3
date	2014.06.12.13.31.44;	author fhajny;	state dead;
branches;
next	1.2;
commitid	vej1HweAjeLuHeEx;

1.2
date	2013.08.21.09.20.16;	author wiz;	state Exp;
branches;
next	1.1;
commitid	i1l6KgKnY9zfNi2x;

1.1
date	2013.07.14.21.57.09;	author wiz;	state Exp;
branches;
next	;
commitid	WbMsje1W2t8AcuXw;


desc
@@


1.5
log
@mail/postgrey: Update to 1.37

* 2016-09-22: version 1.37
   - added initial test suite
   - testing using travis-ci (https://travis-ci.org/schweikert/postgrey)
   - removed IP pool-detection code for --lookup-by-net, because it matched
     also the naming of some big hosters like facebook (#32, Michal Petrucha,
     Andrew Ayer, Jon Sailor)
   - fix early logging of errors and warnings to syslog
   - simplified IP matching code
   - added support for IPv6 whitelists with netmask
   - add network-range based whitelist for Office 365 (Holger Stember)
   - updated whitelist
@
text
@$NetBSD: patch-postgrey,v 1.4 2019/09/06 09:58:26 jperkin Exp $

Backport https://github.com/schweikert/postgrey/pull/34

--- postgrey.orig	2019-09-06 09:53:38.119350175 +0000
+++ postgrey
@@@@ -185,12 +185,6 @@@@ sub do_client_substitutions($$$)
     my $ipaddr;
     if($ip =~ /\./) {
         # IPv4
-        my @@ip=split(/\./, $ip);
-        return ($ip, undef) unless defined $ip[3];
-        # skip if it contains the last two IP numbers in the hostname
-        # (we assume it is a pool of dialup addresses of a provider)
-        return ($ip, undef) if $revdns =~ /$ip[2]/ and $revdns =~ /$ip[3]/;
-
         $ipaddr = NetAddr::IP->new($ip, $self->{postgrey}{ipv4cidr});
     }
     elsif($ip =~ /:/) {
@


1.4
log
@postgrey: Backport dedupe fix.

Requested in joyent/pkgsrc#214.  We can't yet upgrade to postgrey 1.37 as there
is no working distribution patch for the postgrey-targrey option, hence the
backport rather than upgrade.  Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Update postgrey to 1.35.

* 2014-06-11: version 1.35
   - use just 'postgrey' as process name, instead of '/usr/sbin/postgrey',
     because Linux tools are limited to 15 characters (#5)
   - Make postgrey work with Perl 5.18 (Yasuhiro KIMURA, #4)
   - updated whitelist
@
text
@d1 1
a1 1
$NetBSD: patch-postgrey,v 1.2 2013/08/21 09:20:16 wiz Exp $
d3 1
a3 1
Fix postgrey with perl-5.18.
d5 1
a5 1
--- postgrey.orig	2010-05-04 20:51:52.000000000 +0000
d7 11
a17 3
@@@@ -552,6 +552,16 @@@@ sub main()
     if($opt{dbdir}) {
         $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1;
d19 1
a19 13
+    # untaint what is given on --pidfile. It is not security sensitive since
+    # it is provided by the admin
+    if($opt{pidfile}) {
+        $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1;
+    }
+    # untaint what is given on --inet. It is not security sensitive since
+    # it is provided by the admin
+    if($opt{inet}) {
+        $opt{inet} =~ /^(.*)$/; $opt{inet} = $1;
+    }
 
     # determine proper "logsock" for Sys::Syslog
     my $syslog_logsock;
@


1.2
log
@Untaint --inet as well.
From Yasuhiro KIMURA via github upstream bug report.
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-postgrey,v 1.1 2013/07/14 21:57:09 wiz Exp $
@


1.1
log
@Fix postgrey for perl-5.18. Based on description given by
uwe@@ on pkgsrc-users. Bump PKGREVISION.
While here, set LICENSE.
@
text
@d1 1
a1 1
$NetBSD$
d7 1
a7 1
@@@@ -552,6 +552,10 @@@@ sub main()
d11 2
a12 1
+    # untaint pidfile
d16 5
@