... | ... |
@@ -121,7 +121,7 @@ am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \ |
121 | 121 |
textnorm.h dlp.c dlp.h jsparse/js-norm.c jsparse/js-norm.h \ |
122 | 122 |
jsparse/lexglobal.h jsparse/textbuf.h uniq.c uniq.h version.c \ |
123 | 123 |
version.h mpool.c mpool.h default.h sha256.c sha256.h bignum.h \ |
124 |
- bytecode.c bytecode.h bignum.c bignum_class.h |
|
124 |
+ bytecode.c bytecode.h clambc.h bignum.c bignum_class.h |
|
125 | 125 |
@LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo |
126 | 126 |
am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \ |
127 | 127 |
libclamav_la-matcher-bm.lo libclamav_la-matcher.lo \ |
... | ... |
@@ -529,7 +529,8 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \ |
529 | 529 |
explode.h textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \ |
530 | 530 |
jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \ |
531 | 531 |
uniq.h version.c version.h mpool.c mpool.h default.h sha256.c \ |
532 |
- sha256.h bignum.h bytecode.c bytecode.h $(am__append_7) |
|
532 |
+ sha256.h bignum.h bytecode.c bytecode.h clambc.h \ |
|
533 |
+ $(am__append_7) |
|
533 | 534 |
noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la |
534 | 535 |
COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno |
535 | 536 |
@MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf |
... | ... |
@@ -111,7 +111,7 @@ static inline uint64_t readNumber(const unsigned char *p, unsigned *off, unsigne |
111 | 111 |
for (i=*off+1;i < newoff; i++) { |
112 | 112 |
uint64_t v = p[i]; |
113 | 113 |
if (UNLIKELY((v&0xf0) != 0x60)) { |
114 |
- cli_errmsg("Invalid number part: %c\n", v); |
|
114 |
+ cli_errmsg("Invalid number part: %c\n", (char)v); |
|
115 | 115 |
*ok = 0; |
116 | 116 |
return 0; |
117 | 117 |
} |
... | ... |
@@ -247,8 +247,8 @@ static int parseHeader(struct cli_bc *bc, unsigned char *buffer) |
247 | 247 |
magic1 = readNumber(buffer, &offset, len, &ok); |
248 | 248 |
magic2 = readFixedNumber(buffer, &offset, len, &ok, 2); |
249 | 249 |
if (!ok || magic1 != 0x53e5493e9f3d1c30ull || magic2 != 42) { |
250 |
- unsigned m0 = magic1 >> 32; |
|
251 |
- unsigned m1 = magic1; |
|
250 |
+ unsigned long m0 = magic1 >> 32; |
|
251 |
+ unsigned long m1 = magic1; |
|
252 | 252 |
cli_errmsg("Magic numbers don't match: %lx%lx, %u\n", m0, m1, magic2); |
253 | 253 |
return CL_EMALFDB; |
254 | 254 |
} |
... | ... |
@@ -163,7 +163,9 @@ AWK = @AWK@ |
163 | 163 |
CC = @CC@ |
164 | 164 |
CCDEPMODE = @CCDEPMODE@ |
165 | 165 |
CFGDIR = @CFGDIR@ |
166 |
-CFLAGS = @CFLAGS@ |
|
166 |
+ |
|
167 |
+# ClamAV: filter -Werror here |
|
168 |
+CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'` |
|
167 | 169 |
CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
168 | 170 |
CHECK_LIBS = @CHECK_LIBS@ |
169 | 171 |
CLAMAVGROUP = @CLAMAVGROUP@ |