Merge latest code into SVN (some code wasn't copied across)

git-svn: trunk@3674

contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def

@@ -1,6 +1,7 @@
-LIBRARY libClamUnrar
-VERSION 0.92
-EXPORTS cli_unrar_open @1000
-EXPORTS cli_unrar_close @1001
-EXPORTS cli_unrar_extract_next_prepare @1002
-EXPORTS cli_unrar_extract_next @1003
+LIBRARY libClamunrar
+VERSION 0.92.1
+EXPORTS rar_unpack @1
+EXPORTS rar_init_filters @2
+EXPORTS ppm_destructor @3
+EXPORTS ppm_constructor @4
+EXPORTS rarvm_free @5

contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj

@@ -71,6 +71,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				UseUnicodeResponseFiles="false"
+				Version="0.92.1"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(InputDir)/libclamunrar.def"
 				GenerateDebugInformation="true"
@@ -156,6 +158,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				UseUnicodeResponseFiles="false"
+				Version="0.92.1"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(InputDir)/libclamunrar.def"
 				GenerateDebugInformation="true"

contrib/Windows/Projects/clamAV/patches

@@ -45,43 +45,6 @@
   }
   #else
   int checkaccess(const char *path, const char *username, int mode)
-*** /home/njh/src/clamav-devel/trunk/./clamscan/clamscan_opt.h	2008-02-15 09:45:55.000000000 +0000
---- ./clamscan/clamscan_opt.h	2007-11-08 14:27:08.000000000 +0000
-***************
-*** 54,68 ****
-      {"include", 1, 0, 0},
-      {"include-dir", 1, 0, 0},
-      {"max-files", 1, 0, 0},
-!     {"max-filesize", 1, 0, 0},
-!     {"max-scansize", 1, 0, 0},
-      {"max-recursion", 1, 0, 0},
-      {"max-dir-recursion", 1, 0, 0},
-      {"detect-pua", 0, 0, 0},
-      {"disable-archive", 0, 0, 0},
-      {"no-archive", 0, 0, 0},
-      {"detect-broken", 0, 0, 0},
-      {"block-encrypted", 0, 0, 0},
-      {"no-pe", 0, 0, 0},
-      {"no-elf", 0, 0, 0},
-      {"no-ole2", 0, 0, 0},
---- 54,70 ----
-      {"include", 1, 0, 0},
-      {"include-dir", 1, 0, 0},
-      {"max-files", 1, 0, 0},
-!     {"max-space", 1, 0, 0},
-!     {"max-ratio", 1, 0, 0},
-      {"max-recursion", 1, 0, 0},
-      {"max-dir-recursion", 1, 0, 0},
-+     {"max-mail-recursion", 1, 0, 0},
-      {"detect-pua", 0, 0, 0},
-      {"disable-archive", 0, 0, 0},
-      {"no-archive", 0, 0, 0},
-      {"detect-broken", 0, 0, 0},
-      {"block-encrypted", 0, 0, 0},
-+     {"block-max", 0, 0, 0},
-      {"no-pe", 0, 0, 0},
-      {"no-elf", 0, 0, 0},
-      {"no-ole2", 0, 0, 0},
 *** /home/njh/src/clamav-devel/trunk/./freshclam/manager.c	2008-02-25 15:41:07.000000000 +0000
 --- ./freshclam/manager.c	2008-02-25 15:43:03.000000000 +0000
 ***************
@@ -475,7 +438,7 @@
       }
   
 *** /home/njh/src/clamav-devel/trunk/./clamdscan/client.c	2008-01-23 16:19:16.000000000 +0000
---- ./clamdscan/client.c	2008-01-22 17:46:00.000000000 +0000
+--- ./clamdscan/client.c	2008-02-25 15:57:20.000000000 +0000
 ***************
 *** 15,36 ****
 --- 15,44 ----
@@ -550,12 +513,12 @@
 + 				else {
 + 					*pt = 0;
 + 					if(unlink(buff)) {
-+ 						mprintf("%s: Can't remove.\n", buff);
-+ 						logg("%s: Can't remove.\n", buff);
++ 						mprintf("~%s: Can't remove.\n", buff);
++ 						logg("~%s: Can't remove.\n", buff);
 + 						notremoved++;
 + 					} else {
-+ 						mprintf("%s: Removed.\n", buff);
-+ 						logg("%s: Removed.\n", buff);
++ 						mprintf("~%s: Removed.\n", buff);
++ 						logg("~%s: Removed.\n", buff);
 + 					}
 + 				}
 + 			}
@@ -664,23 +627,6 @@
   	free(scancmd);
   	return -1;
 ***************
-*** 134,140 ****
-      ret = dsresult(sockd, opt);
-  
-      if(!ret)
-! 	logg("~%s: OK\n", filename);
-  
-      return ret;
-  }
---- 212,218 ----
-      ret = dsresult(sockd, opt);
-  
-      if(!ret)
-! 	logg("%s: OK\n", filename);
-  
-      return ret;
-  }
-***************
 *** 148,161 ****
   	char buff[4096], *pt;