[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-167-g4319a8f
Stephen Gran
steve at lobefin.net
Fri Jun 12 19:12:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6ea1e9011091701a3a9039df0a77888ae9e82259
Merge: e2d5b155d51fb139ac39c031b0e7bd9da49d9b0d 682f1c236ad877d6ed3f7b44dfbe0e512a74524b
Author: Stephen Gran <steve at lobefin.net>
Date: Fri Jun 12 18:25:47 2009 +0100
Merge commit 'clamav-devel/tags/clamav-0.95.2' into debian/unstable
Conflicts:
contrib/split-tarball.sh
libclamunrar/unrarvm.c
Signed-off-by: Stephen Gran <steve at lobefin.net>
diff --combined configure
index eae2657,4a4c94c..99ae32c
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for clamav devel.
+# Generated by GNU Autoconf 2.63 for clamav 0.95.1.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@@ -747,8 -747,8 +747,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='clamav'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='devel'
-PACKAGE_STRING='clamav devel'
+PACKAGE_VERSION='0.95.1'
+PACKAGE_STRING='clamav 0.95.1'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
ac_unique_file="clamscan/clamscan.c"
@@@ -1578,7 -1578,7 +1578,7 @@@ if test "$ac_init_help" = "long"; the
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures clamav devel to adapt to many kinds of systems.
+\`configure' configures clamav 0.95.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1649,7 -1649,7 +1649,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of clamav devel:";;
+ short | recursive ) echo "Configuration of clamav 0.95.1:";;
esac
cat <<\_ACEOF
@@@ -1799,7 -1799,7 +1799,7 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-clamav configure devel
+clamav configure 0.95.1
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1813,7 -1813,7 +1813,7 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by clamav $as_me devel, which was
+It was created by clamav $as_me 0.95.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@@ -2849,7 -2849,7 +2849,7 @@@ f
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='devel'
+ VERSION='0.95.1'
# Some tools Automake needs.
@@@ -2989,7 -2989,7 +2989,7 @@@ cat >>confdefs.h <<\_ACEO
_ACEOF
-VERSION="devel-`date +%Y%m%d`"
+VERSION="0.95.1"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
@@@ -2997,7 -2997,7 +2997,7 @@@ _ACEO
LC_CURRENT=6
- LC_REVISION=3
+ LC_REVISION=4
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@@ -14762,7 -14762,10 +14762,10 @@@ $as_echo "$as_me: error: gcc 4.1.0 is k
{ $as_echo "$as_me:$LINENO: result: ok (${gcc_version})" >&5
$as_echo "ok (${gcc_version})" >&6; }
;;
- esac
+ esac
+ # bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
+ # works correctly
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
fi
else
CFLAGS="$CFLAGS -O0"
@@@ -16277,7 -16280,8 +16280,8 @@@ f
- for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp
+
+ for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@@ -20814,6 -20818,11 +20818,11 @@@ cat >>confdefs.h <<\_ACEO
#define _REENTRANT 1
_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+ #define _THREAD_SAFE 1
+ _ACEOF
+
fi
cat >>confdefs.h <<\_ACEOF
@@@ -25382,100 -25391,6 +25391,6 @@@ 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
@@@ -26013,7 -25928,7 +25928,7 @@@ exec 6>&
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by clamav $as_me devel, which was
+This file was extended by clamav $as_me 0.95.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -26076,7 -25991,7 +25991,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-clamav config.status devel
+clamav config.status 0.95.1
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --combined configure.in
index cc4d033,ddbcf48..03b2632
--- a/configure.in
+++ b/configure.in
@@@ -20,7 -20,7 +20,7 @@@ dnl MA 02110-1301, USA
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([clamav], [devel], [http://bugs.clamav.net/])
+AC_INIT([clamav], [0.95.1], [http://bugs.clamav.net/])
dnl put configure auxiliary into config
AC_CONFIG_AUX_DIR([config])
@@@ -38,11 -38,13 +38,11 @@@ dnl we told automake to not define thes
dnl the date in the version
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.1"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=6
- LC_REVISION=3
+ LC_REVISION=4
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@@@ -96,7 -98,10 +96,10 @@@ if test "$gcc_check" = "yes"; the
*)
AC_MSG_RESULT([ok (${gcc_version})])
;;
- esac
+ esac
+ # bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
+ # works correctly
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
fi
else
CFLAGS="$CFLAGS -O0"
@@@ -418,7 -423,7 +421,7 @@@ f
AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
- AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp])
+ AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo])
AC_C_FUNC_MMAP_PRIVATE
AC_FUNC_FSEEKO
@@@ -1047,6 -1052,7 +1050,7 @@@ aix*
TH_SAFE="-thread-safe"
AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
AC_DEFINE([_REENTRANT],1,[thread safe])
+ AC_DEFINE([_THREAD_SAFE],1,[thread safe])
fi
AC_DEFINE([C_AIX],1,[os is aix])
;;
@@@ -1567,11 -1573,6 +1571,6 @@@ 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 b509180,1e3de4a..0b11d55
--- 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
##
@@@ -133,11 -132,12 +133,12 @@@
# - Defer
# Return a temporary failure message (4xx) to the peer
# - Blackhole (not available for OnFail)
- # Like accept but the message is sent to oblivion
+ # Like Accept but the message is sent to oblivion
# - Quarantine (not available for OnFail)
- # Like accept but message is quarantined instead of being delivered
- # In sendmail the quarantine queue can be examined via mailq -qQ
- # For Postfix this causes the message to be accepted but placed on hold
+ # Like Accept but message is quarantined instead of being delivered
+ #
+ # NOTE: In Sendmail the quarantine queue can be examined via mailq -qQ
+ # For Postfix this causes the message to be placed on hold
#
# Action to be performed on clean messages (mostly useful for testing)
# Default Accept
@@@ -159,11 -159,15 +160,15 @@@
# Default: MTA specific
#RejectMsg
- # If this option is set to Yes, an "X-Virus-Scanned" and an "X-Virus-Status"
- # headers will be attached to each processed message, possibly replacing
- # existing headers.
- # Default: No
- #AddHeader Yes
+ # If this option is set to "Replace" (or "Yes"), an "X-Virus-Scanned" and an
+ # "X-Virus-Status" headers will be attached to each processed message, possibly
+ # replacing existing headers.
+ # If it is set to Add, the X-Virus headers are added possibly on top of the
+ # existing ones.
+ # Note that while "Replace" can potentially break DKIM signatures, "Add" may
+ # confuse procmail and similar filters.
+ # Default: no
+ #AddHeader Replace
##
@@@ -175,7 -179,7 +180,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.
@@@ -217,6 -221,13 +222,13 @@@
# This option allows to tune what is logged when a message is infected.
# Possible values are Off (the default - nothing is logged),
# Basic (minimal info logged), Full (verbose info logged)
+ # Note:
+ # For this to work properly in sendmail, make sure the msg_id, mail_addr,
+ # rcpt_addr and i macroes are available in eom. In other words add a line like:
+ # Milter.macros.eom={msg_id}, {mail_addr}, {rcpt_addr}, i
+ # to your .cf file. Alternatively use the macro:
+ # define(`confMILTER_MACROS_EOM', `{msg_id}, {mail_addr}, {rcpt_addr}, i')
+ # Postfix should be working fine with the default settings.
#
# Default: disabled
#LogInfected Basic
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list