@@ -1,3 +1,14 @@

+Mon Apr  5 23:49:23 CEST 2004 (tk)

+----------------------------------

+  * contrib: new init script for SuSE (by Martin Fuxa <yeti*email.cz>)

+  * configure: fix linking problem under NetBSD (reported by Nigel);

+	       enable support for threads (pth is required and

+	       LDFLAGS="-L/usr/pkg/lib" and CPPFLAGS="-I/usr/pkg/include"

+	       must be exported). Thanks to Jorgen Norgaard <jnp*anneli.dk>.

+  * clamscan: fix --bell behaviour ("one beep" problem reported by Tomasz

+	      Papszun)

+  * libclamav: small cosmetics

+

 Mon Apr  5 15:39:12 BST 2004 (njh)

 ----------------------------------

   * contrib:	Windows client (finally!) open sourced

@@ -1,4 +1,4 @@

-# aclocal.m4t generated automatically by aclocal 1.6.1 -*- Autoconf -*-

+# aclocal.m4 generated automatically by aclocal 1.6.1 -*- Autoconf -*-

 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002

 # Free Software Foundation, Inc.

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.30 2004/03/29 00:00:57 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.31 2004/04/05 21:42:10 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.30 2004/03/29 00:00:57 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.31 2004/04/05 21:42:10 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -651,7 +651,7 @@ int scancompressed(const char *filename, struct cl_node *root, const struct pass

 	    mprintf("%s: Infected Archive FOUND\n", filename);

 	    if(bell)

-		printf("\007");

+		fprintf(stderr, "\007");

 	    if(optl(opt, "remove")) {

 		if(unlink(filename)) {

@@ -780,7 +780,7 @@ int checkfile(const char *filename, const struct cl_node *root, const struct cl_

 	claminfo.ifiles++;

 	if(bell)

-	    printf("\007");

+	    fprintf(stderr, "\007");

     } else if(ret == CL_CLEAN) {

 	if(!printinfected)

@@ -806,7 +806,7 @@ int checkstdin(const struct cl_node *root, const struct cl_limits *limits)

 	claminfo.ifiles++;

 	if(bell)

-	    printf("\007");

+	    fprintf(stderr, "\007");

     } else if(ret == CL_CLEAN) {

 	if(!printinfected)

@@ -9573,6 +9573,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

   echo "$as_me:$LINENO: result: -lwrap" >&5

 echo "${ECHO_T}-lwrap" >&6

                 have_wrappers=yes

+		LIBS="$save_LIBS"

                 CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"

 else

   echo "$as_me: failed program was:" >&5

@@ -9819,11 +9820,13 @@ openbsd3.3*)

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"

 	fi

 	TH_SAFE="-thread-safe"

-	cat >>confdefs.h <<\_ACEOF

+

+cat >>confdefs.h <<\_ACEOF

 #define CL_THREAD_SAFE 1

 _ACEOF

-	cat >>confdefs.h <<\_ACEOF

+

+cat >>confdefs.h <<\_ACEOF

 #define _REENTRANT 1

 _ACEOF

@@ -9863,9 +9866,21 @@ _ACEOF

     ;;

 netbsd*)

-    echo "$as_me:$LINENO: result: NetBSD detected. Disabling thread support." >&5

-echo "${ECHO_T}NetBSD detected. Disabling thread support." >&6

-    have_pthreads="no"

+     if test "$have_pthreads" = "yes"; then

+ 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

+ 	CLAMD_LIBS="-lpthread"

+ 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

+

+cat >>confdefs.h <<\_ACEOF

+#define CL_THREAD_SAFE 1

+_ACEOF

+

+

+cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

+     fi

 cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

@@ -245,6 +245,7 @@ struct request_info *req;

 hosts_access(req)

                 ],[AC_MSG_RESULT([-lwrap])

                 have_wrappers=yes

+		LIBS="$save_LIBS"

                 CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"],[

                 dnl try with -lnsl

                 LIBS="$LIBS -lnsl"

@@ -350,8 +351,8 @@ openbsd3.3*)

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"

 	fi

 	TH_SAFE="-thread-safe"

-	AC_DEFINE(CL_THREAD_SAFE)

-	AC_DEFINE(_REENTRANT)

+	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])

