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

freshclam bugfix (-c, -u)

Browse Source 
git-svn: trunk@322
remotes/push_mirror/metadata
Tomasz Kojm 22 years ago
parent 1fd76a139e
commit d685f6ddf2
18 changed files with 51 additions and 9 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. 1
      clamav-devel/AUTHORS
  2. 9
      clamav-devel/ChangeLog
  3. 1
      clamav-devel/Makefile.in
  4. 4
      clamav-devel/aclocal.m4
  5. 2
      clamav-devel/clamav-milter/Makefile.am
  6. 3
      clamav-devel/clamav-milter/Makefile.in
  7. 1
      clamav-devel/clamd/Makefile.in
  8. 1
      clamav-devel/clamdscan/Makefile.in
  9. 1
      clamav-devel/clamscan/Makefile.in
  10. 14
      clamav-devel/configure
  11. 13
      clamav-devel/configure.in
  12. 1
      clamav-devel/database/Makefile.in
  13. 1
      clamav-devel/docs/Makefile.in
  14. 1
      clamav-devel/etc/Makefile.in
  15. 1
      clamav-devel/freshclam/Makefile.in
  16. 4
      clamav-devel/freshclam/freshclam.c
  17. 1
      clamav-devel/libclamav/Makefile.in
  18. 1
      clamav-devel/sigtool/Makefile.in

1
clamav-devel/AUTHORS
Unescape View File

@ -63,6 +63,7 @@ Alejandro Dubrovsky <s328940*student.uq.edu.au>
Magnus Ekdahl <magnus*debian.org>
Jason Englander <jason*englanders.cc>
David Ford <david+cert*blue-labs.org>
Michel Gaudet <Michel.Gaudet*ehess.fr>
Luca 'NERvOus' Gibelli <nervous*clamav.net>
Nigel Horne <njh*smsltd.demon.co.uk>
Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>

9
clamav-devel/ChangeLog
Unescape View File

