[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.94.dfsg.1-1+volatile1-37-gcd86c8a
Stephen Gran
steve at lobefin.net
Sat Nov 29 17:46:41 UTC 2008
The following commit has been merged in the debian/etch-volatile branch:
commit 9286bc94932775564c26b6093dc47fff3b61b68d
Merge: 52a3e247ec35fc0c17d79927f902e51201f4903e c4fc65cea4e5c4b11b870e35db0b2400024984eb
Author: Stephen Gran <steve at lobefin.net>
Date: Sat Nov 29 17:11:38 2008 +0000
Merge commit 'clamav-devel/tags/clamav-0.94.2' into debian/etch-volatile
Conflicts:
configure
configure.in
libclamunrar/unrar.c
Signed-off-by: Stephen Gran <steve at lobefin.net>
diff --combined clamav-milter/clamav-milter.c
index 7cad23d,74848c7..61d3bd2
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@@ -151,14 -151,6 +151,14 @@@ static char console[] = "/dev/console"
#define _GNU_SOURCE
#include <getopt.h>
+#ifndef SENDMAIL_VERSION_A
+#define SENDMAIL_VERSION_A 8
+#endif
+
+#ifndef SENDMAIL_VERSION_B
+#define SENDMAIL_VERSION_B 13
+#endif
+
#ifndef SENDMAIL_BIN
#define SENDMAIL_BIN "/usr/lib/sendmail"
#endif
@@@ -1855,7 -1847,7 +1855,7 @@@ main(int argc, char **argv
* Limitation: doesn't store message in a temporary
* file, so we won't be able to use mail < file
*/
- fprintf(stderr, "%s: when using --external, --report-phish cannot be used without either LocalSocket or --quarantine\n",
+ fprintf(stderr, "%s: when using --external, --report-phish cannot be used without either LocalSocket or --quarantine-dir\n",
argv[0]);
return EX_USAGE;
}
diff --combined configure
index 0bd9797,0bc4751..5c32986
--- 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.61 for clamav 0.94.1.
+ # Generated by GNU Autoconf 2.61 for clamav 0.94.2.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@@ -723,8 -723,8 +723,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='clamav'
PACKAGE_TARNAME='clamav'
- PACKAGE_VERSION='0.94.1'
- PACKAGE_STRING='clamav 0.94.1'
+ PACKAGE_VERSION='0.94.2'
+ PACKAGE_STRING='clamav 0.94.2'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
ac_unique_file="clamscan/clamscan.c"
@@@ -1430,7 -1430,7 +1430,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 0.94.1 to adapt to many kinds of systems.
+ \`configure' configures clamav 0.94.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1501,7 -1501,7 +1501,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of clamav 0.94.1:";;
+ short | recursive ) echo "Configuration of clamav 0.94.2:";;
esac
cat <<\_ACEOF
@@@ -1643,7 -1643,7 +1643,7 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- clamav configure 0.94.1
+ clamav configure 0.94.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1657,7 -1657,7 +1657,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 0.94.1, which was
+ It was created by clamav $as_me 0.94.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@@ -2213,7 -2213,7 +2213,7 @@@ ac_need_target_h_file_new=tru
- ac_need_target_h_file=`echo target.h`
+ ac_need_target_h_file=target.h
ac_need_target_h_prefix=`echo target | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'`
#
target_os0=`echo "$target_os" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'`
@@@ -2667,7 -2667,7 +2667,7 @@@ f
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='0.94.1'
+ VERSION='0.94.2'
# Some tools Automake needs.
@@@ -2811,7 -2811,7 +2811,7 @@@ cat >>confdefs.h <<\_ACEO
_ACEOF
- VERSION="0.94.1"
+ VERSION="0.94.2"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
@@@ -2819,7 -2819,7 +2819,7 @@@ _ACEO
LC_CURRENT=5
- LC_REVISION=3
+ LC_REVISION=4
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@@ -14158,6 -14158,7 +14158,7 @@@ if test "${with_libcheck_prefix+set}"
if test "X$withval" = "Xno"; then
use_additional=no
else
+ additional_compat_libdir=
if test "X$withval" = "X"; then
acl_save_prefix="$prefix"
@@@ -14174,6 -14175,9 +14175,9 @@@
else
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
+ if test "X$acl_libdirstem" != "Xlib"; then
+ additional_compat_libdir="-L$withval/lib"
+ fi
fi
fi
@@@ -14264,7 -14268,11 +14268,11 @@@ f
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBCHECK; do
+ compat_libdir=
+ if test "X$acl_libdirstem" != "Xlib"; then
+ compat_libdir=-L'${exec_prefix}'/lib
+ fi
+ for x in $LDFLAGS $LTLIBCHECK $compat_libdir $additional_compat_libdir; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
@@@ -14395,6 -14403,11 +14403,11 @@@
LIBCHECK_PREFIX="$basedir"
additional_includedir="$basedir/include"
;;
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
+ LIBCHECK_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
esac
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
@@@ -15554,6 -15567,7 +15567,7 @@@ if test "${with_libbz2_prefix+set}" = s
if test "X$withval" = "Xno"; then
use_additional=no
else
+ additional_compat_libdir=
if test "X$withval" = "X"; then
acl_save_prefix="$prefix"
@@@ -15570,6 -15584,9 +15584,9 @@@
else
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
+ if test "X$acl_libdirstem" != "Xlib"; then
+ additional_compat_libdir="-L$withval/lib"
+ fi
fi
fi
@@@ -15660,7 -15677,11 +15677,11 @@@ f
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBBZ2; do
+ compat_libdir=
+ if test "X$acl_libdirstem" != "Xlib"; then
+ compat_libdir=-L'${exec_prefix}'/lib
+ fi
+ for x in $LDFLAGS $LTLIBBZ2 $compat_libdir $additional_compat_libdir; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
@@@ -15791,6 -15812,11 +15812,11 @@@
LIBBZ2_PREFIX="$basedir"
additional_includedir="$basedir/include"
;;
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
+ LIBBZ2_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
esac
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
@@@ -17014,6 -17040,7 +17040,7 @@@ if test "${with_libgmp_prefix+set}" = s
if test "X$withval" = "Xno"; then
use_additional=no
else
+ additional_compat_libdir=
if test "X$withval" = "X"; then
acl_save_prefix="$prefix"
@@@ -17030,6 -17057,9 +17057,9 @@@
else
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
+ if test "X$acl_libdirstem" != "Xlib"; then
+ additional_compat_libdir="-L$withval/lib"
+ fi
fi
fi
@@@ -17120,7 -17150,11 +17150,11 @@@ f
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBGMP; do
+ compat_libdir=
+ if test "X$acl_libdirstem" != "Xlib"; then
+ compat_libdir=-L'${exec_prefix}'/lib
+ fi
+ for x in $LDFLAGS $LTLIBGMP $compat_libdir $additional_compat_libdir; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
@@@ -17251,6 -17285,11 +17285,11 @@@
LIBGMP_PREFIX="$basedir"
additional_includedir="$basedir/include"
;;
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
+ LIBGMP_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
esac
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
@@@ -18989,43 -19028,21 +19028,43 @@@ f
sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
+ case "$sendmailver_a" in
+ [[:digit:]]*) ;;
+ *) sendmailver_a= ;;
+ esac
+
+ case "$sendmailver_b" in
+ [[:digit:]]*) ;;
+ *) sendmailver_b= ;;
+ esac
+
+ case "$sendmailver_c" in
+ [[:digit:]]*) ;;
+ *) sendmailver_c= ;;
+ esac
+
+ if test -n "$sendmailver_a"; then
cat >>confdefs.h <<_ACEOF
#define SENDMAIL_VERSION_A $sendmailver_a
_ACEOF
+ fi
+ if test -n "$sendmailver_b"; then
cat >>confdefs.h <<_ACEOF
#define SENDMAIL_VERSION_B $sendmailver_b
_ACEOF
+ fi
+ if test -n "$sendmailver_c"; then
+
cat >>confdefs.h <<_ACEOF
#define SENDMAIL_VERSION_C $sendmailver_c
_ACEOF
+ fi
fi
if test "x$ac_cv_have_lresolv_r" != "xyes"; then
{ echo "$as_me:$LINENO: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&5
@@@ -21671,7 -21688,7 +21710,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 0.94.1, which was
+ This file was extended by clamav $as_me 0.94.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -21724,7 -21741,7 +21763,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- clamav config.status 0.94.1
+ clamav config.status 0.94.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --combined configure.in
index 424f2df,d4b4acc..4a27763
--- 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.94.2], [http://bugs.clamav.net/])
dnl put configure auxiliary into config
AC_CONFIG_AUX_DIR([config])
@@@ -39,11 -39,12 +39,12 @@@ dnl the date in the versio
AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
dnl change this on a release
- VERSION="0.94"
+ VERSION="0.94.2"
+ dnl VERSION="devel-`date +%Y%m%d`"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=5
- LC_REVISION=3
+ LC_REVISION=4
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@@@ -1141,30 -1142,9 +1142,30 @@@ if test "$have_milter" = "yes"; the
sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])
- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])
- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])
+ case "$sendmailver_a" in
+ [[[:digit:]]]*) ;;
+ *) sendmailver_a= ;;
+ esac
+
+ case "$sendmailver_b" in
+ [[[:digit:]]]*) ;;
+ *) sendmailver_b= ;;
+ esac
+
+ case "$sendmailver_c" in
+ [[[:digit:]]]*) ;;
+ *) sendmailver_c= ;;
+ esac
+
+ if test -n "$sendmailver_a"; then
+ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
+ fi
+ if test -n "$sendmailver_b"; then
+ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
+ fi
+ if test -n "$sendmailver_c"; then
+ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
+ fi
fi
if test "x$ac_cv_have_lresolv_r" != "xyes"; then
AC_MSG_WARN([****** Your libresolv is not thread safe, SPF queries in clamav-milter will block])
diff --combined etc/clamd.conf
index b7c4d56,15ca791..5b0c3e1
--- 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).
@@@ -64,12 -64,12 +64,12 @@@
# Default: hardcoded (depends on installation options)
#DatabaseDirectory /var/lib/clamav
- # The daemon works in a local OR a network mode. Due to security reasons we
- # recommend the local mode.
+ # The daemon can work in local mode, network mode or both.
+ # Due to security reasons we recommend the local mode.
# 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
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list