@@ -10,8 +10,8 @@ Author of clamav-milter and the whole mbox code.

 System administrator (www, mailing lists, mirror issues, virus

 submission mechanisms): Luca 'NERvOus' Gibelli <nervous*clamav.net>

-Submission management interface (for database developers only): Thomas Madsen

-<tm*softcom.dk>

+Submission management interface (for database developers only): Diego D'Ambra

+<diego*clamav.net>, Thomas Madsen <tm*softcom.dk>

 Database developers:

@@ -27,7 +27,8 @@ ClamAV logo: Mia Kalenius and Sergei Pronin <sp*finndesign.fi>

 TrashScan was written by Trashware <trashware*gmx.net>.

 libclamav/zziplib: Guido Draheim <guidod*gmx.de>

-libclamav/unrarlib.c: Christian Scheurer and Johannes Winkelmann (jw*tks6.net)

+libclamav/unrarlib.c: Christian Scheurer and Johannes Winkelmann, see

+							    www.unrarlib.org

 ClamAV patches were submitted by (in alphabetical order):

@@ -1,3 +1,10 @@

+Wed Jan 14 04:44:03 CET 2004 (tk)

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

+  * libclamav: reversed zziplib patch from 20031224 (due to a problem reported

+  * freshclam: display a warning if the engine is outdated

+  * docs: manual page updates

+

 Tue Jan 13 10:12:36 GMT 2004 (njh)

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

   * libclamav: Remove duplicate code when handling multipart messages

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

 /*

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

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

  *

  *  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

@@ -186,7 +186,7 @@ void help(void)

     mprintf("\n");

     mprintf("                          Clam AntiVirus Scanner "VERSION"\n");

-    mprintf("                (c) 2002, 2003 Tomasz Kojm <tkojm@clamav.net>\n\n");

+    mprintf("                (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>\n\n");

     mprintf("    --help                -h             Show help\n");

     mprintf("    --version             -V             Print version number and exit\n");

@@ -1,13 +1,17 @@

-.TH "clamav-milter" "8" "November 11, 2003" "" "Clam AntiVirus"

+.TH "clamav-milter" "8" "January 12, 2004" "" "Clam AntiVirus"

 .SH "NAME"

 .LP 

-clamav\-milter \- a milter compatible mail scanner

+clamav\-milter \- milter compatible mail scanner

 .SH "SYNOPSIS"

 .LP 

 clamav\-milter [options] socket_address

 .SH "DESCRIPTION"

 .LP 

-clamav\-milter is a virus filter interface for sendmail. It uses a mail scanning engine built into clamd.

+clamav\-milter is a filter for sendmail mail server. It uses a mail scanning engine built into clamd.

+.TP

+clamav\-milter requires \fBclamd(8)\fR to run.

+When starting, clamav\-milter verifies that it can communicate with clamd;

+if it cannot it terminates.

 .SH "OPTIONS"

 .LP 

@@ -19,49 +23,76 @@ Output the help information and exit.

 Print the version number and exit.

 .TP 

 \fB\-c FILE, \-\-config\-file=FILE\fR

-By default clamav\-milter uses a default ClamAV configuration file. With this option you may select an another one.

+By default clamav\-milter uses a default configuration file, this option allows you to specify another one.

 .TP 

 \fB\-x n, \-\-debug\-level=n\fR

-Set the debug level to n (where n from [0..9]).

+Set the debug level to n (where n from [0..9]) if \fBclamav\-miter\fR was

+configured with \-\-clamav-debug.

 .TP 

 \fB\-b, \-\-bounce\fR

-Send a failure message to the sender.

+Send a failure message to the sender, and to the postmaster.

+[ \fBWarning\fR: most viruses and worms

+fake their source address, so this option is not recommended ]

+.TP

+\fB-d, \-\-dont-scan-on-error\fR

+If a system error occurs pass messages through unscanned,

+usually when a system error occurs the milter raises a temporary failure which

+generally causes the message to remain in the queue.

+.TP

+\fB-f, \-\-force-scan\fR

+Always scan, whereever the address came from.

 .TP 

-\fB\-l, \-\-local\fR

+\fB-l, \-\-local\fR

 Also scan messages sent from LAN.

+.TP

+\fB-n, \-\-noxheader\fR

+Usually clamav\-milter adds a heading to messages that are scanned.

+The header is of the form "X-Virus-Scanned: version", this option instructs

+clamav\-milter to refrain from adding this heading.

 .TP 

-\fB\-o, \-\-outgoing\fR

+\fB-o, \-\-outgoing\fR

 Scan outgoing messages from this machine.

+.TP

+\fB-p, \-\-postmaster=EMAILADDRESS\fR

+Sets the e-mail address to send notifications to when the \-\-bounce or

+\-\-postmaster-only option is given [ Default: postmaster ]

+.TP

+\fB-P, \-\-postmaster-only\fR

+When the \-\-bounce option is given, only send a notification to the postmaster,

+not the sender.

+.TP

+\fB-q, \-\-quiet\fR

+Don't send any warning messages when a virus or worm or is detected.

+This option overrides the \-\-bounce and \-\-postmaster-only options, and is

+the way to turn off notification to the postmaster.

+.TP

+\fB-Q, \-\-quarantine=EMAILADDRESS\fR

+If this e-mail address is given, messages containing a virus or worm are

+redirected to it.

+.TP

+\fB-U, \-\-quarantine-dir=DIR\fR

+If this option is given, infected files are left in this directory.

+Note - this option only works when using LocalSocket.

 .TP 

 \fB\-\-server=ADDRESS, \-s ADDRESS\fR

 IP address of server running clamd (when using TCPsocket).

+.TP

+\fB\-\-sign, \-S\fR

+Add a hard\-coded signature to each scanned file.

+.TP

+\fB\-\-signature-file, \-F\fR

+Location of file to be appended to each scanned message. Overrides \-S.

 .TP 

 \fB\-\-max\-children=n, \-m n\fR

 Maximum number of children.

-.TP 

-\fB\-\-dont\-scan\-on\-error, \-d\fR

-Pass e\-mails through unscanned if a system error occurs.

-.TP 

-\fB\-\-force\-scan\fR

-Force scan all messages (overrides (\-o and \-l).

-.TP 

-\fB\-\-noxheader\fR

-Suppress X\-Virus\-Scanned header.

-.TP 

-\fB\-\-postmaster, \-p\fR

-Postmaster address (default is "postmaster").

-.TP 

-\fB\-\-postmaster\-only, \-P\fR

-Send warnings only to the postmaster.

-.TP 

-\fB\-\-quiet, \-q\fR

-Don't send e\-mail notifications of interceptions.

+There is no default, if this argument is not \fBclamav\-milter\fR will

+spawn as many children as is necessary.

 .SH "EXAMPLES"

 .LP 

 clamav\-milter \-\-max\-children=2 \-obl local:/var/run/clmilter.sock

 .SH "AUTHOR"

 .LP 

-clamav\-milter was written by Nigel Horne <njh@clamav.net>, the manual page was created by Tomasz Kojm <tkojm@clamav.net>.

+clamav\-milter was written by Nigel Horne <njh@bandsman.co.uk>, the manual page was created by Tomasz Kojm <zolw@konarski.edu.pl>.

 .SH "SEE ALSO"

 .LP 

 clamd(8), clamscan(1), freshclam(1), sigtool(1), clamav.conf(5)

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

 .\" Manual page created by Tomasz Kojm, 14/15 IV 2002

-.TH "clamscan" "1" "November 11, 2003" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamscan" "1" "January 13, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 clamscan \- scan files and directories against viruses

@@ -23,10 +23,10 @@ Print the version number and exit.

 Be verbose.

 .TP 

 \fB\-\-debug\fR

-This option causes clamscan to print many additional informations.

+Enable debug messages (mainly from libclamav).

 .TP 

 \fB\-\-quiet\fR

-Be quiet \- output only error messages.

+Be quiet \- output error messages only.

 .TP 

 \fB\-\-stdout\fR

 Write all messages to the standard output (stdout), instead of the standard error output (stderr). The buffer is automatically flushed (stdout unlike stderr is buffered), to avoid race conditions on output.

@@ -46,8 +46,11 @@ Create temporary files in DIRECTORY. Directory must be writeable for the 'clamav

 \fB\-r, \-\-recursive\fR

 Scan directories recursively. All the files in the given directory will be scanned. \fBThis option affects scanning subdirectories in archives, if you are using unpackers just turn it on.\fR

 .TP 

-\fB\-\-disable\-summary\fR

-Disable summary printing at the end of the scanning.

+\fB\-\-bell\fR

+Sound bell on virus detection.

+.TP 

+\fB\-\-no\-summary\fR

+Disable summary printing at the end of scanning.

 .TP 

 \fB\-\-exclude=PATT\fR

 Don't scan file names containing PATT. It may be used multiple times.

@@ -69,7 +72,7 @@ Move infected files into DIRECTORY. Directory must be writeable for the 'clamav'

 .TP 

 EXTRACTION OPTIONS:

 .TP 

-\fB\-\-disable\-archive\fR

+\fB\-\-no\-archive\fR

 Disable archive support built in libclamav.

 .TP 

 \fB\-\-max\-files=#n\fR

@@ -20,7 +20,7 @@ Example

 DatabaseMirror database.clamav.net

 MaxAttempts 3

-#Checks 12

+#Checks 8

 #HTTPProxyServer myproxy.com

 #HTTPProxyPort 1234

@@ -115,7 +115,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 	int hostfd, nodb = 0, ret, port = 0;

 	char  *tempname, ipaddr[16];

 	const char *proxy = NULL, *user = NULL, *pass = NULL;

-

+	int flevel = cl_retflevel();

     if((current = cl_cvdhead(localname)) == NULL)

 	nodb = 1;

@@ -169,6 +169,15 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

     if(current && (current->version >= remote->version)) {

 	mprintf("%s is up to date (version: %d, sigs: %d, f-level: %d, builder: %s)\n", localname, current->version, current->sigs, current->fl, current->builder);

 	logg("%s is up to date (version: %d, sigs: %d, f-level: %d, builder: %s)\n", localname, current->version, current->sigs, current->fl, current->builder);

+

+	if(flevel < current->fl) {

+	    /* display warning even for already installed database */

+	    mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");

+	    mprintf("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);

+	    logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");

+	    logg("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);

+	}

+

 	close(hostfd);

 	cl_cvdfree(current);

 	cl_cvdfree(remote);

@@ -234,6 +243,13 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

     mprintf("%s updated (version: %d, sigs: %d, f-level: %d, builder: %s)\n", localname, current->version, current->sigs, current->fl, current->builder);

     logg("%s updated (version: %d, sigs: %d, f-level: %d, builder: %s)\n", localname, current->version, current->sigs, current->fl, current->builder);

+    if(flevel < current->fl) {

+	mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");

+	mprintf("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);

+	logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");

+	logg("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);

+    }

+

     cl_cvdfree(current);

     free(tempname);

     return 0;

@@ -121,6 +121,7 @@ extern int cl_scanfile(const char *filename, char **virname, unsigned long int *

 extern int cl_loaddb(const char *filename, struct cl_node **root, int *virnum);

 extern int cl_loaddbdir(const char *dirname, struct cl_node **root, int *virnum);

 extern char *cl_retdbdir(void);

+extern int cl_retflevel(void);

 extern struct cl_cvd *cl_cvdhead(const char *file);

 extern struct cl_cvd *cl_cvdparse(const char *head);

@@ -38,6 +38,8 @@

 #include "others.h"

 #include "md5.h"

+#define CL_FLEVEL 1 /* don't touch it */

+

 int cli_debug_flag = 0;

 void cli_warnmsg(const char *str, ...)

@@ -79,6 +81,11 @@ void cl_debug(void)

     cli_debug_flag = 1;

 }

+int cl_retflevel(void)

+{

+    return CL_FLEVEL;

+}

+

 char *cl_strerror(int clerror)

 {

     switch(clerror) {

@@ -102,20 +102,10 @@ _zzip_inline static void __fixup_rootseek(

  * anything in zziplib or dump the trailer structure then watch out that

  * these are still unused, so that this code may still (ab)use those. */

 #define __fixup_rootseek(_offset_of_trailer, _trailer)          \

-		_trailer->z_magic[0] = _offset_of_trailer & 0xff; \

-		_trailer->z_magic[1] = _offset_of_trailer >> 8 & 0xff ; \

-		_trailer->z_magic[2] = _offset_of_trailer >> 16 & 0xff ; \

-		_trailer->z_magic[3] = _offset_of_trailer >> 24 & 0xff ; \

-		_trailer->z_disk[0] = 0 ; \

-		_trailer->z_disk[1] = 0 ; \

-		_trailer->z_finaldisk[0] = 0 ; \

-		_trailer->z_finaldisk[1] = 0 ;

-#define __trailer_to_address(_trailer) \

-	(_trailer->z_magic[0] + (_trailer->z_magic[1] << 8) + \

-	(_trailer->z_magic[2] << 16) + (_trailer->z_magic[3] << 25))

+                      *(zzip_off_t*)_trailer = _offset_of_trailer;

 #define __correct_rootseek( _u_rootseek, _u_rootsize, _trailer) \

-    if (_u_rootseek > __trailer_to_address(_trailer) - _u_rootsize)     \

-	_u_rootseek = __trailer_to_address(_trailer) - _u_rootsize;

+    if (_u_rootseek > *(zzip_off_t*)_trailer - _u_rootsize)     \

+	_u_rootseek = *(zzip_off_t*)_trailer - _u_rootsize;

 #else

 #define __fixup_rootseek(A,B) 

 #define __correct_rootseek(A,B,C)