@ -1,3 +1,10 @@
Sat Feb 21 16:05:42 CET 2004 (tk)
---------------------------------
* freshclam: fixed problem with -u handling (missing `else' in logical block)
Thanks to Michel GAUDET <Michel.Gaudet*ehess.fr>. The same bug
(copy & paste) existed in -c mode.
* configure: added CLAMAV_MILTER_LIBS
Sat Feb 21 13:38:23 CET 2004 (tk)
---------------------------------
* libclamav: fixed various segmentation faults introduced by a small bug
@ -52,7 +59,7 @@ Thu Feb 19 12:16:33 CET 2004 (tl)
Thu Feb 19 10:05:39 GMT 2004 (njh)
----------------------------------
* clamav-milter: Reworked TCPwrappers code thanks to
"Hector M. Rulot Segovia" <Hector.Rulot@uv.es>
"Hector M. Rulot Segovia" <Hector.Rulot*uv.es>
Changed some printf/puts to cli_dbgmsg
Wed Feb 18 13:35:59 GMT 2004 (njh)

1
clamav-devel/Makefile.in
Unescape View File

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

4
clamav-devel/aclocal.m4 vendored
Unescape View File

@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for
dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created
dnl (the prefix is a bit different, since we add an extra -target- and -host-)
dnl
dnl @version: $Id: aclocal.m4,v 1.21 2004/02/20 22:29:45 kojm Exp $
dnl @version: $Id: aclocal.m4,v 1.22 2004/02/21 15:08:38 kojm Exp $
dnl @author Guido Draheim <guidod@gmx.de> STATUS: used often
AC_DEFUN([AC_CREATE_TARGET_H],
@ -4041,7 +4041,7 @@ dnl AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)
dnl AC_COMPILE_CHECK_SIZEOF(off_t, $headers)
dnl
dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>
dnl @version $Id: aclocal.m4,v 1.21 2004/02/20 22:29:45 kojm Exp $
dnl @version $Id: aclocal.m4,v 1.22 2004/02/21 15:08:38 kojm Exp $
dnl
AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
[changequote(<<, >>)dnl

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

@ -32,6 +32,6 @@ 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 @CLAMD_LIBS@
LIBS = -L../libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I../clamd -I../libclamav -I../clamscan
EXTRA_DIST = clamav-milter.c clamd.sh clamav-milter.sh INSTALL

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

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@
@ -127,7 +128,7 @@ install_sh = @install_sh@
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 @CLAMD_LIBS@
LIBS = -L../libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I../clamd -I../libclamav -I../clamscan
EXTRA_DIST = clamav-milter.c clamd.sh clamav-milter.sh INSTALL
subdir = clamav-milter

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

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

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

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

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

@ -93,6 +93,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

14
clamav-devel/configure vendored
Unescape View File

@ -9560,7 +9560,7 @@ cat >>confdefs.h <<\_ACEOF
#define WITH_TCPWRAP 1
_ACEOF
LIBS="$LIBS -lwrap"
CLAMAV_MILTER_LIBS="-lwrap"
fi
fi
@ -9626,6 +9626,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
if test "$want_clamuko" = "yes"; then
cat >>confdefs.h <<\_ACEOF
@ -9667,6 +9668,7 @@ solaris*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lsocket -lnsl -lresolv"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -9689,6 +9691,7 @@ freebsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
CLAMD_LIBS="-pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -9712,6 +9715,7 @@ openbsd3.3*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$disable_cr" = "yes"; then
CLAMD_LIBS="-pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
fi
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -9733,8 +9737,10 @@ openbsd*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$disable_cr" = "yes"; then
CLAMD_LIBS="-pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
else
CLAMD_LIBS="-pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
fi
TH_SAFE="-thread-safe"
@ -9800,11 +9806,13 @@ _ACEOF
sco*)
FRESHCLAM_LIBS="-lsocket"
CLAMD_LIBS="-lsocket"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"
;;
hpux*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -9827,6 +9835,7 @@ aix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -9849,6 +9858,7 @@ irix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -9879,6 +9889,7 @@ esac
if test "$have_pthreads" = "yes"; then
BUILD_CLAMD_TRUE=
BUILD_CLAMD_FALSE='#'
@ -11237,6 +11248,7 @@ s,@INSTALL_FRESHCLAM_CONF_TRUE@,$INSTALL_FRESHCLAM_CONF_TRUE,;t t
s,@INSTALL_FRESHCLAM_CONF_FALSE@,$INSTALL_FRESHCLAM_CONF_FALSE,;t t
s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t
s,@CLAMD_LIBS@,$CLAMD_LIBS,;t t
s,@CLAMAV_MILTER_LIBS@,$CLAMAV_MILTER_LIBS,;t t
s,@FRESHCLAM_LIBS@,$FRESHCLAM_LIBS,;t t
s,@TH_SAFE@,$TH_SAFE,;t t
s,@BUILD_CLAMD_TRUE@,$BUILD_CLAMD_TRUE,;t t

13
clamav-devel/configure.in
Unescape View File

@ -233,7 +233,7 @@ if test x"$tcpw" != xno; then
fi
else
AC_DEFINE(WITH_TCPWRAP,1,[tcpwrappers support])
LIBS="$LIBS -lwrap"
CLAMAV_MILTER_LIBS="-lwrap"
fi
fi
@ -257,6 +257,7 @@ linux*)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
if test "$want_clamuko" = "yes"; then
AC_DEFINE(CLAMUKO,1,[enable clamuko])
fi
@ -283,6 +284,7 @@ solaris*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lsocket -lnsl -lresolv"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -293,6 +295,7 @@ freebsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
CLAMD_LIBS="-pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -304,6 +307,7 @@ openbsd3.3*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$disable_cr" = "yes"; then
CLAMD_LIBS="-pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
fi
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
@ -316,8 +320,10 @@ openbsd*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$disable_cr" = "yes"; then
CLAMD_LIBS="-pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
else
CLAMD_LIBS="-pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
fi
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
@ -351,12 +357,14 @@ sco*)
dnl njh@bandsman.sco.uk: SCO Unix port
FRESHCLAM_LIBS="-lsocket"
CLAMD_LIBS="-lsocket"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"
dnl AC_DEFINE(NO_SNPRINTF)
;;
hpux*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -367,6 +375,7 @@ aix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -377,6 +386,7 @@ irix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -391,6 +401,7 @@ esac
AC_SUBST(LIBCLAMAV_LIBS)
AC_SUBST(CLAMD_LIBS)
AC_SUBST(CLAMAV_MILTER_LIBS)
AC_SUBST(FRESHCLAM_LIBS)
AC_SUBST(TH_SAFE)

1
clamav-devel/database/Makefile.in
Unescape View File

@ -94,6 +94,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

1
clamav-devel/docs/Makefile.in
Unescape View File

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

1
clamav-devel/etc/Makefile.in
Unescape View File

@ -94,6 +94,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

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

@ -93,6 +93,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

4
clamav-devel/freshclam/freshclam.c
Unescape View File

@ -127,7 +127,7 @@ int freshclam(struct optstruct *opt)
/* freshclam shouldn't work with root priviledges */
if(optc(opt, 'u')) {
unpuser = getargc(opt, 'u');
} if((cpt = cfgopt(copt, "DatabaseOwner"))) {
} else if((cpt = cfgopt(copt, "DatabaseOwner"))) {
unpuser = cpt->strarg;
} else {
unpuser = UNPUSER;
@ -209,7 +209,7 @@ int freshclam(struct optstruct *opt)
if(optc(opt, 'c')) {
checks = atoi(getargc(opt, 'c'));
} if((cpt = cfgopt(copt, "Checks"))) {
} else if((cpt = cfgopt(copt, "Checks"))) {
checks = cpt->numarg;
} else {
checks = CL_DEFAULT_CHECKS;

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

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

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

@ -92,6 +92,7 @@ CC = @CC@
CFGDIR = @CFGDIR@
CLAMAVGROUP = @CLAMAVGROUP@
CLAMAVUSER = @CLAMAVUSER@
CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
CLAMD_LIBS = @CLAMD_LIBS@
DBDIR = @DBDIR@
DEPDIR = @DEPDIR@

Write Preview
Loading…
Cancel
Save