open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source 
git-svn: trunk@378
remotes/push_mirror/metadata
Tomasz Kojm 22 years ago
parent 5b6bb93bd8
commit bddfdc1967
22 changed files with 93 additions and 72 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      clamav-devel/AUTHORS
  2. 15
      clamav-devel/ChangeLog
  3. 10
      clamav-devel/clamav-milter/Makefile.am
  4. 16
      clamav-devel/clamav-milter/Makefile.in
  5. 8
      clamav-devel/clamd/Makefile.am
  6. 10
      clamav-devel/clamd/Makefile.in
  7. 2
      clamav-devel/clamd/clamd.c
  8. 6
      clamav-devel/clamdscan/Makefile.am
  9. 14
      clamav-devel/clamdscan/Makefile.in
  10. 4
      clamav-devel/clamscan/Makefile.am
  11. 4
      clamav-devel/clamscan/Makefile.in
  12. 2
      clamav-devel/clamscan/manager.c
  13. 4
      clamav-devel/clamscan/others.c
  14. 10
      clamav-devel/freshclam/Makefile.am
  15. 21
      clamav-devel/freshclam/Makefile.in
  16. 4
      clamav-devel/libclamav/Makefile.am
  17. 4
      clamav-devel/libclamav/Makefile.in
  18. 4
      clamav-devel/libclamav/cvd.c
  19. 2
      clamav-devel/libclamav/scanners.c
  20. 2
      clamav-devel/libclamav/unrarlib.c
  21. 8
      clamav-devel/sigtool/Makefile.am
  22. 11
      clamav-devel/sigtool/Makefile.in

4
clamav-devel/AUTHORS
Unescape View File

@ -57,6 +57,7 @@ ClamAV patches were submitted by (in alphabetical order):
Kamil Andrusz <wizz*mniam.net>
Patrick Bihan-Faou <patrick*mindstep.com>
Len Budney <lbudney*pobox.com>
Andrey Cherezov <andrey*cherezov.koenig.su>
Damien Curtain <damien*pagefault.org>
Michael Dankov <misha*btrc.ru>
Alejandro Dubrovsky <s328940*student.uq.edu.au>
@ -64,6 +65,7 @@ Magnus Ekdahl <magnus*debian.org>
Jason Englander <jason*englanders.cc>
David Ford <david+cert*blue-labs.org>
Michel Gaudet <Michel.Gaudet*ehess.fr>
Philippe Gay <ph.gay*free.fr>
Luca 'NERvOus' Gibelli <nervous*clamav.net>
Nigel Horne <njh*smsltd.demon.co.uk>
Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>
@ -79,10 +81,12 @@ Peter N Lewis <peter*stairways.com.au>
David S. Madole <david*madole.net>
Andrey V. Malyshev <amal*krasn.ru>
Everton da Silva Marques <everton*lab.ipaccess.diveo.net.br>
Andrey J. Melnikoff <temnota*kmv.ru>
Denis De Messemacker <ddm*clamav.net>
Mark Mielke <mark*mark.mielke.cc>
Arkadiusz Miskiewicz <misiek*pld.org.pl>
Dustin Mollo <dustin.mollo*sonoma.edu>
Dirk Mueller <mueller*kde.org>
Hendrik Muhs <Hendrik.Muhs*student.uni-magdeburg.de>
Masaki Ogawa <proc*mac.com>
Phil Oleson <oz*nixil.net>

15
clamav-devel/ChangeLog
Unescape View File

@ -1,3 +1,16 @@
Sun Mar 7 23:29:25 CET 2004 (tk)
---------------------------------
* Makefiles: allow building outside of the source tree (thanks to Philippe
Gay <ph.gay*free.fr>)
* libclamav: improved checking for sscanf matching failure (thanks to
Dirk Mueller <mueller*kde.org>)
* libclamav: fixed a typo in unrarlib (Dirk Mueller)
* libclamav: fixed detection of encrypted zip archives (Dirk Mueller)
* clamscan: pass libclamav options to checkfile() (bug introduced a few
days ago, found by Dirk Mueller <mueller*kde.org>)
* clamd: fixed TemporaryDirectory option (don't call free() on putenv()'ed
variable). Thanks to Andrey Cherezov <andrey*cherezov.koenig.su>.
Sun Mar 7 15:19:51 GMT 2004 (njh)
----------------------------------
* libclamav/message.c: Fixed minor typo in bounce message
@ -6,7 +19,7 @@ Sun Mar 7 15:19:51 GMT 2004 (njh)
Sun Mar 7 12:40:05 GMT 2004 (njh)
----------------------------------
* libclamav/message.c: Added new bounce delimeter (thanks to Dirk
Mueller <mueller@kde.org>)
Mueller <mueller*kde.org>)
Removed a warning generated by icc
Fri Mar 5 14:25:52 CET 2004 (tk)

