Skip to content

Commit

Permalink
clamwin 0.99.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sherpya committed Jan 25, 2018
1 parent 0b856fc commit ded8141
Show file tree
Hide file tree
Showing 14 changed files with 73 additions and 713 deletions.
121 changes: 0 additions & 121 deletions 3rdparty/libmspack/config.h
View file

This file was deleted.

2 changes: 1 addition & 1 deletion README.txt
View file
@@ -1,6 +1,6 @@
-- ClamAV native win32 port --

Copyright (c) 2005-2017 Gianluigi Tiesi <sherpya@netfarm.it>
Copyright (c) 2005-2018 Gianluigi Tiesi <sherpya@netfarm.it>

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
Expand Down
2 changes: 1 addition & 1 deletion clamav
Submodule clamav updated 5767 files
31 changes: 1 addition & 30 deletions include/clamav-config.h
View file
Expand Up @@ -387,15 +387,6 @@
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY

/* Define to 1 if you have the `strndup' function. */
#undef HAVE_STRNDUP

/* using internal strn functions */
#undef HAVE_STRNI

/* Define to 1 if you have the `strnlen' function. */
#undef HAVE_STRNLEN

/* Define to 1 if sysconf(_SC_PAGESIZE) is available */
#undef HAVE_SYSCONF_SC_PAGESIZE

Expand All @@ -405,9 +396,6 @@
/* systemd is supported */
#undef HAVE_SYSTEMD

/* Use private fts() implementation which is LFS safe */
#undef HAVE_SYSTEM_LFS_FTS

/* Define to 1 if you have the <sys/cdefs.h> header file. */
#undef HAVE_SYS_CDEFS_H

Expand Down Expand Up @@ -542,12 +530,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* Libprelude support enabled */
#undef PRELUDE

/* Define whether application use libtool >= 2.0 */
#undef PRELUDE_APPLICATION_USE_LIBTOOL2

/* scan buffer size */
#define SCANBUFF 131072

Expand Down Expand Up @@ -611,7 +593,7 @@
#undef USING_PCRE2

/* Stable releases tag */
#define CLAMWIN_RELEASE "0.99.3-beta2"
#define CLAMWIN_RELEASE "0.99.3"

