From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 2 08:20:06 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5DF5216A409 for ; Mon, 2 Apr 2007 08:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 2866413C458 for ; Mon, 2 Apr 2007 08:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l328K6qn037099 for ; Mon, 2 Apr 2007 08:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l328K6kg037098; Mon, 2 Apr 2007 08:20:06 GMT (envelope-from gnats) Resent-Date: Mon, 2 Apr 2007 08:20:06 GMT Resent-Message-Id: <200704020820.l328K6kg037098@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Denis Eremenko " Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A77116A401 for ; Mon, 2 Apr 2007 08:13:56 +0000 (UTC) (envelope-from moonshade@pnhz.kz) Received: from relay.pnhz.kz (relay.pnhz.kz [212.154.198.217]) by mx1.freebsd.org (Postfix) with ESMTP id B3C7E13C458 for ; Mon, 2 Apr 2007 08:13:53 +0000 (UTC) (envelope-from moonshade@pnhz.kz) Received: from abyss.pnhz.kz (abyss.pnhz.kz [192.168.121.40]) by relay.pnhz.kz with ESMTP id l328DVxv033017 for ; Mon, 2 Apr 2007 14:13:45 +0600 (ALMT) (envelope-from moonshade@pnhz.kz) Message-Id: <1175501623.82253@abyss.pnhz.kz> Date: Mon, 2 Apr 2007 14:13:43 +0600 From: "Denis Eremenko " To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: Subject: ports/111130: [security/clamav] clamav-milter rc script have hardcoded timeout for waiting clamd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Apr 2007 08:20:06 -0000 >Number: 111130 >Category: ports >Synopsis: [security/clamav] clamav-milter rc script have hardcoded timeout for waiting clamd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Apr 02 08:20:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Denis Eremenko >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD 6.2-STABLE #0: Sun Mar 25 16:15:38 ALMT 2007 root@abyss.pnhz.kz:/usr/obj/data/os/FreeBSD/src/6/src/sys/ABYSS-6 >Description: clamav-milter rc script have hardcoded 10 sec timeout for waiting clamd which is not enough on slow machines. >How-To-Repeat: >Fix: --- patch-rc_clamav-milter begins here --- --- clamav-milter.orig Wed Mar 28 15:35:56 2007 +++ clamav-milter Wed Mar 28 17:09:35 2007 @@ -35,11 +35,23 @@ rm "$clamav_milter_socket" fi rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket" - for a in 1 2 3 4 5 6 7 8 9 10 + + echo -n "Waiting for clamd socket.. " + i=${clamav_milter_socktimeout} + while [ $i -ne 0 ] do [ -S "$clamav_clamd_socket" ] && break + if [ `expr $i % 10` -eq 0 ]; then + echo -n "${i}.. " + fi sleep 1 + i=$(($i-1)) done + echo + if [ $i -eq 0 ]; then + echo "There is no clamd socket (${clamav_clamd_socket})!" + exit 1 + fi } # read settings, set default values @@ -48,5 +60,6 @@ : ${clamav_milter_socket="/var/run/clamav/clmilter.sock"} : ${clamav_clamd_socket="/var/run/clamav/clamd"} : ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"} +: ${clamav_milter_socktimeout="60"} run_rc_command "$1" --- patch-rc_clamav-milter ends here --- >Release-Note: >Audit-Trail: >Unformatted: