[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
aCaB
acab at clamav.net
Sun Apr 4 01:18:15 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 3d7d59c10410750dfb6e9fb54e439852199b762a
Author: aCaB <acab at clamav.net>
Date: Sat Jan 30 04:19:23 2010 +0100
clamd-win32 - works!
diff --git a/ChangeLog b/ChangeLog
index d03bd5e..89d7944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 30 04:19:29 CET 2010 (acab)
+-----------------------------------
+ * win32: clamd (sort of) works
+
Thu Jan 28 12:53:45 CET 2010 (tk)
---------------------------------
* libclamav: provide information about lsig matches to bytecode (bb#1799)
diff --git a/clamd/others.c b/clamd/others.c
index 7d2e2aa..c4df2c0 100644
--- a/clamd/others.c
+++ b/clamd/others.c
@@ -236,7 +236,9 @@ void fds_cleanup(struct fd_data *data)
logg("$Number of file descriptors polled: %u fds\n", (unsigned) data->nfds);
/* Shrink buffer */
newbuf = realloc(data->buf, j*sizeof(*newbuf));
- if (newbuf)
+ if(!j)
+ data->buf = NULL;
+ else if (newbuf)
data->buf = newbuf;/* non-fatal if shrink fails */
}
diff --git a/clamd/server-th.c b/clamd/server-th.c
index 4a0ca97..b381c0b 100644
--- a/clamd/server-th.c
+++ b/clamd/server-th.c
@@ -69,10 +69,8 @@ pthread_mutex_t reload_mutex = PTHREAD_MUTEX_INITIALIZER;
int sighup = 0;
static struct cl_stat dbstat;
-#ifdef _WIN32
-HANDLE event_wake_recv;
-HANDLE event_wake_accept;
-#endif
+void *event_wake_recv = NULL;
+void *event_wake_accept = NULL;
static void scanner_thread(void *arg)
{
diff --git a/win32/ClamAV.sln b/win32/ClamAV.sln
index 7b62112..270a4ee 100644
--- a/win32/ClamAV.sln
+++ b/win32/ClamAV.sln
@@ -106,7 +106,9 @@ Global
{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Release|Win32.ActiveCfg = Release|Win32
{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}.Release|Win32.Build.0 = Release|Win32
{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|Win32.Build.0 = Debug|Win32
{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.ActiveCfg = Release|Win32
+ {B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32/clamav-config.h b/win32/clamav-config.h
index cbbeccd..a0e7cab 100644
--- a/win32/clamav-config.h
+++ b/win32/clamav-config.h
@@ -493,7 +493,7 @@
/* #undef USE_SYSLOG */
/* Version number of package */
-#define VERSION "devel-r5076-706-g0380088"
+#define VERSION "devel-r5076-720-g288b945"
/* Version suffix for package */
#define VERSION_SUFFIX ""
diff --git a/win32/clamd.vcproj b/win32/clamd.vcproj
index c246e84..9486a17 100644
--- a/win32/clamd.vcproj
+++ b/win32/clamd.vcproj
@@ -1,251 +1,255 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="clamd"
- ProjectGUID="{B3CA73CF-E71E-42F3-95DE-43797A86C798}"
- RootNamespace="clamd"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
- PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996;4244;4090;4018"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
- PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996;4244;4090;4018"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\clamd\clamd.c"
- >
- </File>
- <File
- RelativePath="..\clamd\localserver.c"
- >
- </File>
- <File
- RelativePath="..\clamd\others.c"
- >
- </File>
- <File
- RelativePath="..\clamd\scanner.c"
- >
- </File>
- <File
- RelativePath="..\clamd\server-th.c"
- >
- </File>
- <File
- RelativePath="..\clamd\session.c"
- >
- </File>
- <File
- RelativePath="..\clamd\tcpserver.c"
- >
- </File>
- <File
- RelativePath="..\clamd\thrmgr.c"
- >
- </File>
- <Filter
- Name="shared"
- >
- <File
- RelativePath="..\shared\misc.c"
- >
- </File>
- <File
- RelativePath="..\shared\output.c"
- >
- </File>
- </Filter>
- <Filter
- Name="compat"
- >
- <File
- RelativePath=".\compat\libgen.c"
- >
- </File>
- <File
- RelativePath=".\compat\setargv.c"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ Keyword="Win32Proj"
+ Name="clamd"
+ ProjectGUID="{B3CA73CF-E71E-42F3-95DE-43797A86C798}"
+ ProjectType="Visual C++"
+ RootNamespace="clamd"
+ TargetFrameworkVersion="196613"
+ Version="9,00"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ CharacterSet="2"
+ ConfigurationType="1"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
+ BasicRuntimeChecks="3"
+ CompileAs="1"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996;4244;4090;4018"
+ MinimalRebuild="true"
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ GenerateDebugInformation="true"
+ LinkIncremental="1"
+ Name="VCLinkerTool"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ CharacterSet="2"
+ ConfigurationType="1"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
+ CompileAs="1"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996;4244;4090;4018"
+ EnableFunctionLevelLinking="true"
+ EnableIntrinsicFunctions="true"
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ EnableCOMDATFolding="2"
+ GenerateDebugInformation="true"
+ LinkIncremental="1"
+ Name="VCLinkerTool"
+ OptimizeReferences="2"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ Name="Source Files"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\clamd\clamd.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\localserver.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\others.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\scanner.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\server-th.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\session.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\tcpserver.c"
+ >
+ </File>
+ <File
+ RelativePath="..\clamd\thrmgr.c"
+ >
+ </File>
+ <Filter
+ Name="shared"
+ >
+ <File
+ RelativePath="..\shared\misc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\shared\output.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="compat"
+ >
+ <File
+ RelativePath=".\compat\libgen.c"
+ >
+ </File>
+ <File
+ RelativePath=".\compat\setargv.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ Name="Header Files"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ Name="Resource Files"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ <File
+ RelativePath=".\res\clamd.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/res/clamconf.rc b/win32/res/clamconf.rc
index 50b0834..af8f63b 100644
--- a/win32/res/clamconf.rc
+++ b/win32/res/clamconf.rc
@@ -1,6 +1,6 @@
-#define RES_FNAME "clamscan.exe"
-#define RES_NAME "clamscan"
-#define RES_FDESC "ClamAV - clamscan"
+#define RES_FNAME "clamconf.exe"
+#define RES_NAME "clamconf"
+#define RES_FDESC "ClamAV - clamconf"
#include "common.rc"
1337 ICON "clam.ico"
diff --git a/win32/res/clamd.rc b/win32/res/clamd.rc
new file mode 100644
index 0000000..fae7a83
--- /dev/null
+++ b/win32/res/clamd.rc
@@ -0,0 +1,6 @@
+#define RES_FNAME "clamd.exe"
+#define RES_NAME "clamd"
+#define RES_FDESC "ClamAV - clamd"
+#include "common.rc"
+
+1337 ICON "clam.ico"
diff --git a/win32/res/clamscan.rc b/win32/res/clamscan.rc
index af8f63b..50b0834 100644
--- a/win32/res/clamscan.rc
+++ b/win32/res/clamscan.rc
@@ -1,6 +1,6 @@
-#define RES_FNAME "clamconf.exe"
-#define RES_NAME "clamconf"
-#define RES_FDESC "ClamAV - clamconf"
+#define RES_FNAME "clamscan.exe"
+#define RES_NAME "clamscan"
+#define RES_FDESC "ClamAV - clamscan"
#include "common.rc"
1337 ICON "clam.ico"
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list