git-svn: trunk@961
remotes/push_mirror/metadata
Tomasz Kojm 21 years ago
parent 54a9f64ec0
commit 24f501733a
  1. 6
      clamav-devel/ChangeLog
  2. 4
      clamav-devel/Makefile.in
  3. 2
      clamav-devel/clamav-config
  4. 4
      clamav-devel/clamav-milter/Makefile.in
  5. 4
      clamav-devel/clamd/Makefile.in
  6. 4
      clamav-devel/clamdscan/Makefile.in
  7. 4
      clamav-devel/clamscan/Makefile.in
  8. 49
      clamav-devel/configure
  9. 12
      clamav-devel/configure.in
  10. 4
      clamav-devel/database/Makefile.in
  11. 4
      clamav-devel/docs/Makefile.in
  12. 14
      clamav-devel/etc/Makefile.am
  13. 14
      clamav-devel/etc/Makefile.in
  14. 4
      clamav-devel/freshclam/Makefile.in
  15. 4
      clamav-devel/libclamav/Makefile.in
  16. 4
      clamav-devel/sigtool/Makefile.in
  17. 21
      clamav-devel/sigtool/sigtool.c

@ -1,3 +1,9 @@
Sat Oct 2 23:02:39 CEST 2004 (tk)
----------------------------------
* configure: improve config file installation (patch by Andrey J. Melnikoff
(TEMHOTA) <temnota*kmv.ru>)
* sigtool: fix --unpack/--unpack-current problem on Cygwin and FreeBSD
Sat Oct 2 18:52:32 BST 2004 (njh) Sat Oct 2 18:52:32 BST 2004 (njh)
---------------------------------- ----------------------------------
* clamav-milter: Fix crash if %h is used in a template and --headers is * clamav-milter: Fix crash if %h is used in a template and --headers is

@ -139,11 +139,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -46,7 +46,7 @@ while test $# -gt 0; do
;; ;;
--version) --version)
echo devel-20040927 echo devel-20041002
exit 0 exit 0
;; ;;