10
clamav-devel/clamav-milter/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2003 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,15 +23,15 @@ sbin_PROGRAMS = clamav-milter
clamav_milter_SOURCES = clamav-milter.c
clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o ../clamscan/getopt.o
clamav_milter_LDADD = $(tpop_builddir)/clamd/cfgfile.o $(tpop_builddir)/clamd/others.o $(tpop_builddir)/clamscan/getopt.o
man_MANS = ../docs/man/clamav-milter.8
man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
endif
endif
DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"
# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd
LIBS = -L../libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I../clamd -I../libclamav -I../clamscan
LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/clamscan
EXTRA_DIST = clamav-milter.c INSTALL

16
clamav-devel/clamav-milter/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@
#
# Copyright (C) 2003 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -122,14 +122,14 @@ install_sh = @install_sh@
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = clamav-milter.c
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o ../clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_LDADD = $(tpop_builddir)/clamd/cfgfile.o $(tpop_builddir)/clamd/others.o $(tpop_builddir)/clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = ../docs/man/clamav-milter.8
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"
# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd
LIBS = -L../libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I../clamd -I../libclamav -I../clamscan
LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/clamscan
EXTRA_DIST = clamav-milter.c INSTALL
subdir = clamav-milter
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -148,9 +148,9 @@ clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)
@BUILD_CLAMD_FALSE@@HAVE_MILTER_TRUE@clamav_milter_DEPENDENCIES =
@BUILD_CLAMD_FALSE@@HAVE_MILTER_FALSE@clamav_milter_DEPENDENCIES =
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_DEPENDENCIES = \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ ../clamd/cfgfile.o \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ ../clamd/others.o \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ ../clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(tpop_builddir)/clamd/cfgfile.o \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(tpop_builddir)/clamd/others.o \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(tpop_builddir)/clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_FALSE@clamav_milter_DEPENDENCIES =
clamav_milter_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

8
clamav-devel/clamd/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -51,10 +51,10 @@ clamd_SOURCES = \
tests.c \
tests.h
clamd_LDADD = ../clamscan/getopt.o
clamd_LDADD = $(top_builddir)/clamscan/getopt.o
endif
DEFS = @DEFS@
LIBS = -L../libclamav -lclamav @CLAMD_LIBS@
INCLUDES = -I../clamscan -I../libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/libclamav

10
clamav-devel/clamd/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@
#
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -151,11 +151,11 @@ install_sh = @install_sh@
@BUILD_CLAMD_TRUE@ tests.h
@BUILD_CLAMD_TRUE@clamd_LDADD = ../clamscan/getopt.o
@BUILD_CLAMD_TRUE@clamd_LDADD = $(top_builddir)/clamscan/getopt.o
DEFS = @DEFS@
LIBS = -L../libclamav -lclamav @CLAMD_LIBS@
INCLUDES = -I../clamscan -I../libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/libclamav
subdir = clamd
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
@ -172,7 +172,7 @@ PROGRAMS = $(sbin_PROGRAMS)
@BUILD_CLAMD_TRUE@ clamuko.$(OBJEXT) dazukoio_compat12.$(OBJEXT) \
@BUILD_CLAMD_TRUE@ dazukoio.$(OBJEXT) tests.$(OBJEXT)
clamd_OBJECTS = $(am_clamd_OBJECTS)
@BUILD_CLAMD_TRUE@clamd_DEPENDENCIES = ../clamscan/getopt.o
@BUILD_CLAMD_TRUE@clamd_DEPENDENCIES = $(top_builddir)/clamscan/getopt.o
@BUILD_CLAMD_FALSE@clamd_DEPENDENCIES =
clamd_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

2
clamav-devel/clamd/clamd.c
Unescape View File

@ -209,7 +209,7 @@ void clamd(struct optstruct *opt)
logg("Setting %s as global temporary directory\n", cpt->strarg);
else
logg("!Can't set TMPDIR variable - insufficient space in the environment.\n");
free(var);
/* DON'T CALL free(var) - see putenv(3) */
}
/* load the database(s) */

6
clamav-devel/clamdscan/Makefile.am
Unescape View File

@ -25,9 +25,9 @@ clamdscan_SOURCES = \
client.h \
defaults.h
clamdscan_LDADD = ../clamscan/getopt.o ../clamscan/options.o ../clamscan/others.o ../clamd/cfgfile.o
clamdscan_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/options.o $(top_builddir)/clamscan/others.o $(top_builddir)/clamd/cfgfile.o
endif
INCLUDES = -I../clamscan -I../clamd -I../libclamav
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

14
clamav-devel/clamdscan/Makefile.in
Unescape View File

