diff options
| -rw-r--r-- | mail/amavis-perl/Makefile | 4 | ||||
| -rw-r--r-- | mail/amavis-perl/distinfo | 4 | ||||
| -rw-r--r-- | mail/amavis-perl/patches/patch-amavis_amavisd.in | 17 | ||||
| -rw-r--r-- | mail/amavis-perl/patches/patch-amavis_av_clamavd | 15 |
4 files changed, 37 insertions, 3 deletions
diff --git a/mail/amavis-perl/Makefile b/mail/amavis-perl/Makefile index 7e21385169f..88dbc3dee95 100644 --- a/mail/amavis-perl/Makefile +++ b/mail/amavis-perl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2015/07/12 18:56:22 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2015/08/10 06:54:15 dholland Exp $ DISTNAME= amavisd-${VERSION} PKGNAME= amavis-perl-${VERSION} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= mail security MASTER_SITES= http://www.amavis.org/dist/perl/ \ ${MASTER_SITE_SOURCEFORGE:=amavis/} diff --git a/mail/amavis-perl/distinfo b/mail/amavis-perl/distinfo index c8643df071d..69b9bb0c0cc 100644 --- a/mail/amavis-perl/distinfo +++ b/mail/amavis-perl/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/12/24 07:21:08 kefren Exp $ +$NetBSD: distinfo,v 1.2 2015/08/10 06:54:15 dholland Exp $ SHA1 (amavisd-0.1.tar.gz) = 0c8cfe497ee0e42c2f5ff5c958e47e8a0d08720b RMD160 (amavisd-0.1.tar.gz) = d1688aa5a0a4df36e7d938f28d923b350302faa2 Size (amavisd-0.1.tar.gz) = 329501 bytes +SHA1 (patch-amavis_amavisd.in) = feec13284ace3a1c5661bcba4a88d47ce7b4b43e +SHA1 (patch-amavis_av_clamavd) = 52b4da21b363900a369eabf8cd97acc5374868af diff --git a/mail/amavis-perl/patches/patch-amavis_amavisd.in b/mail/amavis-perl/patches/patch-amavis_amavisd.in new file mode 100644 index 00000000000..d11484dc263 --- /dev/null +++ b/mail/amavis-perl/patches/patch-amavis_amavisd.in @@ -0,0 +1,17 @@ +$NetBSD: patch-amavis_amavisd.in,v 1.1 2015/08/10 06:54:16 dholland Exp $ + +Catch SIGCHLD properly, per PR 24350. + +--- amavis/amavisd.in~ 2003-03-04 19:00:43.000000000 +0000 ++++ amavis/amavisd.in +@@ -157,8 +157,8 @@ sub deadbabe { + + # If IGNORE leaves zombies behind on your system, + # switch the comments between the two lines below +-# $SIG{CHLD} = \&deadbabe; +-$SIG{CHLD} = 'IGNORE'; ++$SIG{CHLD} = \&deadbabe; ++# $SIG{CHLD} = 'IGNORE'; + + # may need to do more - eg. if logging changes, close/reopen syslog/log file + # rethink - handler should be simple diff --git a/mail/amavis-perl/patches/patch-amavis_av_clamavd b/mail/amavis-perl/patches/patch-amavis_av_clamavd new file mode 100644 index 00000000000..00feab71090 --- /dev/null +++ b/mail/amavis-perl/patches/patch-amavis_av_clamavd @@ -0,0 +1,15 @@ +$NetBSD: patch-amavis_av_clamavd,v 1.1 2015/08/10 06:54:16 dholland Exp $ + +Make this scanner fragment work like the other ones, from PR 24350. + +--- amavis/av/clamavd~ 2003-02-25 10:42:54.000000000 +0000 ++++ amavis/av/clamavd +@@ -15,7 +15,7 @@ if ($clamd) { + if ($output =~ /FOUND$/) { # no errors, a virus was found + $scanner_errors = 0; + @virusname = ($output =~ /: (.+) FOUND/g); +- return 1; # 'true' indicates virus found and stops further checking ++ do_virus(); + } elsif ($output =~ /OK$/) { # no errors, no viruses + $scanner_errors = 0; + } elsif ($output =~ /ERROR$/) { |