[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-80-g33a95c7
Michael Tautschnig
mt at debian.org
Fri Apr 10 16:11:01 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 88edf6ef0f6efc5b5ea883f78be637e21b85824d
Merge: 871f0492f30383cef72d84ad2fe653714705b2c8 979cef4383d15548957a1bc928d2b455d0cc5386
Author: Michael Tautschnig <mt at debian.org>
Date: Fri Apr 10 17:42:37 2009 +0200
Merge commit 'clamav-svn/tags/clamav-0.95.1' into debian/unstable
Conflicts:
Makefile.am
Makefile.in
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --combined configure
index c936212,48e2909..6e54809
--- a/configure
+++ b/configure
@@@ -2989,7 -2989,7 +2989,7 @@@ cat >>confdefs.h <<\_ACEO
_ACEOF
-VERSION="devel-`date +%Y%m%d`"
+VERSION="0.95"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
@@@ -2997,7 -2997,7 +2997,7 @@@ _ACEO
LC_CURRENT=6
- LC_REVISION=2
+ LC_REVISION=3
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@@ -13749,6 -13749,17 +13749,17 @@@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec
ac_config_files="$ac_config_files libltdl/Makefile"
+ major=`expr $LC_CURRENT - $LC_AGE`
+
+ cat >>confdefs.h <<_ACEOF
+ #define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+ #define LIBCLAMAV_MAJORVER $major
+ _ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define SCANBUFF 131072
@@@ -14951,8 -14962,8 +14962,8 @@@ static struct v
extern void abort(void);
#define CLI_ISCONTAINED(bb, bb_size, sb, sb_size) \
- (bb_size > 0 && sb_size > 0 && sb_size <= bb_size \
- && sb >= bb && sb + sb_size <= bb + bb_size && sb + sb_size > bb)
+ ((bb_size) > 0 && (sb_size) > 0 && (size_t)(sb_size) <= (size_t)(bb_size) \
+ && (sb) >= (bb) && ((sb) + (sb_size)) <= ((bb) + (bb_size)) && ((sb) + (sb_size)) > (bb) && (sb) < ((bb) + (bb_size)))
int crashtest()
{
@@@ -18202,11 -18213,7 +18213,7 @@@ f
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
$as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz";
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ZLIB_H 1
- _ACEOF
-
+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"
else
{ { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
$as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
@@@ -18361,11 -18368,7 +18368,7 @@@ f
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
$as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz";
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ZLIB_H 1
- _ACEOF
-
+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"
else
{ { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
$as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
@@@ -25379,6 -25382,100 +25382,100 @@@ els
fi
+ { $as_echo "$as_me:$LINENO: checking for library containing mallinfo" >&5
+ $as_echo_n "checking for library containing mallinfo... " >&6; }
+ if test "${ac_cv_search_mallinfo+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char mallinfo ();
+ int
+ main ()
+ {
+ return mallinfo ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ for ac_lib in '' malloc; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_search_mallinfo=$ac_res
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_mallinfo+set}" = set; then
+ break
+ fi
+ done
+ if test "${ac_cv_search_mallinfo+set}" = set; then
+ :
+ else
+ ac_cv_search_mallinfo=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5
+ $as_echo "$ac_cv_search_mallinfo" >&6; }
+ ac_res=$ac_cv_search_mallinfo
+ if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MALLINFO 1
+ _ACEOF
+
+ test "$ac_cv_search_mallinfo" = "none required" ||
+ CLAMD_LIBS="$CLAMD_LIBS $ac_cv_search_mallinfo"
+ fi
+
+
ac_config_files="$ac_config_files libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
cat >confcache <<\_ACEOF
diff --combined configure.in
index c29b654,54fd171..9e5f964
--- a/configure.in
+++ b/configure.in
@@@ -39,11 -39,12 +39,11 @@@ dnl the date in the versio
AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
dnl change this on a release
-VERSION="devel-`date +%Y%m%d`"
-dnl VERSION="0.94rc1"
+VERSION="0.95"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=6
- LC_REVISION=2
+ LC_REVISION=3
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@@@ -58,6 -59,11 +58,11 @@@ LT_INIT([dlopen]
LTDL_INIT([recursive])
AC_CONFIG_FILES([libltdl/Makefile])
+ major=`expr $LC_CURRENT - $LC_AGE`
+ AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",
+ ["Full library version number"])
+ AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $major,
+ ["Major library version number"])
AC_DEFINE([SCANBUFF], 131072, [scan buffer size])
AC_DEFINE([FILEBUFF], 8192, [file i/o buffer size])
@@@ -185,8 -191,8 +190,8 @@@ static struct v
extern void abort(void);
#define CLI_ISCONTAINED(bb, bb_size, sb, sb_size) \
- (bb_size > 0 && sb_size > 0 && sb_size <= bb_size \
- && sb >= bb && sb + sb_size <= bb + bb_size && sb + sb_size > bb)
+ ((bb_size) > 0 && (sb_size) > 0 && (size_t)(sb_size) <= (size_t)(bb_size) \
+ && (sb) >= (bb) && ((sb) + (sb_size)) <= ((bb) + (bb_size)) && ((sb) + (sb_size)) > (bb) && (sb) < ((bb) + (bb_size)))
int crashtest()
{
@@@ -531,12 -537,12 +536,12 @@@ els
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
- AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
+ AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
else
- AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
+ AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))
fi
fi
@@@ -1563,6 -1569,11 +1568,11 @@@ AC_SUBST([CURSES_LIBS]
AM_CONDITIONAL([HAVE_CURSES],
[test "X$HAVE_LIBNCURSES" = "Xyes" || test "X$HAVE_LIBPDCURSES" = "Xyes"])
+ AC_SEARCH_LIBS([mallinfo],[malloc],
+ [AC_DEFINE([HAVE_MALLINFO],1,[have mallinfo])
+ test "$ac_cv_search_mallinfo" = "none required" ||
+ CLAMD_LIBS="$CLAMD_LIBS $ac_cv_search_mallinfo"])
+
AC_OUTPUT([
libclamav/Makefile
libclamav/lzma/Makefile
diff --combined etc/clamav-milter.conf
index a8dd199,7c017f7..b509180
--- a/etc/clamav-milter.conf
+++ b/etc/clamav-milter.conf
@@@ -56,7 -56,7 +56,7 @@@ Exampl
# daemon (main thread).
#
# Default: disabled
-#PidFile /var/run/clamav-milter.pid
+#PidFile /var/run/clamav/clamav-milter.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@@ -83,7 -83,6 +83,7 @@@
#
# Default: no default
#ClamdSocket tcp:scanner.mydomain:7357
+ClamdSocket /var/run/clamav/clamd
##
@@@ -100,7 -99,7 +100,7 @@@
#LocalNet 192.168.0.0/24
#LocalNet 1111:2222:3333::/48
- # This option specifies a file which contains a list of POSIX regular
+ # This option specifies a file which contains a list of basic POSIX regular
# expressions. Addresses (sent to or from - see below) matching these regexes
# will not be scanned. Optionally each line can start with the string "From:"
# or "To:" (note: no whitespace after the colon) indicating if it is,
@@@ -111,6 -110,13 +111,13 @@@
# Default unset (no exclusion applied)
#Whitelist /etc/whitelisted_addresses
+ # Messages from authenticated SMTP users matching this extended POSIX
+ # regular expression (egrep-like) will not be scanned.
+ # Note: this is the AUTH login name!
+ #
+ # Default: unset (no whitelisting based on SMTP auth)
+ #SkipAuthenticated ^(tom|dick|henry)$
+
##
## Actions
@@@ -168,7 -174,7 +175,7 @@@
# A full path is required.
#
# Default: disabled
-#LogFile /tmp/clamav-milter.log
+#LogFile /var/log/clamav/clamav-milter.log
# By default the log file is locked for writing - the lock protects against
# running clamav-milter multiple times.
diff --combined etc/clamd.conf
index 3d04340,566d032..4426396
--- a/etc/clamd.conf
+++ b/etc/clamd.conf
@@@ -11,7 -11,7 +11,7 @@@ Exampl
# LogFile must be writable for the user running daemon.
# A full path is required.
# Default: disabled
-#LogFile /tmp/clamd.log
+#LogFile /var/log/clamav/clamd.log
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
@@@ -54,7 -54,7 +54,7 @@@
# This option allows you to save a process identifier of the listening
# daemon (main thread).
# Default: disabled
-#PidFile /var/run/clamd.pid
+#PidFile /var/run/clamav/clamd.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@@ -69,7 -69,7 +69,7 @@@
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-LocalSocket /tmp/clamd.socket
+LocalSocket /var/run/clamav/clamd
# Remove stale socket after unclean shutdown.
# Default: yes
@@@ -114,6 -114,26 +114,26 @@@
# Default: 120
#ReadTimeout 300
+ # This option specifies the time (in seconds) after which clamd should
+ # timeout if a client doesn't provide any initial command after connecting.
+ # Default: 5
+ #CommandReadTimeout 5
+
+ # This option specifies how long to wait (in miliseconds) if the send buffer is full.
+ # Keep this value low to prevent clamd hanging
+ #
+ # Default: 500
+ #SendBufTimeout 200
+
+ # Maximum number of queued items (including those being processed by MaxThreads threads)
+ # It is recommended to have this value at least twice MaxThreads if possible.
+ # WARNING: you shouldn't increase this too much to avoid running out of file descriptors,
+ # the following condition should hold:
+ # MaxThreads*MaxRecursion + (MaxQueue - MaxThreads) + 6< RLIMIT_NOFILE (usual max is 1024)
+ #
+ # Default: 100
+ #MaxQueue 200
+
# Waiting for a new job will timeout after this time (seconds).
# Default: 30
#IdleTimeout 60
@@@ -137,7 -157,7 +157,7 @@@
#FollowFileSymlinks yes
# Perform a database check.
- # Default: 1800 (30 min)
+ # Default: 600 (10 min)
#SelfCheck 600
# Execute a command when virus is found. In the command string %v will
@@@ -335,11 -355,6 +355,6 @@@
# Default: yes
#ScanArchive yes
- # Use slower but memory efficient decompression algorithm.
- # only affects the bzip2 decompressor.
- # Default: no
- #ArchiveLimitMemoryUsage yes
-
# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
# Default: no
#ArchiveBlockEncrypted no
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list