@ -139,11 +139,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -154,11 +154,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -139,11 +139,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -134,11 +134,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -468,7 +468,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL DBDIR CFGDIR INSTALL_CLAMD_CONF_TRUE INSTALL_CLAMD_CONF_FALSE INSTALL_FRESHCLAM_CONF_TRUE INSTALL_FRESHCLAM_CONF_FALSE LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL DBDIR CFGDIR LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -11269,27 +11269,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
if test ! -r "$cfg_dir/clamd.conf"; then
INSTALL_CLAMD_CONF_TRUE=
INSTALL_CLAMD_CONF_FALSE='#'
else
INSTALL_CLAMD_CONF_TRUE='#'
INSTALL_CLAMD_CONF_FALSE=
fi
if test ! -r "$cfg_dir/freshclam.conf"; then
INSTALL_FRESHCLAM_CONF_TRUE=
INSTALL_FRESHCLAM_CONF_FALSE='#'
else
INSTALL_FRESHCLAM_CONF_TRUE='#'
INSTALL_FRESHCLAM_CONF_FALSE=
fi
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5 See \`config.log' for more details." >&5
@ -11495,6 +11474,7 @@ cat >>confdefs.h <<\_ACEOF
#define C_BSD 1 #define C_BSD 1
_ACEOF _ACEOF
bad_gethostbyname_r="yes"
;; ;;
openbsd3.3*) openbsd3.3*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -11520,6 +11500,7 @@ cat >>confdefs.h <<\_ACEOF
#define C_BSD 1 #define C_BSD 1
_ACEOF _ACEOF
bad_gethostbyname_r="yes"
;; ;;
openbsd*) openbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -11548,6 +11529,7 @@ cat >>confdefs.h <<\_ACEOF
#define C_BSD 1 #define C_BSD 1
_ACEOF _ACEOF
bad_gethostbyname_r="yes"
;; ;;
netbsd*) netbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -11571,6 +11553,7 @@ cat >>confdefs.h <<\_ACEOF
#define C_BSD 1 #define C_BSD 1
_ACEOF _ACEOF
bad_gethostbyname_r="yes"
;; ;;
bsd*) bsd*)
echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5 echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5
@ -11581,6 +11564,7 @@ cat >>confdefs.h <<\_ACEOF
#define C_BSD 1 #define C_BSD 1
_ACEOF _ACEOF
bad_gethostbyname_r="yes"
;; ;;
beos*) beos*)
echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5 echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5
@ -11609,6 +11593,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
use_netinfo="yes" use_netinfo="yes"
bad_gethostbyname_r="yes"
;; ;;
sco*) sco*)
;; ;;
@ -12707,7 +12692,7 @@ if test "${enable_gethostbyname_r+set}" = set; then
ac_cv_gethostbyname_args="" ac_cv_gethostbyname_args=""
fi; fi;
if test -z "$ac_cv_gethostbyname_args"; then if test -z "$ac_cv_gethostbyname_args" || test "$bad_gethostbyname_r" = "yes"; then
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
else else
@ -13619,20 +13604,6 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${INSTALL_CLAMD_CONF_TRUE}" && test -z "${INSTALL_CLAMD_CONF_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"INSTALL_CLAMD_CONF\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"INSTALL_CLAMD_CONF\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${INSTALL_FRESHCLAM_CONF_TRUE}" && test -z "${INSTALL_FRESHCLAM_CONF_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"INSTALL_FRESHCLAM_CONF\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"INSTALL_FRESHCLAM_CONF\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined. { { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5 Usually this means the macro was only invoked conditionally." >&5
@ -14253,10 +14224,6 @@ s,@EGREP@,$EGREP,;t t
s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBTOOL@,$LIBTOOL,;t t
s,@DBDIR@,$DBDIR,;t t s,@DBDIR@,$DBDIR,;t t
s,@CFGDIR@,$CFGDIR,;t t s,@CFGDIR@,$CFGDIR,;t t
s,@INSTALL_CLAMD_CONF_TRUE@,$INSTALL_CLAMD_CONF_TRUE,;t t
s,@INSTALL_CLAMD_CONF_FALSE@,$INSTALL_CLAMD_CONF_FALSE,;t t
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,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t
s,@CLAMD_LIBS@,$CLAMD_LIBS,;t t s,@CLAMD_LIBS@,$CLAMD_LIBS,;t t
s,@CLAMAV_MILTER_LIBS@,$CLAMAV_MILTER_LIBS,;t t s,@CLAMAV_MILTER_LIBS@,$CLAMAV_MILTER_LIBS,;t t

@ -227,10 +227,6 @@ CFGDIR=$cfg_dir
AC_SUBST(CFGDIR) AC_SUBST(CFGDIR)
AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])
dnl Do not overwrite current config files
AM_CONDITIONAL(INSTALL_CLAMD_CONF, test ! -r "$cfg_dir/clamd.conf")
AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf")
dnl check for in_port_t definition dnl check for in_port_t definition
AC_TRY_RUN([ AC_TRY_RUN([
#include <sys/types.h> #include <sys/types.h>
@ -300,6 +296,7 @@ freebsd*)
fi fi
fi fi
AC_DEFINE(C_BSD,1,[os is freebsd]) AC_DEFINE(C_BSD,1,[os is freebsd])
bad_gethostbyname_r="yes"
;; ;;
openbsd3.3*) openbsd3.3*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -313,6 +310,7 @@ openbsd3.3*)
AC_DEFINE(_REENTRANT,1,[thread safe]) AC_DEFINE(_REENTRANT,1,[thread safe])
fi fi
AC_DEFINE(C_BSD,1,[os is bsd flavor]) AC_DEFINE(C_BSD,1,[os is bsd flavor])
bad_gethostbyname_r="yes"
;; ;;
openbsd*) openbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -329,6 +327,7 @@ openbsd*)
AC_DEFINE(_REENTRANT,1,[thread safe]) AC_DEFINE(_REENTRANT,1,[thread safe])
fi fi
AC_DEFINE(C_BSD,1,[os is bsd flavor]) AC_DEFINE(C_BSD,1,[os is bsd flavor])
bad_gethostbyname_r="yes"
;; ;;
netbsd*) netbsd*)
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then
@ -340,11 +339,13 @@ netbsd*)
ADDITIONAL_LIBS="$LIBS -lpthread" ADDITIONAL_LIBS="$LIBS -lpthread"
fi fi
AC_DEFINE(C_BSD,1,[os is bsd flavor]) AC_DEFINE(C_BSD,1,[os is bsd flavor])
bad_gethostbyname_r="yes"
;; ;;
bsd*) bsd*)
AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.) AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.)
have_pthreads="no" have_pthreads="no"
AC_DEFINE(C_BSD,1,[os is bsd flavor]) AC_DEFINE(C_BSD,1,[os is bsd flavor])
bad_gethostbyname_r="yes"
;; ;;
beos*) beos*)
AC_MSG_RESULT(BeOS detected. Disabling thread support.) AC_MSG_RESULT(BeOS detected. Disabling thread support.)
@ -356,6 +357,7 @@ darwin*)
AC_DEFINE(C_DARWIN,1,[os is darwin]) AC_DEFINE(C_DARWIN,1,[os is darwin])
AC_DEFINE(BIND_8_COMPAT,1,[enable bind8 compatibility]) AC_DEFINE(BIND_8_COMPAT,1,[enable bind8 compatibility])
use_netinfo="yes" use_netinfo="yes"
bad_gethostbyname_r="yes"
;; ;;
sco*) sco*)
dnl njh@bandsman.sco.uk: SCO Unix port dnl njh@bandsman.sco.uk: SCO Unix port
@ -565,7 +567,7 @@ AC_ARG_ENABLE(gethostbyname_r,
[ --disable-gethostbyname_r disable support for gethostbyname_r], [ --disable-gethostbyname_r disable support for gethostbyname_r],
ac_cv_gethostbyname_args="",) ac_cv_gethostbyname_args="",)
if test -z "$ac_cv_gethostbyname_args"; then if test -z "$ac_cv_gethostbyname_args" || test "$bad_gethostbyname_r" = "yes"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
if test "$ac_cv_gethostbyname_args" = 3; then if test "$ac_cv_gethostbyname_args" = 3; then

@ -103,11 +103,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -107,11 +107,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -1,7 +1,5 @@
# #
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl> # Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
# Fixes by Arkadiusz Miskiewicz <misiek@pld.org.pl>
# Masaki Ogawa <proc@mac.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -22,9 +20,7 @@ CFGINST = @CFGDIR@
install: install:
$(mkinstalldirs) $(DESTDIR)$(CFGINST) $(mkinstalldirs) $(DESTDIR)$(CFGINST)
if INSTALL_CLAMD_CONF @test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
@$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST) $(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
endif @test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
if INSTALL_FRESHCLAM_CONF $(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
endif

@ -15,9 +15,7 @@
@SET_MAKE@ @SET_MAKE@
# #
# Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl> # Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
# Fixes by Arkadiusz Miskiewicz <misiek@pld.org.pl>
# Masaki Ogawa <proc@mac.com>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -103,11 +101,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@ -339,8 +333,10 @@ uninstall-am: uninstall-info-am
install: install:
$(mkinstalldirs) $(DESTDIR)$(CFGINST) $(mkinstalldirs) $(DESTDIR)$(CFGINST)
@INSTALL_CLAMD_CONF_TRUE@ @$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST) @test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
@INSTALL_FRESHCLAM_CONF_TRUE@ @$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST) $(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
@test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

@ -133,11 +133,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -160,11 +160,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -130,11 +130,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
GETENT = @GETENT@ GETENT = @GETENT@
HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@ HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

@ -53,6 +53,9 @@
#include "../libclamav/others.h" #include "../libclamav/others.h"
#include "../libclamav/str.h" #include "../libclamav/str.h"
#ifndef O_BINARY
#define O_BINARY 0
#endif
void help(void); void help(void);
char *getdsig(const char *host, const char *user, const char *data); char *getdsig(const char *host, const char *user, const char *data);
@ -492,29 +495,31 @@ char *getdsig(const char *host, const char *user, const char *data)
int unpack(struct optstruct *opt) int unpack(struct optstruct *opt)
{ {
FILE *fd; int fd;
char *name; char *name;
if(optl(opt, "unpack-current")) { if(optl(opt, "unpack-current")) {
name = mcalloc(300, sizeof(char)); /* FIXME */ name = mcalloc(strlen(freshdbdir()) + strlen(getargl(opt, "unpack-current")) + 2, sizeof(char));
sprintf(name, "%s/%s", freshdbdir(), getargl(opt, "unpack-current")); sprintf(name, "%s/%s", freshdbdir(), getargl(opt, "unpack-current"));
} else } else
name = getargc(opt, 'u'); name = strdup(getargc(opt, 'u'));
if((fd = fopen(name, "rb")) == NULL) { if((fd = open(name, O_RDONLY|O_BINARY)) == -1) {
mprintf("!Can't open CVD file %s\n", name); mprintf("!Can't open CVD file %s\n", name);
free(name);
exit(1); exit(1);
} }
fseek(fd, 512L, SEEK_SET); free(name);
lseek(fd, 512, SEEK_SET);
if(cli_untgz(fileno(fd), ".")) { if(cli_untgz(fd, ".")) {
mprintf("!Can't unpack file.\n"); mprintf("!Can't unpack file.\n");
fclose(fd); close(fd);
exit(1); exit(1);
} }
fclose(fd); close(fd);
exit(0); exit(0);
} }

Loading…
Cancel
Save