+	AC_DEFINE(_REENTRANT,1,[thread safe])

     fi

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

     ;;

@@ -372,8 +373,13 @@ openbsd*)

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

     ;;

 netbsd*)

-    AC_MSG_RESULT(NetBSD detected. Disabling thread support.)

-    have_pthreads="no"

+     if test "$have_pthreads" = "yes"; then

+ 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

+ 	CLAMD_LIBS="-lpthread"

+ 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

+	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])

+	AC_DEFINE(_REENTRANT,1,[thread safe])

+     fi

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

     ;;

 bsd*)

@@ -1,8 +1,6 @@

 #! /bin/sh

-

-# -- ntw2007:/etc/init.d/clamd, 17.06.2003 shw --

-

-

+# v1.1 03-2004, martin fuxa, yeti@email.cz

+#

 ### BEGIN INIT INFO

 # Provides:       clamd

 # Required-Start: 

@@ -12,85 +10,57 @@

 # Description:    Control clamav daemon.

 ### END INIT INFO

+# Variables

+PID="/var/run/clamd.pid"

+SBIN="/usr/local/sbin/clamd"

+CONF="/etc/clamav.conf"

+WHAT="Clam AntiVirus"

-# -- variables --

-_what="Clam AntiVirus"

-

-# -- see whether we are installed --

-_cnf="/etc/clamav.conf"

-

-_pid="$(awk '/^PidFile/ {print $2}' ${_cnf})"

-_port="$(awk '/^TCPSocket/ {print $2}' ${_cnf})"

-

-if [ -s "${_cnf}" -a -r "${_cnf}" ]

-   then

-      _srv="$(\which clamd | sed -e 's+/*+/+' | head -1)"

-      test -x "${_srv}" || exit 5

-

-      _clnt="$(\which clamdscan | sed -e 's+/*+/+' | head -1)"

-      test -x "${_clnt}" || exit 5

+# Source SuSE config

+. /etc/rc.status

-      _cnf="-c ${_cnf}"

-   else

-      exit 6

-fi

+test -x $SBIN || exit 5

+test -e $CONF || exit 5

-

-# -- fetch LSB compliant functions (hope they get our environment) --

-. /lib/lsb/init-functions

-

-

-# -- first reset status of this service --

+# First reset status of this service

 rc_reset

-

-# -- process request --

-case "${1}" in

-   start)

-      echo -n "Starting ${_what} ${_cnf}."

-

-      "${_srv}" "${_cfg}"

-

-      rc_status -v

-   ;;

-   stop)

-      echo -n "Shutting down ${_what}: "

-

-      "${_clnt}" +QUIT

-

-      rc_status -v

-   ;;

-   try-restart)

-      ${0} status 1>/dev/null && ${0} restart

-

-      rc_status

-   ;;

-   restart)

-      ${0} stop; sleep 3

-

-      ${0} start

-

-      rc_status

-   ;;

-   status)

-      echo -n "Checking ${_what}: "

-

-      "${_clnt}" +VERSION

-

-      rc_status -v

-

-      test -s "${_pid}" && echo "ProcessID claims to be: $(cat ${_pid})."

-   ;;

-   *)

-      (echo; echo "Usage: ${0} {start|stop|status|try-restart|restart}") 2>&1

-

-      exit 1

-   ;;

+# Process request

+case "$1" in

+    start)

+        echo -n "Starting ${WHAT} ${CONF} "

+        ## Start daemon with startproc(8). If this fails

+        ## the echo return value is set appropriate.

+        startproc $SBIN $CONF

+        # Remember status and be verbose

+        rc_status -v

+    ;;

+    stop)

+        echo -n "Shutting down ${WHAT} "

+        ## Stop daemon with killproc(8) and if this fails

+        ## set echo the echo return value.

+        killproc -TERM $SBIN

+        # Remember status and be verbose

+        rc_status -v

+    ;;

+    restart)

+        ## Stop the service and regardless of whether it was

+        ## running or not, start it again.

+        $0 stop

+        $0 start

+        # Remember status and be quiet

+        rc_status

+    ;;

+    status)

+        echo -n "Checking for ${WHAT} "

+        checkproc $SBIN

+        rc_status -v

+    ;;

+

+    *)

+        echo "Usage: $0 {start|stop|status|restart}"