/* Version number of package */
#ifdef CLAMWIN_RELEASE
Expand Down Expand Up @@ -643,20 +625,9 @@
`char[]'. */
#undef YYTEXT_POINTER

/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif

/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS

/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE

/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES

/* Define to 1 if on MINIX. */
#undef _MINIX

Expand Down
85 changes: 42 additions & 43 deletions libclamav.def
View file
Expand Up @@ -141,49 +141,48 @@ cli_filecopy @106 NONAME
cli_filetype2 @107 NONAME
cli_fmap_scandesc @108 NONAME
cli_ftw @109 NONAME
cli_genhash_pe @110 NONAME
cli_gentemp @111 NONAME
cli_gentempfd @112 NONAME
cli_gettmpdir @113 NONAME
cli_hashfile @114 NONAME
cli_hashset_destroy @115 NONAME
cli_hashstream @116 NONAME
cli_hex2str @117 NONAME
cli_hex2ui @118 NONAME
cli_initroots @119 NONAME
cli_isnumber @120 NONAME
cli_ldbtokenize @121 NONAME
cli_malloc @122 NONAME
cli_matchregex @123 NONAME
cli_ole2_extract @124 NONAME
cli_parse_add @125 NONAME
cli_pcre_perf_events_destroy @126 NONAME
cli_pcre_perf_print @127 NONAME
cli_ppt_vba_read @128 NONAME
cli_readn @129 NONAME
cli_regcomp @130 NONAME
cli_regexec @131 NONAME
cli_regfree @132 NONAME
cli_rndnum @133 NONAME
cli_scancpio_newc @134 NONAME
cli_scancpio_odc @135 NONAME
cli_scancpio_old @136 NONAME
cli_scanmacho @137 NONAME
cli_sigperf_events_destroy @138 NONAME
cli_sigperf_print @139 NONAME
cli_str2hex @140 NONAME
cli_strbcasestr @141 NONAME
cli_strdup @142 NONAME
cli_strerror @143 NONAME
cli_strtok @144 NONAME
cli_strtokenize @145 NONAME
cli_utf16toascii @146 NONAME
cli_vba_inflate @147 NONAME
cli_vba_readdir @148 NONAME
cli_versig2 @149 NONAME
cli_wm_decrypt_macro @150 NONAME
cli_wm_readdir @151 NONAME
cli_writen @152 NONAME
cli_gentemp @110 NONAME
cli_gentempfd @111 NONAME
cli_gettmpdir @112 NONAME
cli_hashfile @113 NONAME
cli_hashset_destroy @114 NONAME
cli_hashstream @115 NONAME
cli_hex2str @116 NONAME
cli_hex2ui @117 NONAME
cli_initroots @118 NONAME
cli_isnumber @119 NONAME
cli_ldbtokenize @120 NONAME
cli_malloc @121 NONAME
cli_matchregex @122 NONAME
cli_ole2_extract @123 NONAME
cli_parse_add @124 NONAME
cli_pcre_perf_events_destroy @125 NONAME
cli_pcre_perf_print @126 NONAME
cli_ppt_vba_read @127 NONAME
cli_readn @128 NONAME
cli_regcomp @129 NONAME
cli_regexec @130 NONAME
cli_regfree @131 NONAME
cli_rndnum @132 NONAME
cli_scancpio_newc @133 NONAME
cli_scancpio_odc @134 NONAME
cli_scancpio_old @135 NONAME
cli_scanmacho @136 NONAME
cli_sigperf_events_destroy @137 NONAME
cli_sigperf_print @138 NONAME
cli_str2hex @139 NONAME
cli_strbcasestr @140 NONAME
cli_strdup @141 NONAME
cli_strerror @142 NONAME
cli_strtok @143 NONAME
cli_strtokenize @144 NONAME
cli_utf16toascii @145 NONAME
cli_vba_inflate @146 NONAME
cli_vba_readdir @147 NONAME
cli_versig2 @148 NONAME
cli_wm_decrypt_macro @149 NONAME
cli_wm_readdir @150 NONAME
cli_writen @151 NONAME

html_normalise_map @160 NONAME
text_normalize_init @161 NONAME
Expand Down
1 change: 0 additions & 1 deletion mingw/common.mak
View file
Expand Up @@ -6,7 +6,6 @@ CFLAGS=-I$(top)/include -I$(3rdparty)/gnulib -I$(3rdparty)/json-c -I$(3rdparty)/
CFLAGS+=-I$(clamav) -I$(clamav)/shared -I$(clamav)/libclamav -I$(clamav)/libclamav/nsis
CFLAGS+=-I$(clamav)/win32/3rdparty/bzip2 -I$(clamav)/win32/3rdparty/pthreads
CFLAGS+=-I$(clamav)/win32/3rdparty/zlib -I$(clamav)/win32/3rdparty/pcre
CFLAGS+=-I$(clamav)/libclamav/libmspack-0.5alpha/mspack
CFLAGS+=-DCLAMWIN -DHAVE_CONFIG_H -DNDEBUG -DWIN32_LEAN_AND_MEAN -DPCRE_STATIC
CFLAGS+=-Wall -Wno-unused -Wno-format -Wno-uninitialized -Wno-attributes -Wno-switch
CFLAGS+=-pipe -fno-strict-aliasing -mno-ms-bitfields
Expand Down
10 changes: 2 additions & 8 deletions mingw/libs.mak
View file
Expand Up @@ -7,12 +7,6 @@ gnulib_OBJECTS=$(gnulib_SOURCES:.c=.o)
json_c_SOURCES=$(wildcard $(3rdparty)/json-c/*.c)
json_c_OBJECTS=$(json_c_SOURCES:.c=.o)

libmspack_SOURCES=$(wildcard $(clamav)/libclamav/libmspack-0.5alpha/mspack/*.c)
libmspack_OBJECTS=$(libmspack_SOURCES:.c=.o)
libmspack.a: CFLAGS=-I$(3rdparty)/libmspack -I$(clamav)/libclamav/libmspack-0.5alpha/mspack -DHAVE_CONFIG_H
libmspack.a: $(libmspack_OBJECTS)
$(AR) cru $@ $^

libclamunrar_SOURCES=$(wildcard $(clamav)/libclamunrar/*.c)
libclamunrar_OBJECTS=$(libclamunrar_SOURCES:.c=.o)
libclamunrar_OBJECTS+=$(top)/resources/libclamunrar-rc.o
Expand Down Expand Up @@ -50,7 +44,7 @@ libclamav_SOURCES:=$(subst $(clamav)/libclamav/tomsfastmath/misc/fp_ident.c,,$(l

libclamav_OBJECTS=$(libclamav_SOURCES:.c=.o)
libclamav_OBJECTS+=$(top)/resources/libclamav-rc.o
libclamav.dll: $(libclamav_OBJECTS) $(gnulib_OBJECTS) $(json_c_OBJECTS) libmspack.a
libclamav.dll: $(libclamav_OBJECTS) $(gnulib_OBJECTS) $(json_c_OBJECTS)
$(DLLWRAP) $(LDFLAGS) --def $(top)/libclamav.def --implib $@.a -o $@ $^ -L$(openssl)/lib/mingw32 -lssl -lcrypto -lws2_32 -lgdi32

# LLVM
Expand All @@ -71,5 +65,5 @@ llvm-clean:
clean:
@rm -f libclamav.dll libclamav.dll.a
@rm -f $(CLAMAV_LIBS) $(addsuffix .a,$(CLAMAV_LIBS))
@rm -f $(gnulib_OBJECTS) $(json_c_OBJECTS) $(libmspack_OBJECTS) libmspack.a $(libclamunrar_OBJECTS) $(libclamunrar_iface_OBJECTS) $(libclamav_OBJECTS)
@rm -f $(gnulib_OBJECTS) $(json_c_OBJECTS) $(libclamunrar_OBJECTS) $(libclamunrar_iface_OBJECTS) $(libclamav_OBJECTS)
@echo Project cleaned
10 changes: 0 additions & 10 deletions msvc/clamav-vc8.sln
View file
Expand Up @@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamav_llvm", "proj\vc8\
{0E45E0DC-F9DB-4F31-A58C-1515EDE2A95B} = {0E45E0DC-F9DB-4F31-A58C-1515EDE2A95B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmspack", "proj\vc8\libmspack.vcproj", "{314D6352-EEAB-42A7-9224-17137AC6DFA1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -180,14 +178,6 @@ Global
{2F22753C-7D09-4A1A-B638-0CA93BAEAF4D}.Release|Win32.Build.0 = Release|Win32
{2F22753C-7D09-4A1A-B638-0CA93BAEAF4D}.Release|x64.ActiveCfg = Release|x64
{2F22753C-7D09-4A1A-B638-0CA93BAEAF4D}.Release|x64.Build.0 = Release|x64
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Debug|Win32.ActiveCfg = Debug|Win32
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Debug|Win32.Build.0 = Debug|Win32
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Debug|x64.ActiveCfg = Debug|x64
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Debug|x64.Build.0 = Debug|x64
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Release|Win32.ActiveCfg = Release|Win32
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Release|Win32.Build.0 = Release|Win32
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Release|x64.ActiveCfg = Release|x64
{314D6352-EEAB-42A7-9224-17137AC6DFA1}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion msvc/proj/vc8/clamav.vsprops
View file
Expand Up @@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\include&quot;;&quot;$(3rdparty)\gnulib&quot;;&quot;$(3rdparty)\json-c&quot;;&quot;$(3rdparty)\openssl\include&quot;;&quot;$(clamav)&quot;;&quot;$(clamav)\shared&quot;;&quot;$(clamav)\libclamav&quot;;&quot;$(clamav)\libclamav\libmspack-0.5alpha\mspack&quot;;&quot;$(3rdparty_clamav)\pthreads&quot;;&quot;$(3rdparty_clamav)\zlib&quot;;&quot;$(3rdparty_clamav)\pcre&quot;;&quot;$(3rdparty_clamav)\bzip2&quot;"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\include&quot;;&quot;$(3rdparty)\gnulib&quot;;&quot;$(3rdparty)\json-c&quot;;&quot;$(3rdparty)\openssl\include&quot;;&quot;$(clamav)&quot;;&quot;$(clamav)\shared&quot;;&quot;$(clamav)\libclamav&quot;;&quot;$(3rdparty_clamav)\pthreads&quot;;&quot;$(3rdparty_clamav)\zlib&quot;;&quot;$(3rdparty_clamav)\pcre&quot;;&quot;$(3rdparty_clamav)\bzip2&quot;"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32_LEAN_AND_MEAN;CLAMWIN;HAVE_CONFIG_H;PTW32_STATIC_LIB;PCRE_STATIC"
/>
<UserMacro
Expand Down
4 changes: 0 additions & 4 deletions msvc/proj/vc8/clamd.vcproj
View file
Expand Up @@ -447,10 +447,6 @@
RelativePath="..\..\..\clamav\shared\getopt.c"
>
</File>
<File
RelativePath="..\..\..\clamav\shared\idmef_logging.c"
>
</File>
<File
RelativePath="..\..\..\clamav\shared\misc.c"
>
Expand Down

0 comments on commit ded8141

Please sign in to comment.