@ -125,10 +125,10 @@ install_sh = @install_sh@
@BUILD_CLAMD_TRUE@ defaults.h
@BUILD_CLAMD_TRUE@clamdscan_LDADD = ../clamscan/getopt.o ../clamscan/options.o ../clamscan/others.o ../clamd/cfgfile.o
@BUILD_CLAMD_TRUE@clamdscan_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/options.o $(top_builddir)/clamscan/others.o $(top_builddir)/clamd/cfgfile.o
INCLUDES = -I../clamscan -I../clamd -I../libclamav
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@
subdir = clamdscan
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
@ -140,9 +140,11 @@ PROGRAMS = $(bin_PROGRAMS)
@BUILD_CLAMD_TRUE@am_clamdscan_OBJECTS = clamdscan.$(OBJEXT) \
@BUILD_CLAMD_TRUE@ client.$(OBJEXT)
clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)
@BUILD_CLAMD_TRUE@clamdscan_DEPENDENCIES = ../clamscan/getopt.o \
@BUILD_CLAMD_TRUE@ ../clamscan/options.o ../clamscan/others.o \
@BUILD_CLAMD_TRUE@ ../clamd/cfgfile.o
@BUILD_CLAMD_TRUE@clamdscan_DEPENDENCIES = \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamscan/getopt.o \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamscan/options.o \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamscan/others.o \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamd/cfgfile.o
@BUILD_CLAMD_FALSE@clamdscan_DEPENDENCIES =
clamdscan_LDFLAGS =

4
clamav-devel/clamscan/Makefile.am
Unescape View File

@ -34,5 +34,5 @@ clamscan_SOURCES = \
defaults.h
DEFS = @DEFS@
LIBS = -L../libclamav -lclamav
INCLUDES = -I.. -I../libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libclamav

4
clamav-devel/clamscan/Makefile.in
Unescape View File

@ -136,8 +136,8 @@ clamscan_SOURCES = \
DEFS = @DEFS@
LIBS = -L../libclamav -lclamav
INCLUDES = -I.. -I../libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libclamav
subdir = clamscan
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h

2
clamav-devel/clamscan/manager.c
Unescape View File