+        exit 1

+    ;;

 esac

-

-

-# -- inform caller --

 rc_exit

-

-

-# -- end of clamd --

+### END

@@ -4,7 +4,7 @@

  *  http://www-sr.informatik.uni-tuebingen.de/~buehler/AC/AC.html

  *  Thanks to Kurt Huwig for pointing me to this page.

  *

- *  Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -193,23 +193,19 @@ void cl_freetrie(struct cl_node *root)

     free(root);

 }

-int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root, int *pcnt)

+int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root, int *partcnt)

 {

 	struct cl_node *current;

 	struct cli_patt *pt;

-	int position, *partcnt, extpartcnt = 0;

+	int position;

         unsigned int i;

+

     current = (struct cl_node *) root;

-    if(pcnt) {

-	partcnt = pcnt;

-	extpartcnt = 1;

-    } else {

-	if((partcnt = (int *) cli_calloc(root->partsigs + 1, sizeof(int))) == NULL) {

-	    cli_dbgmsg("cl_scanbuff(): unable to calloc(%d, %d)\n", root->partsigs + 1, sizeof(int));

-	    return CL_EMEM;

-	}

+    if(!partcnt) {

+	cli_dbgmsg("cli_scanbuff(): partcnt == NULL\n");

+	return CL_EMEM;

     }

     for(i = 0; i < length; i++)  {

@@ -223,19 +219,15 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 		if(cli_findpos(buffer, position, length, pt)) {

 		    if(pt->sigid) { /* it's a partial signature */

 			if(partcnt[pt->sigid] + 1 == pt->partno) {

-			    if(++partcnt[pt->sigid] == pt->parts) { /* last */

+			    if(++partcnt[pt->sigid] == pt->parts) { /* the last one */

 				if(virname)

 				    *virname = pt->virname;

-				if(!extpartcnt)

-				    free(partcnt);

 				return CL_VIRUS;

 			    }

 			}

 		    } else { /* old type signature */

 			if(virname)

 			    *virname = pt->virname;

-			if(!extpartcnt)

-			    free(partcnt);

 			return CL_VIRUS;

 		    }

 		}

@@ -247,15 +239,23 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	}

     }

-    if(!extpartcnt)

-	free(partcnt);

     return CL_CLEAN;

 }

 int cl_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root)

 {

-    return cli_scanbuff(buffer, length, virname, root, NULL);

+	int ret, *partcnt;

+

+    if((partcnt = (int *) cli_calloc(root->partsigs + 1, sizeof(int))) == NULL) {

+	cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", root->partsigs + 1, sizeof(int));

+	return CL_EMEM;

+    }

+

+    ret = cli_scanbuff(buffer, length, virname, root, partcnt);

+

+    free(partcnt);

+    return ret;

 }

 int cli_findpos(const char *buffer, int offset, int length, const struct cli_patt *pattern)

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -31,6 +31,6 @@ struct nodelist *cli_bfsadd(struct nodelist *bfs, struct cl_node *n);

 void cli_failtrans(struct cl_node *root);

 void cli_fasttrie(struct cl_node *n, struct cl_node *root);

 int cli_findpos(const char *buffer, int offset, int length, const struct cli_patt *pattern);

-int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root, int *pcnt);

+int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root, int *partcnt);

 #endif

@@ -118,12 +118,12 @@ cl_node *root)

     /* prepare the buffer */

     buffsize = root->maxpatlen + SCANBUFF;

     if(!(buffer = (char *) cli_calloc(buffsize, sizeof(char)))) {

-	cli_dbgmsg("cli_scandesc(): unable to malloc(%d)\n", buffsize);

+	cli_dbgmsg("cli_scandesc(): unable to cli_malloc(%d)\n", buffsize);

 	return CL_EMEM;

     }

     if((partcnt = (int *) cli_calloc(root->partsigs + 1, sizeof(int))) == NULL) {

-	cli_dbgmsg("cl_scandesc(): unable to calloc(%d, %d)\n", root->partsigs + 1, sizeof(int));

+	cli_dbgmsg("cli_scandesc(): unable to cli_calloc(%d, %d)\n", root->partsigs + 1, sizeof(int));

 	free(buffer);

 	return CL_EMEM;

     }