head	1.2;
access;
symbols
	pkgsrc-2019Q1:1.1.0.32
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.30
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.28
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.26
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.24
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.22
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.20
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.16
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.14
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.12
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.10
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.8
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.6
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.4
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.2
	pkgsrc-2015Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2019.05.02.22.12.34;	author wiz;	state dead;
branches;
next	1.1;
commitid	LfYujXIYEyr1dGlB;

1.1
date	2015.08.10.06.54.16;	author dholland;	state Exp;
branches;
next	;
commitid	sqpBX5M0GgaPRGwy;


desc
@@


1.2
log
@amavis-perl: remove

Depends on removed uvscan.
@
text
@$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$/) {
@


1.1
log
@Apply two bug fixes from Markus W Kilbinger in PR 24350:
  - handle SIGCHLD properly
  - make the code for contacting clamavd work properly
@
text
@d1 1
a1 1
$NetBSD$
@