@ -375,7 +375,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us
if((strbcasestr(filename, ".zip") || strbcasestr(filename, ".rar")) && (options & CL_ARCHIVE)) {
/* try to use internal archivers */
if((ret = checkfile(filename, root, limits, CL_ARCHIVE)) == CL_VIRUS) {
if((ret = checkfile(filename, root, limits, options)) == CL_VIRUS) {
if(optl(opt, "remove")) {
if(unlink(filename)) {
mprintf("%s: Can't remove.\n", filename);

4
clamav-devel/clamscan/others.c
Unescape View File

@ -172,7 +172,7 @@ void *mmalloc(size_t size)
alloc = malloc(size);
if(!alloc) {
printf("CRITICAL: Can't allocate memory (%d bytes).\n", size);
printf("CRITICAL: Can't allocate memory (%ld bytes).\n", size);
exit(71);
return NULL;
} else return alloc;
@ -185,7 +185,7 @@ void *mcalloc(size_t nmemb, size_t size)
alloc = calloc(nmemb, size);
if(!alloc) {
printf("CRITICAL: Can't allocate memory (%d bytes).\n", nmemb * size);
printf("CRITICAL: Can't allocate memory (%ld bytes).\n", nmemb * size);
exit(70);
return NULL;
} else return alloc;

10
clamav-devel/freshclam/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
# Fixes - Arkadiusz Miskiewicz <misiek@pld.org.pl>
#
# This program is free software; you can redistribute it and/or modify
@ -29,12 +29,12 @@ freshclam_SOURCES = \
notify.h
if BUILD_CLAMD
freshclam_LDADD = ../clamscan/getopt.o ../clamscan/others.o ../clamd/cfgfile.o
freshclam_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/others.o $(top_builddir)/clamd/cfgfile.o
else
freshclam_LDADD = ../clamscan/getopt.o ../clamscan/others.o
freshclam_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/others.o
endif
DEFS = @DEFS@
INCLUDES = -I../clamscan -I../clamd -I../libclamav
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

21
clamav-devel/freshclam/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@
#
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
# Fixes - Arkadiusz Miskiewicz <misiek@pld.org.pl>
#
# This program is free software; you can redistribute it and/or modify
@ -130,12 +130,12 @@ freshclam_SOURCES = \
notify.h
@BUILD_CLAMD_TRUE@freshclam_LDADD = ../clamscan/getopt.o ../clamscan/others.o ../clamd/cfgfile.o
@BUILD_CLAMD_FALSE@freshclam_LDADD = ../clamscan/getopt.o ../clamscan/others.o
@BUILD_CLAMD_TRUE@freshclam_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/others.o $(top_builddir)/clamd/cfgfile.o
@BUILD_CLAMD_FALSE@freshclam_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/others.o
DEFS = @DEFS@
INCLUDES = -I../clamscan -I../clamd -I../libclamav
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav
LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@
subdir = freshclam
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
@ -146,10 +146,13 @@ PROGRAMS = $(bin_PROGRAMS)
am_freshclam_OBJECTS = freshclam.$(OBJEXT) options.$(OBJEXT) \
manager.$(OBJEXT) notify.$(OBJEXT)
freshclam_OBJECTS = $(am_freshclam_OBJECTS)
@BUILD_CLAMD_TRUE@freshclam_DEPENDENCIES = ../clamscan/getopt.o \
@BUILD_CLAMD_TRUE@ ../clamscan/others.o ../clamd/cfgfile.o
@BUILD_CLAMD_FALSE@freshclam_DEPENDENCIES = ../clamscan/getopt.o \
@BUILD_CLAMD_FALSE@ ../clamscan/others.o
@BUILD_CLAMD_TRUE@freshclam_DEPENDENCIES = \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamscan/getopt.o \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamscan/others.o \
@BUILD_CLAMD_TRUE@ $(top_builddir)/clamd/cfgfile.o
@BUILD_CLAMD_FALSE@freshclam_DEPENDENCIES = \
@BUILD_CLAMD_FALSE@ $(top_builddir)/clamscan/getopt.o \
@BUILD_CLAMD_FALSE@ $(top_builddir)/clamscan/others.o
freshclam_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@

4
clamav-devel/libclamav/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
INCLUDES = -I.. -I@srcdir@/zziplib
INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@

4
clamav-devel/libclamav/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@
#
# Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -116,7 +116,7 @@ am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
INCLUDES = -I.. -I@srcdir@/zziplib
INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@

4
clamav-devel/libclamav/cvd.c
Unescape View File

@ -119,10 +119,8 @@ int cli_untgz(int fd, const char *destdir)
strncpy(osize, block + 124, 12);
osize[12] = '\0';
size = -1;
sscanf(osize, "%o", &size);
if(size < 0) {
if((sscanf(osize, "%o", &size)) == 0) {
cli_errmsg("Invalid size in header.\n");
free(fullname);
gzclose(infile);

2
clamav-devel/libclamav/scanners.c
Unescape View File

@ -350,7 +350,7 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod
break;
}
if(DETECT_ENCRYPTED && (zdirent.d_flags & (1 | 2^6))) {
if(DETECT_ENCRYPTED && (zdirent.d_flags & 1 )) {
files++;
cli_dbgmsg("Zip -> Encrypted files found in archive.\n");
*virname = "Encrypted.Zip";

2
clamav-devel/libclamav/unrarlib.c
Unescape View File

@ -935,7 +935,7 @@ BOOL ExtrFile(int desc)
#else
/* open and identify archive */
newdesc = dup(desc);
cli_dbgmsg("ExtrFile(): dup(%d) = %d\n");
cli_dbgmsg("ExtrFile(): dup(%d) = %d\n", desc, newdesc);
if ((ArcPtr=fdopen(newdesc,READBINARY))!=NULL)
{
if (!IsArchive())

8
clamav-devel/sigtool/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
INCLUDES = -I../clamscan -I../libclamav
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/libclamav
bin_PROGRAMS = sigtool
@ -23,7 +23,7 @@ sigtool_SOURCES = \
options.c \
sigtool.c
sigtool_LDADD = ../clamscan/getopt.o ../clamscan/others.o
sigtool_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/others.o
DEFS = @DEFS@
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

11
clamav-devel/sigtool/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@
#
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -116,7 +116,7 @@ am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
INCLUDES = -I../clamscan -I../libclamav
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/libclamav
bin_PROGRAMS = sigtool
@ -125,10 +125,10 @@ sigtool_SOURCES = \
sigtool.c
sigtool_LDADD = ../clamscan/getopt.o ../clamscan/others.o
sigtool_LDADD = $(top_builddir)/clamscan/getopt.o $(top_builddir)/clamscan/others.o
DEFS = @DEFS@
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@
subdir = sigtool
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
@ -138,7 +138,8 @@ PROGRAMS = $(bin_PROGRAMS)
am_sigtool_OBJECTS = options.$(OBJEXT) sigtool.$(OBJEXT)
sigtool_OBJECTS = $(am_sigtool_OBJECTS)
sigtool_DEPENDENCIES = ../clamscan/getopt.o ../clamscan/others.o
sigtool_DEPENDENCIES = $(top_builddir)/clamscan/getopt.o \
$(top_builddir)/clamscan/others.o
sigtool_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@

Write Preview
Loading…
Cancel
Save