From 24f501733a6bb7dab9f68e5b04036df6b09e71a5 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Sat, 2 Oct 2004 21:09:13 +0000 Subject: [PATCH] bugfixes git-svn: trunk@961 --- clamav-devel/ChangeLog | 6 ++++ clamav-devel/Makefile.in | 4 --- clamav-devel/clamav-config | 2 +- clamav-devel/clamav-milter/Makefile.in | 4 --- clamav-devel/clamd/Makefile.in | 4 --- clamav-devel/clamdscan/Makefile.in | 4 --- clamav-devel/clamscan/Makefile.in | 4 --- clamav-devel/configure | 49 +++++--------------------- clamav-devel/configure.in | 12 ++++--- clamav-devel/database/Makefile.in | 4 --- clamav-devel/docs/Makefile.in | 4 --- clamav-devel/etc/Makefile.am | 14 +++----- clamav-devel/etc/Makefile.in | 14 +++----- clamav-devel/freshclam/Makefile.in | 4 --- clamav-devel/libclamav/Makefile.in | 4 --- clamav-devel/sigtool/Makefile.in | 4 --- clamav-devel/sigtool/sigtool.c | 21 ++++++----- 17 files changed, 45 insertions(+), 113 deletions(-) diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog index 29906d001..78e3a5402 100644 --- a/clamav-devel/ChangeLog +++ b/clamav-devel/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 2 23:02:39 CEST 2004 (tk) +---------------------------------- + * configure: improve config file installation (patch by Andrey J. Melnikoff + (TEMHOTA) ) + * sigtool: fix --unpack/--unpack-current problem on Cygwin and FreeBSD + Sat Oct 2 18:52:32 BST 2004 (njh) ---------------------------------- * clamav-milter: Fix crash if %h is used in a template and --headers is diff --git a/clamav-devel/Makefile.in b/clamav-devel/Makefile.in index 2d36e08d6..43de46fa4 100644 --- a/clamav-devel/Makefile.in +++ b/clamav-devel/Makefile.in @@ -139,11 +139,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/clamav-config b/clamav-devel/clamav-config index ecf5e7070..469b59e75 100755 --- a/clamav-devel/clamav-config +++ b/clamav-devel/clamav-config @@ -46,7 +46,7 @@ while test $# -gt 0; do ;; --version) - echo devel-20040927 + echo devel-20041002 exit 0 ;; diff --git a/clamav-devel/clamav-milter/Makefile.in b/clamav-devel/clamav-milter/Makefile.in index bf8de93d4..fa084168b 100644 --- a/clamav-devel/clamav-milter/Makefile.in +++ b/clamav-devel/clamav-milter/Makefile.in @@ -139,11 +139,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/clamd/Makefile.in b/clamav-devel/clamd/Makefile.in index de532164b..961c49782 100644 --- a/clamav-devel/clamd/Makefile.in +++ b/clamav-devel/clamd/Makefile.in @@ -154,11 +154,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/clamdscan/Makefile.in b/clamav-devel/clamdscan/Makefile.in index b66038022..46295dd44 100644 --- a/clamav-devel/clamdscan/Makefile.in +++ b/clamav-devel/clamdscan/Makefile.in @@ -139,11 +139,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/clamscan/Makefile.in b/clamav-devel/clamscan/Makefile.in index ee7b55390..ad25051b1 100644 --- a/clamav-devel/clamscan/Makefile.in +++ b/clamav-devel/clamscan/Makefile.in @@ -134,11 +134,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/configure b/clamav-devel/configure index 7d0b6332a..0429fccf4 100755 --- a/clamav-devel/configure +++ b/clamav-devel/configure @@ -468,7 +468,7 @@ ac_includes_default="\ # include #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='' # Initialize some variables set by options. @@ -11269,27 +11269,6 @@ cat >>confdefs.h <<_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 { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@ -11495,6 +11474,7 @@ cat >>confdefs.h <<\_ACEOF #define C_BSD 1 _ACEOF + bad_gethostbyname_r="yes" ;; openbsd3.3*) if test "$have_pthreads" = "yes"; then @@ -11520,6 +11500,7 @@ cat >>confdefs.h <<\_ACEOF #define C_BSD 1 _ACEOF + bad_gethostbyname_r="yes" ;; openbsd*) if test "$have_pthreads" = "yes"; then @@ -11548,6 +11529,7 @@ cat >>confdefs.h <<\_ACEOF #define C_BSD 1 _ACEOF + bad_gethostbyname_r="yes" ;; netbsd*) if test "$have_pthreads" = "yes"; then @@ -11571,6 +11553,7 @@ cat >>confdefs.h <<\_ACEOF #define C_BSD 1 _ACEOF + bad_gethostbyname_r="yes" ;; bsd*) echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5 @@ -11581,6 +11564,7 @@ cat >>confdefs.h <<\_ACEOF #define C_BSD 1 _ACEOF + bad_gethostbyname_r="yes" ;; beos*) echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5 @@ -11609,6 +11593,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF use_netinfo="yes" + bad_gethostbyname_r="yes" ;; sco*) ;; @@ -12707,7 +12692,7 @@ if test "${enable_gethostbyname_r+set}" = set; then ac_cv_gethostbyname_args="" 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 "${ECHO_T}no" >&6 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;} { (exit 1); exit 1; }; } 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 { { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined. 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,@DBDIR@,$DBDIR,;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,@CLAMD_LIBS@,$CLAMD_LIBS,;t t s,@CLAMAV_MILTER_LIBS@,$CLAMAV_MILTER_LIBS,;t t diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in index db334a831..cb286651e 100644 --- a/clamav-devel/configure.in +++ b/clamav-devel/configure.in @@ -227,10 +227,6 @@ CFGDIR=$cfg_dir AC_SUBST(CFGDIR) 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 AC_TRY_RUN([ #include @@ -300,6 +296,7 @@ freebsd*) fi fi AC_DEFINE(C_BSD,1,[os is freebsd]) + bad_gethostbyname_r="yes" ;; openbsd3.3*) if test "$have_pthreads" = "yes"; then @@ -313,6 +310,7 @@ openbsd3.3*) AC_DEFINE(_REENTRANT,1,[thread safe]) fi AC_DEFINE(C_BSD,1,[os is bsd flavor]) + bad_gethostbyname_r="yes" ;; openbsd*) if test "$have_pthreads" = "yes"; then @@ -329,6 +327,7 @@ openbsd*) AC_DEFINE(_REENTRANT,1,[thread safe]) fi AC_DEFINE(C_BSD,1,[os is bsd flavor]) + bad_gethostbyname_r="yes" ;; netbsd*) if test "$have_pthreads" = "yes"; then @@ -340,11 +339,13 @@ netbsd*) ADDITIONAL_LIBS="$LIBS -lpthread" fi AC_DEFINE(C_BSD,1,[os is bsd flavor]) + bad_gethostbyname_r="yes" ;; bsd*) AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.) have_pthreads="no" AC_DEFINE(C_BSD,1,[os is bsd flavor]) + bad_gethostbyname_r="yes" ;; beos*) AC_MSG_RESULT(BeOS detected. Disabling thread support.) @@ -356,6 +357,7 @@ darwin*) AC_DEFINE(C_DARWIN,1,[os is darwin]) AC_DEFINE(BIND_8_COMPAT,1,[enable bind8 compatibility]) use_netinfo="yes" + bad_gethostbyname_r="yes" ;; sco*) 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], 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) else if test "$ac_cv_gethostbyname_args" = 3; then diff --git a/clamav-devel/database/Makefile.in b/clamav-devel/database/Makefile.in index e24f05d2c..f266d701d 100644 --- a/clamav-devel/database/Makefile.in +++ b/clamav-devel/database/Makefile.in @@ -103,11 +103,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/docs/Makefile.in b/clamav-devel/docs/Makefile.in index 5584a8217..65fc5aa5e 100644 --- a/clamav-devel/docs/Makefile.in +++ b/clamav-devel/docs/Makefile.in @@ -107,11 +107,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/etc/Makefile.am b/clamav-devel/etc/Makefile.am index 74fe6247a..f978a7a67 100644 --- a/clamav-devel/etc/Makefile.am +++ b/clamav-devel/etc/Makefile.am @@ -1,7 +1,5 @@ # -# Copyright (C) 2002 Tomasz Kojm -# Fixes by Arkadiusz Miskiewicz -# Masaki Ogawa +# Copyright (C) 2002 - 2004 Tomasz Kojm # # 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 @@ -22,9 +20,7 @@ CFGINST = @CFGDIR@ install: $(mkinstalldirs) $(DESTDIR)$(CFGINST) -if INSTALL_CLAMD_CONF - @$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST) -endif -if INSTALL_FRESHCLAM_CONF - @$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST) -endif + @test -f $(DESTDIR)$(CFGINST)/clamd.conf || \ + $(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST) + @test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \ + $(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST) diff --git a/clamav-devel/etc/Makefile.in b/clamav-devel/etc/Makefile.in index 402b5b7be..c97e1c06c 100644 --- a/clamav-devel/etc/Makefile.in +++ b/clamav-devel/etc/Makefile.in @@ -15,9 +15,7 @@ @SET_MAKE@ # -# Copyright (C) 2002 Tomasz Kojm -# Fixes by Arkadiusz Miskiewicz -# Masaki Ogawa +# Copyright (C) 2002 - 2004 Tomasz Kojm # # 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 @@ -103,11 +101,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -339,8 +333,10 @@ uninstall-am: uninstall-info-am install: $(mkinstalldirs) $(DESTDIR)$(CFGINST) -@INSTALL_CLAMD_CONF_TRUE@ @$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST) -@INSTALL_FRESHCLAM_CONF_TRUE@ @$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST) + @test -f $(DESTDIR)$(CFGINST)/clamd.conf || \ + $(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. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/clamav-devel/freshclam/Makefile.in b/clamav-devel/freshclam/Makefile.in index 4a49683ae..daab309f5 100644 --- a/clamav-devel/freshclam/Makefile.in +++ b/clamav-devel/freshclam/Makefile.in @@ -133,11 +133,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/libclamav/Makefile.in b/clamav-devel/libclamav/Makefile.in index 755e3aa0c..dbd28e532 100644 --- a/clamav-devel/libclamav/Makefile.in +++ b/clamav-devel/libclamav/Makefile.in @@ -160,11 +160,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/sigtool/Makefile.in b/clamav-devel/sigtool/Makefile.in index 89d88cd27..599b32330 100644 --- a/clamav-devel/sigtool/Makefile.in +++ b/clamav-devel/sigtool/Makefile.in @@ -130,11 +130,7 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ GETENT = @GETENT@ HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@ 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_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@ -INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/clamav-devel/sigtool/sigtool.c b/clamav-devel/sigtool/sigtool.c index 2d6598f40..ee4132fbf 100644 --- a/clamav-devel/sigtool/sigtool.c +++ b/clamav-devel/sigtool/sigtool.c @@ -53,6 +53,9 @@ #include "../libclamav/others.h" #include "../libclamav/str.h" +#ifndef O_BINARY +#define O_BINARY 0 +#endif void help(void); 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) { - FILE *fd; + int fd; char *name; 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")); } 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); + free(name); 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"); - fclose(fd); + close(fd); exit(1); } - fclose(fd); + close(fd); exit(0); }