[Pkg-clamav-devel] [acab at clamav.net: [Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b]

[Michael Tautschnig]

I believe the changes below could need another review; at least the man page
changes seem to be wrong.

aCaB, please re-check those changes; I don't really know about the C code
modifications, no idea whether these are ok or not.

Best,
Michael

----- Forwarded message from aCaB <acab at clamav.net> -----

Date: Sun, 04 Apr 2010 01:28:11 +0000
From: aCaB <acab at clamav.net>
To: pkg-clamav-commits at lists.alioth.debian.org
Subject: [Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch,
	debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

The following commit has been merged in the debian/unstable branch:
commit fa2a05e6e7cda77d8b22079cdb1b3e9979bcf9a8
Author: aCaB <acab at clamav.net>
Date:   Sun Apr 4 01:24:42 2010 +0200

    restore files broken in the (auto)merge

diff --git a/docs/man/clamd.conf.5.in b/docs/man/clamd.conf.5.in
index 6953fbc..6a81be9 100644
--- a/docs/man/clamd.conf.5.in
+++ b/docs/man/clamd.conf.5.in
@@ -1,4 +1,4 @@
-.TH "clamd.conf" "5" "November 2, 2009" "ClamAV @VERSION@" "Clam AntiVirus"
+.TH "clamd.conf" "5" "February 12, 2007" "ClamAV @VERSION@" "Clam AntiVirus"
 .SH "NAME"
 .LP 
 \fBclamd.conf\fR \- Configuration file for Clam AntiVirus Daemon
@@ -151,7 +151,7 @@ It is recommended to have this value at least twice MaxThreads if possible.
 the following condition should hold:
 MaxThreads*MaxRecursion + MaxQueue - MaxThreads + 6 < RLIMIT_NOFILE.\fR
 RLIMIT_NOFILE is the maximum number of open file descriptors (usually 1024), set
-by \fBulimit \-n\fR.
+by \fBulimit -n\fR.
 .br
 Default: 100
 .TP 
@@ -387,8 +387,8 @@ Default: yes
 \fBArchiveBlockMax (OBSOLETE)\fR
 \fBWARNING:\fR This option is no longer accepted.
 .TP 
-\fBArchiveLimitMemoryUsage (OBSOLETE)\fR
-\fBWARNING:\fR This option is no longer accepted.
+\fBArchiveLimitMemoryUsage BOOL\fR
+Use slower decompression algorithm which uses less memory. This option only affects the bzip2 decompressor.
 .br 
 Default: no
 .TP 
diff --git a/libclamav/filetypes.h b/libclamav/filetypes.h
index 785805c..0ed8ad4 100644
--- a/libclamav/filetypes.h
+++ b/libclamav/filetypes.h
@@ -73,12 +73,6 @@ typedef enum {
     CL_TYPE_RTF,
     CL_TYPE_7Z,
 
-    /* for compatibility with daily.cvd < 9954 */
-    CL_TYPE_CPIO_NEWC,
-    CL_TYPE_CPIO_CRC,
-    CL_TYPE_CPIO_ODC,
-    CL_TYPE_CPIO_OLD,
-
     /* bigger numbers have higher priority (in o-t-f detection) */
     CL_TYPE_HTML, /* on the fly */
     CL_TYPE_MAIL,  /* magic + on the fly */
diff --git a/libclamav/others_common.c b/libclamav/others_common.c
index 4203458..68a95e7 100644
--- a/libclamav/others_common.c
+++ b/libclamav/others_common.c
@@ -632,11 +632,6 @@ static int cli_ftw_dir(const char *dirname, int flags, int maxdepth, cli_ftw_cb
 		continue;
 	    }
 
-	    if(pathchk && pathchk(fname, data) == 1) {
-		free(fname);
-		continue;
-	    }
-
 	    ret = handle_filetype(fname, flags, &statbuf, &stated, &ft, callback, data);
 	    if (ret != CL_SUCCESS) {
 		free(fname);

-- 
Debian repository for ClamAV

_______________________________________________
Pkg-clamav-commits mailing list
Pkg-clamav-commits at lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-clamav-commits


----- End forwarded message -----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20100404/5461d381/attachment.pgp>