Untaint --inet as well. >From Yasuhiro KIMURA via github upstream bug report. Bump PKGREVISION.diff -r1.36 -r1.37 pkgsrc/mail/postgrey/Makefile
(wiz)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.36 2013/07/14 21:57:09 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2013/08/21 09:20:16 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= postgrey-1.33 | 3 | DISTNAME= postgrey-1.33 | |
4 | PKGREVISION= 8 | 4 | PKGREVISION= 9 | |
5 | CATEGORIES= mail | 5 | CATEGORIES= mail | |
6 | MASTER_SITES= http://postgrey.schweikert.ch/pub/ | 6 | MASTER_SITES= http://postgrey.schweikert.ch/pub/ | |
7 | 7 | |||
8 | MAINTAINER= kim@tac.nyc.ny.us | 8 | MAINTAINER= kim@tac.nyc.ny.us | |
9 | HOMEPAGE= http://postgrey.schweikert.ch/ | 9 | HOMEPAGE= http://postgrey.schweikert.ch/ | |
10 | COMMENT= Postfix Greylist Policy Server | 10 | COMMENT= Postfix Greylist Policy Server | |
11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
12 | 12 | |||
13 | DEPENDS+= p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB | 13 | DEPENDS+= p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB | |
14 | DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 | 14 | DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 | |
15 | DEPENDS+= p5-IO-Multiplex-[0-9]*:../../devel/p5-IO-Multiplex | 15 | DEPENDS+= p5-IO-Multiplex-[0-9]*:../../devel/p5-IO-Multiplex | |
16 | DEPENDS+= p5-Net-Server-[0-9]*:../../net/p5-Net-Server | 16 | DEPENDS+= p5-Net-Server-[0-9]*:../../net/p5-Net-Server | |
17 | 17 |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2013/07/14 21:57:09 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.10 2013/08/21 09:20:16 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (postgrey-1.33.tar.gz) = 2273d4b6087f0ae6ad6d3ee6b388a672a4190906 | 3 | SHA1 (postgrey-1.33.tar.gz) = 2273d4b6087f0ae6ad6d3ee6b388a672a4190906 | |
4 | RMD160 (postgrey-1.33.tar.gz) = 0dfd72accef8404301832389d84edb1433e4e7f9 | 4 | RMD160 (postgrey-1.33.tar.gz) = 0dfd72accef8404301832389d84edb1433e4e7f9 | |
5 | Size (postgrey-1.33.tar.gz) = 36077 bytes | 5 | Size (postgrey-1.33.tar.gz) = 36077 bytes | |
6 | SHA1 (patch-postgrey) = 58a92e5e7df2747f2fae33effa24cd7ae43bc66b | 6 | SHA1 (patch-postgrey) = 72592aab8b209da85c736fcdf8ed7f22422d5777 |
@@ -1,17 +1,23 @@ | @@ -1,17 +1,23 @@ | |||
1 | $NetBSD: patch-postgrey,v 1.1 2013/07/14 21:57:09 wiz Exp $ | 1 | $NetBSD: patch-postgrey,v 1.2 2013/08/21 09:20:16 wiz Exp $ | |
2 | 2 | |||
3 | Fix postgrey with perl-5.18. | 3 | Fix postgrey with perl-5.18. | |
4 | 4 | |||
5 | --- postgrey.orig 2010-05-04 20:51:52.000000000 +0000 | 5 | --- postgrey.orig 2010-05-04 20:51:52.000000000 +0000 | |
6 | +++ postgrey | 6 | +++ postgrey | |
7 | @@ -552,6 +552,10 @@ sub main() | 7 | @@ -552,6 +552,16 @@ sub main() | |
8 | if($opt{dbdir}) { | 8 | if($opt{dbdir}) { | |
9 | $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1; | 9 | $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1; | |
10 | } | 10 | } | |
11 | + # untaint pidfile | 11 | + # untaint what is given on --pidfile. It is not security sensitive since | |
12 | + # it is provided by the admin | |||
12 | + if($opt{pidfile}) { | 13 | + if($opt{pidfile}) { | |
13 | + $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1; | 14 | + $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1; | |
14 | + } | 15 | + } | |
16 | + # untaint what is given on --inet. It is not security sensitive since | |||
17 | + # it is provided by the admin | |||
18 | + if($opt{inet}) { | |||
19 | + $opt{inet} =~ /^(.*)$/; $opt{inet} = $1; | |||
20 | + } | |||
15 | 21 | |||
16 | # determine proper "logsock" for Sys::Syslog | 22 | # determine proper "logsock" for Sys::Syslog | |
17 | my $syslog_logsock; | 23 | my $syslog_logsock; |