Bug#681274: Full diff
Here's the full diff between Squeeze and the proposed update.
Scott K
diff -Nru clamav-0.97.3+dfsg/aclocal.m4 clamav-0.97.5+dfsg/aclocal.m4
--- clamav-0.97.3+dfsg/aclocal.m4 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/aclocal.m4 2012-06-15 10:05:04.000000000 -0400
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff -Nru clamav-0.97.3+dfsg/ChangeLog clamav-0.97.5+dfsg/ChangeLog
--- clamav-0.97.3+dfsg/ChangeLog 2011-10-17 12:04:34.000000000 -0400
+++ clamav-0.97.5+dfsg/ChangeLog 2012-06-15 10:05:05.000000000 -0400
@@ -1,3 +1,77 @@
+Fri Jun 1 13:15:50 EST 2012 (dar)
+---------------------------------
+ * libclamav: Scan output at end of truncated tar (bb#4625)
+
+Wed May 30 17:27:00 EST 2012 (dar)
+----------------------------------
+ * libclamav: Fix handling of tar file with malformed header
+ (bb#4627)
+
+Fri May 25 13:05:40 EST 2012 (dar)
+----------------------------------
+ * libclamav: Scan chm with invalid handling (bb#4626)
+
+Thu May 10 15:45:56 CEST 2012 (tk)
+----------------------------------
+ * freshclam: give custom dbs higher priority during update
+
+Tue May 8 15:31:51 CEST 2012 (acab)
+------------------------------------
+ * libclamav: detect read races and abort the scan with an error
+ (bb#4669)
+
+Tue Apr 10 17:04:20 CEST 2012 (tk)
+----------------------------------
+ * libclamav/pe.c: drop old header check (bb#4699)
+
+Wed Mar 14 22:52:48 CET 2012 (tk)
+---------------------------------
+ * V 0.97.4
+
+Wed Feb 29 18:35:45 CET 2012 (acab)
+-----------------------------------
+ * libclamav/bytecode.c: reset to BYTECODE_AUTO mode at db reload so that
+ we don't fail to re-enable or re-disable it again
+ (bb#3789)
+
+Tue Jan 17 11:15:57 CET 2012 (acab)
+-----------------------------------
+ * misc: performance improvement for HP-UX PA-RISC - patch from
+ Michael Pelletier <michael.v.pelletier*raytheon.com> (bb#3926)
+
+Fri Nov 4 00:52:21 CET 2011 (acab)
+-----------------------------------
+ * libclamav/pe.c: parse vinfo where varfileinfo occours before stringfileinfo
+ (bb#3062)
+
+Fri Mar 2 19:48:36 CET 2012 (tk)
+---------------------------------
+ * clamd: add support for on-access scanning on OS X with ClamAuth (beta)
+
+Wed Feb 29 17:02:18 EET 2012 (edwin)
+------------------------------------
+ * libclamav/bytecode_api*: Fix Sparc crash (bb #4324)
+
+Tue Feb 7 23:23:48 CET 2012 (tk)
+---------------------------------
+ * libclamav: fix bytecode whitelisting
+
+Wed Jan 25 18:56:44 CET 2012 (tk)
+---------------------------------
+ * libclamav: fix macro detection in OLE2BlockMacros (bb#4269)
+
+Thu Dec 1 15:07:49 CET 2011 (tk)
+---------------------------------
+ * libclamav/readdb.c: allow comments in all db files (bb#3930)
+
+Fri Nov 18 15:23:50 CET 2011 (tk)
+---------------------------------
+ * libclamav/scanners.c: use lsigs when scanning vba data (bb#3922)
+
+Fri Nov 18 15:48:59 EET 2011 (edwin)
+-----------------------------------
+ * libclamav/matcher-hash.c: Fix SIGBUS on PA-RISC (big-endian) architectures (bb #3894).
+
Mon Oct 17 18:04:30 CEST 2011 (tk)
----------------------------------
* V 0.97.3
diff -Nru clamav-0.97.3+dfsg/clamav-config.h.in clamav-0.97.5+dfsg/clamav-config.h.in
--- clamav-0.97.3+dfsg/clamav-config.h.in 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/clamav-config.h.in 2012-06-15 10:05:04.000000000 -0400
@@ -12,6 +12,9 @@
/* "build clamd" */
#undef BUILD_CLAMD
+/* enable ClamAuth */
+#undef CLAMAUTH
+
/* name of the clamav group */
#undef CLAMAVGROUP
diff -Nru clamav-0.97.3+dfsg/clamd/clamuko.c clamav-0.97.5+dfsg/clamd/clamuko.c
--- clamav-0.97.3+dfsg/clamd/clamuko.c 2011-08-03 09:45:20.000000000 -0400
+++ clamav-0.97.5+dfsg/clamd/clamuko.c 2012-06-15 10:05:05.000000000 -0400
@@ -231,4 +231,142 @@
return clamukofsth(arg);
}
+#elif defined(CLAMAUTH)
+
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <pthread.h>
+#include <string.h>
+#include <errno.h>
+
+#include "libclamav/clamav.h"
+#include "libclamav/scanners.h"
+
+#include "shared/optparser.h"
+#include "shared/output.h"
+
+#include "server.h"
+#include "others.h"
+#include "scanner.h"
+
+#define SUPPORTED_PROTOCOL 2
+
+static int cauth_fd = -1;
+
+struct ClamAuthEvent {
+ unsigned int action;
+ char path[1024];
+ unsigned int pid;
+};
+
+static void cauth_exit(int sig)
+{
+ logg("*ClamAuth: cauth_exit(), signal %d\n", sig);
+ if(cauth_fd > 0)
+ close(cauth_fd);
+ pthread_exit(NULL);
+ logg("ClamAuth: stopped\n");
+}
+
+static int cauth_scanfile(const char *fname, int extinfo, struct thrarg *tharg)
+{
+ struct cb_context context;
+ const char *virname;
+ int ret = 0, fd;
+
+ context.filename = fname;
+ context.virsize = 0;
+
+ fd = open(fname, O_RDONLY);
+ if(fd == -1)
+ return -1;
+
+ if(cl_scandesc_callback(fd, &virname, NULL, tharg->engine, tharg->options, &context) == CL_VIRUS) {
+ if(context.virsize)
+ detstats_add(virname, fname, context.virsize, context.virhash);
+ if(extinfo && context.virsize)
+ logg("ClamAuth: %s: %s(%s:%llu) FOUND\n", fname, virname, context.virhash, context.virsize);
+ else
+ logg("ClamAuth: %s: %s FOUND\n", fname, virname);
+ virusaction(fname, virname, tharg->opts);
+ }
+ close(fd);
+ return ret;
+}
+
+void *clamukoth(void *arg)
+{
+ struct thrarg *tharg = (struct thrarg *) arg;
+ sigset_t sigset;
+ struct sigaction act;
+ int eventcnt = 1, extinfo;
+ char err[128];
+ struct ClamAuthEvent event;
+
+ /* ignore all signals except SIGUSR1 */
+ sigfillset(&sigset);
+ sigdelset(&sigset, SIGUSR1);
+ /* The behavior of a process is undefined after it ignores a
+ * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */
+ sigdelset(&sigset, SIGFPE);
+ sigdelset(&sigset, SIGILL);
+ sigdelset(&sigset, SIGSEGV);
+#ifdef SIGBUS
+ sigdelset(&sigset, SIGBUS);
+#endif
+ pthread_sigmask(SIG_SETMASK, &sigset, NULL);
+ memset(&act, 0, sizeof(struct sigaction));
+ act.sa_handler = cauth_exit;
+ sigfillset(&(act.sa_mask));
+ sigaction(SIGUSR1, &act, NULL);
+ sigaction(SIGSEGV, &act, NULL);
+
+ extinfo = optget(tharg->opts, "ExtendedDetectionInfo")->enabled;
+
+ cauth_fd = open("/dev/clamauth", O_RDONLY);
+ if(cauth_fd == -1) {
+ logg("!ClamAuth: Can't open /dev/clamauth\n");
+ if(errno == ENOENT)
+ logg("!ClamAuth: Please make sure ClamAuth.kext is loaded\n");
+ else if(errno == EACCES)
+ logg("!ClamAuth: This application requires root privileges\n");
+ else
+ logg("!ClamAuth: /dev/clamauth: %s\n", cli_strerror(errno, err, sizeof(err)));
+
+ return NULL;
+ }
+
+ while(1) {
+ if(read(cauth_fd, &event, sizeof(event)) > 0) {
+ if(eventcnt == 1) {
+ if(event.action != SUPPORTED_PROTOCOL) {
+ logg("!ClamAuth: Protocol version mismatch (tool: %d, driver: %d)\n", SUPPORTED_PROTOCOL, event.action);
+ close(cauth_fd);
+ return NULL;
+ }
+ if(strncmp(event.path, "ClamAuth", 8)) {
+ logg("!ClamAuth: Invalid version event\n");
+ close(cauth_fd);
+ return NULL;
+ }
+ logg("ClamAuth: Driver version: %s, protocol version: %d\n", &event.path[9], event.action);
+ } else {
+ cauth_scanfile(event.path, extinfo, tharg);
+ }
+ eventcnt++;
+ } else {
+ if(errno == ENODEV) {
+ printf("^ClamAuth: ClamAuth module deactivated, terminating\n");
+ close(cauth_fd);
+ return NULL;
+ }
+ }
+ usleep(200);
+ }
+}
#endif
diff -Nru clamav-0.97.3+dfsg/clamd/clamuko.h clamav-0.97.5+dfsg/clamd/clamuko.h
--- clamav-0.97.3+dfsg/clamd/clamuko.h 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/clamd/clamuko.h 2012-06-15 10:05:05.000000000 -0400
@@ -18,7 +18,7 @@
* MA 02110-1301, USA.
*/
-#ifdef CLAMUKO
+#if defined(CLAMUKO) || defined(CLAMAUTH)
#ifndef __CLAMUKO_H
#define __CLAMUKO_H
diff -Nru clamav-0.97.3+dfsg/clamd/server-th.c clamav-0.97.5+dfsg/clamd/server-th.c
--- clamav-0.97.3+dfsg/clamd/server-th.c 2011-08-03 09:45:20.000000000 -0400
+++ clamav-0.97.5+dfsg/clamd/server-th.c 2012-06-15 10:05:05.000000000 -0400
@@ -452,7 +452,7 @@
closesocket(fds->buf[i].fd);
}
fds_free(fds);
-
+ pthread_mutex_destroy(fds->buf_mutex);
pthread_mutex_lock(&exit_mutex);
progexit = 1;
pthread_mutex_unlock(&exit_mutex);
@@ -709,7 +709,7 @@
unsigned int selfchk;
threadpool_t *thr_pool;
-#ifdef CLAMUKO
+#if defined(CLAMUKO) || defined(CLAMAUTH)
pthread_t clamuko_pid;
pthread_attr_t clamuko_attr;
struct thrarg *tharg = NULL; /* shut up gcc */
@@ -1004,8 +1004,8 @@
logg("*MaxQueue set to: %d\n", max_queue);
acceptdata.max_queue = max_queue;
- if(optget(opts, "ClamukoScanOnAccess")->enabled)
-#ifdef CLAMUKO
+ if(optget(opts, "ClamukoScanOnAccess")->enabled || optget(opts, "ClamAuth")->enabled)
+#if defined(CLAMUKO) || defined(CLAMAUTH)
{
do {
if(pthread_attr_init(&clamuko_attr)) break;
@@ -1284,8 +1284,8 @@
pthread_mutex_lock(&reload_mutex);
if(reload) {
pthread_mutex_unlock(&reload_mutex);
-#ifdef CLAMUKO
- if(optget(opts, "ClamukoScanOnAccess")->enabled && tharg) {
+#if defined(CLAMUKO) || defined(CLAMAUTH)
+ if((optget(opts, "ClamukoScanOnAccess")->enabled || optget(opts, "ClamAuth")->enabled) && tharg) {
logg("Stopping and restarting Clamuko.\n");
pthread_kill(clamuko_pid, SIGUSR1);
pthread_join(clamuko_pid, NULL);
@@ -1303,8 +1303,8 @@
reload = 0;
time(&reloaded_time);
pthread_mutex_unlock(&reload_mutex);
-#ifdef CLAMUKO
- if(optget(opts, "ClamukoScanOnAccess")->enabled && tharg) {
+#if defined(CLAMUKO) || defined(CLAMAUTH)
+ if((optget(opts, "ClamukoScanOnAccess")->enabled || optget(opts, "ClamAuth")->enabled) && tharg) {
tharg->engine = engine;
pthread_create(&clamuko_pid, &clamuko_attr, clamukoth, tharg);
}
@@ -1330,8 +1330,8 @@
*/
logg("*Waiting for all threads to finish\n");
thrmgr_destroy(thr_pool);
-#ifdef CLAMUKO
- if(optget(opts, "ClamukoScanOnAccess")->enabled) {
+#if defined(CLAMUKO) || defined(CLAMAUTH)
+ if(optget(opts, "ClamukoScanOnAccess")->enabled || optget(opts, "ClamAuth")->enabled) {
logg("Stopping Clamuko.\n");
pthread_kill(clamuko_pid, SIGUSR1);
pthread_join(clamuko_pid, NULL);
@@ -1344,6 +1344,8 @@
pthread_join(accept_th, NULL);
fds_free(fds);
+ pthread_mutex_destroy(fds->buf_mutex);
+ pthread_cond_destroy(&acceptdata.cond_nfds);
#ifdef _WIN32
CloseHandle(event_wake_accept);
CloseHandle(event_wake_recv);
diff -Nru clamav-0.97.3+dfsg/clamd/thrmgr.c clamav-0.97.5+dfsg/clamd/thrmgr.c
--- clamav-0.97.3+dfsg/clamd/thrmgr.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/clamd/thrmgr.c 2012-06-15 10:05:05.000000000 -0400
@@ -35,6 +35,7 @@
#include "others.h"
#include "mpool.h"
#include "server.h"
+#include "libclamav/others.h"
#ifdef HAVE_MALLINFO
#include <malloc.h>
@@ -467,7 +468,15 @@
#if defined(C_BIGSTACK)
pthread_attr_getstacksize(&(threadpool->pool_attr), &stacksize);
stacksize = stacksize + 64 * 1024;
- if (stacksize < 1048576) stacksize = 1048576; /* at least 1MB please */
+ if (stacksize < 1048576) /* at least 1MB please */
+#if defined(C_HPUX) && defined(USE_MPOOL)
+ /* Set aside one cli_pagesize() for the stack's pthread header,
+ * giving a 1M region to fit a 1M large-page */
+ if(cli_getpagesize() < 1048576)
+ stacksize = 1048576 - cli_getpagesize();
+ else
+#endif
+ stacksize = 1048576;
logg("Set stacksize to %lu\n", (unsigned long int) stacksize);
pthread_attr_setstacksize(&(threadpool->pool_attr), stacksize);
#endif
diff -Nru clamav-0.97.3+dfsg/configure clamav-0.97.5+dfsg/configure
--- clamav-0.97.3+dfsg/configure 2011-10-17 11:18:11.000000000 -0400
+++ clamav-0.97.5+dfsg/configure 2012-06-15 10:05:05.000000000 -0400
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ClamAV 0.97.3.
+# Generated by GNU Autoconf 2.65 for ClamAV 0.97.5.
#
# Report bugs to <http://bugs.clamav.net/>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -359,19 +359,19 @@
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -684,7 +684,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -703,8 +703,8 @@
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='0.97.3'
-PACKAGE_STRING='ClamAV 0.97.3'
+PACKAGE_VERSION='0.97.5'
+PACKAGE_STRING='ClamAV 0.97.5'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
PACKAGE_URL='http://www.clamav.net/'
@@ -1060,9 +1060,8 @@
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1107,7 +1106,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1133,7 +1132,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1337,7 +1336,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1353,7 +1352,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1383,8 +1382,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1392,7 +1391,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1410,13 +1409,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1439,7 +1438,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1453,8 +1452,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1469,9 +1468,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1510,11 +1509,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1540,7 +1539,7 @@
# 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.97.3 to adapt to many kinds of systems.
+\`configure' configures ClamAV 0.97.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1554,7 +1553,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1611,7 +1610,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ClamAV 0.97.3:";;
+ short | recursive ) echo "Configuration of ClamAV 0.97.5:";;
esac
cat <<\_ACEOF
@@ -1768,10 +1767,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ClamAV configure 0.97.3
-generated by GNU Autoconf 2.67
+ClamAV configure 0.97.5
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1875,7 +1874,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1918,7 +1917,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1984,7 +1983,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2043,18 +2042,15 @@
} # ac_fn_c_check_func
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
ac_fn_c_check_decl ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2063,12 +2059,8 @@
int
main ()
{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
+#ifndef $2
+ (void) $2;
#endif
;
@@ -2098,7 +2090,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -2151,10 +2143,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2190,7 +2182,7 @@
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2213,15 +2205,17 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
+( cat <<\_ASBOX
+## -------------------------------------- ##
## Report this to http://bugs.clamav.net/ ##
-## -------------------------------------- ##"
+## -------------------------------------- ##
+_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2237,8 +2231,8 @@
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.97.3, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by ClamAV $as_me 0.97.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2348,9 +2342,11 @@
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2384,9 +2380,11 @@
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2399,9 +2397,11 @@
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2415,9 +2415,11 @@
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2472,12 +2474,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2492,11 +2489,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+ . "$ac_site_file"
fi
done
@@ -2572,7 +2565,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2589,22 +2582,16 @@
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2623,7 +2610,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -2634,16 +2621,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2668,7 +2655,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2676,7 +2663,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2701,7 +2688,7 @@
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -2709,7 +2696,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -3026,11 +3013,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -3052,7 +3039,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -3062,7 +3049,7 @@
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3300,7 +3287,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3308,7 +3295,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3342,7 +3329,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3358,7 +3345,7 @@
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='0.97.3'
+ VERSION='0.97.5'
# Some tools Automake needs.
@@ -3487,10 +3474,10 @@
$as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h
-VERSION="0.97.3"
+VERSION="0.97.5"
LC_CURRENT=7
-LC_REVISION=12
+LC_REVISION=14
LC_AGE=1
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@ -3553,7 +3540,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3561,7 +3548,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3976,8 +3963,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4091,8 +4078,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4134,8 +4122,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4192,9 +4180,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -4245,8 +4233,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4650,7 +4638,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -4726,7 +4714,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4792,7 +4780,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4859,7 +4847,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -4975,7 +4963,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5177,13 +5165,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5180: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5168: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5183: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5171: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5186: output\"" >&5)
+ (eval echo "\"\$as_me:5174: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6378,7 +6366,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6381 "configure"' > conftest.$ac_ext
+ echo '#line 6369 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7167,7 +7155,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7183,11 +7171,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -7226,7 +7214,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7242,18 +7230,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -7382,7 +7370,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7905,11 +7894,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7908: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7897: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7912: \$? = $ac_status" >&5
+ echo "$as_me:7901: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8244,11 +8233,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8247: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8236: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8251: \$? = $ac_status" >&5
+ echo "$as_me:8240: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8349,11 +8338,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8356: \$? = $ac_status" >&5
+ echo "$as_me:8345: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8404,11 +8393,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8407: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8396: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8411: \$? = $ac_status" >&5
+ echo "$as_me:8400: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10788,7 +10777,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10791 "configure"
+#line 10780 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10884,7 +10873,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10887 "configure"
+#line 10876 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11556,7 +11545,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11559 "configure"
+#line 11548 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11793,7 +11782,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11970,7 +11960,7 @@
if test -n "$with_ltdl_include"; then
if test -f "$with_ltdl_include/ltdl.h"; then :
else
- as_fn_error $? "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5
+ as_fn_error "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5
fi
else
with_ltdl_include=no
@@ -11986,7 +11976,7 @@
if test -n "$with_ltdl_lib"; then
if test -f "$with_ltdl_lib/libltdl.la"; then :
else
- as_fn_error $? "invalid ltdl library directory: \`$with_ltdl_lib'" "$LINENO" 5
+ as_fn_error "invalid ltdl library directory: \`$with_ltdl_lib'" "$LINENO" 5
fi
else
with_ltdl_lib=no
@@ -11995,7 +11985,7 @@
case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
,yes,no,no,)
case $enable_ltdl_convenience in
- no) as_fn_error $? "this package needs a convenience libltdl" "$LINENO" 5 ;;
+ no) as_fn_error "this package needs a convenience libltdl" "$LINENO" 5 ;;
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
@@ -12023,7 +12013,7 @@
LTDLINCL=
;;
,no*,no,*)
- as_fn_error $? "\`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" "$LINENO" 5
+ as_fn_error "\`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" "$LINENO" 5
;;
*) with_included_ltdl=no
LIBLTDL="-L$with_ltdl_lib -lltdl"
@@ -12090,7 +12080,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12104,7 +12095,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12121,7 +12113,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12776,8 +12769,8 @@
;; #(
*)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -12933,7 +12926,7 @@
4.1.0*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${gcc_version})" >&5
$as_echo "no (${gcc_version})" >&6; }
- as_fn_error $? "gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" "$LINENO" 5
+ as_fn_error "gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" "$LINENO" 5
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gcc_version})" >&5
@@ -12960,7 +12953,7 @@
if test "x$ac_compiler_gnu" = "xyes"; then
gcc_version=`${CC} -dumpversion`
case "${gcc_version}" in
- 4.[3456789].*)
+ 4.[3456789]*)
distcheck_enable_flags=1
;;
[56789].*)
@@ -13000,7 +12993,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603"; "$LINENO" 5
+ as_fn_error "your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603"; "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13039,7 +13032,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763"; "$LINENO" 5
+ as_fn_error "your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763"; "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13117,7 +13110,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670"; "$LINENO" 5
+ as_fn_error "your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670"; "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13159,7 +13152,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045"; "$LINENO" 5
+ as_fn_error "your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045"; "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13255,7 +13248,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573"; "$LINENO" 5
+ as_fn_error "your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573"; "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13340,7 +13333,8 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -13399,7 +13393,7 @@
fi
if test x$ac_cv_sizeof_short = x ; then
- as_fn_error $? "cannot determine a size for short" "$LINENO" 5
+ as_fn_error "cannot determine a size for short" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
$as_echo "$ac_cv_sizeof_short" >&6; }
@@ -13439,7 +13433,7 @@
fi
if test x$ac_cv_sizeof_int = x ; then
- as_fn_error $? "cannot determine a size for int" "$LINENO" 5
+ as_fn_error "cannot determine a size for int" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
$as_echo "$ac_cv_sizeof_int" >&6; }
@@ -13479,7 +13473,7 @@
fi
if test x$ac_cv_sizeof_long = x ; then
- as_fn_error $? "cannot determine a size for long" "$LINENO" 5
+ as_fn_error "cannot determine a size for long" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
$as_echo "$ac_cv_sizeof_long" >&6; }
@@ -13519,7 +13513,7 @@
fi
if test x$ac_cv_sizeof_long_long = x ; then
- as_fn_error $? "cannot determine a size for long long" "$LINENO" 5
+ as_fn_error "cannot determine a size for long long" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
$as_echo "$ac_cv_sizeof_long_long" >&6; }
@@ -13559,7 +13553,7 @@
fi
if test x$ac_cv_sizeof_void_p = x ; then
- as_fn_error $? "cannot determine a size for void *" "$LINENO" 5
+ as_fn_error "cannot determine a size for void *" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
$as_echo "$ac_cv_sizeof_void_p" >&6; }
@@ -13728,7 +13722,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -14187,7 +14182,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${acl_cv_prog_gnu_ld+set}" = set; then :
@@ -14777,7 +14772,7 @@
if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then
- as_fn_error $? "
+ as_fn_error "
ERROR! Check was configured, but not found. Get it from http://check.sf.net/
" "$LINENO" 5
@@ -14793,10 +14788,10 @@
if test "x$enable_coverage" = "xyes"; then
if test "x$CHECK_LIBS" = "x"; then
- as_fn_error $? "Coverage testing required, but unit tests not enabled!" "$LINENO" 5
+ as_fn_error "Coverage testing required, but unit tests not enabled!" "$LINENO" 5
fi
if test "x$ac_compiler_gnu" != "xyes"; then
- as_fn_error $? "coverage testing only works if gcc is used" "$LINENO" 5
+ as_fn_error "coverage testing only works if gcc is used" "$LINENO" 5
fi
CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
@@ -15008,7 +15003,7 @@
if test ! -f "$ZLIB_HOME/include/zlib.h"
then
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
else
vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
@@ -15018,7 +15013,7 @@
if test -n "$vuln"; then
if test "$zlib_check" = "yes"; then
- as_fn_error $? "The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" "$LINENO" 5
+ as_fn_error "The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** This ClamAV installation may be linked against" >&5
$as_echo "$as_me: WARNING: ****** This ClamAV installation may be linked against" >&2;}
@@ -15073,7 +15068,7 @@
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"
else
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
@@ -15120,7 +15115,7 @@
LIBS="-lz $LIBS"
else
- as_fn_error $? "Your zlib is missing gzopen()" "$LINENO" 5
+ as_fn_error "Your zlib is missing gzopen()" "$LINENO" 5
fi
LDFLAGS="$save_LDFLAGS"
@@ -15164,7 +15159,7 @@
if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"
else
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
@@ -15211,7 +15206,7 @@
LIBS="-lz $LIBS"
else
- as_fn_error $? "Your zlib is missing gzopen()" "$LINENO" 5
+ as_fn_error "Your zlib is missing gzopen()" "$LINENO" 5
fi
fi
@@ -16311,7 +16306,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- as_fn_error $? "cannot check setpgrp when cross compiling" "$LINENO" 5
+ as_fn_error "cannot check setpgrp when cross compiling" "$LINENO" 5
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16451,7 +16446,7 @@
;;
no) ;;
- *) as_fn_error $? "--with-system-tommath does not take an argument" "$LINENO" 5 ;;
+ *) as_fn_error "--with-system-tommath does not take an argument" "$LINENO" 5 ;;
esac
fi
@@ -16472,7 +16467,7 @@
withval=$with_iconv;
case "$withval" in
yes|no) wiconv="$withval";;
- *) as_fn_error $? "--with-iconv does not take an argument" "$LINENO" 5 ;;
+ *) as_fn_error "--with-iconv does not take an argument" "$LINENO" 5;;
esac
else
wiconv=auto
@@ -16941,6 +16936,9 @@
$as_echo "#define BIND_8_COMPAT 1" >>confdefs.h
+
+$as_echo "#define CLAMAUTH 1" >>confdefs.h
+
use_netinfo="yes"
;;
os2*)
@@ -16966,6 +16964,9 @@
$as_echo "#define C_HPUX 1" >>confdefs.h
+ if test "$have_mempool" = "yes"; then
+ LDFLAGS="$LDFLAGS -Wl,+pd,1M"
+ fi
;;
aix*)
if test "$have_pthreads" = "yes"; then
@@ -17187,7 +17188,7 @@
CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"
else
- as_fn_error $? "Cannot find libmilter" "$LINENO" 5
+ as_fn_error "Cannot find libmilter" "$LINENO" 5
fi
@@ -17205,7 +17206,7 @@
have_milter="yes"
else
- as_fn_error $? "Please install mfapi.h from the sendmail distribution" "$LINENO" 5
+ as_fn_error "Please install mfapi.h from the sendmail distribution" "$LINENO" 5
fi
@@ -17238,7 +17239,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17564,7 +17566,7 @@
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" "$LINENO" 5
+ as_fn_error "User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user $clamav_user and group $clamav_group" >&5
$as_echo "yes, user $clamav_user and group $clamav_group" >&6; }
@@ -17618,8 +17620,8 @@
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17657,8 +17659,8 @@
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17719,7 +17721,7 @@
$as_echo "$have_cv_attrib_aligned" >&6; }
if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
- as_fn_error $? "Need to know how to pack structures with this compiler" "$LINENO" 5
+ as_fn_error "Need to know how to pack structures with this compiler" "$LINENO" 5
fi
if test "$have_cv_attrib_packed" = yes; then
@@ -17807,7 +17809,7 @@
$as_echo "$have_cv_struct_pack" >&6; }
if test "$have_cv_struct_pack" = "no"; then
- as_fn_error $? "Structure packing seems to be available, but is not working with this compiler" "$LINENO" 5
+ as_fn_error "Structure packing seems to be available, but is not working with this compiler" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set" >&5
@@ -17944,7 +17946,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19969,7 +19972,7 @@
fi
if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
- as_fn_error $? "
+ as_fn_error "
ERROR! Clamdtop was configured, but not found. You need to install libncurses5-dev.
" "$LINENO" 5
@@ -20008,7 +20011,7 @@
# configure think that -lm doesn't have cos, hence its in libc).
if test "x$enable_distcheckwerror" = "xyes"; then
if test "$distcheck_enable_flags" = "1"; then
- CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
+ CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Wno-error=strict-aliasing -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
fi
fi
@@ -20132,7 +20135,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -20156,19 +20158,19 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined.
+ as_fn_error "conditional \"INSTALL_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"CONVENIENCE_LTDL\" was never defined.
+ as_fn_error "conditional \"CONVENIENCE_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
LT_CONFIG_H=clamav-config.h
@@ -20190,39 +20192,39 @@
if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
- as_fn_error $? "conditional \"VERSIONSCRIPT\" was never defined.
+ as_fn_error "conditional \"VERSIONSCRIPT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LIBCHECK\" was never defined.
+ as_fn_error "conditional \"HAVE_LIBCHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_COVERAGE\" was never defined.
+ as_fn_error "conditional \"ENABLE_COVERAGE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined.
+ as_fn_error "conditional \"ENABLE_UNRAR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
- as_fn_error $? "conditional \"LINK_TOMMATH\" was never defined.
+ as_fn_error "conditional \"LINK_TOMMATH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_CLAMD\" was never defined.
+ as_fn_error "conditional \"BUILD_CLAMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_MILTER_TRUE}" && test -z "${HAVE_MILTER_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MILTER\" was never defined.
+ as_fn_error "conditional \"HAVE_MILTER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_CURSES\" was never defined.
+ as_fn_error "conditional \"HAVE_CURSES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -20372,19 +20374,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -20580,7 +20582,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -20633,8 +20635,8 @@
# 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.97.3, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by ClamAV $as_me 0.97.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -20700,11 +20702,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ClamAV config.status 0.97.3
-configured by $0, generated by GNU Autoconf 2.67,
+ClamAV config.status 0.97.5
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -20722,16 +20724,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -20753,7 +20750,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -20766,7 +20762,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -20775,7 +20771,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -21119,7 +21115,7 @@
"docs/man/sigtool.1") CONFIG_FILES="$CONFIG_FILES docs/man/sigtool.1" ;;
"docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -21157,7 +21153,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -21174,7 +21170,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -21188,18 +21184,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -21288,28 +21284,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -21337,7 +21325,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -21422,7 +21410,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -21435,7 +21423,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -21463,7 +21451,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -21490,7 +21478,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -21627,22 +21615,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -21653,19 +21641,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -22450,7 +22438,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -22471,7 +22459,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
@@ -22628,7 +22616,7 @@
if test "$enable_llvm" = "yes" && test "$subdirfailed" != "no"; then
- as_fn_error $? "Failed to configure LLVM, and LLVM was explicitly requested" "$LINENO" 5
+ as_fn_error "Failed to configure LLVM, and LLVM was explicitly requested" "$LINENO" 5
fi
if test "$subdirfailed" != "yes" && test "$enable_llvm" != "no"; then
ENABLE_LLVM_TRUE=
@@ -22724,7 +22712,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -22748,19 +22735,19 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined.
+ as_fn_error "conditional \"INSTALL_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"CONVENIENCE_LTDL\" was never defined.
+ as_fn_error "conditional \"CONVENIENCE_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
LT_CONFIG_H=clamav-config.h
@@ -22782,47 +22769,47 @@
if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
- as_fn_error $? "conditional \"VERSIONSCRIPT\" was never defined.
+ as_fn_error "conditional \"VERSIONSCRIPT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LIBCHECK\" was never defined.
+ as_fn_error "conditional \"HAVE_LIBCHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_COVERAGE\" was never defined.
+ as_fn_error "conditional \"ENABLE_COVERAGE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined.
+ as_fn_error "conditional \"ENABLE_UNRAR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
- as_fn_error $? "conditional \"LINK_TOMMATH\" was never defined.
+ as_fn_error "conditional \"LINK_TOMMATH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_CLAMD\" was never defined.
+ as_fn_error "conditional \"BUILD_CLAMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_MILTER_TRUE}" && test -z "${HAVE_MILTER_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MILTER\" was never defined.
+ as_fn_error "conditional \"HAVE_MILTER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_CURSES\" was never defined.
+ as_fn_error "conditional \"HAVE_CURSES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
- as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
+ as_fn_error "conditional \"am__EXEEXT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_LLVM_TRUE}" && test -z "${ENABLE_LLVM_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_LLVM\" was never defined.
+ as_fn_error "conditional \"ENABLE_LLVM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -22972,19 +22959,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -23180,7 +23167,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -23233,8 +23220,8 @@
# 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.97.3, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by ClamAV $as_me 0.97.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -23300,11 +23287,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ClamAV config.status 0.97.3
-configured by $0, generated by GNU Autoconf 2.67,
+ClamAV config.status 0.97.5
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -23322,16 +23309,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -23353,7 +23335,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -23366,7 +23347,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -23375,7 +23356,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -23721,7 +23702,7 @@
"docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
"libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -23759,7 +23740,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -23776,7 +23757,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -23790,18 +23771,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -23890,28 +23871,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -23939,7 +23912,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -24024,7 +23997,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -24037,7 +24010,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -24065,7 +24038,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -24092,7 +24065,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -24229,22 +24202,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -24255,19 +24228,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -25052,7 +25025,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -25073,7 +25046,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
diff -Nru clamav-0.97.3+dfsg/configure.in clamav-0.97.5+dfsg/configure.in
--- clamav-0.97.3+dfsg/configure.in 2011-10-17 11:17:41.000000000 -0400
+++ clamav-0.97.5+dfsg/configure.in 2012-06-15 10:05:05.000000000 -0400
@@ -20,7 +20,7 @@
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([ClamAV], [0.97.3], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
+AC_INIT([ClamAV], [0.97.5], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
AH_BOTTOM([#include "platform.h"])
dnl put configure auxiliary into config
@@ -43,10 +43,10 @@
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
-VERSION="0.97.3"
+VERSION="0.97.5"
LC_CURRENT=7
-LC_REVISION=12
+LC_REVISION=14
LC_AGE=1
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@@ -120,7 +120,7 @@
if test "x$ac_compiler_gnu" = "xyes"; then
gcc_version=`${CC} -dumpversion`
case "${gcc_version}" in
- 4.[[3456789]].*)
+ 4.[[3456789]]*)
distcheck_enable_flags=1
;;
[[56789]].*)
@@ -1044,6 +1044,7 @@
AC_DEFINE([C_BSD],1,[os is bsd flavor])
AC_DEFINE([C_DARWIN],1,[os is darwin])
AC_DEFINE([BIND_8_COMPAT],1,[enable bind8 compatibility])
+ AC_DEFINE([CLAMAUTH],1,[enable ClamAuth])
use_netinfo="yes"
;;
os2*)
@@ -1069,6 +1070,9 @@
TH_SAFE="-thread-safe"
fi
AC_DEFINE([C_HPUX],1,[os is hpux])
+ if test "$have_mempool" = "yes"; then
+ LDFLAGS="$LDFLAGS -Wl,+pd,1M"
+ fi
;;
aix*)
if test "$have_pthreads" = "yes"; then
@@ -1596,7 +1600,7 @@
# configure think that -lm doesn't have cos, hence its in libc).
if test "x$enable_distcheckwerror" = "xyes"; then
if test "$distcheck_enable_flags" = "1"; then
- CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
+ CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Wno-error=strict-aliasing -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
fi
fi
diff -Nru clamav-0.97.3+dfsg/contrib/cleanup-partial.pl clamav-0.97.5+dfsg/contrib/cleanup-partial.pl
--- clamav-0.97.3+dfsg/contrib/cleanup-partial.pl 2010-07-30 08:25:16.000000000 -0400
+++ clamav-0.97.5+dfsg/contrib/cleanup-partial.pl 1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-
-# ---- Settings ----
-# TemporaryDirectory in clamd.conf
-my $TMPDIR='/tmp';
-# How long to wait for next part of RFC1341 message (seconds)
-my $cleanup_interval=3600;
-
-# ---- End of Settings ----
-
-my $partial_dir = "$TMPDIR/clamav-partial";
-# if there is no partial directory, nothing to clean up
-opendir(DIR, $partial_dir) || exit 0;
-
-my $cleanup_threshold = time - $cleanup_interval;
-while(my $file = readdir(DIR)) {
- next unless $file =~ m/^clamav-partial-([0-9]+)_[0-9a-f]{32}-[0-9]+$/;
- my $filetime = $1;
- unlink "$partial_dir/$file" unless $filetime > $cleanup_threshold;
-}
-closedir DIR;
diff -Nru clamav-0.97.3+dfsg/contrib/safe_clamd/safe_clamd clamav-0.97.5+dfsg/contrib/safe_clamd/safe_clamd
--- clamav-0.97.3+dfsg/contrib/safe_clamd/safe_clamd 2011-10-17 12:08:23.000000000 -0400
+++ clamav-0.97.5+dfsg/contrib/safe_clamd/safe_clamd 1969-12-31 19:00:00.000000000 -0500
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-# safe_clamd - a script to start clamd and restart if it dies unexpectedly
-# Please report bugs at https://wwws.clamav.net/bugzilla/show_bug.cgi?id=2026
-# Usage:
-# start with ./safe_clamd
-# stop by sending a TERM signal to the safe_clamd process
-
-{
-####################### CONFIGURATION #######################
-# path to clamd.conf
-CLAMDCONF='/usr/local/etc/clamd.conf'
-# path to clamd binary
-CLAMDBIN='/usr/local/sbin/clamd'
-# interval between checks
-SLEEPINTERVAL=3
-# after a successful restart, sleep for $THROTTLE secs before attempting to restart clamd again
-THROTTLE=30
-##################### END CONFIGURATION #####################
-
-# Do not touch anything below this line, unless you know what you are doing
-trap "signalClamd HUP" HUP
-trap "signalClamd TERM" TERM
-trap "signalClamd USR2" USR2
-
-getPid() {
- PIDFILE=`grep ^PidFile $CLAMDCONF | sed -e 's/^PidFile\s*//'`
- if [ -z "$PIDFILE" ]
- then
- # missing PidFile directive
- echo "Please enable the PidFile directive in $CLAMDCONF. See man clamd.conf for more info."
- exit 1
- fi
- CLAMDPID=`cat $PIDFILE 2>/dev/null | grep -Eo '^[0-9]+$'`
- if [ -z "$CLAMDPID" ]
- then
- # empty pidfile
- CLAMDPID=0
- return
- fi
- if ps p $CLAMDPID | grep -v grep | grep $CLAMDBIN > /dev/null
- then
- # good pid
- return
- fi
- # invalid pid
- CLAMDPID=0
-}
-
-startClamd() {
- rm -f $PIDFILE
- if test -f $PIDFILE
- then
- echo "ERROR: cannot remove $PIDFILE"
- exit 1
- else
- $CLAMDBIN $args
- if [ $? -ne 0 ]
- then
- exit $?
- fi
- sleep $THROTTLE
- fi
-}
-
-signalClamd() {
- getPid
- if [ $CLAMDPID -gt 0 ]; then
- echo "Sending $1 to pid $CLAMDPID..."
- kill -$1 $CLAMDPID
- else
- echo "$CLAMDBIN is not running."
- fi
- if [ "$1" == "TERM" ]; then
- echo Exiting $0 ...
- exit
- fi
-}
-
-args=$@
-
-# start clamd
-# if it start successfully, enter loop
-# every 5 secs, find pid, verify it belongs to clamd, kill -0
-# restart it if dead
-while [ true ]; do
- if test -r "$CLAMDCONF"
- then
- if test -x "$CLAMDBIN"
- then
- # retrieve pid
- getPid
- # pid found?
- if [ $CLAMDPID -gt 0 ]
- then
- if kill -0 $CLAMDPID > /dev/null 2>/dev/null
- then
- # pid is alive, sleep before next check
- sleep $SLEEPINTERVAL
- else
- # stale pid
- rm -f $PIDFILE
- startClamd
- fi
- else
- # pid does not belong to clamd
- startClamd
- fi
- else
- echo $CLAMDBIN not found
- exit 1
- fi
- else
- echo $CLAMDCONF not found
- exit 1
- fi
-done
-
-} &
Binary files /tmp/R2b17oUk7a/clamav-0.97.3+dfsg/database/daily.cvd and /tmp/UeGx1Nk2IY/clamav-0.97.5+dfsg/database/daily.cvd differ
Binary files /tmp/R2b17oUk7a/clamav-0.97.3+dfsg/database/main.cvd and /tmp/UeGx1Nk2IY/clamav-0.97.5+dfsg/database/main.cvd differ
diff -Nru clamav-0.97.3+dfsg/debian/changelog clamav-0.97.5+dfsg/debian/changelog
--- clamav-0.97.3+dfsg/debian/changelog 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/changelog 2012-07-12 11:19:13.000000000 -0400
@@ -1,3 +1,59 @@
+clamav (0.97.5+dfsg-3~squeeze1) stable; urgency=low
+
+ [ Scott Kitterman ]
+ * New upstream release (Closes: #668273, #669370, #678744)
+ - Addresses possible evasion cases in some archive formats (CVE-2012-1419,
+ CVE-2012-1457, CVE-2012-1458, CVE-2012-1459) (Closes: #668273)
+ - Repack tarball to remove non-free unrar code and win32 directory
+ - Add contrib/split-tarball.sh and docs/man/clambc.1 in the diff.gz
+ (these used to be added to the Debian specific upstream tarball, but
+ aren't upstream so are better in the diff)
+ - Change etc/clamav-milter.conf to Debian defaults
+ * Fix proxy port configuration handling in clamav-freshclam.postinst so that
+ failure to specify port does not result in an invalid configuration
+ (Closes: #678247), (LP: #784797)
+ * Remove /var/run/clamav on purge (LP: #829945)
+ - Thanks to Imre Gergely for the patch
+ * Add call to /sbin/restorecon, if present, in debian/common_functions
+ make_directory to to label the /run directory for SE Linux
+ (Closes: #677686)
+ - Thanks to Russell Coker for the patch
+ * Remove obsolete reference to clamav-data package in clamav-daemon init log
+ failure message
+ * Enabled hardened build flags (Closes: #653958)
+ - Thanks to Moritz Muehlenhoff for the patch
+ * Remove var/lib/clamav/daily.cvd and main.cvd from clamav-base.examples
+ because they aren't installed by the build system anymore (and are
+ provided only as empty files in the upstream tarball)
+ * Fix typos in README.Debian (Closes: #667831)
+ * Update libclamav6 binary lintian override to match current filename
+ * Bump standards version to 3.9.3 without further change
+ * Add myself to uploaders
+
+ [ Stephen Gran ]
+ * Add a note about RAR functionality to README.Debian (Closes: #652009)
+ * Add VERBOSE=1 to make check
+
+ [ Christian Perrier ]
+ * Fix spelling error in debconf templates. Closes: #660966
+ * Fix pending l10n issues. Debconf translations:
+ - Dutch; (Jeroen Schot). Closes: #651405
+ - German (Thomas Müller). Closes: #653409
+ - Polish (Michał Kułach). Closes: #659369
+ - Japanese (Kenshi Muto). Closes: #659980
+ - Czech (Miroslav Kure). Closes: #660319
+ - Italian (Luca Monducci). Closes: #660475
+
+ [ Loïc Minier ]
+ * Pass --without-included-ltdl to configure instead of hardcoding
+ --with-ltdl-include= and --with-ltdl-lib= pathnames, the pathnames
+ wouldn't work with multiarch anymore.
+ * rules: let clamav-dbg depend on libclamav6 as it seems to require it and
+ this could make rules -j safe (didn't manage to reproduce the -j2 failure
+ I was getting with the change).
+
+ -- Scott Kitterman <scott@kitterman.com> Wed, 11 Jul 2012 15:10:50 -0400
+
clamav (0.97.3+dfsg-1~squeeze1) stable; urgency=medium
[ Michael Tautschnig ]
diff -Nru clamav-0.97.3+dfsg/debian/clamav-base.examples clamav-0.97.5+dfsg/debian/clamav-base.examples
--- clamav-0.97.3+dfsg/debian/clamav-base.examples 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-base.examples 2012-07-12 11:19:13.000000000 -0400
@@ -1,3 +1 @@
etc/clamd.conf
-debian/tmp/var/lib/clamav/daily.cvd
-debian/tmp/var/lib/clamav/main.cvd
diff -Nru clamav-0.97.3+dfsg/debian/clamav-base.postinst.in clamav-0.97.5+dfsg/debian/clamav-base.postinst.in
--- clamav-0.97.3+dfsg/debian/clamav-base.postinst.in 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-base.postinst.in 2012-07-12 11:19:13.000000000 -0400
@@ -384,7 +384,7 @@
# Update database now
for db in main daily; do
if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && \
- [ ! -e "$DATABASEDIR"/"$db".cld ] && [ -d /usr/share/doc/clamav-base/examples ] ; then
+ [ ! -e "$DATABASEDIR"/"$db".cld ] && [ -e /usr/share/doc/clamav-base/examples/"$db".cvd ] ; then
install -m 0644 -o $user -g $user /usr/share/doc/clamav-base/examples/"$db".cvd \
"$DATABASEDIR"
fi
diff -Nru clamav-0.97.3+dfsg/debian/clamav-base.postrm clamav-0.97.5+dfsg/debian/clamav-base.postrm
--- clamav-0.97.3+dfsg/debian/clamav-base.postrm 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-base.postrm 2012-07-12 11:19:13.000000000 -0400
@@ -45,7 +45,7 @@
fi
rm -f /var/lib/clamav/*.md5sum || true
rm -f $DATABASEDIR/main.cvd $DATABASEDIR/daily.cvd $DATABASEDIR/bytecode.cvd
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+ for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
if [ -d "$dir" ]; then
rmdir "$dir" --ignore-fail-on-non-empty || true
fi
diff -Nru clamav-0.97.3+dfsg/debian/clamav-base.templates clamav-0.97.5+dfsg/debian/clamav-base.templates
--- clamav-0.97.3+dfsg/debian/clamav-base.templates 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-base.templates 2012-07-12 11:19:13.000000000 -0400
@@ -189,5 +189,5 @@
Template: clamav-base/BytecodeTimeout
Type: string
Default: 60000
-_Description: Bytecode execution timeout in miliseconds:
+_Description: Bytecode execution timeout in milliseconds:
diff -Nru clamav-0.97.3+dfsg/debian/clamav-daemon.init.in clamav-0.97.5+dfsg/debian/clamav-daemon.init.in
--- clamav-0.97.3+dfsg/debian/clamav-daemon.init.in 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-daemon.init.in 2012-07-12 11:19:13.000000000 -0400
@@ -94,7 +94,7 @@
for db in main daily; do
if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && [ ! -e "$DATABASEDIR"/"$db".cld ]; then
log_failure_msg "Clamav signatures not found in $DATABASEDIR"
- log_failure_msg "Please retrieve them using freshclam or install the clamav-data package"
+ log_failure_msg "Please retrieve them using freshclam"
log_failure_msg "Then run '/etc/init.d/clamav-daemon start'"
exit 0
fi
diff -Nru clamav-0.97.3+dfsg/debian/clamav-daemon.postrm clamav-0.97.5+dfsg/debian/clamav-daemon.postrm
--- clamav-0.97.3+dfsg/debian/clamav-daemon.postrm 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-daemon.postrm 2012-07-12 11:19:13.000000000 -0400
@@ -29,7 +29,7 @@
if [ -e "$LOGROTATE_FILE" ]; then
rm -f $LOGROTATE_FILE
fi
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+ for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
if [ -d "$dir" ]; then
rmdir "$dir" --ignore-fail-on-non-empty || true
fi
diff -Nru clamav-0.97.3+dfsg/debian/clamav-freshclam.postinst.in clamav-0.97.5+dfsg/debian/clamav-freshclam.postinst.in
--- clamav-0.97.3+dfsg/debian/clamav-freshclam.postinst.in 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-freshclam.postinst.in 2012-07-12 11:19:13.000000000 -0400
@@ -81,6 +81,9 @@
url="`echo "$RET" | sed -e 's,^http://,,g' | sed -e 's,/$,,g'`"
phost="`echo "$url" | cut -d':' -f 1`"
pport="`echo "$url" | cut -d':' -f 2`"
+ if [ "$pport" = "$phost" ]; then
+ pport=""
+ fi
fullurl="$RET"
db_metaget clamav-freshclam/proxy_user value || true
if [ "$RET" != "" ]; then
@@ -239,10 +242,12 @@
grep -q "$m" "$DEBCONFILE" || echo "DatabaseMirror $m" >> $DEBCONFILE
done
- if [ -n "$phost" ] && [ -n "$pport" ]; then
+ if [ -n "$phost" ]; then
echo "# Proxy: $fullurl" >> $DEBCONFILE
echo "HTTPProxyServer $phost" >> $DEBCONFILE
- echo "HTTPProxyPort $pport" >> $DEBCONFILE
+ if [ -n "$pport" ]; then
+ echo "HTTPProxyPort $pport" >> $DEBCONFILE
+ fi
fi
if [ -n "$puser" ] && [ -n "$ppass" ]; then
echo "# Proxy authentication: $fulluser" >> $DEBCONFILE
diff -Nru clamav-0.97.3+dfsg/debian/clamav-freshclam.postrm clamav-0.97.5+dfsg/debian/clamav-freshclam.postrm
--- clamav-0.97.3+dfsg/debian/clamav-freshclam.postrm 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-freshclam.postrm 2012-07-12 11:19:13.000000000 -0400
@@ -52,7 +52,7 @@
[ ! -d "${workdir}/main.inc/" ] || rmdir --ignore-fail-on-non-empty ${workdir}/main.inc/
[ ! -d "${workdir}/daily.inc/" ] || rmdir --ignore-fail-on-non-empty ${workdir}/daily.inc/
update-rc.d clamav-freshclam remove >/dev/null
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+ for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
if [ -d "$dir" ]; then
rmdir "$dir" --ignore-fail-on-non-empty || true
fi
diff -Nru clamav-0.97.3+dfsg/debian/clamav-milter.postrm clamav-0.97.5+dfsg/debian/clamav-milter.postrm
--- clamav-0.97.3+dfsg/debian/clamav-milter.postrm 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/clamav-milter.postrm 2012-07-12 11:19:13.000000000 -0400
@@ -35,7 +35,7 @@
fi
done
rm -f /var/log/clamav/clamav-milter.log* /etc/clamav/clamav-milter.conf.dpkg-old /etc/clamav/clamav-milter.conf.ucf-old
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
+ for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
if [ -d "$dir" ]; then
rmdir "$dir" --ignore-fail-on-non-empty || true
fi
diff -Nru clamav-0.97.3+dfsg/debian/common_functions clamav-0.97.5+dfsg/debian/common_functions
--- clamav-0.97.3+dfsg/debian/common_functions 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/common_functions 2012-07-12 11:19:13.000000000 -0400
@@ -171,6 +171,7 @@
[ -n "$User" ] || User=clamav
mkdir -p -m 0755 "$DIR"
chown "$User" "$DIR"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$DIR"
}
# Debconf Functions
diff -Nru clamav-0.97.3+dfsg/debian/control clamav-0.97.5+dfsg/debian/control
--- clamav-0.97.3+dfsg/debian/control 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/control 2012-07-12 11:19:13.000000000 -0400
@@ -2,9 +2,9 @@
Section: utils
Priority: optional
Maintainer: ClamAV Team <pkg-clamav-devel@lists.alioth.debian.org>
-Uploaders: Stephen Gran <sgran@debian.org>, Michael Meskes <meskes@debian.org>, Michael Tautschnig <mt@debian.org>
+Uploaders: Stephen Gran <sgran@debian.org>, Michael Meskes <meskes@debian.org>, Michael Tautschnig <mt@debian.org>, Scott Kitterman <scott@kitterman.com>
Build-Depends: debhelper (>= 6.0.7), po-debconf, zlib1g-dev, libbz2-dev, libmilter-dev, perl, bc, check, libtommath-dev, libltdl-dev, electric-fence, libncurses5-dev, python
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/pkg-clamav/clamav.git
Vcs-Browser: http://git.debian.org/?p=pkg-clamav/clamav.git;a=summary
Homepage: http://www.clamav.net/
diff -Nru clamav-0.97.3+dfsg/debian/libclamav6.lintian-overrides clamav-0.97.5+dfsg/debian/libclamav6.lintian-overrides
--- clamav-0.97.3+dfsg/debian/libclamav6.lintian-overrides 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/libclamav6.lintian-overrides 2012-07-12 11:19:13.000000000 -0400
@@ -1 +1 @@
-libclamav6 binary: embedded-library usr/lib/libclamav.so.6.1.12: zlib
+libclamav6 binary: embedded-library usr/lib/libclamav.so.6.1.14: zlib
diff -Nru clamav-0.97.3+dfsg/debian/NEWS.Debian clamav-0.97.5+dfsg/debian/NEWS.Debian
--- clamav-0.97.3+dfsg/debian/NEWS.Debian 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/NEWS.Debian 2012-07-12 11:19:13.000000000 -0400
@@ -1,3 +1,11 @@
+clamav (0.97.5+dfsg-1) unstable; urgency=medium
+
+ This release of clamav no longer ships signature files in clamav-base so
+ no signatures are available until after freshclam has run and downloaded
+ them. This is an upstream change.
+
+ -- Scott Kitterman <scott@kitterman.com> Fri, 15 Jun 2012 11:39:26 -0400
+
clamav (0.95.2+dfsg-1) unstable; urgency=low
This release of clamav-milter requires you to amend your configuration.
diff -Nru clamav-0.97.3+dfsg/debian/po/cs.po clamav-0.97.5+dfsg/debian/po/cs.po
--- clamav-0.97.3+dfsg/debian/po/cs.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/cs.po 2012-07-12 11:19:13.000000000 -0400
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: clamav\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2010-10-13 19:12+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -586,7 +586,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Maximální čas běhu bajtkódu (v milisekundách):"
#. Type: boolean
@@ -768,16 +768,13 @@
#. Type: string
#. Description
#: ../clamav-milter.templates:13001
-#, fuzzy
-#| msgid ""
-#| "Please specify the directory for clamav-milter's temporary files. If "
-#| "unset, $TMPDIR and $TEMP will be honored."
msgid ""
"Please specify the directory for clamav-milter's files that are temporarily "
"buffered for scanning. If unset, $TMPDIR and $TEMP will be honored."
msgstr ""
-"Zadejte adresář pro dočasné soubory clamav-milteru. Nezadáte-li nic, použijí "
-"se proměnné prostředí $TMPDIR a $TEMP."
+"Zadejte adresář, kam si má clamav-milter dočasně odkládat soubory, které "
+"právě prohledává. Nezadáte-li nic, použijí se proměnné prostředí $TMPDIR a "
+"$TEMP."
#. Type: string
#. Description
@@ -966,7 +963,7 @@
msgstr ""
"Zvolte, jaká akce se má provést v případě, že se objeví chyby typu: nelze "
"alokovat datové struktury, nejsou dostupné žádné prohledávače, síťové "
-"výpadky, neznámé odpovědi od prohledávačů, ..."
+"výpadky, neznámé odpovědi od prohledávačů…"
#. Type: select
#. Description
@@ -1199,21 +1196,12 @@
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid "Information to log on infected messages:"
msgid "Information to log if no threat is found:"
-msgstr "Informace, které se mají zaznamenávat o infikovaných zprávách:"
+msgstr "Co se má zaznamenat v případě, že není nalezena žádná hrozba:"
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid ""
-#| "Please choose the level of information that will be logged when infected "
-#| "messages are found:\n"
-#| " - Off : no logging;\n"
-#| " - Basic: minimal information;\n"
-#| " - Full : verbose information."
msgid ""
"Please choose the level of information that will be logged when no threat is "
"found in a scanned message (this is useful in debugging but drastically "
@@ -1222,8 +1210,9 @@
" - Basic: minimal information;\n"
" - Full : verbose information."
msgstr ""
-"Zvolte si množství informací, které se budou zaznamenávat v případě nálezu "
-"infikované zprávy:\n"
+"Zvolte si množství informací, které se budou zaznamenávat v případě, že ve "
+"zprávě není nalezena žádná hrozba (užitečné pro ladění, ale drasticky zvýší "
+"velikost logů):\n"
" - Vypnuto : nezaznamená se nic\n"
" - Základní: minimální informace\n"
" - Plné : upovídaný popis."
diff -Nru clamav-0.97.3+dfsg/debian/po/da.po clamav-0.97.5+dfsg/debian/po/da.po
--- clamav-0.97.3+dfsg/debian/po/da.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/da.po 2012-07-12 11:19:13.000000000 -0400
@@ -587,7 +587,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Tidsudl??b for bytecodeudf??rsel i millisekunder:"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/de.po clamav-0.97.5+dfsg/debian/po/de.po
--- clamav-0.97.3+dfsg/debian/po/de.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/de.po 2012-07-12 11:19:13.000000000 -0400
@@ -6,20 +6,20 @@
# Erik Schanze <schanzi_@gmx.de>, 2006.
# Helge Kreutzmann <debian@helgefjell.de>, 2007.
# Matthias Julius <mdeb@julius-net.net>, 2009.
-# Thomas Mueller <thomas.mueller@tmit.eu>, 2009, 2010.
+# Thomas Müller <thomas.mueller@tmit.eu>, 2009, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: clamav_0.95.2+dfsg-4_de\n"
+"Project-Id-Version: clamav_0.97.3+dfsg-4_de\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
-"PO-Revision-Date: 2010-05-02 20:31+0200\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
+"PO-Revision-Date: 2011-12-12 22:14+0100\n"
"Last-Translator: Thomas Müller <thomas.mueller@tmit.eu>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: select
@@ -71,7 +71,8 @@
" Sie genau festlegen wollen, wann die Datenbank aktualisiert\n"
" wird.\n"
" manuell: Kein automatischer Start von Freshclam. Dies wird nicht\n"
-" empfohlen, weil die Datenbank von ClamAV ständig aktualisiert wird."
+" empfohlen, weil die Datenbank von ClamAV ständig aktualisiert\n"
+" wird."
#. Type: select
#. Description
@@ -119,13 +120,14 @@
#. Description
#: ../clamav-freshclam.templates:4001
msgid "Please use URL syntax (\"http://host[:port]\";) here."
-msgstr "Bitte benutzen Sie die URL-Schreibweise (»http://Rechner[:Port]«;)."
+msgstr ""
+"Bitte benutzen Sie hier die URL-Schreibweise (»http://Rechner[:Port]«;)."
#. Type: string
#. Description
#: ../clamav-freshclam.templates:5001
msgid "Proxy user information (leave blank for none):"
-msgstr "Proxy-Benutzerdaten (leer lassen für keine)"
+msgstr "Proxy-Benutzerdaten (leer lassen für keine):"
#. Type: string
#. Description
@@ -188,7 +190,7 @@
msgstr ""
"Sie können dieses Feld leer lassen und der Daemon wird statt dessen von den "
"Initialisierungsskripten gestartet. Sie sollten dann sicherstellen, dass der "
-"Rechner ständig mit dem Internet verbunden ist, um ein Füllen der "
+"Rechner ständig mit dem Internet verbunden ist, um ein Volllaufen der "
"Protokolldateien zu vermeiden."
#. Type: string
@@ -309,7 +311,7 @@
#. Description
#: ../clamav-base.templates:7001
msgid "Creation mode for clamd local (UNIX) socket:"
-msgstr "Erzeugungsmodus für den lokalen Clamd-(UNIX)-Socket."
+msgstr "Erzeugungsmodus für den lokalen Clamd-(UNIX)-Socket:"
#. Type: string
#. Description
@@ -596,15 +598,15 @@
" from unsigned sources\n"
" - Paranoid : always insert runtime checks"
msgstr ""
-" - TrustSigned : der aus signierten Virus-Datenbanken geladene Bytecode ist\n"
-" vertrauenswürdig, in Bytecode aus nicht-signierten Quellen\n"
-" werden Laufzeitprüfungen eingefügt\n"
+" - TrustSigned : der aus signierten Virus-Datenbanken geladene Bytecode\n"
+" ist vertrauenswürdig, in Bytecode aus nicht-signierten\n"
+" Quellen werden Laufzeitprüfungen eingefügt\n"
" - Paranoid : Laufzeitprüfungen werden immer eingefügt"
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Timeout für die Ausführung von Bytecode (in Millisekunden):"
#. Type: boolean
@@ -655,7 +657,7 @@
#. Description
#: ../clamav-milter.templates:4001
msgid "Remove stale socket after unclean shutdown?"
-msgstr "Übrig gebliebenen Socket nach unplanmäßigem Abschalten entfernen?"
+msgstr "Übrig gebliebenen Socket nach unsauberem Abschalten entfernen?"
#. Type: string
#. Description
@@ -667,7 +669,7 @@
#. Description
#: ../clamav-milter.templates:6001
msgid "Creation mode for clamav-milter local (UNIX) socket:"
-msgstr "Erzeugungsmodus für den lokalen Clamac-Milter-(UNIX)-Socket:"
+msgstr "Erzeugungsmodus für den lokalen Clamav-Milter-(UNIX)-Socket:"
#. Type: string
#. Description
@@ -758,7 +760,7 @@
msgstr ""
"Clamav-Milter kann in einem Chroot-Gefängnis (Jail) betrieben werden. Es "
"wird in dieses eintreten, nachdem es die Konfigurationsdatei gelesen hat und "
-"bevor es root-Privilegien aufgibt."
+"bevor es die root-Privilegien aufgibt."
#. Type: string
#. Description
@@ -791,16 +793,13 @@
#. Type: string
#. Description
#: ../clamav-milter.templates:13001
-#, fuzzy
-#| msgid ""
-#| "Please specify the directory for clamav-milter's temporary files. If "
-#| "unset, $TMPDIR and $TEMP will be honored."
msgid ""
"Please specify the directory for clamav-milter's files that are temporarily "
"buffered for scanning. If unset, $TMPDIR and $TEMP will be honored."
msgstr ""
-"Bitte geben Sie das Verzeichnis für die temporären Dateien von Clamav-Milter "
-"an. Wenn nicht angegeben, werden $TMPDIR und $TEMP berücksichtigt."
+"Bitte geben Sie das Verzeichnis für die Dateien von Clamav-Milter an, welche "
+"für die Analyse temporär gepuffert werden. Wenn nicht angegeben, werden "
+"$TMPDIR und $TEMP berücksichtigt."
#. Type: string
#. Description
@@ -823,15 +822,13 @@
msgstr ""
"Bitte geben Sie den Socket an, der zur Verbindung mit dem ClamAV-Daemon zur "
"Dateiüberprüfung verwendet werden soll. Mögliche Auswahlen sind:\n"
-" - ein lokaler Unix-Socket unter Verwendung eines absoluten Pfades im "
-"Format\n"
-" »unix:Pfad« (zum Beispiel: unix:/var/run/clamd/clamd.socket)\n"
+" - ein lokaler Unix-Socket unter Verwendung eines absoluten Pfades im\n"
+" Format »unix:Pfad« (zum Beispiel: unix:/var/run/clamd/clamd.socket)\n"
" - ein lokaler oder in der Ferne befindlicher TCP-Socket im Format\n"
-" »tcp:Rechner:Port« (zum Beispiel tcp:192.168.0.1). Der Wert für "
-"»Rechner«\n"
-" kann entweder ein Rechnername oder eine IP-Adresse sein. Der Port ist "
-"nur\n"
-" für IPv6-Adressen notwendig. Anderenfalls ist 3310 die Voreinstellung."
+" »tcp:Rechner:Port« (zum Beispiel tcp:192.168.0.1). Der Wert für\n"
+" »Rechner« kann entweder ein Rechnername oder eine IP-Adresse sein.\n"
+" Der Port ist nur für IPv6-Adressen notwendig. Anderenfalls ist 3310\n"
+" die Voreinstellung."
#. Type: string
#. Description
@@ -905,8 +902,8 @@
"\" prefix, it affects recipient addresses."
msgstr ""
"Zeilen können mit »From:« (ohne Leerzeichen nach dem Doppelpunkt) anfangen, "
-"um die Positivliste auf passende Absenderadressen anzuwenden. Anderenfalls "
-"oder mit einem »To:«-Prefix, beeinflussen sie Empfängeradressen."
+"um die Positivliste auf passende Absenderadressen anzuwenden. Anderenfalls, "
+"oder mit einem »To:«-Prefix beeinflussen sie Empfängeradressen."
#. Type: select
#. Choices
@@ -972,14 +969,14 @@
" on hold."
msgstr ""
" - Akzeptieren: akzeptiert die Nachricht zur Zustellung (accept)\n"
-" - Ablehnen: lehnt die Zustellung sofort ab (mit einem 5xx-Fehler, "
-"reject)\n"
+" - Ablehnen: lehnt die Zustellung sofort ab (mit einem 5xx-Fehler,\n"
+" reject)\n"
" - Verzögern: gibt eine temporäre Fehlermeldung zurück (4xx, defer)\n"
" - Verwerfen: akzeptiert die Nachricht und löscht sie\n"
-" - Quarantäne: akzeptiert die Nachricht und stellt sie unter Quarantäne. \n"
-" Bei Sendmail kann die Quarantäne-Warteschlange mit\n"
-" »mailq -qQ« untersucht werden. Bei Postfix werden solche\n"
-" E-Mails zurückgehalten."
+" - Quarantäne: akzeptiert die Nachricht und stellt sie unter\n"
+" Quarantäne. Bei Sendmail kann die Quarantäne-\n"
+" Warteschlange mit »mailq -qQ« untersucht werden.\n"
+" Bei Postfix werden solche E-Mails zurückgehalten."
#. Type: select
#. Description
@@ -1236,21 +1233,13 @@
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid "Information to log on infected messages:"
msgid "Information to log if no threat is found:"
-msgstr "Informationen, die für infizierte Nachrichten protokolliert werden:"
+msgstr ""
+"Informationen, die protokolliert werden, falls keine Gefahr erkannt wurde:"
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid ""
-#| "Please choose the level of information that will be logged when infected "
-#| "messages are found:\n"
-#| " - Off : no logging;\n"
-#| " - Basic: minimal information;\n"
-#| " - Full : verbose information."
msgid ""
"Please choose the level of information that will be logged when no threat is "
"found in a scanned message (this is useful in debugging but drastically "
@@ -1260,7 +1249,9 @@
" - Full : verbose information."
msgstr ""
"Bitte wählen sie den Grad von Informationen, die protokolliert werden, wenn "
-"infizierte Nachrichten gefunden werden:\n"
+"keine Gefahr in den analysierten Nachrichten erkannt wurde (dies ist für die "
+"Fehlersuche hilfreich, lässt aber auch die Größe des Logs drastisch "
+"anwachsen):\n"
" - Aus: keine Protokollierung \n"
" - Einfach: minimale Informationen\n"
" - Vollständig: Ausführliche Informationen"
diff -Nru clamav-0.97.3+dfsg/debian/po/es.po clamav-0.97.5+dfsg/debian/po/es.po
--- clamav-0.97.3+dfsg/debian/po/es.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/es.po 2012-07-12 11:19:13.000000000 -0400
@@ -36,7 +36,7 @@
msgstr ""
"Project-Id-Version: clamav 0.96+dfsg-4\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2011-07-03 18:45+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -635,7 +635,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Intervalo de ejecución del bytecode en milisegundos:"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/eu.po clamav-0.97.5+dfsg/debian/po/eu.po
--- clamav-0.97.3+dfsg/debian/po/eu.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/eu.po 2012-07-12 11:19:13.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: clamav-eu\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2008-09-24 11:03+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -589,7 +589,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr ""
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/fi.po clamav-0.97.5+dfsg/debian/po/fi.po
--- clamav-0.97.3+dfsg/debian/po/fi.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/fi.po 2012-07-12 11:19:13.000000000 -0400
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: clamav\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2009-06-22 22:47+0300\n"
"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -585,7 +585,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr ""
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/fr.po clamav-0.97.5+dfsg/debian/po/fr.po
--- clamav-0.97.3+dfsg/debian/po/fr.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/fr.po 2012-07-12 11:19:13.000000000 -0400
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2010-06-14 19:37+0200\n"
"Last-Translator: Florentin Duneau <fduneau@gmail.com>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -613,7 +613,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Délai d'attente (« timeout ») pour le code intermédiaire (ms) :"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/gl.po clamav-0.97.5+dfsg/debian/po/gl.po
--- clamav-0.97.3+dfsg/debian/po/gl.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/gl.po 2012-07-12 11:19:13.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: clamav\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2009-05-06 21:40+0200\n"
"Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n"
"Language-Team: Galician <proxecto@trasno.ent>\n"
@@ -593,7 +593,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr ""
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/it.po clamav-0.97.5+dfsg/debian/po/it.po
--- clamav-0.97.3+dfsg/debian/po/it.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/it.po 2012-07-12 11:19:13.000000000 -0400
@@ -1,14 +1,14 @@
# Italian translation of the clamav debconf template
# This file is distributed under the same license as the clamav package
# Cristian Rigamonti <cri@linux.it>, 2004-2005-2006-2007.
-# Luca Monducci <luca.mo@tiscali.it>, 2009, 2010.
+# Luca Monducci <luca.mo@tiscali.it>, 2009-2012.
#
msgid ""
msgstr ""
"Project-Id-Version: clamav 0.96.1+dfsg-3 \n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
-"PO-Revision-Date: 2010-09-18 16:35+0200\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
+"PO-Revision-Date: 2011-02-19 15:31+0100\n"
"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
"Language: it\n"
@@ -129,14 +129,14 @@
"Otherwise, leave this blank."
msgstr ""
"Se occorre inserire un nome utente e una password per accedere al proxy, "
-"inserirla qui, altrimenti lasciare in bianco."
+"inserirli qui, altrimenti lasciare in bianco."
#. Type: string
#. Description
#: ../clamav-freshclam.templates:5001
msgid "When entering user information, use the standard form of \"user:pass\"."
msgstr ""
-"Per inserire le informazioni relative all'utente, si usi la forma standard "
+"Per inserire le informazioni relative all'utente, usare la forma standard "
"\"utente:password\"."
#. Type: string
@@ -200,7 +200,7 @@
#. Description
#: ../clamav-freshclam.templates:8001
msgid "Should clamd be notified after updates?"
-msgstr "Si desidera avvisare clamd dopo ogni aggiornamento?"
+msgstr "Avvisare clamd dopo ogni aggiornamento?"
#. Type: boolean
#. Description
@@ -275,7 +275,7 @@
msgstr ""
"Scegliendo TCP, clamd può essere contattato da remoto. Scegliendo un socket "
"UNIX locale, l'accesso a clamd avviene tramite un file speciale. L'uso dei "
-"socket UNIX locali è raccomandato per motivi si sicurezza."
+"socket UNIX locali è raccomandato per motivi di sicurezza."
#. Type: string
#. Description
@@ -287,7 +287,7 @@
#. Description
#: ../clamav-base.templates:5001
msgid "Gracefully handle left-over UNIX socket files?"
-msgstr "Gestire automaticamente i file UNIX socket inutilizzati?"
+msgstr "Gestire automaticamente i file socket UNIX inutilizzati?"
#. Type: string
#. Description
@@ -414,7 +414,7 @@
#. Description
#: ../clamav-base.templates:14001
msgid "Entering '0' will disable this limit."
-msgstr "Il valore \"0\" disabilita il limite di dimensione."
+msgstr "Il valore \"0\" disabilita questo limite."
#. Type: boolean
#. Description
@@ -432,7 +432,7 @@
#. Description
#: ../clamav-base.templates:17001
msgid "Timeout for stopping the thread-scanner (seconds):"
-msgstr "Limite di tempo per l'analizzatore (secondi):"
+msgstr "Limite di tempo per thread di analisi (secondi):"
#. Type: string
#. Description
@@ -456,7 +456,7 @@
#. Description
#: ../clamav-base.templates:20001
msgid "Do you want to use the system logger?"
-msgstr "Si desidera utilizzare il log di sistema?"
+msgstr "Utilizzare il log di sistema?"
#. Type: boolean
#. Description
@@ -465,8 +465,9 @@
"It is possible to log the daemon activity to the system logger. This can be "
"done independently of whether you want to log activity to a special file."
msgstr ""
-"È possibile registrare l'attività del demone usando il log di sistema, e in "
-"modo indipendente registrarla su un file speciale."
+"È possibile registrare l'attività del demone usando il log di sistema; ciò è "
+"possibile indipendentemente dal fatto che si desideri registrarla su un file "
+"speciale."
#. Type: string
#. Description
@@ -478,7 +479,7 @@
#. Description
#: ../clamav-base.templates:22001
msgid "Do you want to log time information with each message?"
-msgstr "Si desidera registrare anche l'orario nei messaggi di log?"
+msgstr "Registrare anche l'orario nei messaggi di log?"
#. Type: string
#. Description
@@ -516,7 +517,7 @@
"Si raccomanda di usare un utente non privilegiato per eseguire i programmi "
"di ClamAV. Questa impostazione funziona con i principali MTA con qualche "
"piccola correzione alla configurazione, invece se si vuole usare clamd per "
-"analizzare il proprio filesystem è molto probabile che occorra farlo "
+"analizzare il proprio file system è molto probabile che occorra farlo "
"eseguire dall'utente root. Si veda \"README.Debian\" nel pacchetto clamav-"
"base per i dettagli."
@@ -580,16 +581,16 @@
" from unsigned sources\n"
" - Paranoid : always insert runtime checks"
msgstr ""
-" - TrustSigned : fiducia nel bytecode caricato dal database dei virus\n"
-" firmato ed effettua dei controlli di sicurezza al\n"
-" momento dell'esecuzione per il bytecode caricato da\n"
-" sorgenti non firmate\n"
+" - TrustSigned : fiducia nel bytecode caricato da file firmati\n"
+" contenti il database dei virus ed effettua dei\n"
+" controlli di sicurezza al momento dell'esecuzione\n"
+" per il bytecode caricato da sorgenti non firmate\n"
" - Paranoico : effettua sempre dei controlli al momento dell'esecuzione"
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Tempo massimo di esecuzione del bytecode in millisecondi:"
#. Type: boolean
@@ -631,9 +632,9 @@
msgstr ""
"Segliere il metodo che clamav-milter deve usare per comunicare con Sendmail. "
"È possibile usare questi formati:\n"
-" - Socket di dominio Unix : [[unix|local]:]/percorso/al/file\n"
-" - IPv4 socket : inet:port@[nomehost|indirizzo-ip]\n"
-" - IPv6 socket : inet6:port@[nomehost|indirizzo-ip]"
+" - socket di dominio Unix : [[unix|local]:]/percorso/al/file\n"
+" - socket IPv4 : inet:porta@[nomehost|indirizzo-ip]\n"
+" - socket IPv6 : inet6:porta@[nomehost|indirizzo-ip]"
#. Type: boolean
#. Description
@@ -712,7 +713,7 @@
"is waiting for incoming data from clamd."
msgstr ""
"Inserire il tempo di attesa (in secondi) prima che clamav-milter rinunci "
-"quando aspetta i dati delle mail in arrivo da clamd."
+"quando attende i dati in arrivo da clamd."
#. Type: string
#. Description
@@ -774,22 +775,18 @@
#. Type: string
#. Description
#: ../clamav-milter.templates:13001
-#, fuzzy
-#| msgid ""
-#| "Please specify the directory for clamav-milter's temporary files. If "
-#| "unset, $TMPDIR and $TEMP will be honored."
msgid ""
"Please specify the directory for clamav-milter's files that are temporarily "
"buffered for scanning. If unset, $TMPDIR and $TEMP will be honored."
msgstr ""
-"Indicare la directory per i file temporanei di clamav-milter. Se lasciato "
-"vuoto, verranno onorate $TMPDIR e $TEMP."
+"Indicare la directory in cui clamav-milter appoggia temporaneamente i file "
+"per la scansione. Se non è impostato, verranno onorate $TMPDIR e $TEMP."
#. Type: string
#. Description
#: ../clamav-milter.templates:14001
msgid "Clamd socket to connect to for scanning:"
-msgstr "Socket clamd a cui connettersi per l'analisi:"
+msgstr "Socket di clamd a cui connettersi per l'analisi:"
#. Type: string
#. Description
@@ -804,8 +801,8 @@
" address, and the \"port\" is only required for IPv6 addresses,\n"
" defaulting to 3310 otherwise."
msgstr ""
-"Specificare il socket da usare per la connessione al demone ClamAV di "
-"analisi. Le scelte possibili sono:\n"
+"Specificare il socket da usare per la connessione al demone ClamAV per "
+"l'analisi. Le scelte possibili sono:\n"
" - un socket unix locale con percorso assoluto, nel formato\n"
" \"unix:percorso\" (per esempio unix:/var/run/clamd/clamd.socket);\n"
" - un socket TCP locale o remoto, nel formato \"tcp:host:porta\"\n"
@@ -839,9 +836,9 @@
"originated (non-SMTP) email."
msgstr ""
"Specificare, usando la notazione CIDR ((nome)host/maschera), gli host per i "
-"quali non fare l'analisi delle mail in arrivo. È possibile inserire più "
+"quali non fare l'analisi della posta in arrivo. È possibile inserire più "
"valori usando uno spazio come separatore. È possibile usare l'abbreviazione "
-"\"local\" per indicare le mail (non-SMTP) generate in locale."
+"\"local\" per indicare la posta (non-SMTP) generata in locale."
#. Type: string
#. Description
@@ -885,9 +882,10 @@
"whitelisting apply to matching sender addresses; otherwise, or with a \"To:"
"\" prefix, it affects recipient addresses."
msgstr ""
-"Le righe che iniziano con \"From:\" (senza spazio dopo i due punti) per "
-"applicare il whitelisting agli indirizzi mittenti corrispondenti; usare il "
-"prefisso \"To:\" per influenzare gli indirizzi dei destinatari."
+"Le righe che iniziano con \"From:\" (senza spazio dopo i due punti) fanno "
+"applicare il whitelisting agli indirizzi mittenti corrispondenti; negli "
+"altri casi, o usando il prefisso \"To:\", il whitelisting viene applicato "
+"agli indirizzi dei destinatari."
#. Type: select
#. Choices
@@ -935,7 +933,7 @@
#. Description
#: ../clamav-milter.templates:17002
msgid "Please choose the action to perform on \"infected\" messages:"
-msgstr "Azione da effettuare sui messaggi \"infetti\":"
+msgstr "Scegliere l'azione da effettuare sui messaggi \"infetti\":"
#. Type: select
#. Description
@@ -957,7 +955,7 @@
" - Quarantena : accetta il messaggio e lo mette in quarantena. Con\n"
" Sendmail è possibile esaminare la coda di quarantena\n"
" usando \"mailq -qQ\". Con Postfix queste email sono\n"
-" bloccate."
+" messe in attesa."
#. Type: select
#. Description
@@ -974,7 +972,7 @@
"replies...:"
msgstr ""
"Scegliere l'azione da effettuare in caso di errori quali l'impossibilità di "
-"allocare le strutture dati, l'indisponibilità degli analizzatori, problemi "
+"allocare le strutture dati, l'indisponibilità degli analizzatori, i problemi "
"di rete, le risposte sconosciute degli analizzatori, ecc."
#. Type: select
@@ -1001,8 +999,8 @@
msgid ""
"Please specify the rejection reason that will be included in reject mails."
msgstr ""
-"Indicare la motivazione del rifiuto dei messaggi infetti da inserire nella "
-"mail di rifiuto."
+"Indicare la motivazione del rifiuto dei messaggi infetti da inserire nel "
+"messaggio di rifiuto."
#. Type: string
#. Description
@@ -1135,7 +1133,7 @@
"Please choose whether you want to use the system logger (syslog). This "
"option can be used along with logging in a dedicated file."
msgstr ""
-"Scegliere se usare il log di sistema (syslog). Questa opzione può essere "
+"Scegliere se usare il log di sistema (syslog). Questa opzione può essere "
"usata insieme alla registrazione su un file dedicato."
#. Type: string
@@ -1200,8 +1198,8 @@
" - Basic: minimal information;\n"
" - Full : verbose information."
msgstr ""
-"Sceglere il livello delle informazioni da registrare quando viene trovato un "
-"messaggio infatto:\n"
+"Scegliere il livello delle informazioni da registrare quando viene trovato "
+"un messaggio infetto:\n"
" - Spento : nessuna registrazione;\n"
" - Base : informazioni minime;\n"
" - Completo : informazioni dettagliate."
@@ -1209,21 +1207,12 @@
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid "Information to log on infected messages:"
msgid "Information to log if no threat is found:"
-msgstr "Informazioni da registrare sui messaggi infetti:"
+msgstr "Informazioni da registrare quando non viene trovata una minaccia:"
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid ""
-#| "Please choose the level of information that will be logged when infected "
-#| "messages are found:\n"
-#| " - Off : no logging;\n"
-#| " - Basic: minimal information;\n"
-#| " - Full : verbose information."
msgid ""
"Please choose the level of information that will be logged when no threat is "
"found in a scanned message (this is useful in debugging but drastically "
@@ -1232,8 +1221,9 @@
" - Basic: minimal information;\n"
" - Full : verbose information."
msgstr ""
-"Sceglere il livello delle informazioni da registrare quando viene trovato un "
-"messaggio infatto:\n"
+"Scegliere il livello delle informazioni da registrare quando non viene "
+"trovata alcuna minaccia in un messaggio analizzato (questo è utile per il "
+"debug ma incrementa drasticamente la dimensione del log):\n"
" - Spento : nessuna registrazione;\n"
" - Base : informazioni minime;\n"
" - Completo : informazioni dettagliate."
@@ -1263,161 +1253,3 @@
msgstr ""
"Assicurarsi che questo valore sia inferiore al valore di \"StreamMaxLength\" "
"nel file clamd.conf"
-
-#~ msgid "Define the interface through to communicate with sendmail:"
-#~ msgstr "Definire tramite quale interfaccia comunicare con sendmail:"
-
-#~ msgid "Possible formats are:"
-#~ msgstr "I formati ammessi sono:"
-
-#~ msgid "Unix domain socket: [[unix|local]:]/path/to/file"
-#~ msgstr "Socket di dominio Unix: [[unix|local]:]/percorso/al/file"
-
-#~ msgid "IPv4 socket: inet:port@[hostname|ip-address]"
-#~ msgstr "Socket IPV4: inet:porta@[nomehost|indirizzo-ip]"
-
-#~ msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
-#~ msgstr "Socket IPV6: inet6:porta@[nomehost|indirizzo-ip]"
-
-#~ msgid "Waiting for data from clamd will timeout after this time (seconds):"
-#~ msgstr "Limite di tempo per la scrittura dei dati da clamd (secondi):"
-
-#~ msgid "Set to a value of '0' to disable the timeout."
-#~ msgstr "Il valore \"0\" disabilita il limite di tempo."
-
-#~ msgid ""
-#~ "Chrooting is performed just after reading the config file and before "
-#~ "dropping privileges. An empty value means don't chroot."
-#~ msgstr ""
-#~ "Il chroot viene fatto immediatamente dopo la lettura del file di "
-#~ "configurazione e prima di abbandonare i privilegi. Un valore vuoto "
-#~ "significa non effettuare il chroot."
-
-#~ msgid "Optional path to the global temporary directory:"
-#~ msgstr "Percorso opzionale della directory temporanea globale:"
-
-#~ msgid " If unset, $TMPDIR and $TEMP will be honored."
-#~ msgstr "Se non è impostato, vengono onorate $TMPDIR e $TEMP."
-
-#~ msgid "Exclusions - IP ranges:"
-#~ msgstr "Esclusioni - Intervalli IP:"
-
-#~ msgid ""
-#~ "Messages originating from these hosts/networks will not be scanned. This "
-#~ "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-#~ "several times (separated by whitespace). If \"/mask\" is omitted, a host "
-#~ "is assumed. To specify a locally originated, non-smtp, email use the "
-#~ "keyword \"local\"."
-#~ msgstr ""
-#~ "I messaggi provenienti da queste macchine/reti non verranno analizzati. "
-#~ "Questa opzione accetta una coppia host/maschera in notazione CIRD e può "
-#~ "essere ripetuta più volte (separandole con degli spazi bianchi). Se viene "
-#~ "omessa la \"/maschera\", si suppone che sia un solo host. Per specificare "
-#~ "le email generate in locale (non smtp), usare la parola chiave \"local\"."
-
-#~ msgid "If unset, everything regardless of the origin is scanned."
-#~ msgstr ""
-#~ "Se non è impostato, verrà analizzato tutto senza tener conto dell'origine."
-
-#~ msgid "Exclusions - Regular expressions:"
-#~ msgstr "Esclusioni - Espressioni regolari:"
-
-#~ msgid ""
-#~ "This option specifies a file which contains a list of POSIX regular "
-#~ "expressions. Addresses (sent to or from) 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, "
-#~ "respectively, the sender or recipient that is to be whitelisted. If the "
-#~ "field is missing, \"To:\" is assumed."
-#~ msgstr ""
-#~ "Per questa opzione occorre specificare un file contenente un elenco di "
-#~ "espressioni regolari POSIX. Gli indirizzi (di provenienza o di "
-#~ "destinazione) che verificano queste espressioni regolari non verranno "
-#~ "analizzati. Inoltre ogni riga può iniziare con le stringhe \"From:\" o "
-#~ "\"To:\" (notare che non ci sono spazi dopo i due punti) per indicare se "
-#~ "il mittente o il destinatario devono essere inseriti nella whitelist. "
-#~ "Quando questo campo è omesso, si assume che sia \"To:\"."
-
-#~ msgid "Lines in this file starting with #, : or ! are ignored."
-#~ msgstr "Le righe che iniziano con #, : o ! sono ignorate."
-
-#~ msgid ""
-#~ "Action to be performed on clean messages (mostly useful for testing):"
-#~ msgstr "Azione da effettuare sui messaggi puliti (utile per fare dei test):"
-
-#~ msgid "The following actions are available:"
-#~ msgstr "Sono disponibili le seguenti azioni:"
-
-#~ msgid "- Accept: The message is accepted for delievery"
-#~ msgstr "- Accetta: il messaggio viene accettato e consegnato"
-
-#~ msgid ""
-#~ "- Reject: Immediately refuse delievery (a 5xx error is returned to the "
-#~ "peer)"
-#~ msgstr ""
-#~ "- Rifiuta: rifiuta immediatamente la consegna (al peer viene restituito\n"
-#~ " un errore 5xx)"
-
-#~ msgid "- Defer: Return a temporary failure message (4xx) to the peer"
-#~ msgstr ""
-#~ "- Ritarda: restituisce un messaggio di errore temporaneo (4xx) al peer"
-
-#~ msgid ""
-#~ "- Blackhole (not available for OnFail): Like accept but the message is "
-#~ "sent to\n"
-#~ " oblivion"
-#~ msgstr ""
-#~ "- Buco nero (non disponibile in caso di errore): come accetta ma il\n"
-#~ " messaggio è inviato nell'oblio"
-
-#~ msgid ""
-#~ "- Quarantine (not available for OnFail): Like accept but message is "
-#~ "quarantined\n"
-#~ " instead of being delivered In sendmail the quarantine queue can be "
-#~ "examined\n"
-#~ " via mailq -qQ For Postfix this causes the message to be accepted but "
-#~ "placed\n"
-#~ " on hold"
-#~ msgstr ""
-#~ "- Quarantena (non disponibile in caso di errore): come accetta ma il\n"
-#~ " messaggio finisce in quarantena anziché essere consegnato. Con\n"
-#~ " sendmail è possibile esaminare la coda di quarantena con mailq -qQ.\n"
-#~ " Con Postfix il messaggio viene accettato e messo in attesa."
-
-#~ msgid ""
-#~ "It is only useful together with \"OnInfected Reject\". The string \"%v"
-#~ "\", if present, will be replaced with the virus name."
-#~ msgstr ""
-#~ "È utile solo quando si rifiutano i messagg Infetti. La stringa \"%v\", se "
-#~ "presente, verrà sostituita con il nome del virus."
-
-#~ msgid "Log to file:"
-#~ msgstr "Log su file:"
-
-#~ msgid ""
-#~ "LogFile must be writable for the user running daemon. A full path is "
-#~ "required."
-#~ msgstr ""
-#~ "Il demone in esecuzione deve poter scrivere sul file di log. Si deve "
-#~ "inserire il percorso completo."
-
-#~ msgid "Use system logger (can work together with LogFile)?"
-#~ msgstr "Usare il log di sistema (può funzionare insieme a un file di log)?"
-
-#~ msgid "Please refer to 'man syslog' for facility names."
-#~ msgstr "Fare riferimento a \"man syslog\" per i nomi validi."
-
-#~ msgid "What should be logged when a message is infected:"
-#~ msgstr "Cosa scrivere nel log quando un messaggio è infetto:"
-
-#~ msgid ""
-#~ "Possible values are Off (the default - nothing is logged), Basic (minimal "
-#~ "info logged), Full (verbose info logged)"
-#~ msgstr ""
-#~ "I valori possibili sono Off (opzione predefinita, nel log non viene "
-#~ "scritto nulla), Basic (nel log sono scritte delle informazioni minimali), "
-#~ "Full (nel log sono scritte tutte le informazioni)."
-
-#~ msgid "Messages larger than this value won't be scanned (unit Mb):"
-#~ msgstr ""
-#~ "I messaggi più grandi di questo valore non verranno analizzati (in Mb):"
diff -Nru clamav-0.97.3+dfsg/debian/po/ja.po clamav-0.97.5+dfsg/debian/po/ja.po
--- clamav-0.97.3+dfsg/debian/po/ja.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/ja.po 2012-07-12 11:19:13.000000000 -0400
@@ -3,8 +3,8 @@
msgstr ""
"Project-Id-Version: clamav\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
-"PO-Revision-Date: 2009-04-22 08:45+0900\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
+"PO-Revision-Date: 2012-02-15 22:59+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
"Language: ja\n"
@@ -576,7 +576,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "バイトコード実行のタイムアウト時間、単位ミリ秒:"
#. Type: boolean
@@ -630,10 +630,8 @@
#. Type: string
#. Description
#: ../clamav-milter.templates:5001
-#, fuzzy
-#| msgid "Groups for clamav-milter (space-separated):"
msgid "Group owner of clamav-milter local (UNIX) socket:"
-msgstr "clamav-milter のグループ (スペースで区切る):"
+msgstr "clamav-milter のローカル (UNIX) ソケットのグループ所有者:"
#. Type: string
#. Description
@@ -761,16 +759,12 @@
#. Type: string
#. Description
#: ../clamav-milter.templates:13001
-#, fuzzy
-#| msgid ""
-#| "Please specify the directory for clamav-milter's temporary files. If "
-#| "unset, $TMPDIR and $TEMP will be honored."
msgid ""
"Please specify the directory for clamav-milter's files that are temporarily "
"buffered for scanning. If unset, $TMPDIR and $TEMP will be honored."
msgstr ""
-"clamav-milter の一時ファイルのためのディレクトリを指定してください。設定しな"
-"いと、$TMPDIR および $TEMP が優先されます。"
+"走査時の一時的なバッファとなる clamav-milter のファイルのためのディレクトリを"
+"指定してください。設定しないと、$TMPDIR および $TEMP が優先されます。"
#. Type: string
#. Description
@@ -1189,21 +1183,12 @@
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid "Information to log on infected messages:"
msgid "Information to log if no threat is found:"
-msgstr "感染したメッセージについて記録する情報:"
+msgstr "脅威が見つからなかった場合に記録する情報:"
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid ""
-#| "Please choose the level of information that will be logged when infected "
-#| "messages are found:\n"
-#| " - Off : no logging;\n"
-#| " - Basic: minimal information;\n"
-#| " - Full : verbose information."
msgid ""
"Please choose the level of information that will be logged when no threat is "
"found in a scanned message (this is useful in debugging but drastically "
@@ -1212,7 +1197,8 @@
" - Basic: minimal information;\n"
" - Full : verbose information."
msgstr ""
-"感染したメッセージを発見したときに記録する情報のレベルを選んでください:\n"
+"走査したメッセージに脅威が見つからなかったときに記録する情報のレベルを選んで"
+"ください (これはデバッグに有益ですが、ログサイズを急激に増加させます):\n"
" - なし : 記録しない;\n"
" - 基本 : 最小情報;\n"
" - 完全 : 冗長な情報。"
diff -Nru clamav-0.97.3+dfsg/debian/po/nl.po clamav-0.97.5+dfsg/debian/po/nl.po
--- clamav-0.97.3+dfsg/debian/po/nl.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/nl.po 2012-07-12 11:19:13.000000000 -0400
@@ -1,30 +1,21 @@
-# translation of nl.po to Dutch
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-#
+# Dutch translation of clamav debconf templates.
+# Copyright (C) 2009-2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the clamav package.
# Paul Gevers <paul@climbing.nl>, 2009-2010.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
+#
msgid ""
msgstr ""
-"Project-Id-Version: clamav 0.95.1+dfsg.2\n"
+"Project-Id-Version: clamav 0.97.3+dfsg-2\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
-"PO-Revision-Date: 2010-12-01 22:04+0100\n"
-"Last-Translator: Paul Gevers <paul@climbing.nl>\n"
-"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
+"PO-Revision-Date: 2011-12-08 12:17+0100\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Dutch\n"
-"X-Poedit-SourceCharset: utf-8\n"
#. Type: select
#. Choices
@@ -83,13 +74,13 @@
#. Description
#: ../clamav-freshclam.templates:3001
msgid "Local database mirror site:"
-msgstr "Dichtstbijzijnde database-mirror:"
+msgstr "Dichtstbijzijnde database-spiegelserver:"
#. Type: select
#. Description
#: ../clamav-freshclam.templates:3001
msgid "Please select the closest local mirror site."
-msgstr "Wat is de dichtstbijzijnde mirror?"
+msgstr "Wat is de dichtstbijzijnde spiegelserver?"
#. Type: select
#. Description
@@ -99,9 +90,10 @@
"Please select the closest mirror. If you leave the default setting, an "
"attempt will be made to guess a nearby mirror."
msgstr ""
-"Freshclam werkt zijn database bij via een wereldwijd netwerk van mirrors. "
-"Wilt u de dichtstbijzijnde mirror kiezen? Als u de standaardwaarde laat "
-"staan, zal geprobeerd worden om een mirror in uw buurt te vinden."
+"Freshclam werkt zijn database bij via een wereldwijd netwerk van "
+"spiegelservers. Wilt u de dichtstbijzijnde spiegelserver kiezen? Als u de "
+"standaardwaarde laat staan, zal geprobeerd worden om een spiegelserver in uw "
+"buurt te vinden."
#. Type: string
#. Description
@@ -335,9 +327,9 @@
"Enter \"any\" to listen on every IP address configured. If you want to "
"listen on a single address or host name, enter it here."
msgstr ""
-"Als clamd op elk geconfigureerd TCP-adres moet luisteren, kunt u \"any\" "
+"Als clamd op elk geconfigureerd IP-adres moet luisteren, kunt u \"any\" "
"invullen. Als clamd in plaats daarvan op een adres of computernaam moet "
-"luisteren, vult u dan dat adres (bijv. \"127.0.0.1\") of die computernaam in."
+"luisteren, vult u dan dat adres of die computernaam in."
#. Type: error
#. Description
@@ -487,13 +479,15 @@
msgstr ""
"Het is mogelijk om de activiteit van de achtergronddienst te loggen via het "
"systeemlogproces. Deze keuze is onafhankelijk van de keuze om de "
-"activiteiten van clamav-daemon in een speciaal bestand te loggen."
+"activiteiten in een speciaal logbestand op te slaan."
#. Type: string
#. Description
#: ../clamav-base.templates:21001
msgid "Log file for clamav-daemon (enter none to disable):"
-msgstr "Logbestand voor clamav-daemon (vul \"none\" in om dit uit te zetten):"
+msgstr ""
+"Logbestand voor clamav-achtergronddienst (vul \"none\" in om dit uit te "
+"zetten):"
#. Type: boolean
#. Description
@@ -611,7 +605,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Verlooptijd voor uitvoering van bytecode in milliseconden:"
#. Type: boolean
@@ -798,16 +792,13 @@
#. Type: string
#. Description
#: ../clamav-milter.templates:13001
-#, fuzzy
-#| msgid ""
-#| "Please specify the directory for clamav-milter's temporary files. If "
-#| "unset, $TMPDIR and $TEMP will be honored."
msgid ""
"Please specify the directory for clamav-milter's files that are temporarily "
"buffered for scanning. If unset, $TMPDIR and $TEMP will be honored."
msgstr ""
-"Welke map wilt u dat clamav-milter gebruikt voor de tijdelijke bestanden? "
-"Indien u dit niet specificeert zullen $TMPDIR en $TEMP gebruikt worden."
+"Welke map wilt u dat clamav-milter gebruikt voor bestanden die tijdelijk "
+"worden gebufferd voor het scannen? Indien u dit niet specificeert zullen "
+"$TMPDIR en $TEMP gebruikt worden."
#. Type: string
#. Description
@@ -976,13 +967,13 @@
" on hold."
msgstr ""
" - Aannemen : het bericht aannemen voor bezorging.\n"
-" - Weigeren : onmiddelijk bezorging weigeren (met een 5xx fout).\n"
+" - Weigeren : onmiddellijk bezorging weigeren (met een 5xx fout).\n"
" - Uitstellen : een tijdelijke mislukking melden (4xx).\n"
" - Zwart gat : het bericht aannemen en dan vernietigen.\n"
" - Quarantaine: het bericht aannemen en dan isoleren. Met\n"
-" sendmail kan de quarantaine wachtrij bekeken worden\n"
-" met \"mailq -qQ\". Met postfix worden zulke berichten\n"
-" \"on hold\" geplaatst worden."
+" sendmail kan de quarantaine wachtrij bekeken worden\n"
+" met \"mailq -qQ\". Met Postfix worden zulke berichten\n"
+" \"on hold\" geplaatst worden."
#. Type: select
#. Description
@@ -1012,7 +1003,7 @@
" - Defer : return a temporary failure message (4xx)."
msgstr ""
" - Aannemen : het bericht aannemen voor bezorging.\n"
-" - Weigeren : onmiddelijk bezorging weigeren (met een 5xx fout).\n"
+" - Weigeren : onmiddellijk bezorging weigeren (met een 5xx fout).\n"
" - Uitstellen : een tijdelijke mislukking melden (4xx)."
#. Type: string
@@ -1236,22 +1227,14 @@
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid "Information to log on infected messages:"
msgid "Information to log if no threat is found:"
msgstr ""
-"Informatie die geregistreerd dient te worden bij geïnfecteerde berichten:"
+"Informatie die geregistreerd dient te worden als er geen bedreiging is "
+"gevonden:"
#. Type: select
#. Description
#: ../clamav-milter.templates:29002
-#, fuzzy
-#| msgid ""
-#| "Please choose the level of information that will be logged when infected "
-#| "messages are found:\n"
-#| " - Off : no logging;\n"
-#| " - Basic: minimal information;\n"
-#| " - Full : verbose information."
msgid ""
"Please choose the level of information that will be logged when no threat is "
"found in a scanned message (this is useful in debugging but drastically "
@@ -1261,7 +1244,9 @@
" - Full : verbose information."
msgstr ""
"Welk niveau wilt u gebruiken voor de informatie die geregistreerd zal worden "
-"als er geïnfecteerde berichten worden gevonden?\n"
+"als er geen bedreiging in het gescande bericht is gevonden? (Dit is nuttig "
+"bij het debuggen, maar zorgt voor een drastische toename in de grootte van "
+"het logbestand.)\n"
" - Uit: geen logberichten;\n"
" - Basaal: minimale informatie;\n"
" - Volledig: uitgebreide informatie."
diff -Nru clamav-0.97.3+dfsg/debian/po/pl.po clamav-0.97.5+dfsg/debian/po/pl.po
--- clamav-0.97.3+dfsg/debian/po/pl.po 1969-12-31 19:00:00.000000000 -0500
+++ clamav-0.97.5+dfsg/debian/po/pl.po 2012-07-12 11:19:13.000000000 -0400
@@ -0,0 +1,1261 @@
+# Translation of clamav debconf templates to Polish.
+# Copyright (C) 2011
+# This file is distributed under the same license as the clamav package.
+#
+# Michał Kułach <michal.kulach@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
+"PO-Revision-Date: 2012-02-10 16:25+0100\n"
+"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Choices
+#: ../clamav-freshclam.templates:2001
+msgid "daemon"
+msgstr "demon"
+
+#. Type: select
+#. Choices
+#: ../clamav-freshclam.templates:2001
+msgid "manual"
+msgstr "ręcznie"
+
+#. Type: select
+#. Description
+#: ../clamav-freshclam.templates:2002
+msgid "Virus database update method:"
+msgstr "Metoda aktualizacji bazy wirusów:"
+
+#. Type: select
+#. Description
+#: ../clamav-freshclam.templates:2002
+msgid "Please choose the method for virus database updates."
+msgstr "Proszę wybrać metodę aktualizacji bazy danych wirusów."
+
+#. Type: select
+#. Description
+#: ../clamav-freshclam.templates:2002
+msgid ""
+" daemon: freshclam is running as a daemon all the time. You should choose\n"
+" this option if you have a permanent network connection;\n"
+" ifup.d: freshclam will be running as a daemon as long as your Internet\n"
+" connection is up. Choose this one if you use a dialup Internet\n"
+" connection and don't want freshclam to initiate new connections;\n"
+" cron: freshclam is started from cron. Choose this if you want full "
+"control\n"
+" of when the database is updated;\n"
+" manual: no automatic invocation of freshclam. This is not recommended,\n"
+" as ClamAV's database is constantly updated."
+msgstr ""
+" demon: freshclam działa jako demon przez cały czas. Proszę wybrać tę\n"
+" opcję w przypadku stałego połączenia z Internetem.\n"
+" ifup.d: freshclam będzie działał tak długo, jak długo będzie dostępne\n"
+" połączenie z Internetem. Proszę wybrać tę opcję w przypadku\n"
+" połączenia wdzwanianego.\n"
+" cron: freshclam jest uruchamiany przez crona. Proszę wybrać tę opcję\n"
+" aby mieć pełną kontrolę nad aktualizacjami.\n"
+" ręcznie: freshclam nie będzie uruchaminy automatycznie. Nie jest to\n"
+" zalecana opcja, ponieważ baza ClamAV jest na bieżąco\n"
+" aktualizowana."
+
+#. Type: select
+#. Description
+#: ../clamav-freshclam.templates:3001
+msgid "Local database mirror site:"
+msgstr "Lokalny serwer lustrzany:"
+
+#. Type: select
+#. Description
+#: ../clamav-freshclam.templates:3001
+msgid "Please select the closest local mirror site."
+msgstr "Proszę wybrać najbliższy serwer lustrzany"
+
+#. Type: select
+#. Description
+#: ../clamav-freshclam.templates:3001
+msgid ""
+"Freshclam updates its database from a world wide network of mirror sites. "
+"Please select the closest mirror. If you leave the default setting, an "
+"attempt will be made to guess a nearby mirror."
+msgstr ""
+"Freshclam aktualizuje swoją bazę danych za pomocą sieci serwerów "
+"lustrzanych. Proszę wybrać najbliższy. Jeśli pozostawione zostanie domyślne "
+"ustawienie, zostanie podjęta próba odgadnięcia najbliższego serwera."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:4001
+msgid "HTTP proxy information (leave blank for none):"
+msgstr "Informacje HTTP proxy (pole może pozostać puste):"
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:4001
+msgid ""
+"If you need to use an HTTP proxy to access the outside world, enter the "
+"proxy information here. Otherwise, leave this blank."
+msgstr ""
+"Jeśli zachodzi konieczność użycia HTTP proxy aby uzyskać dostęp do sieci "
+"WWW, proszę wprowadzić potrzebne informacje. W innym wypadku pole należy "
+"pozostawić puste."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:4001
+msgid "Please use URL syntax (\"http://host[:port]\";) here."
+msgstr "Proszę użyć składni URL (\"http://host[:port]\";)."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:5001
+msgid "Proxy user information (leave blank for none):"
+msgstr "Informacje o użytkowniku proxy (pole może postać puste):"
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:5001
+msgid ""
+"If you need to supply a username and password to the proxy, enter it here. "
+"Otherwise, leave this blank."
+msgstr ""
+"Jeśli zachodzi konieczność podania użytkownika i hasła do serwera proxy, "
+"proszę je wprowadzić. W przeciwnym wypadku, należy pozostawić to pole puste."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:5001
+msgid "When entering user information, use the standard form of \"user:pass\"."
+msgstr "Proszę użyć standardowego schematu \"użytkownik:hasło\"."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:6001
+msgid "Number of freshclam updates per day:"
+msgstr "Dzienna liczba aktualizacji freshclam:"
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:7001
+msgid "Network interface connected to the Internet:"
+msgstr "Interfejs sieciowy służący do połączenia z Internetem:"
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:7001
+msgid ""
+"Please enter the name of the network interface connected to the Internet. "
+"Example: eth0."
+msgstr ""
+"Proszę wprowadzić nazwę interfejsu sieciowego służącego do połączenia z "
+"Internetem np. eth0."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:7001
+msgid ""
+"If the daemon runs when the network is down, the log file will be filled "
+"with entries like 'ERROR: Connection with database.clamav.net failed.', "
+"making it easy to miss when freshclam really can't update the database."
+msgstr ""
+"Jeśli demon będzie uruchomiony w czasie braku połączenia z siecią, plik "
+"dziennika zostanie zapełniony wpisami podobnymi do \"ERROR: Connection with "
+"database.clamav.net failed.\", co pozwoli na łatwe zorientowanie się, że "
+"freshclam nie zaktualizował w rzeczywistości bazy danych."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:7001
+msgid ""
+"You can leave this field blank and the daemon will be started from the "
+"initialization scripts instead. You should then make sure the computer is "
+"permanently connected to the Internet to avoid filling the log files."
+msgstr ""
+"Można pozostawić to pole puste; demon będzie wtedy uruchamiany za pomocą "
+"skryptu inicjalizującego. Należy się wtedy upewnić, czy komputer ma stałe "
+"połączenie z Internetem, aby uniknąć zapełniania plików dziennika."
+
+#. Type: string
+#. Description
+#: ../clamav-freshclam.templates:7001
+msgid ""
+"If the computer has multiple network interfaces connecting to the Internet "
+"use a space-separated list of device names."
+msgstr ""
+"Jeśli komputer ma wiele interfejsów sieciowych, za pomocą których łączy się "
+"z Internetem, należy oddzielić je spacjami."
+
+#. Type: boolean
+#. Description
+#: ../clamav-freshclam.templates:8001
+msgid "Should clamd be notified after updates?"
+msgstr "Czy clamd powinien być powiadamiany po aktualizacjach?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-freshclam.templates:8001
+msgid ""
+"Please confirm whether clamd should be notified to reload the database after "
+"successful updates."
+msgstr ""
+"Proszę potwierdzić, czy clamd powinien być zawiadamiany w celu przeładowania "
+"bazy danych, po udanych aktualizacjach."
+
+#. Type: boolean
+#. Description
+#: ../clamav-freshclam.templates:8001
+msgid ""
+"If you do not choose this option, clamd's database reloads will be notably "
+"delayed (it performs this check every 6 hours by default), posing the risk "
+"that a new virus may slip through even if the database is up to date. Do not "
+"use this if you do not use clamd, as it will produce errors."
+msgstr ""
+"Jeśli ta opcja nie zostanie wybrana, przeładowanie bazy danych clamd będzie "
+"znacznie opóźnione (domyślnie, sprawdzanie odbywa się co 6 godzin), co "
+"narazi na zarażenie nowymi wirusami, nawet jeśli baza będzie zaktualizowana. "
+"Jeśli clamd nie jest używany należy nie wybierać tej opcji, w przeciwnym "
+"wypadku pojawią się błędy."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:2001 ../clamav-milter.templates:2001
+msgid "Handle the configuration file automatically?"
+msgstr "Obsłużyć plik konfiguracyjny w sposób automatyczny?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:2001
+msgid "Some options must be configured for clamav-base."
+msgstr "Niektóre opcje muszą zostać skonfigurowane do clamav-base."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:2001
+msgid ""
+"The ClamAV suite won't work if it isn't configured. If you do not configure "
+"it automatically, you'll have to configure /etc/clamav/clamd.conf manually "
+"or run 'dpkg-reconfigure clamav-base' later. In any case, manual changes in /"
+"etc/clamav/clamd.conf will be respected."
+msgstr ""
+"Zestaw ClamAV nie będzie działał, jeśli nie zostanie skonfigurowany. Jeśli "
+"nie zostanie wybrana opcja konfiguracji automatycznej, będzie trzeba "
+"skonfigurować /etc/clamav/clamd.conf ręcznie lub wykonać \"dpkg-reconfigure "
+"clamav-base\" później. W każdym przypadku ręczne zmiany w /etc/clamav/clamd."
+"conf będą przestrzegane."
+
+#. Type: select
+#. Description
+#: ../clamav-base.templates:3001
+msgid "Socket type:"
+msgstr "Typ gniazda:"
+
+#. Type: select
+#. Description
+#: ../clamav-base.templates:3001
+msgid "Please choose the type of socket clamd will be listening on."
+msgstr "Proszę wybrać typ gniazda, na którym będzie nasłuchiwał clamd."
+
+#. Type: select
+#. Description
+#: ../clamav-base.templates:3001
+msgid ""
+"If you choose TCP, clamd can be accessed remotely. If you choose local UNIX "
+"sockets, clamd can be accessed through a file. Local UNIX sockets are "
+"recommended for security reasons."
+msgstr ""
+"Jeśli zostanie wybrane TCP, clamd będzie dostępny zdalnie. W przypadku "
+"lokalnych gniazd UNIX-owych, clamd będzie dostępny przez plik. Ze względów "
+"bezpieczeństwa, zaleca się wybór lokalnych gniazd UNIX-owych."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:4001
+msgid "Local (UNIX) socket clamd will listen on:"
+msgstr "Lokalne gniazdo (UNIX-owe), na którym będzie nasłuchiwał clamd:"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:5001
+msgid "Gracefully handle left-over UNIX socket files?"
+msgstr "Obsłużyć pozostawione pliki gniazd UNIX-owych w sposób łagodny?"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:6001
+msgid "Group owner of clamd local (UNIX) socket:"
+msgstr "Grupa do której należy lokalne gniazdo (UNIX-owe) clamd:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:7001
+msgid "Creation mode for clamd local (UNIX) socket:"
+msgstr "Uprawnienia lokalnego gniazda (UNIX-owego) clamd:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:8001
+msgid "TCP port clamd will listen on:"
+msgstr "Port TCP, na którym będzie nasłuchiwał clamd:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:9001
+msgid "IP address clamd will listen on:"
+msgstr "Adres IP, na którym będzie nasłuchiwał clamd:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:9001
+msgid ""
+"Enter \"any\" to listen on every IP address configured. If you want to "
+"listen on a single address or host name, enter it here."
+msgstr ""
+"Proszę wybrać \"any\" aby nasłuchiwać na wszystkich skonfigurowanych "
+"adresach IP. Jeśli nasłuch ma następować na pojedynczym adresie lub nazwie "
+"komputera, proszę go wpisać."
+
+#. Type: error
+#. Description
+#: ../clamav-base.templates:10001
+msgid "Mandatory numeric value"
+msgstr "Wymagana wartość liczbowa"
+
+#. Type: error
+#. Description
+#: ../clamav-base.templates:10001
+msgid "This question requires a numeric answer."
+msgstr "To pytanie wymaga odpowiedzi w postaci wartości liczbowej."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:11001
+msgid "Do you want to enable mail scanning?"
+msgstr "Włączyć skanowanie poczty elektronicznej?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:11001
+msgid ""
+"This option enables scanning mail contents for viruses. You need this option "
+"enabled if you want to use clamav-milter, or if you want to enable phishing "
+"checks."
+msgstr ""
+"Ta opcja włącza skanowanie zawartości poczty elektronicznej pod kątem "
+"wirusów. Należy ją włączyć, jeśli ma być używany clamav-milter lub jeśli ma "
+"być włączone sprawdzanie pod kątem phisingu."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:12001
+msgid "Do you want to enable archive scanning?"
+msgstr "Włączyć skanowanie archiwów?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:12001
+msgid ""
+"If archive scanning is enabled, the daemon will extract archives such as "
+"bz2, tar.gz, deb and many more, to check their contents for viruses."
+msgstr ""
+"Jeśli skanowanie archiwów jest włączone, demon wypakowuje archiwa takie jak "
+"bz2, tar.gz, deb i wiele innych, w celu sprawdzenia zawartości pod kątem "
+"wirusów."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:12001
+msgid ""
+"For more information about what archives are supported, see /usr/share/doc/"
+"clamav-docs/clamdoc.pdf or the manpage clamscan(5)."
+msgstr ""
+"Aby dowiedzieć się o obsługiwanych typach archiwów, proszę zapoznać się z /"
+"usr/share/doc/clamav-docs/clamdoc.pdf lub stroną podręcznika systemowego "
+"clamscan(5)."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:13001
+msgid "Maximum stream length (unit Mb) allowed:"
+msgstr "Maksymalna dozwolona długość strumienia (w Mb):"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:13001
+msgid "You can set a limit on the stream length that can be scanned."
+msgstr ""
+"Można ustawić maksymalną długość strumienia, jaka może być przeskanowana."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:14001
+msgid "Maximum directory depth that will be allowed:"
+msgstr "Maksymalny poziom zagnieżdżenia katalogów:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:14001
+msgid ""
+"This value must be set if you want to allow the daemon to follow directory "
+"symlinks."
+msgstr ""
+"Wartość musi być ustawiona, jeśli zostanie wybrane podążanie za dowiązaniami "
+"symbolicznymi katalogów przez demona."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:14001
+msgid "Entering '0' will disable this limit."
+msgstr "Wpisanie \"0\" wyłączy ten limit."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:15001
+msgid "Do you want the daemon to follow directory symlinks?"
+msgstr "Czy demon ma podążać za dowiązaniami symbolicznymi katalogów?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:16001
+msgid "Do you want the daemon to follow regular file symlinks?"
+msgstr "Czy demon ma podążać za zwykłymi dowiązaniami symbolicznymi?"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:17001
+msgid "Timeout for stopping the thread-scanner (seconds):"
+msgstr "Czas oczekiwania przed przerwaniem wątku skanowania (sekundy):"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:17001
+msgid "Entering '0' will disable the timeout."
+msgstr "Wprowadzenie \"0\" wyłączy ten limit."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:18001
+msgid "Number of threads for the daemon:"
+msgstr "Liczba wątków demona:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:19001
+msgid "Number of pending connections allowed:"
+msgstr "Dozwolona liczba oczekujących połączeń:"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:20001
+msgid "Do you want to use the system logger?"
+msgstr "Czy używać loggera systemowego?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:20001
+msgid ""
+"It is possible to log the daemon activity to the system logger. This can be "
+"done independently of whether you want to log activity to a special file."
+msgstr ""
+"Można korzystać z zapisywania aktywności demona do loggera systemowego. Jest "
+"to ustawienie niezależne od zapisywania aktywności do odrębnego pliku "
+"dziennika."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:21001
+msgid "Log file for clamav-daemon (enter none to disable):"
+msgstr ""
+"Plik dziennika dla clamav-daemon (proszę wpisać \"none\" aby go wyłączyć):"
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:22001
+msgid "Do you want to log time information with each message?"
+msgstr "Zapisywać czas przy każdej informacji w logu?"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:23001
+msgid "Delay in seconds between daemon self checks:"
+msgstr "Opóźnienie (w sekundach) pomiędzy sprawdzeniami demona:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:23001
+msgid ""
+"During the SelfCheck the daemon checks if it needs to reload the virus "
+"database. It also tries to repair problems caused by bugs in the daemon, "
+"(that is, in some cases it's able to repair broken data structures)."
+msgstr ""
+"Podczas wykonywania SelfCheck demon sprawdza czy należy przeładować bazę "
+"wirusów. Stara się także naprawić problemy spowodowane przez błędy w demonie "
+"(w niektórych przypadkach potrafi naprawić zniszczone struktury danych)."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:24001
+msgid "User to run clamav-daemon as:"
+msgstr "Użytkownik uruchamiający clamav-daemon:"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:24001
+msgid ""
+"It is recommended to run the ClamAV programs as a non-privileged user. This "
+"will work with most MTAs with a little tweaking, but if you want to use "
+"clamd for filesystem scans, running as root is probably unavoidable. Please "
+"see README.Debian in the clamav-base package for details."
+msgstr ""
+"Zaleca się uruchamianie programów ClamAV z poziomu użytkownika "
+"nieuprzywilejowanego. Takie ustawienie działa z większością serwerów poczty "
+"elektronicznej (ang. MTA), po dokonaniu niewielkich poprawek, ale jeśli "
+"clamd ma być używany do skanowania systemów plików, prawdopodobnie nie da "
+"się uniknąć uruchamiania go jako root. Proszę zapoznać się z plikiem README."
+"Debian z pakietu clamav-base, aby uzyskać więcej szczegółów."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:25001
+msgid "Groups for clamav-daemon (space-separated):"
+msgstr "Grupy clamav-daemon (oddzielone spacjami):"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:25001
+msgid "Please enter any extra groups for clamd."
+msgstr "Proszę podać wszystkie dodatkowe grupy dla clamd."
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:25001
+msgid ""
+"By default, clamd runs as a non-privileged user. If you need clamd to be "
+"able to access files owned by another user (e.g., in combination with an "
+"MTA), then you will need to add clamd to the group for that piece of "
+"software. Please see README.Debian in the clamav-base package for details."
+msgstr ""
+"Domyślnie, clamd jest uruchamiany jako użytkownik nieuprzywilejowany. Jeśli "
+"zachodzi potrzeba aby miał dostęp do plików należących do innego użytkownika "
+"(np. w połączeniu z serwerem poczty elektronicznej), należy dodać clamd do "
+"grupy odpowiedniej danemu oprogramowaniu. Proszę zapoznać się z plikiem "
+"README.Debian z pakietu clamav-base, aby uzyskać więcej szczegółów."
+
+#. Type: boolean
+#. Description
+#: ../clamav-base.templates:26001
+msgid "Do you want to load bytecode from the database?"
+msgstr "Ładować kod bajtowy z bazy danych?"
+
+#. Type: select
+#. Choices
+#: ../clamav-base.templates:27001
+msgid "TrustSigned"
+msgstr "Ufaj podpis."
+
+#. Type: select
+#. Choices
+#: ../clamav-base.templates:27001
+msgid "Paranoid"
+msgstr "Paranoiczny"
+
+#. Type: select
+#. Description
+#: ../clamav-base.templates:27002
+msgid "Security level to apply to the bytecode:"
+msgstr "Poziom bezpieczeństwa dla kodu bajtowego:"
+
+#. Type: select
+#. Description
+#: ../clamav-base.templates:27002
+msgid ""
+" - TrustSigned : trust bytecode loaded from signed virus database files,\n"
+" but insert runtime safety checks for bytecode loaded\n"
+" from unsigned sources\n"
+" - Paranoid : always insert runtime checks"
+msgstr ""
+" - Ufaj podpis. : ufa kodowi bajtowemu ładowanemu z podpisanych plików\n"
+" baz wirusów, ale wykonuje testy bezpieczeństwa dla\n"
+" kodu bajtowego ładowanego z niepodpisanych źródeł\n"
+" - Paranoiczny : zawsze wykonuje testy bezpieczeństwa"
+
+#. Type: string
+#. Description
+#: ../clamav-base.templates:28001
+msgid "Bytecode execution timeout in milliseconds:"
+msgstr "Czas oczekiwania na wykonanie kodu bajtowego (w milisekundach):"
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Some options must be configured for clamav-milter."
+msgstr "Niektóre opcje muszą zostać skonfigurowane do clamav-milter."
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:2001
+msgid ""
+"It won't work if it isn't configured. If you do not configure it "
+"automatically, you'll have to configure /etc/clamav/clamav-milter.conf "
+"manually or run \"dpkg-reconfigure clamav-milter\" later. In any case, "
+"manual changes in /etc/clamav/clamav-milter.conf will be respected."
+msgstr ""
+"Nie będzie on działał, jeśli nie zostanie skonfigurowany. Jeśli nie zostanie "
+"wybrana opcja automatycznej konfiguracji, będzie trzeba skonfigurować /etc/"
+"clamav/clamav-milter.conf ręcznie lub wykonać \"dpkg-reconfigure clamav-"
+"milter\" później. W każdym przypadku ręczne zmiany w /etc/clamav/clamav-"
+"milter.conf będą przestrzegane."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:3001
+msgid "Communication interface with Sendmail:"
+msgstr "Interfejs komunikacyjny dla programu Sendmail:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:3001
+msgid ""
+"Please choose the method that should be used by clamav-milter to communicate "
+"with Sendmail. The following formats can be used:\n"
+" - Unix domain socket: [[unix|local]:]/path/to/file\n"
+" - IPv4 socket : inet:port@[hostname|ip-address]\n"
+" - IPv6 socket : inet6:port@[hostname|ip-address]"
+msgstr ""
+"Proszę wybrać metodę, która powinna być użyta do komunikowania się clamav-"
+"milter z Sendmailem. Można użyć następujących formatów:\n"
+" - gniazdo dziedziny UNIX: [[unix|local]:]/ścieżka/do/pliku\n"
+" - gniazdo IPv4 : inet:port@[nazwa-komp|adres-ip]\n"
+" - gniazdo IPv6 : inet6:port@[nazwa-komp|adres-ip]"
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:4001
+msgid "Remove stale socket after unclean shutdown?"
+msgstr "Usunąć wygasłe gniazdo po nieprawidłowym zamknięciu?"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:5001
+msgid "Group owner of clamav-milter local (UNIX) socket:"
+msgstr "Grupa lokalnego gniazda (UNIX-owego) clamav-milter:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001
+msgid "Creation mode for clamav-milter local (UNIX) socket:"
+msgstr "Uprawnienia lokalnego gniazda (UNIX-owego) clamav-milter:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:7001
+msgid "User to run clamav-milter as:"
+msgstr "Użytkownik uruchamiający clamav-milter:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:7001
+msgid ""
+"It is recommended to run the ClamAV programs as a non-privileged user. This "
+"will work with most MTAs with a little tweaking."
+msgstr ""
+"Zaleca się uruchamianie programów ClamAV z poziomu użytkownika "
+"nieuprzywilejowanego. Takie ustawienie działa z większością serwerów poczty "
+"elektronicznej (ang. MTA), po dokonaniu niewielkich poprawek."
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:7001 ../clamav-milter.templates:8001
+msgid "Please see README.Debian in the clamav-base package for details."
+msgstr ""
+"Proszę zapoznać się z plikiem README.Debian z pakietu clamav-base, aby "
+"uzyskać więcej szczegółów."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:8001
+msgid "Groups for clamav-milter (space-separated):"
+msgstr "Grupy clamav-milter (oddzielone spacjami):"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:8001
+msgid ""
+"By default, clamav-milter runs as a non-privileged user. If you need clamav-"
+"milter to be able to access files owned by another user (for instance when "
+"it is used in combination with an MTA), the user running clamav-milter need "
+"to be added to the relevant group(s)."
+msgstr ""
+"Domyślnie, clamav-milter jest uruchamiany jako użytkownik "
+"nieuprzywilejowany. Jeśli zachodzi potrzeba aby miał dostęp do plików "
+"należących do innego użytkownika (np. w połączeniu z serwerem poczty "
+"elektronicznej), należy dodać clamav-milter do odpowiedniej grupy lub grup."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:9001
+msgid "Wait timeout for data coming from clamd:"
+msgstr "Czas oczekiwania dla danych otrzymywanych z clamd:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:9001
+msgid ""
+"Please enter the delay (in seconds) before clamav-milter times out when it "
+"is waiting for incoming data from clamd."
+msgstr ""
+"Proszę określić czas oczekiwania (w sekundach), jaki zastosuje clamav-milter "
+"do danych otrzymywanych od clamd."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:9001
+msgid "Choosing \"0\" will disable this timeout."
+msgstr "Wybranie \"0\" wyłączy ten limit."
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:10001
+msgid "Should clamav-milter stay in foreground (not forking)?"
+msgstr "Czy clamav-milter powinien pozostać w tle (bez forkowania)?"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:11001
+msgid "Chroot to directory:"
+msgstr "Katalog do chroot:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:11001
+msgid ""
+"Clamav-milter can run in a chroot jail. It will enter it after reading the "
+"configuration file and before dropping root privileges."
+msgstr ""
+"Clamav-milter może działać w środowisku chroot. Wejdzie w nie po odczytaniu "
+"pliku konfiguracyjnego i przed porzuceniem uprawnień roota."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:11001
+msgid "If this field is left empty, no chrooting will occur."
+msgstr "Jeśli pole pozostanie puste, chroot nie zostanie zastosowany."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:12001
+msgid "PID file:"
+msgstr "Plik PID:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:12001
+msgid ""
+"Please specify the process identifier file location for clamav-milter's "
+"listening daemon (main thread)."
+msgstr ""
+"Proszę określić lokalizację pliku identyfikatora procesu dla nasłuchującego "
+"demona clamav-milter (główny wątek)."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Temporary directory path:"
+msgstr "Ścieżka katalogu tymczasowego:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid ""
+"Please specify the directory for clamav-milter's files that are temporarily "
+"buffered for scanning. If unset, $TMPDIR and $TEMP will be honored."
+msgstr ""
+"Proszę określić katalog, w którym będą tymczasowo buforowane pliki clamav-"
+"milter. Jeśli nie zostanie ustawiony, program skorzysta ze zmiennych $TMPDIR "
+"i $TEMP."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "Clamd socket to connect to for scanning:"
+msgstr "Gniazdo clamd do połączenia w celu skanowania:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"Please specify the socket to use to connect to the ClamAV daemon for "
+"scanning purposes. Possible choices are:\n"
+" - a local unix socket using an absolute path, in \"unix:path\" format\n"
+" (for example: unix:/var/run/clamd/clamd.socket);\n"
+" - a local or remote TCP socket in \"tcp:host:port\" format (for example:\n"
+" tcp:192.168.0.1). The \"host\" value can be either a hostname or an IP\n"
+" address, and the \"port\" is only required for IPv6 addresses,\n"
+" defaulting to 3310 otherwise."
+msgstr ""
+"Proszę określić gniazdo, które zostanie użyte do połączenia z demonem "
+"ClamAV\n"
+"w celu skanowania. Można wybrać:\n"
+" - lokalne gniazdo UNIX-owe, używające pełnej ścieżki w formacie\n"
+" \"unix:path\" (np.: unix:/var/run/clamd/clamd.socket);\n"
+" - lokalne lub zdalne gniazdo TCP w formacie \"tcp:host:port\" (np.:\n"
+" tcp:192.168.0.1). Wartość \"host\" może być nazwą komputera lub adresem\n"
+" IP, a \"port\" jest wymagany tylko w przypadku adresów IPv6, w innym\n"
+" przypadku zostanie wybrana wartość domyślna 3310."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"You may specify multiple choices, separated by spaces. In such case, the "
+"clamd servers will be selected in a round-robin fashion."
+msgstr ""
+"Można określić ich wiele, oddzielając poszczególne spacjami. W takim "
+"przypadku serwery clamd będą wybrane za pomocą algorytmu karuzelowego (ang. "
+"round robin)."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:15001
+msgid "Hosts excluded from scanning:"
+msgstr "Komputery wyłączone ze skanowania:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:15001
+msgid ""
+"Please specify, in CIDR notation (host(name)/mask), the hosts for which no "
+"scanning should be performed on incoming mail. Multiple entries should be "
+"separated by spaces. The \"local\" shortcut can be used to specify locally-"
+"originated (non-SMTP) email."
+msgstr ""
+"Proszę podać, w notacji CIDR (nazwa-lub-adres-komp/maska), komputery których "
+"wpływająca poczta nie powinna być skanowana. Można podać wiele wpisów, "
+"oddzielonych spacjami. Skrót \"local\" może być użyty w celu podania poczty "
+"pochodzenia lokalnego (nie SMTP)."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:15001
+msgid "If this field is left empty, all incoming mail will be scanned."
+msgstr ""
+"Jeśli to pole pozostanie puste, będzie skanowana cała poczta przychodząca."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:16001
+msgid "Mail addresses whitelist:"
+msgstr "Biała lista adresów pocztowych:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:16001
+msgid ""
+"Please specify the path to a whitelist file, listing email addresses that "
+"should cause scanning to be bypassed."
+msgstr ""
+"Proszę podać ścieżkę do pliku białej listy zawierającego adresy poczty "
+"elektronicznej, których poczta nie będzie skanowana."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:16001
+msgid ""
+"Each line in this file should be a POSIX regular expression; lines starting "
+"with \"#\", \":\" or \"!\" will be ignored as comments."
+msgstr ""
+"Każdy wiersz w tym pliku powinien być wyrażeniem regularnym POSIX; wiersze "
+"zaczynające się od \"#\", \":\", \"!\" będą traktowane jako komentarze i "
+"ignorowane."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:16001
+msgid ""
+"Lines may start with \"From:\" (with no space after the colon) to make the "
+"whitelisting apply to matching sender addresses; otherwise, or with a \"To:"
+"\" prefix, it affects recipient addresses."
+msgstr ""
+"Wiersze mogą się zaczynać od \"From:\" (bez spacji po dwukropku), aby biała "
+"lista odnosiła się do pasujących adresów nadawców; w przeciwnym razie (lub z "
+"prefiksem \"To:\") będzie dotyczyła adresów odbiorców."
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:17001 ../clamav-milter.templates:18001
+msgid "Accept"
+msgstr "Zaakceptuj"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:17001 ../clamav-milter.templates:18001
+msgid "Reject"
+msgstr "Odmów"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:17001 ../clamav-milter.templates:18001
+msgid "Defer"
+msgstr "Odrocz"
+
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:17001
+msgid "Blackhole"
+msgstr "Czarna dziura"
+
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:17001
+msgid "Quarantine"
+msgstr "Kwarantanna"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:17002
+msgid "Action to perform on infected messages:"
+msgstr "Działania do wykonania na zarażonych wiadomościach:"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:17002
+msgid "Please choose the action to perform on \"infected\" messages:"
+msgstr ""
+"Proszę wybrać działania, które zostaną wykonane na \"zarażonych\" "
+"wiadomościach."
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:17002
+msgid ""
+" - Accept : accept the message for delivery;\n"
+" - Reject : immediately refuse delivery (with a 5xx error);\n"
+" - Defer : return a temporary failure message (4xx);\n"
+" - Blackhole : accept the message then drop it;\n"
+" - Quarantine: accept the message then quarantine it. With\n"
+" Sendmail, the quarantine queue can be examined\n"
+" with \"mailq -qQ\". With Postfix, such mails are placed\n"
+" on hold."
+msgstr ""
+" - Zaakceptuj : akceptuje wiadomość do doręczenia;\n"
+" - Odmów : natychmiastowo odmawia doręczenia (z błędem 5xx);\n"
+" - Odrocz : zwraca tymczasowy błąd doręczenia (4xx)\n"
+" - Czarna dziura: akceptuje wiadomość po czym ją porzuca;\n"
+" - Kwarantanna : akceptuje wiadomość, po czym przekazuje ją do\n"
+" kwarantanny; używając Sendmaila, kolejka\n"
+" kwarantanny może być uzyskana poleceniem \"mailq -qQ\";\n"
+" Postfix wstrzymuje takie wiadomości."
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:18002
+msgid "Action to perform on error conditions:"
+msgstr "Działania w przypadku wystąpienia błędu:"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:18002
+msgid ""
+"Please choose the action to perform on errors such as failure to allocate "
+"data structures, no scanners available, network timeouts, unknown scanner "
+"replies...:"
+msgstr ""
+"Proszę wybrać działania, które zostaną wykonane w przypadku błędu alokacji "
+"danych, braku dostępnych skanerów, upływu czasu połączenia, nieznanych "
+"odpowiedzi od skanera...:"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:18002
+msgid ""
+" - Accept: accept the message for delivery;\n"
+" - Reject: immediately refuse delivery (with a 5xx error);\n"
+" - Defer : return a temporary failure message (4xx)."
+msgstr ""
+" - Zaakceptuj: akceptuje wiadomość do doręczenia;\n"
+" - Odmów : natychmiast odmawia doręczenia (z błędem 5xx);\n"
+" - Odrocz : zwraca tymczasowy błąd doręczenia (4xx)."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:19001
+msgid "Specific rejection reason for infected messages:"
+msgstr "Powód odmowy doręczenia zarażonych wiadomości:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:19001
+msgid ""
+"Please specify the rejection reason that will be included in reject mails."
+msgstr ""
+"Proszę wprowadzić powód odmowy, który będzie umieszczony w odrzuconych "
+"wiadomościach."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:19001
+msgid "This option is only useful together with \"OnInfected Reject\"."
+msgstr "Opcja jest użyteczna tylko z \"OnInfected Reject\"."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:19001
+#, no-c-format
+msgid "The \"%v\" string may be used to include the virus name."
+msgstr "Można użyć ciągu \"%v\", który będzie zawierał nazwę wirusa."
+
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:20001
+msgid "Replace"
+msgstr "Zastąp"
+
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:20001
+msgid "Yes"
+msgstr "Tak"
+
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:20001
+msgid "No"
+msgstr "Nie"
+
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:20001
+msgid "Add"
+msgstr "Dodaj"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:20002
+msgid "Add headers to processed messages?"
+msgstr "Dodać nagłówki do przetworzonych wiadomości?"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:20002
+msgid ""
+"If you choose this option, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
+"existing similar headers."
+msgstr ""
+"Jeśli ta opcja zostanie wybrana, do każdej przetworzonej wiadomości będą "
+"dołączone nagłówki \"X-Virus-Scanned\" i \"X-Virus-Status\", potencjalnie "
+"zastępując istniejące, podobne nagłówki."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:21001
+msgid "Log file for clamav-milter:"
+msgstr "Plik dziennika dla clamav-milter:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:21001
+msgid ""
+"Specify the full path to the clamav-milter log file, which must be writable "
+"for the clamav daemon. Enter none to disable."
+msgstr ""
+"Proszę podać pełną ścieżkę pliku dziennika clamav-milter, która musi być "
+"zapisywalna dla demona clamav. Proszę wpisać \"none\", aby go wyłączyć."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:21001
+msgid "Logging via syslog is configured independently of this setting."
+msgstr ""
+"Prowadzenie dziennika przez syslog jest konfigurowane niezależnie od tego "
+"ustawienia."
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:22001
+msgid "Disable log file locking?"
+msgstr "Wyłączyć blokowanie pliku dziennika?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:22001
+msgid ""
+"By default the log file is locked for writing. The lock protects against "
+"running clamav-milter multiple times. This option disables log file locking."
+msgstr ""
+"Domyślnie, plik dziennika jest blokowany do zapisu. Blokada przeciwdziała "
+"uruchamianiu clamav-milter wielokrotnie. Ta opcja wyłącza blokowanie pliku "
+"dziennika."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:23001
+msgid "Maximum size of the log file (MB):"
+msgstr "Maksymalny rozmiar pliku dziennika (MB):"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:23001
+msgid ""
+"Please specify the maximum size for the log file. Using \"0\" will allow "
+"that file to grow indefinitely."
+msgstr ""
+"Proszę określić maksymalny rozmiar pliku dziennika. Wpisanie \"0\" pozwala "
+"na nieograniczony rozmiar."
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:24001
+msgid "Log time with each message?"
+msgstr "Zapisywać czas przy każdej wiadomości?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:25001
+msgid "Use system logger?"
+msgstr "Użyć loggera systemowego?"
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:25001
+msgid ""
+"Please choose whether you want to use the system logger (syslog). This "
+"option can be used along with logging in a dedicated file."
+msgstr ""
+"Proszę wybrać, czy ma zostać użyty logger systemowy (syslog). Ta opcja może "
+"być używana równocześnie z zapisywaniem dzienników do oddzielnego pliku."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:26001
+msgid "Type of syslog messages:"
+msgstr "Typ wiadomości syslog:"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:26001
+msgid ""
+"Please choose the type of syslog messages as detailed in the system logger's "
+"documentation."
+msgstr ""
+"Proszę wybrać typ wiadomości syslog, zgodnie z dokumentacją systemowego "
+"programu do logów."
+
+#. Type: boolean
+#. Description
+#: ../clamav-milter.templates:27001
+msgid "Enable verbose logging?"
+msgstr "Włączyć szczegółowe zapisywanie do dziennika?"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:28001 ../clamav-milter.templates:29001
+msgid "Off"
+msgstr "Wył."
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:28001 ../clamav-milter.templates:29001
+msgid "Basic"
+msgstr "Proste"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../clamav-milter.templates:28001 ../clamav-milter.templates:29001
+msgid "Full"
+msgstr "Pełne"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:28002
+msgid "Information to log on infected messages:"
+msgstr "Informacje zapisywane do dziennika w przypadku zarażonych wiadomości:"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:28002
+msgid ""
+"Please choose the level of information that will be logged when infected "
+"messages are found:\n"
+" - Off : no logging;\n"
+" - Basic: minimal information;\n"
+" - Full : verbose information."
+msgstr ""
+"Proszę wybrać poziom informacji, jakie będą zapisywane do dziennika w "
+"przypadku znalezienia zarażonych wiadomości:\n"
+" - Wył. : bez zapisywania informacji,\n"
+" - Proste: minimalna ilość informacji,\n"
+" - Pełne : obszerne informacje."
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:29002
+msgid "Information to log if no threat is found:"
+msgstr "Informacje zapisywane jeśli nie zostanie znalezione nic podejrzanego:"
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:29002
+msgid ""
+"Please choose the level of information that will be logged when no threat is "
+"found in a scanned message (this is useful in debugging but drastically "
+"increases the log size):\n"
+" - Off : no logging;\n"
+" - Basic: minimal information;\n"
+" - Full : verbose information."
+msgstr ""
+"Proszę wybrać poziom informacji, które będą zapisywane jeśli w skanowanych "
+"wiadomościach nie zostanie znalezione nic podejrzanego (jest to użyteczne do "
+"debugowania, ale drastycznie zwiększa rozmiar pliku dziennika):\n"
+" - Wył. : bez zapisywania informacji,\n"
+" - Proste: minimalna ilość informacji,\n"
+" - Pełne : obszerne informacje."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:30001
+msgid "Size limit for scanned messages (MB):"
+msgstr "Limit rozmiaru skanowanych wiadomości (MB):"
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:30001
+msgid ""
+"Please specify the maximum size for scanned messages. Messages bigger than "
+"this limit will not be scanned."
+msgstr ""
+"Proszę określić maksymalny rozmiar skanowanych wiadomości. Wiadomości "
+"większe od limitu nie będą skanowane."
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:30001
+msgid ""
+"You should check that this value is lower than the value of \"StreamMaxLength"
+"\" in the clamd.conf file."
+msgstr ""
+"Proszę sprawdzić, czy wartość ta jest niższa niż wartość \"StreamMaxLength\" "
+"w pliku clamd.conf."
diff -Nru clamav-0.97.3+dfsg/debian/po/pt_BR.po clamav-0.97.5+dfsg/debian/po/pt_BR.po
--- clamav-0.97.3+dfsg/debian/po/pt_BR.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/pt_BR.po 2012-07-12 11:19:13.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: clamav\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2007-10-06 14:39-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -599,7 +599,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr ""
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/pt.po clamav-0.97.5+dfsg/debian/po/pt.po
--- clamav-0.97.3+dfsg/debian/po/pt.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/pt.po 2012-07-12 11:19:13.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: clamav 0.97+dfsg-1\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2011-06-19 07:34+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -588,7 +588,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Limite de tempo de execução do bytecode em milissegundos:"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/ru.po clamav-0.97.5+dfsg/debian/po/ru.po
--- clamav-0.97.3+dfsg/debian/po/ru.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/ru.po 2012-07-12 11:19:13.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: clamav 0.97.1+dfsg-1\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2011-07-23 09:03+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -589,7 +589,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Задержка выполнения байт-кода в миллисекундах:"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/sv.po clamav-0.97.5+dfsg/debian/po/sv.po
--- clamav-0.97.3+dfsg/debian/po/sv.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/sv.po 2012-07-12 11:19:13.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: clamav_0.93~dfsg-1_sv\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2011-06-29 22:37+0100\n"
"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
"Language-Team: Swedish <debian@lists.debian.org>\n"
@@ -581,7 +581,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Maximal tid i millisekunder vid exekvering av bytekod:"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/templates.pot clamav-0.97.5+dfsg/debian/po/templates.pot
--- clamav-0.97.3+dfsg/debian/po/templates.pot 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/templates.pot 2012-07-12 11:19:13.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -508,7 +508,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr ""
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/po/vi.po clamav-0.97.5+dfsg/debian/po/vi.po
--- clamav-0.97.3+dfsg/debian/po/vi.po 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/po/vi.po 2012-07-12 11:19:13.000000000 -0400
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: clamav 0.96.3+dfsg-2\n"
"Report-Msgid-Bugs-To: clamav@packages.debian.org\n"
-"POT-Creation-Date: 2011-10-24 09:56+0000\n"
+"POT-Creation-Date: 2011-10-24 07:48+0000\n"
"PO-Revision-Date: 2010-10-27 16:18+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -586,7 +586,7 @@
#. Type: string
#. Description
#: ../clamav-base.templates:28001
-msgid "Bytecode execution timeout in miliseconds:"
+msgid "Bytecode execution timeout in milliseconds:"
msgstr "Thời hạn thực hiện mã byte (theo mili-giây):"
#. Type: boolean
diff -Nru clamav-0.97.3+dfsg/debian/README.Debian clamav-0.97.5+dfsg/debian/README.Debian
--- clamav-0.97.3+dfsg/debian/README.Debian 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/README.Debian 2012-07-12 11:19:13.000000000 -0400
@@ -52,9 +52,9 @@
Clamav-daemon's configuration is quite complex. However its full
complexity shouldn't be felt by users since the majority of the
- questions alraedy have sensible defaults.
+ questions already have sensible defaults.
- 2. The package also handles manual editing of it's configuration file,
+ 2. The package also handles manual editing of its configuration file,
/etc/clamav/clamd.conf, gracefully.
While it's possible to mix debconf and manual editing, it isn't
@@ -139,7 +139,7 @@
See /usr/share/doc/clamav-milter/INSTALL.gz for some details as well
as the end of the CLAMAV-MILTER section below.
- Other MTA's I am not as familiar with, but the same principles apply -
+ Other MTAs I am not as familiar with, but the same principles apply -
clamav needs read and write access to the diretory where messages are
unpacked (as is the case with amavis and exim4), and the MTA needs
read/write permissions to clamav's socket file, if it is run listening
diff -Nru clamav-0.97.3+dfsg/debian/rules clamav-0.97.5+dfsg/debian/rules
--- clamav-0.97.3+dfsg/debian/rules 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/debian/rules 2012-07-12 11:19:13.000000000 -0400
@@ -10,18 +10,16 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
-CXXFLAGS = -Wall -g
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+CXXFLAGS = `dpkg-buildflags --get CXXFLAGS`
+CXXFLAGS += -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
DEBUG_OPTS=
STRIP_OPTS=
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
-else
- CFLAGS += -O2
- CXXFLAGS += -O2
-endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
STRIP_OPTS += dh_strip --dbg-package=clamav-dbg -p$@
@@ -59,7 +57,7 @@
fi;\
done;
# Add here commands to configure the package.
- ./configure --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-clamav --with-dbdir=/var/lib/clamav/ --sysconfdir=/etc/clamav --enable-milter --disable-clamuko --with-gnu-ld --enable-dns-fix ${DEBUG_OPTS} --disable-unrar --libdir=\$${prefix}/lib --with-system-tommath --with-ltdl-include=/usr/include --with-ltdl-lib=/usr/lib
+ ./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-clamav --with-dbdir=/var/lib/clamav/ --sysconfdir=/etc/clamav --enable-milter --disable-clamuko --with-gnu-ld --enable-dns-fix ${DEBUG_OPTS} --disable-unrar --libdir=\$${prefix}/lib --with-system-tommath --without-included-ltdl
build: build-stamp
build-stamp: build-arch build-indep
@@ -94,12 +92,12 @@
ifeq ($(with_check),yes)
ifneq (,$(filter alpha, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
@echo "Ignoring errors because of #521737"
- -$(MAKE) check
+ -$(MAKE) check VERBOSE=1
else
ifneq (,$(filter ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
- $(MAKE) check EF_ALIGNMENT=8
+ $(MAKE) check EF_ALIGNMENT=8 VERBOSE=1
else
- $(MAKE) check
+ $(MAKE) check VERBOSE=1
endif
endif
else
@@ -196,7 +194,7 @@
touch install-arch-stamp
-clamav-dbg:
+clamav-dbg: libclamav6
dh_testdir
dh_testroot
dh_installdocs -p$@
Binary files /tmp/R2b17oUk7a/clamav-0.97.3+dfsg/docs/clamdoc.pdf and /tmp/UeGx1Nk2IY/clamav-0.97.5+dfsg/docs/clamdoc.pdf differ
diff -Nru clamav-0.97.3+dfsg/docs/clamdoc.tex clamav-0.97.5+dfsg/docs/clamdoc.tex
--- clamav-0.97.3+dfsg/docs/clamdoc.tex 2011-10-17 10:48:34.000000000 -0400
+++ clamav-0.97.5+dfsg/docs/clamdoc.tex 2012-06-15 10:05:04.000000000 -0400
@@ -71,7 +71,7 @@
\vspace{3cm}
\begin{flushright}
\rule[-1ex]{8cm}{3pt}\\
- \huge Clam AntiVirus 0.97.3\\
+ \huge Clam AntiVirus 0.97.4\\
\huge \emph{User Manual}\\
\end{flushright}
diff -Nru clamav-0.97.3+dfsg/docs/html/clamdoc.html clamav-0.97.5+dfsg/docs/html/clamdoc.html
--- clamav-0.97.3+dfsg/docs/html/clamdoc.html 2011-10-17 10:49:31.000000000 -0400
+++ clamav-0.97.5+dfsg/docs/html/clamdoc.html 2012-06-15 10:05:04.000000000 -0400
@@ -56,7 +56,7 @@
<BR>
<BR>
<DIV ALIGN="RIGHT">
-<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.3
+<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.4
<BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN>
<BR>
</BIG></BIG></DIV>
diff -Nru clamav-0.97.3+dfsg/docs/html/index.html clamav-0.97.5+dfsg/docs/html/index.html
--- clamav-0.97.3+dfsg/docs/html/index.html 2011-10-17 10:49:25.000000000 -0400
+++ clamav-0.97.5+dfsg/docs/html/index.html 2012-06-15 10:05:04.000000000 -0400
@@ -56,7 +56,7 @@
<BR>
<BR>
<DIV ALIGN="RIGHT">
-<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.3
+<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.97.4
<BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN>
<BR>
</BIG></BIG></DIV>
diff -Nru clamav-0.97.3+dfsg/docs/man/clamdscan.1.in clamav-0.97.5+dfsg/docs/man/clamdscan.1.in
--- clamav-0.97.3+dfsg/docs/man/clamdscan.1.in 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/docs/man/clamdscan.1.in 2012-06-15 10:05:04.000000000 -0400
@@ -78,7 +78,8 @@
.TP
(4) To scan from standard input:
-\fBclamdscan \- <file_to_scan\fR
+\fBclamdscan \- < file_to_scan\fR
+
\fBcat file_to_scan | clamdscan \-\fR
.SH "RETURN CODES"
.LP
diff -Nru clamav-0.97.3+dfsg/freshclam/manager.c clamav-0.97.5+dfsg/freshclam/manager.c
--- clamav-0.97.3+dfsg/freshclam/manager.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/freshclam/manager.c 2012-06-15 10:05:04.000000000 -0400
@@ -1316,7 +1316,7 @@
char cwd[512], info[32], buff[513], *pt;
struct dirent *dent;
int fd, err = 0;
- gzFile *gzs = NULL;
+ gzFile gzs = NULL;
if(!getcwd(cwd, sizeof(cwd))) {
logg("!buildcld: Can't get path of current working directory\n");
@@ -2182,6 +2182,15 @@
logg("*Using IPv6 aware code\n");
#endif
+ /* custom dbs */
+ if((opt = optget(opts, "DatabaseCustomURL"))->enabled) {
+ while(opt) {
+ if(updatecustomdb(opt->strarg, &signo, opts, localip, logerr) == 0)
+ updated = 1;
+ opt = opt->nextarg;
+ }
+ }
+
#ifdef HAVE_RESOLV_H
dnsdbinfo = optget(opts, "DNSDatabaseInfo")->strarg;
@@ -2363,15 +2372,6 @@
mirman_write("mirrors.dat", dbdir, &mdat);
mirman_free(&mdat);
- /* custom dbs */
- if((opt = optget(opts, "DatabaseCustomURL"))->enabled) {
- while(opt) {
- if(updatecustomdb(opt->strarg, &signo, opts, localip, logerr) == 0)
- updated = 1;
- opt = opt->nextarg;
- }
- }
-
cli_rmdirs(updtmpdir);
if(checkdbdir() < 0) {
diff -Nru clamav-0.97.3+dfsg/libclamav/bytecode_api.c clamav-0.97.5+dfsg/libclamav/bytecode_api.c
--- clamav-0.97.3+dfsg/libclamav/bytecode_api.c 2011-10-10 09:05:01.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/bytecode_api.c 2012-06-15 10:05:05.000000000 -0400
@@ -439,10 +439,10 @@
return v;
}
-int32_t cli_bcapi_get_pe_section(struct cli_bc_ctx *ctx, struct cli_exe_section* section, uint32_t num)
+int32_t cli_bcapi_get_pe_section(struct cli_bc_ctx *ctx, void* section, uint32_t num)
{
if (num < ctx->hooks.pedata->nsections) {
- memcpy(section, &ctx->sections[num], sizeof(*section));
+ memcpy(section, &ctx->sections[num], sizeof(struct cli_exe_section));
return 0;
}
return -1;
diff -Nru clamav-0.97.3+dfsg/libclamav/bytecode_api_decl.c clamav-0.97.5+dfsg/libclamav/bytecode_api_decl.c
--- clamav-0.97.3+dfsg/libclamav/bytecode_api_decl.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/bytecode_api_decl.c 2012-06-15 10:05:05.000000000 -0400
@@ -52,7 +52,7 @@
int32_t cli_bcapi_file_byteat(struct cli_bc_ctx *ctx , uint32_t);
uint8_t* cli_bcapi_malloc(struct cli_bc_ctx *ctx , uint32_t);
uint32_t cli_bcapi_test2(struct cli_bc_ctx *ctx , uint32_t);
-int32_t cli_bcapi_get_pe_section(struct cli_bc_ctx *ctx , struct cli_exe_section*, uint32_t);
+int32_t cli_bcapi_get_pe_section(struct cli_bc_ctx *ctx , void*, uint32_t);
int32_t cli_bcapi_fill_buffer(struct cli_bc_ctx *ctx , uint8_t*, uint32_t, uint32_t, uint32_t, uint32_t);
int32_t cli_bcapi_extract_new(struct cli_bc_ctx *ctx , int32_t);
int32_t cli_bcapi_read_number(struct cli_bc_ctx *ctx , uint32_t);
diff -Nru clamav-0.97.3+dfsg/libclamav/bytecode_api_impl.h clamav-0.97.5+dfsg/libclamav/bytecode_api_impl.h
--- clamav-0.97.3+dfsg/libclamav/bytecode_api_impl.h 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/bytecode_api_impl.h 2012-06-15 10:05:05.000000000 -0400
@@ -50,7 +50,7 @@
int32_t cli_bcapi_file_byteat(struct cli_bc_ctx *ctx , uint32_t);
uint8_t* cli_bcapi_malloc(struct cli_bc_ctx *ctx , uint32_t);
uint32_t cli_bcapi_test2(struct cli_bc_ctx *ctx , uint32_t);
-int32_t cli_bcapi_get_pe_section(struct cli_bc_ctx *ctx , struct cli_exe_section*, uint32_t);
+int32_t cli_bcapi_get_pe_section(struct cli_bc_ctx *ctx , void*, uint32_t);
int32_t cli_bcapi_fill_buffer(struct cli_bc_ctx *ctx , uint8_t*, uint32_t, uint32_t, uint32_t, uint32_t);
int32_t cli_bcapi_extract_new(struct cli_bc_ctx *ctx , int32_t);
int32_t cli_bcapi_read_number(struct cli_bc_ctx *ctx , uint32_t);
diff -Nru clamav-0.97.3+dfsg/libclamav/bytecode.c clamav-0.97.5+dfsg/libclamav/bytecode.c
--- clamav-0.97.3+dfsg/libclamav/bytecode.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/bytecode.c 2012-06-15 10:05:05.000000000 -0400
@@ -2416,6 +2416,7 @@
return CL_SUCCESS;
}
+ engine->bytecode_mode = CL_BYTECODE_MODE_AUTO;
cli_detect_environment(&bcs->env);
switch (bcs->env.arch) {
case arch_i386:
diff -Nru clamav-0.97.3+dfsg/libclamav/c++/aclocal.m4 clamav-0.97.5+dfsg/libclamav/c++/aclocal.m4
--- clamav-0.97.3+dfsg/libclamav/c++/aclocal.m4 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/c++/aclocal.m4 2012-06-15 10:05:05.000000000 -0400
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff -Nru clamav-0.97.3+dfsg/libclamav/c++/configure clamav-0.97.5+dfsg/libclamav/c++/configure
--- clamav-0.97.3+dfsg/libclamav/c++/configure 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/c++/configure 2012-06-15 10:05:05.000000000 -0400
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libclamavc++ devel.
+# Generated by GNU Autoconf 2.65 for libclamavc++ devel.
#
# Report bugs to <http://bugs.clamav.net>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -359,19 +359,19 @@
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -682,7 +682,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -979,9 +979,8 @@
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1026,7 +1025,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1052,7 +1051,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1256,7 +1255,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1272,7 +1271,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1302,8 +1301,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1311,7 +1310,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1329,13 +1328,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1358,7 +1357,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1372,8 +1371,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1388,9 +1387,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1429,11 +1428,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1473,7 +1472,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1643,9 +1642,9 @@
if $ac_init_version; then
cat <<\_ACEOF
libclamavc++ configure devel
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1795,7 +1794,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1820,7 +1819,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1896,7 +1895,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1976,7 +1975,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -2084,7 +2083,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by libclamavc++ $as_me devel, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2194,9 +2193,11 @@
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2230,9 +2231,11 @@
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2245,9 +2248,11 @@
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2261,9 +2266,11 @@
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2318,12 +2325,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2338,11 +2340,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+ . "$ac_site_file"
fi
done
@@ -2418,7 +2416,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2433,22 +2431,16 @@
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2466,7 +2458,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -2477,16 +2469,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2511,7 +2503,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2519,7 +2511,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2544,7 +2536,7 @@
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -2552,7 +2544,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -2680,11 +2672,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2706,7 +2698,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2716,7 +2708,7 @@
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2954,7 +2946,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2962,7 +2954,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2996,7 +2988,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3361,8 +3353,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C++ compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3404,8 +3397,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3462,9 +3455,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C++ compiled programs.
+as_fn_error "cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -3515,8 +3508,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4134,8 +4127,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4544,7 +4537,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4560,11 +4553,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -4603,7 +4596,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4619,18 +4612,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -4691,7 +4684,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4757,7 +4750,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4889,7 +4882,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -5119,8 +5113,8 @@
;; #(
*)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -5241,7 +5235,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -5320,7 +5314,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -5436,7 +5430,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5638,13 +5632,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5641: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5635: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5644: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5638: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5647: output\"" >&5)
+ (eval echo "\"\$as_me:5641: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6849,7 +6843,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6852 "configure"' > conftest.$ac_ext
+ echo '#line 6846 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8036,7 +8030,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -8052,11 +8046,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -8095,7 +8089,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -8111,11 +8105,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
@@ -8637,11 +8631,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8640: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8634: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8644: \$? = $ac_status" >&5
+ echo "$as_me:8638: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8976,11 +8970,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8979: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8973: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8983: \$? = $ac_status" >&5
+ echo "$as_me:8977: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9081,11 +9075,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9084: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9078: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9088: \$? = $ac_status" >&5
+ echo "$as_me:9082: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9136,11 +9130,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9139: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9133: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9143: \$? = $ac_status" >&5
+ echo "$as_me:9137: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11520,7 +11514,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11523 "configure"
+#line 11517 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11616,7 +11610,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11619 "configure"
+#line 11613 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12031,7 +12025,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -13572,11 +13566,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13575: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13569: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13579: \$? = $ac_status" >&5
+ echo "$as_me:13573: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13671,11 +13665,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13674: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13668: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13678: \$? = $ac_status" >&5
+ echo "$as_me:13672: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13723,11 +13717,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13726: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13720: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13730: \$? = $ac_status" >&5
+ echo "$as_me:13724: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14691,7 +14685,7 @@
if test "$GXX" != "yes"; then
- as_fn_error $? "GNU C++ compiler not found, not building LLVM" "$LINENO" 5
+ as_fn_error "GNU C++ compiler not found, not building LLVM" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
@@ -14729,14 +14723,14 @@
if test "${with_system_llvm+set}" = set; then :
withval=$with_system_llvm; case "$withval" in
yes)
- as_fn_error $? "--with-system-llvm needs full path to llvm-config" "$LINENO" 5
+ as_fn_error "--with-system-llvm needs full path to llvm-config" "$LINENO" 5
;;
no) ;;
*)
llvmconfig="$withval"
llvmver=`$llvmconfig --version`
if test "$llvmver" != "2.9"; then
- as_fn_error $? "LLVM 2.9 required, but \"$llvmver\" found" "$LINENO" 5
+ as_fn_error "LLVM 2.9 required, but \"$llvmver\" found" "$LINENO" 5
fi
LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`
@@ -14814,13 +14808,13 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported C++ compiler version" >&5
$as_echo_n "checking for supported C++ compiler version... " >&6; }
gxx_version=`${CXX} -dumpversion` ||
- as_fn_error $? "Unable to get GNU C++ compiler version" "$LINENO" 5
+ as_fn_error "Unable to get GNU C++ compiler version" "$LINENO" 5
case "${gxx_version}" in
[03].*)
- as_fn_error $? "C++ compiler too old (${gxx_version})" "$LINENO" 5
+ as_fn_error "C++ compiler too old (${gxx_version})" "$LINENO" 5
;;
4.1.[1]*)
- as_fn_error $? "C++ compiler is buggy" "$LINENO" 5
+ as_fn_error "C++ compiler is buggy" "$LINENO" 5
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gxx_version})" >&5
@@ -14837,15 +14831,15 @@
$as_echo "ok ($target_cpu-$target_os)" >&6; }
;;
*)
- as_fn_error $? "OS $target_os is not supported, not building LLVM" "$LINENO" 5
+ as_fn_error "OS $target_os is not supported, not building LLVM" "$LINENO" 5
;;
esac
;;
alpha*|arm*)
- as_fn_error $? "CPU support is untested, not building LLVM" "$LINENO" 5
+ as_fn_error "CPU support is untested, not building LLVM" "$LINENO" 5
;;
*)
- as_fn_error $? "Unsupported CPU for JIT: $target_cpu, not building LLVM" "$LINENO" 5
+ as_fn_error "Unsupported CPU for JIT: $target_cpu, not building LLVM" "$LINENO" 5
;;
esac
fi
@@ -14877,8 +14871,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "failed
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f core conftest.err conftest.$ac_objext \
@@ -14902,8 +14896,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "failed
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -15080,7 +15074,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15104,40 +15097,40 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DEBUG_BUILD_TRUE}" && test -z "${DEBUG_BUILD_FALSE}"; then
- as_fn_error $? "conditional \"DEBUG_BUILD\" was never defined.
+ as_fn_error "conditional \"DEBUG_BUILD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_X86_TRUE}" && test -z "${BUILD_X86_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_X86\" was never defined.
+ as_fn_error "conditional \"BUILD_X86\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_PPC_TRUE}" && test -z "${BUILD_PPC_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_PPC\" was never defined.
+ as_fn_error "conditional \"BUILD_PPC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_EXTERNAL_LLVM_TRUE}" && test -z "${BUILD_EXTERNAL_LLVM_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_EXTERNAL_LLVM\" was never defined.
+ as_fn_error "conditional \"BUILD_EXTERNAL_LLVM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -15287,19 +15280,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -15495,7 +15488,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -15549,7 +15542,7 @@
# values after options handling.
ac_log="
This file was extended by libclamavc++ $as_me devel, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15615,10 +15608,10 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libclamavc++ config.status devel
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -15636,16 +15629,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -15667,7 +15655,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -15680,7 +15667,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -15689,7 +15676,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -16099,7 +16086,7 @@
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -16137,7 +16124,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -16154,7 +16141,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -16168,18 +16155,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -16268,28 +16255,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -16317,7 +16296,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -16402,7 +16381,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -16415,7 +16394,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -16443,7 +16422,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -16470,7 +16449,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -16607,22 +16586,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -16633,19 +16612,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -17597,7 +17576,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -17618,7 +17597,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
#
@@ -17759,7 +17738,7 @@
# The eval makes quoting arguments work.
eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+ as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
fi
cd "$ac_popdir"
diff -Nru clamav-0.97.3+dfsg/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp clamav-0.97.5+dfsg/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
--- clamav-0.97.3+dfsg/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp 2012-06-15 10:05:05.000000000 -0400
@@ -19,6 +19,9 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/System/DynamicLibrary.h"
#include "llvm/Config/config.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
using namespace llvm;
// AtExitHandlers - List of functions to call when the program exits,
diff -Nru clamav-0.97.3+dfsg/libclamav/c++/Makefile.am clamav-0.97.5+dfsg/libclamav/c++/Makefile.am
--- clamav-0.97.3+dfsg/libclamav/c++/Makefile.am 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/c++/Makefile.am 2012-06-15 10:05:05.000000000 -0400
@@ -37,7 +37,7 @@
libclamavcxx_la_LDFLAGS = @LLVMCONFIG_LDFLAGS@ @LLVMCONFIG_LIBS@
libclamavcxx_la_DEPENDENCIES = @LLVMCONFIG_LIBFILES@
noinst_LTLIBRARIES = libclamavcxx.la
-libclamavcxx_la_SOURCES += PointerTracking.cpp
+libclamavcxx_la_SOURCES += PointerTracking.cpp PointerTracking.h
else
AM_CPPFLAGS += $(LLVM_INCLUDES) $(LLVM_DEFS)
@@ -603,7 +603,7 @@
endif
# rm configure generated files
dist-hook: clean-local
- make -C llvm dist-hook
+ $(MAKE) -C llvm dist-hook
rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in
rm -f $(distdir)/llvm/include/llvm/System/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
diff -Nru clamav-0.97.3+dfsg/libclamav/c++/Makefile.in clamav-0.97.5+dfsg/libclamav/c++/Makefile.in
--- clamav-0.97.3+dfsg/libclamav/c++/Makefile.in 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/c++/Makefile.in 2012-06-15 10:05:05.000000000 -0400
@@ -51,7 +51,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-@BUILD_EXTERNAL_LLVM_TRUE@am__append_1 = PointerTracking.cpp
+@BUILD_EXTERNAL_LLVM_TRUE@am__append_1 = PointerTracking.cpp PointerTracking.h
@BUILD_EXTERNAL_LLVM_FALSE@am__append_2 = $(LLVM_INCLUDES) $(LLVM_DEFS)
@BUILD_EXTERNAL_LLVM_FALSE@@BUILD_X86_TRUE@am__append_3 = libllvmx86codegen.la
@BUILD_EXTERNAL_LLVM_FALSE@@BUILD_X86_TRUE@am__append_4 = libllvmx86codegen.la
@@ -84,7 +84,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__libclamavcxx_la_SOURCES_DIST = bytecode2llvm.cpp \
ClamBCRTChecks.cpp ClamBCModule.h ClamBCDiagnostics.h \
- detect.cpp PointerTracking.cpp
+ detect.cpp PointerTracking.cpp PointerTracking.h
@BUILD_EXTERNAL_LLVM_TRUE@am__objects_1 = \
@BUILD_EXTERNAL_LLVM_TRUE@ libclamavcxx_la-PointerTracking.lo
am_libclamavcxx_la_OBJECTS = libclamavcxx_la-bytecode2llvm.lo \
@@ -6292,7 +6292,7 @@
# rm configure generated files
dist-hook: clean-local
- make -C llvm dist-hook
+ $(MAKE) -C llvm dist-hook
rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in
rm -f $(distdir)/llvm/include/llvm/System/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
diff -Nru clamav-0.97.3+dfsg/libclamav/c++/PointerTracking.h clamav-0.97.5+dfsg/libclamav/c++/PointerTracking.h
--- clamav-0.97.3+dfsg/libclamav/c++/PointerTracking.h 1969-12-31 19:00:00.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/c++/PointerTracking.h 2012-06-15 10:05:05.000000000 -0400
@@ -0,0 +1,132 @@
+//===- PointerTracking.h - Pointer Bounds Tracking --------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements tracking of pointer bounds.
+// It knows that the libc functions "calloc" and "realloc" allocate memory, thus
+// you should avoid using this pass if they mean something else for your
+// language.
+//
+// All methods assume that the pointer is not NULL, if it is then the returned
+// allocation size is wrong, and the result from checkLimits is wrong too.
+// It also assumes that pointers are valid, and that it is not analyzing a
+// use-after-free scenario.
+// Due to these limitations the "size" returned by these methods should be
+// considered as either 0 or the returned size.
+//
+// Another analysis pass should be used to find use-after-free/NULL dereference
+// bugs.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_ANALYSIS_POINTERTRACKING_H
+#define LLVM_ANALYSIS_POINTERTRACKING_H
+
+#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Analysis/Dominators.h"
+#include "llvm/Instructions.h"
+#include "llvm/Pass.h"
+#include "llvm/Support/PredIteratorCache.h"
+
+namespace llvm {
+ class DominatorTree;
+ class ScalarEvolution;
+ class SCEV;
+ class Loop;
+ class LoopInfo;
+ class TargetData;
+
+ // Result from solver, assuming pointer is not NULL,
+ // and it is not a use-after-free situation.
+ enum SolverResult {
+ AlwaysFalse,// always false with above constraints
+ AlwaysTrue,// always true with above constraints
+ Unknown // it can sometimes be true, sometimes false, or it is undecided
+ };
+
+ class PointerTracking : public FunctionPass {
+ public:
+ typedef ICmpInst::Predicate Predicate;
+ static char ID;
+ PointerTracking();
+
+ virtual bool doInitialization(Module &M);
+
+ // If this pointer directly points to an allocation, return
+ // the number of elements of type Ty allocated.
+ // Otherwise return CouldNotCompute.
+ // Since allocations can fail by returning NULL, the real element count
+ // for every allocation is either 0 or the value returned by this function.
+ const SCEV *getAllocationElementCount(Value *P) const;
+
+ // Same as getAllocationSize() but returns size in bytes.
+ // We consider one byte as 8 bits.
+ const SCEV *getAllocationSizeInBytes(Value *V) const;
+
+ // Given a Pointer, determine a base pointer of known size, and an offset
+ // therefrom.
+ // When unable to determine, sets Base to NULL, and Limit/Offset to
+ // CouldNotCompute.
+ // BaseSize, and Offset are in bytes: Pointer == Base + Offset
+ void getPointerOffset(Value *Pointer, Value *&Base, const SCEV *& BaseSize,
+ const SCEV *&Offset) const;
+
+ // Compares the 2 scalar evolution expressions according to predicate,
+ // and if it can prove that the result is always true or always false
+ // return AlwaysTrue/AlwaysFalse. Otherwise it returns Unknown.
+ enum SolverResult compareSCEV(const SCEV *A, Predicate Pred, const SCEV *B,
+ const Loop *L);
+
+ // Determines whether the condition LHS <Pred> RHS is sufficient
+ // for the condition A <Pred> B to hold.
+ // Currently only ULT/ULE is supported.
+ // This errs on the side of returning false.
+ bool conditionSufficient(const SCEV *LHS, Predicate Pred1, const SCEV *RHS,
+ const SCEV *A, Predicate Pred2, const SCEV *B,
+ const Loop *L);
+
+ // Determines whether Offset is known to be always in [0, Limit) bounds.
+ // This errs on the side of returning Unknown.
+ enum SolverResult checkLimits(const SCEV *Offset, const SCEV *Limit,
+ BasicBlock *BB);
+
+ virtual bool runOnFunction(Function &F);
+ virtual void getAnalysisUsage(AnalysisUsage &AU) const;
+ void print(raw_ostream &OS, const Module* = 0) const;
+ Value *computeAllocationCountValue(Value *P, const Type *&Ty) const;
+ private:
+ Function *FF;
+ TargetData *TD;
+ ScalarEvolution *SE;
+ LoopInfo *LI;
+ DominatorTree *DT;
+
+ Function *callocFunc;
+ Function *reallocFunc;
+ PredIteratorCache predCache;
+
+ SmallPtrSet<const SCEV*, 1> analyzing;
+
+ enum SolverResult isLoopGuardedBy(const Loop *L, Predicate Pred,
+ const SCEV *A, const SCEV *B) const;
+ static bool isMonotonic(const SCEV *S);
+ bool scevPositive(const SCEV *A, const Loop *L, bool strict=true) const;
+ bool conditionSufficient(Value *Cond, bool negated,
+ const SCEV *A, Predicate Pred, const SCEV *B);
+ Value *getConditionToReach(BasicBlock *A,
+ DomTreeNodeBase<BasicBlock> *B,
+ bool &negated);
+ Value *getConditionToReach(BasicBlock *A,
+ BasicBlock *B,
+ bool &negated);
+ const SCEV *computeAllocationCount(Value *P, const Type *&Ty) const;
+ const SCEV *computeAllocationCountForType(Value *P, const Type *Ty) const;
+ };
+}
+#endif
+
diff -Nru clamav-0.97.3+dfsg/libclamav/cache.c clamav-0.97.5+dfsg/libclamav/cache.c
--- clamav-0.97.3+dfsg/libclamav/cache.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/cache.c 2012-06-15 10:05:05.000000000 -0400
@@ -706,7 +706,7 @@
void *buf;
size_t readme = todo < FILEBUFF ? todo : FILEBUFF;
if(!(buf = fmap_need_off_once(map, at, readme)))
- return CL_VIRUS;
+ return CL_EREAD;
todo -= readme;
at += readme;
cli_md5_update(&md5, buf, readme);
diff -Nru clamav-0.97.3+dfsg/libclamav/cvd.c clamav-0.97.5+dfsg/libclamav/cvd.c
--- clamav-0.97.3+dfsg/libclamav/cvd.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/cvd.c 2012-06-15 10:05:05.000000000 -0400
@@ -54,7 +54,7 @@
unsigned int size, pathlen = strlen(destdir) + 100 + 5;
FILE *outfile = NULL;
struct stat foo;
- gzFile *infile;
+ gzFile infile;
cli_dbgmsg("in cli_untgz()\n");
diff -Nru clamav-0.97.3+dfsg/libclamav/cvd.h clamav-0.97.5+dfsg/libclamav/cvd.h
--- clamav-0.97.3+dfsg/libclamav/cvd.h 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/cvd.h 2012-06-15 10:05:05.000000000 -0400
@@ -28,7 +28,7 @@
#include "sha256.h"
struct cli_dbio {
- gzFile *gzs;
+ gzFile gzs;
FILE *fs;
unsigned int size, bread;
char *buf, *bufpt, *readpt;
diff -Nru clamav-0.97.3+dfsg/libclamav/entconv.c clamav-0.97.5+dfsg/libclamav/entconv.c
--- clamav-0.97.3+dfsg/libclamav/entconv.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/entconv.c 2012-06-15 10:05:05.000000000 -0400
@@ -78,8 +78,11 @@
if(u16 < 0xff) {
assert((uint8_t)u16 != 0);
*out++ = (uint8_t)u16;
- } else {
- size_t i;
+ } else if (u16 == 0x3002 || u16 == 0xFF0E || u16 == 0xFE52) {
+ /* bb #4097 */
+ *out++ = '.';
+ } else {
+ size_t i;
/* normalize only >255 to speed up */
if(limit <= 8) {
/* not enough space available */
diff -Nru clamav-0.97.3+dfsg/libclamav/filetypes.c clamav-0.97.5+dfsg/libclamav/filetypes.c
--- clamav-0.97.3+dfsg/libclamav/filetypes.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/filetypes.c 2012-06-15 10:05:05.000000000 -0400
@@ -213,6 +213,8 @@
if((encoding = encoding_detect_bom(buff, bread))) {
unsigned char decodedbuff[(MAGIC_BUFFER_SIZE+1)*2];
m_area_t in_area, out_area;
+
+ memset(decodedbuff, 0, sizeof(decodedbuff));
in_area.buffer = (unsigned char *) buff;
in_area.length = bread;
diff -Nru clamav-0.97.3+dfsg/libclamav/filetypes_int.h clamav-0.97.5+dfsg/libclamav/filetypes_int.h
--- clamav-0.97.3+dfsg/libclamav/filetypes_int.h 2011-10-17 09:02:55.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/filetypes_int.h 2012-06-15 10:05:05.000000000 -0400
@@ -56,7 +56,6 @@
"0:0:48692e20546869732069732074686520716d61696c2d73656e64:Qmail bounce:CL_TYPE_ANY:CL_TYPE_MAIL",
"0:0:494433:MP3:CL_TYPE_ANY:CL_TYPE_IGNORED",
"0:0:49545346:MS CHM:CL_TYPE_ANY:CL_TYPE_MSCHM",
- "0:0:4d534346:MS CAB:CL_TYPE_ANY:CL_TYPE_MSCAB",
"0:0:4d5a:MS-EXE/DLL:CL_TYPE_ANY:CL_TYPE_MSEXE",
"0:0:4d6573736167652d49443a20:Mail:CL_TYPE_ANY:CL_TYPE_MAIL",
"0:0:4d6573736167652d49643a20:Mail:CL_TYPE_ANY:CL_TYPE_MAIL",
@@ -117,7 +116,6 @@
"1:*:3c6f626a656374:HTML data:CL_TYPE_ANY:CL_TYPE_HTML",
"1:*:3c736372697074:HTML data:CL_TYPE_ANY:CL_TYPE_HTML",
"1:*:3c7461626c65:HTML data:CL_TYPE_ANY:CL_TYPE_HTML",
- "1:*:4d534346:CAB-SFX:CL_TYPE_ANY:CL_TYPE_CABSFX",
"1:*:4d5a{60-300}50450000:PE:CL_TYPE_ANY:CL_TYPE_MSEXE",
"1:*:504b0304:ZIP-SFX:CL_TYPE_ANY:CL_TYPE_ZIPSFX",
"1:*:526172211a0700:RAR-SFX:CL_TYPE_ANY:CL_TYPE_RARSFX",
@@ -164,7 +162,10 @@
"0:0:377f0683002de218:SQLite WAL:CL_TYPE_ANY:CL_TYPE_IGNORED",
"0:0:53514c69746520666f726d6174203300:SQLite database:CL_TYPE_ANY:CL_TYPE_IGNORED",
"0:0:d9d505f920a163d7:SQLite journal:CL_TYPE_ANY:CL_TYPE_IGNORED",
- "0:0:ffd9ffd8:JPEG (bad header):CL_TYPE_ANY:CL_TYPE_GRAPHICS:70",
+ "0:0:435753:SWF (compressed):CL_TYPE_ANY:CL_TYPE_SWF:71",
+ "0:0:465753:SWF (uncompressed):CL_TYPE_ANY:CL_TYPE_SWF:71",
+ "0:0:4d53434600000000:MS CAB:CL_TYPE_ANY:CL_TYPE_MSCAB",
+ "1:*:4d53434600000000:CAB-SFX:CL_TYPE_ANY:CL_TYPE_CABSFX",
NULL
};
diff -Nru clamav-0.97.3+dfsg/libclamav/htmlnorm.c clamav-0.97.5+dfsg/libclamav/htmlnorm.c
--- clamav-0.97.3+dfsg/libclamav/htmlnorm.c 2011-08-03 09:45:20.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/htmlnorm.c 2012-06-15 10:05:05.000000000 -0400
@@ -53,6 +53,7 @@
typedef enum {
HTML_BAD_STATE,
HTML_NORM,
+ HTML_8BIT,
HTML_COMMENT,
HTML_CHAR_REF,
HTML_ENTITY_REF_DECODE,
@@ -470,10 +471,40 @@
static inline void html_tag_contents_append(struct tag_contents *cont, const unsigned char* begin,const unsigned char *end)
{
size_t i;
+ uint32_t mbchar = 0;
if(!begin || !end)
return;
for(i = cont->pos; i < MAX_TAG_CONTENTS_LENGTH && (begin < end);i++) {
- cont->contents[i] = *begin++;
+ uint8_t c = *begin++;
+ if (mbchar && (c < 0x80 || mbchar >= 0x10000)) {
+ if (mbchar == 0xE38082 || mbchar == 0xEFBC8E
+ || mbchar == 0xEFB992 ||
+ (mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F))) {
+ cont->contents[i++] = '.';
+ if (mbchar == 0xA1) {
+ --i;
+ mbchar = 0;
+ continue;
+ }
+ } else {
+ uint8_t c0 = mbchar >> 16;
+ uint8_t c1 = (mbchar >> 8)&0xff;
+ uint8_t c2 = (mbchar & 0xff);
+ if (c0 && i+1 < MAX_TAG_CONTENTS_LENGTH)
+ cont->contents[i++] = c0;
+ if ((c0 || c1) && i+1 < MAX_TAG_CONTENTS_LENGTH)
+ cont->contents[i++] = c1;
+ if (i+1 < MAX_TAG_CONTENTS_LENGTH)
+ cont->contents[i++] = c2;
+ }
+ mbchar = 0;
+ }
+ if (c >= 0x80) {
+ mbchar = (mbchar << 8) | c;
+ --i;
+ }
+ else
+ cont->contents[i] = c;
}
cont->pos = i;
}
@@ -631,6 +662,8 @@
struct parser_state *js_state = NULL;
const unsigned char *js_begin = NULL, *js_end = NULL;
struct tag_contents contents;
+ uint32_t mbchar = 0;
+ uint32_t mbchar2 = 0;
tag_args.scanContents=0;/* do we need to store the contents of <a></a>?*/
contents.pos = 0;
@@ -749,6 +782,42 @@
next_state = HTML_BAD_STATE;
}
break;
+ case HTML_8BIT:
+ if (*ptr < 0x80 || mbchar >= 0x10000) {
+ if (mbchar == 0xE38082 || mbchar == 0xEFBC8E
+ || mbchar == 0xEFB992 ||
+ (mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {
+ /* bb #4097 */
+ html_output_c(file_buff_o2, '.');
+ html_output_c(file_buff_text, '.');
+ if (mbchar == 0xA1) {
+ ptr++;
+ mbchar = 0;
+ continue;
+ }
+ } else {
+ uint8_t c0 = mbchar >> 16;
+ uint8_t c1 = (mbchar >> 8)&0xff;
+ uint8_t c2 = (mbchar & 0xff);
+ if (c0) {
+ html_output_c(file_buff_o2, c0);
+ html_output_c(file_buff_text, c0);
+ }
+ if (c0 || c1) {
+ html_output_c(file_buff_o2, c1);
+ html_output_c(file_buff_text, c1);
+ }
+ html_output_c(file_buff_o2, c2);
+ html_output_c(file_buff_text, c1);
+ }
+ mbchar = 0;
+ state = next_state;
+ next_state = HTML_NORM;
+ } else {
+ mbchar = (mbchar << 8) | *ptr;
+ ptr++;
+ }
+ break;
case HTML_NORM:
if (*ptr == '<') {
ptrend=ptr; /* for use by scanContents */
@@ -781,6 +850,11 @@
state = HTML_CHAR_REF;
next_state = HTML_NORM;
ptr++;
+ } else if (*ptr >= 0x80) {
+ state = HTML_8BIT;
+ next_state = HTML_NORM;
+ mbchar = *ptr;
+ ptr++;
} else {
unsigned char c = tolower(*ptr);
/* normalize ' to " for scripts */
@@ -1007,11 +1081,45 @@
ptr++;
}
} else {
+ if (mbchar2 && (*ptr < 0x80 || mbchar2 >= 0x10000)) {
+ if (mbchar2 == 0xE38082 || mbchar2 == 0xEFBC8E
+ || mbchar2 == 0xEFB992 ||
+ (mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {
+ html_output_c(file_buff_o2, '.');
+ if (tag_val_length < HTML_STR_LENGTH)
+ tag_val[tag_val_length++] = '.';
+ if (mbchar2 == 0xA1) {
+ ptr++;
+ mbchar2 = 0;
+ continue;
+ }
+ } else {
+ uint8_t c0 = mbchar2 >> 16;
+ uint8_t c1 = (mbchar2 >> 8)&0xff;
+ uint8_t c2 = (mbchar2 & 0xff);
+ if (c0)
+ html_output_c(file_buff_o2, c0);
+ if (c0 || c1)
+ html_output_c(file_buff_o2, c1);
+ html_output_c(file_buff_o2, c2);
+ if (c0 && tag_val_length < HTML_STR_LENGTH)
+ tag_val[tag_val_length++] = c0;
+ if ((c0 || c1) && tag_val_length < HTML_STR_LENGTH)
+ tag_val[tag_val_length++] = c1;
+ if (tag_val_length < HTML_STR_LENGTH)
+ tag_val[tag_val_length++] = c2;
+ }
+ mbchar2 = 0;
+ }
+ if (*ptr >= 0x80)
+ mbchar2 = (mbchar2 << 8) | *ptr;
+ else {
html_output_c(file_buff_o2, tolower(*ptr));
if (tag_val_length < HTML_STR_LENGTH) {
tag_val[tag_val_length++] = *ptr;
}
- ptr++;
+ }
+ ptr++;
}
if (*ptr == '\\') {
diff -Nru clamav-0.97.3+dfsg/libclamav/matcher-hash.c clamav-0.97.5+dfsg/libclamav/matcher-hash.c
--- clamav-0.97.3+dfsg/libclamav/matcher-hash.c 2011-08-03 09:45:20.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/matcher-hash.c 2012-06-15 10:05:05.000000000 -0400
@@ -127,10 +127,14 @@
static inline int hm_cmp(const uint8_t *itm, const uint8_t *ref, unsigned int keylen) {
+#if WORDS_BIGENDIAN == 0
uint32_t i = *(uint32_t *)itm, r = *(uint32_t *)ref;
if(i!=r)
return (i<r) * 2 -1;
return memcmp(&itm[4], &ref[4], keylen - 4);
+#else
+ return memcmp(itm, ref, keylen);
+#endif
}
static void hm_sort(struct cli_sz_hash *szh, size_t l, size_t r, unsigned int keylen) {
diff -Nru clamav-0.97.3+dfsg/libclamav/mbox.c clamav-0.97.5+dfsg/libclamav/mbox.c
--- clamav-0.97.3+dfsg/libclamav/mbox.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/mbox.c 2012-06-15 10:05:05.000000000 -0400
@@ -2897,7 +2897,7 @@
time(&now);
for(n = 1; n <= t; n++) {
char filename[NAME_MAX + 1];
- const struct dirent *dent;
+ struct dirent *dent;
#if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)
union {
struct dirent d;
diff -Nru clamav-0.97.3+dfsg/libclamav/message.c clamav-0.97.5+dfsg/libclamav/message.c
--- clamav-0.97.3+dfsg/libclamav/message.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/message.c 2012-06-15 10:05:05.000000000 -0400
@@ -1202,9 +1202,10 @@
} else
/*
* Some virus attachments don't say how they've
- * been encoded. We assume base64
+ * been encoded. We assume base64.
+ * RFC says encoding should be 7-bit.
*/
- messageSetEncoding(m, "base64");
+ messageSetEncoding(m, "7-bit");
}
#endif
diff -Nru clamav-0.97.3+dfsg/libclamav/mpool.c clamav-0.97.5+dfsg/libclamav/mpool.c
--- clamav-0.97.3+dfsg/libclamav/mpool.c 2011-05-13 07:25:31.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/mpool.c 2012-06-15 10:05:05.000000000 -0400
@@ -64,7 +64,11 @@
#undef CL_DEBUG /* bb#2222 */
+#ifdef C_HPUX
+#define MIN_FRAGSIZE 1048576 /* Goes with LDFLAGS=-Wl,+pd,1M */
+#else
#define MIN_FRAGSIZE 262144
+#endif
#if SIZEOF_VOID_P==8
static const unsigned int fragsz[] = {
diff -Nru clamav-0.97.3+dfsg/libclamav/mspack.c clamav-0.97.5+dfsg/libclamav/mspack.c
--- clamav-0.97.3+dfsg/libclamav/mspack.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/mspack.c 2012-06-15 10:05:05.000000000 -0400
@@ -1101,7 +1101,7 @@
unsigned char *i_ptr, *i_end;
int match_length, length_footer, extra, verbatim_bits, bytes_todo;
- int this_run, main_element, aligned_bits, j, ret;
+ int this_run, main_element, aligned_bits, j, ret, warned=0;
unsigned char *window, *runsrc, *rundest, buf[12];
unsigned int frame_size=0, end_frame, match_offset, window_posn;
unsigned int R0, R1, R2;
@@ -1132,17 +1132,27 @@
R2 = lzx->R2;
end_frame = (unsigned int)((lzx->offset + out_bytes) / LZX_FRAME_SIZE) + 1;
+ cli_dbgmsg("lzx_decompress: end frame = %u\n", end_frame);
while (lzx->frame < end_frame) {
+ cli_dbgmsg("lzx_decompress: current frame = %u\n", lzx->frame);
/* have we reached the reset interval? (if there is one?) */
if (lzx->reset_interval && ((lzx->frame % lzx->reset_interval) == 0)) {
if (lzx->block_remaining) {
- cli_dbgmsg("lzx_decompress: %d bytes remaining at reset interval\n", lzx->block_remaining);
- return lzx->error = CL_EFORMAT;
+ /* this is a file format error, but we need to extract what we can and scan that */
+ cli_dbgmsg("lzx_decompress: %d bytes remaining at reset interval\n", lzx->block_remaining);
+ if (!warned) {
+ cli_dbgmsg("Detected an invalid reset interval during decompression.\n");
+ warned++;
+ }
+ if (!lzx->header_read) {
+ /* cannot continue if no header at all */
+ return lzx->error = CL_EFORMAT;
+ }
+ } else {
+ /* re-read the intel header and reset the huffman lengths */
+ lzx_reset_state(lzx);
}
-
- /* re-read the intel header and reset the huffman lengths */
- lzx_reset_state(lzx);
}
/* read header if necessary */
diff -Nru clamav-0.97.3+dfsg/libclamav/others.h clamav-0.97.5+dfsg/libclamav/others.h
--- clamav-0.97.3+dfsg/libclamav/others.h 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/others.h 2012-06-15 10:05:05.000000000 -0400
@@ -53,7 +53,7 @@
* in re-enabling affected modules.
*/
-#define CL_FLEVEL 63
+#define CL_FLEVEL 65
#define CL_FLEVEL_DCONF CL_FLEVEL
#define CL_FLEVEL_SIGTOOL CL_FLEVEL
diff -Nru clamav-0.97.3+dfsg/libclamav/pe.c clamav-0.97.5+dfsg/libclamav/pe.c
--- clamav-0.97.3+dfsg/libclamav/pe.c 2011-08-03 09:45:20.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/pe.c 2012-06-15 10:05:05.000000000 -0400
@@ -738,22 +738,6 @@
return CL_CLEAN;
}
pe_plus = 1;
- } else {
- /*
- either it's got a PE32_SIGNATURE or
- we enable win9x compatibility in that we don't honor magic (see bb#119)
- either way it's a 32bit thingy
- */
- if(EC16(optional_hdr32.Magic) != PE32_SIGNATURE) {
- if(!ctx->corrupted_input)
- cli_warnmsg("Incorrect magic number in optional header\n");
- if(DETECT_BROKEN_PE) {
- if(ctx->virname)
- *ctx->virname = "Heuristics.Broken.Executable";
- return CL_VIRUS;
- }
- cli_dbgmsg("9x compatibility mode\n");
- }
}
if(!pe_plus) { /* PE */
@@ -2333,7 +2317,7 @@
fsize = map->len - peinfo->offset;
if(fmap_readn(map, &e_magic, peinfo->offset, sizeof(e_magic)) != sizeof(e_magic)) {
cli_dbgmsg("Can't read DOS signature\n");
- return CL_CLEAN;
+ return -1;
}
if(EC16(e_magic) != PE_IMAGE_DOS_SIGNATURE && EC16(e_magic) != PE_IMAGE_DOS_SIGNATURE_OLD) {
@@ -2506,7 +2490,7 @@
continue;
while(res_sz>4) { /* look for version_info - NOT RESUMABLE (expecting exactly one versioninfo) */
- uint32_t vinfo_sz, vinfo_val_sz;
+ uint32_t vinfo_sz, vinfo_val_sz, got_varfileinfo = 0;
vinfo_sz = vinfo_val_sz = cli_readint32(vptr);
vinfo_sz &= 0xffff;
@@ -2535,7 +2519,14 @@
if(sfi_sz > vinfo_sz)
break; /* the content is larger than the container */
- /* expecting stringfileinfo to always precede varfileinfo */
+ if(!got_varfileinfo && sfi_sz > 6 + 0x18 && !memcmp(vptr+6, "V\0a\0r\0F\0i\0l\0e\0I\0n\0f\0o\0\0\0", 0x18)) {
+ /* skip varfileinfo as it sometimes appear before stringtableinfo */
+ vptr += sfi_sz;
+ vinfo_sz -= sfi_sz;
+ got_varfileinfo = 1;
+ continue;
+ }
+
if(sfi_sz <= 6 + 0x1e || memcmp(vptr+6, "S\0t\0r\0i\0n\0g\0F\0i\0l\0e\0I\0n\0f\0o\0\0\0", 0x1e)) {
/* - there should be enough room for the header(6) and the key "StringFileInfo"(1e)
* - the key should match */
diff -Nru clamav-0.97.3+dfsg/libclamav/readdb.c clamav-0.97.5+dfsg/libclamav/readdb.c
--- clamav-0.97.3+dfsg/libclamav/readdb.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/readdb.c 2012-06-15 10:05:05.000000000 -0400
@@ -538,6 +538,8 @@
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {
line++;
+ if(buffer[0] == '#')
+ continue;
cli_chomp(buffer);
if(engine->ignored)
strcpy(buffer_cpy, buffer);
@@ -884,6 +886,8 @@
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {
line++;
+ if(buffer[0] == '#')
+ continue;
if(!phish)
if(!strncmp(buffer, "HTML.Phishing", 13) || !strncmp(buffer, "Email.Phishing", 14))
@@ -1192,7 +1196,7 @@
} while(0);
#define LDB_TOKENS 67
-static int load_oneldb(char *buffer, int chkpua, int chkign, struct cl_engine *engine, unsigned int options, const char *dbname, unsigned int line, unsigned int *sigs, unsigned bc_idx, const char *buffer_cpy)
+static int load_oneldb(char *buffer, int chkpua, struct cl_engine *engine, unsigned int options, const char *dbname, unsigned int line, unsigned int *sigs, unsigned bc_idx, const char *buffer_cpy, int *skip)
{
const char *sig, *virname, *offset, *logic;
struct cli_ac_lsig **newtable, *lsig;
@@ -1214,8 +1218,11 @@
if (chkpua && cli_chkpua(virname, engine->pua_cats, options))
return CL_SUCCESS;
- if (chkign && cli_chkign(engine->ignored, virname, buffer_cpy))
+ if (engine->ignored && cli_chkign(engine->ignored, virname, buffer_cpy ? buffer_cpy : virname)) {
+ if(skip)
+ *skip = 1;
return CL_SUCCESS;
+ }
if(engine->cb_sigload && engine->cb_sigload("ldb", virname, engine->cb_sigload_ctx)) {
cli_dbgmsg("cli_loadldb: skipping %s due to callback\n", virname);
@@ -1375,6 +1382,8 @@
return CL_EMEM;
while(cli_dbgets(buffer, sizeof(buffer), fs, dbio)) {
line++;
+ if(buffer[0] == '#')
+ continue;
sigs++;
cli_chomp(buffer);
@@ -1382,8 +1391,7 @@
strcpy(buffer_cpy, buffer);
ret = load_oneldb(buffer,
engine->pua_cats && (options & CL_DB_PUA_MODE) && (options & (CL_DB_PUA_INCLUDE | CL_DB_PUA_EXCLUDE)),
- !!engine->ignored,
- engine, options, dbname, line, &sigs, 0, buffer_cpy);
+ engine, options, dbname, line, &sigs, 0, buffer_cpy, NULL);
if (ret)
break;
}
@@ -1409,7 +1417,7 @@
static int cli_loadcbc(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigned int options, struct cli_dbio *dbio, const char *dbname)
{
char buf[4096];
- int rc;
+ int rc, skip = 0;
struct cli_all_bc *bcs = &engine->bcs;
struct cli_bc *bc;
unsigned sigs = 0;
@@ -1470,7 +1478,6 @@
bc->id = bcs->count;/* must set after _load, since load zeroes */
if (engine->bytecode_mode == CL_BYTECODE_MODE_TEST)
cli_infomsg(NULL, "bytecode %u -> %s\n", bc->id, dbname);
- sigs++;
if (bc->kind == BC_LOGICAL || bc->lsig) {
unsigned oldsigs = sigs;
if (!bc->lsig) {
@@ -1478,12 +1485,17 @@
return CL_EMALFDB;
}
cli_dbgmsg("Bytecode %s(%u) has logical signature: %s\n", dbname, bc->id, bc->lsig);
- rc = load_oneldb(bc->lsig, 0, 0, engine, options, dbname, 0, &sigs, bcs->count, NULL);
+ rc = load_oneldb(bc->lsig, 0, engine, options, dbname, 0, &sigs, bcs->count, NULL, &skip);
if (rc != CL_SUCCESS) {
cli_errmsg("Problem parsing logical signature %s for bytecode %s: %s\n",
bc->lsig, dbname, cl_strerror(rc));
return rc;
}
+ if (skip) {
+ cli_bytecode_destroy(bc);
+ bcs->count--;
+ return CL_SUCCESS;
+ }
if (sigs != oldsigs) {
/* compiler ensures Engine field in lsig matches the one in bytecode,
* so this should never happen. */
@@ -1491,6 +1503,7 @@
return CL_EMALFDB;
}
}
+ sigs++;
if (bc->kind != BC_LOGICAL) {
if (bc->lsig) {
/* runlsig will only flip a status bit, not report a match,
@@ -1557,6 +1570,8 @@
} else {
if(!cli_dbgets(buffer, FILEBUFF, fs, dbio))
break;
+ if(buffer[0] == '#')
+ continue;
cli_chomp(buffer);
}
line++;
@@ -1794,6 +1809,8 @@
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {
line++;
+ if(buffer[0] == '#')
+ continue;
cli_chomp(buffer);
tokens_count = cli_strtokenize(buffer, ':', IGN_MAX_TOKENS + 1, tokens);
@@ -1883,6 +1900,8 @@
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {
line++;
+ if(buffer[0] == '#')
+ continue;
cli_chomp(buffer);
if(engine->ignored)
strcpy(buffer_cpy, buffer);
@@ -2677,7 +2696,7 @@
int cl_statinidir(const char *dirname, struct cl_stat *dbstat)
{
DIR *dd;
- const struct dirent *dent;
+ struct dirent *dent;
#if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)
union {
struct dirent d;
diff -Nru clamav-0.97.3+dfsg/libclamav/scanners.c clamav-0.97.5+dfsg/libclamav/scanners.c
--- clamav-0.97.3+dfsg/libclamav/scanners.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/scanners.c 2012-06-15 10:05:05.000000000 -0400
@@ -766,6 +766,37 @@
return ret;
}
+static int vba_scandata(const unsigned char *data, unsigned int len, cli_ctx *ctx)
+{
+ struct cli_matcher *groot = ctx->engine->root[0];
+ struct cli_matcher *troot = ctx->engine->root[2];
+ struct cli_ac_data gmdata, tmdata;
+ struct cli_ac_data *mdata[2];
+ int ret;
+
+ if((ret = cli_ac_initdata(&tmdata, troot->ac_partsigs, troot->ac_lsigs, troot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN)))
+ return ret;
+
+ if((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
+ cli_ac_freedata(&tmdata);
+ return ret;
+ }
+ mdata[0] = &tmdata;
+ mdata[1] = &gmdata;
+
+ ret = cli_scanbuff(data, len, 0, ctx, CL_TYPE_MSOLE2, mdata);
+
+ if(ret != CL_VIRUS) {
+ ret = cli_lsig_eval(ctx, troot, &tmdata, NULL, NULL);
+ if(ret != CL_VIRUS)
+ ret = cli_lsig_eval(ctx, groot, &gmdata, NULL, NULL);
+ }
+ cli_ac_freedata(&tmdata);
+ cli_ac_freedata(&gmdata);
+
+ return ret;
+}
+
static int cli_vba_scandir(const char *dirname, cli_ctx *ctx, struct uniq *U)
{
int ret = CL_CLEAN, i, j, fd, data_len, hasmacros = 0;
@@ -806,7 +837,7 @@
/* cli_dbgmsg("Project content:\n%s", data); */
if(ctx->scanned)
*ctx->scanned += data_len / CL_COUNT_PRECISION;
- if(cli_scanbuff(data, data_len, 0, ctx, CL_TYPE_MSOLE2, NULL) == CL_VIRUS) {
+ if(vba_scandata(data, data_len, ctx) == CL_VIRUS) {
free(data);
ret = CL_VIRUS;
break;
@@ -831,7 +862,6 @@
fd = open(vbaname, O_RDONLY|O_BINARY);
if (fd == -1) continue;
if ((fullname = cli_ppt_vba_read(fd, ctx))) {
- hasmacros++;
if(cli_scandir(fullname, ctx) == CL_VIRUS) {
ret = CL_VIRUS;
}
@@ -858,14 +888,13 @@
for (i = 0; i < vba_project->count; i++) {
cli_dbgmsg("VBADir: Decompress WM project macro:%d key:%d length:%d\n", i, vba_project->key[i], vba_project->length[i]);
data = (unsigned char *)cli_wm_decrypt_macro(fd, vba_project->offset[i], vba_project->length[i], vba_project->key[i]);
- hasmacros++;
if(!data) {
cli_dbgmsg("VBADir: WARNING: WM project '%s' macro %d decrypted to NULL\n", vba_project->name[i], i);
} else {
cli_dbgmsg("Project content:\n%s", data);
if(ctx->scanned)
*ctx->scanned += vba_project->length[i] / CL_COUNT_PRECISION;
- if(cli_scanbuff(data, vba_project->length[i], 0, ctx, CL_TYPE_MSOLE2, NULL) == CL_VIRUS) {
+ if(vba_scandata(data, vba_project->length[i], ctx) == CL_VIRUS) {
free(data);
ret = CL_VIRUS;
break;
@@ -1936,7 +1965,7 @@
static int magic_scandesc(int desc, cli_ctx *ctx, cli_file_t type)
{
- int ret = CL_CLEAN;
+ int ret = CL_CLEAN, res;
cli_file_t dettype = 0;
struct stat sb;
uint8_t typercg = 1;
@@ -2009,10 +2038,11 @@
}
}
- if(cache_check(hash, ctx) == CL_CLEAN) {
+ res = cache_check(hash, ctx);
+ if(res != CL_VIRUS) {
funmap(*ctx->fmap);
ctx->fmap--;
- ret_from_magicscan(CL_CLEAN);
+ ret_from_magicscan(res);
}
hashed_size = (*ctx->fmap)->len;
old_hook_lsig_matches = ctx->hook_lsig_matches;
@@ -2329,8 +2359,12 @@
/* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */
if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) {
- if(cli_scanraw(ctx, type, typercg, &dettype, hash) == CL_VIRUS) {
- ret = cli_checkfp(hash, hashed_size, ctx);
+ res = cli_scanraw(ctx, type, typercg, &dettype, hash);
+ if(res != CL_CLEAN) {
+ if(res == CL_VIRUS)
+ ret = cli_checkfp(hash, hashed_size, ctx);
+ else
+ ret = res;
funmap(*ctx->fmap);
ctx->fmap--;
cli_bitset_free(ctx->hook_lsig_matches);
diff -Nru clamav-0.97.3+dfsg/libclamav/untar.c clamav-0.97.5+dfsg/libclamav/untar.c
--- clamav-0.97.3+dfsg/libclamav/untar.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/libclamav/untar.c 2012-06-15 10:05:05.000000000 -0400
@@ -45,6 +45,11 @@
#include "matcher.h"
#define BLOCKSIZE 512
+#define TARSIZEOFFSET 124
+#define TARSIZELEN 12
+#define TARCHECKSUMOFFSET 148
+#define TARCHECKSUMLEN 8
+#define TARFILETYPEOFFSET 156
static int
octal(const char *str)
@@ -56,19 +61,80 @@
return ret;
}
+/**
+ * Retrieve checksum values from a tar header block.
+ * @param header Header data block, padded with zeroes to reach BLOCKSIZE
+ * @return int value of checksum, -1 (from octal()) if bad value
+ */
+static int
+getchecksum(const char *header)
+{
+ char ochecksum[TARCHECKSUMLEN + 1];
+ int checksum = -1;
+
+ strncpy(ochecksum, header+TARCHECKSUMOFFSET, TARCHECKSUMLEN);
+ ochecksum[TARCHECKSUMLEN] = '\0';
+ checksum = octal(ochecksum);
+ return checksum;
+}
+
+/**
+ * Calculate checksum values for tar header blocks.
+ * @param header Header data block, padded with zeroes to reach BLOCKSIZE
+ * @param targetsum Check value to match (as int not octal!)
+ * @return 0 if checksum matches target, -1 if not
+ */
+static int
+testchecksum(const char *header, int targetsum)
+{
+ const unsigned char *posix;
+ const signed char *legacy;
+ int posix_sum = 0, legacy_sum = 0;
+ int i;
+
+ // targetsum -1 represents an error from octal()
+ if (targetsum == -1) {
+ return -1;
+ }
+
+ /* Build checksums. POSIX is unsigned; some legacy tars use signed. */
+ posix = (unsigned char *)header;
+ legacy = (signed char *)header;
+ for (i = 0; i < BLOCKSIZE; i++ ) {
+ if ((i >= TARCHECKSUMOFFSET) && (i < TARCHECKSUMOFFSET + TARCHECKSUMLEN)) {
+ /* Use ascii value of space in place of checksum value */
+ posix_sum += 32;
+ legacy_sum += 32;
+ }
+ else {
+ posix_sum += posix[i];
+ legacy_sum += legacy[i];
+ }
+ }
+
+ if ((targetsum == posix_sum) || (targetsum == legacy_sum)) {
+ return 0;
+ }
+ return -1;
+}
+
int
cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)
{
int size = 0, ret, fout=-1;
int in_block = 0;
+ int last_header_bad = 0;
+ int limitnear = 0;
unsigned int files = 0;
char fullname[NAME_MAX + 1];
+ size_t currsize = 0;
cli_dbgmsg("In untar(%s, %d)\n", dir, desc);
for(;;) {
char block[BLOCKSIZE];
const int nread = cli_readn(desc, block, (unsigned int)sizeof(block));
+ cli_dbgmsg("cli_untar: nread = %d\n", nread);
if(!in_block && nread == 0)
break;
@@ -83,7 +149,9 @@
if(!in_block) {
char type;
int directory, skipEntry = 0;
- char magic[7], name[101], osize[13];
+ int checksum = -1;
+ char magic[7], name[101], osize[TARSIZELEN + 1];
+ currsize = 0;
if(fout>=0) {
lseek(fout, 0, SEEK_SET);
@@ -101,6 +169,21 @@
if((ret=cli_checklimits("cli_untar", ctx, 0, 0, 0))!=CL_CLEAN)
return ret;
+ checksum = getchecksum(block);
+ cli_dbgmsg("cli_untar: Candidate checksum = %d, [%o in octal]\n", checksum, checksum);
+ if(testchecksum(block, checksum) != 0) {
+ // If checksum is bad, dump and look for next header block
+ cli_dbgmsg("cli_untar: Invalid checksum in tar header. Skip to next...\n");
+ if (last_header_bad == 0) {
+ last_header_bad++;
+ cli_dbgmsg("cli_untar: Invalid checksum found inside archive!\n");
+ }
+ continue;
+ } else {
+ last_header_bad = 0;
+ cli_dbgmsg("cli_untar: Checksum %d is valid.\n", checksum);
+ }
+
/* Notice assumption that BLOCKSIZE > 262 */
if(posix) {
strncpy(magic, block+257, 5);
@@ -111,7 +194,7 @@
}
}
- type = block[156];
+ type = block[TARFILETYPEOFFSET];
switch(type) {
default:
@@ -155,23 +238,35 @@
continue;
}
- strncpy(osize, block+124, 12);
- osize[12] = '\0';
+ strncpy(osize, block+TARSIZEOFFSET, TARSIZELEN);
+ osize[TARSIZELEN] = '\0';
size = octal(osize);
if(size < 0) {
cli_dbgmsg("cli_untar: Invalid size in tar header\n");
skipEntry++;
} else {
cli_dbgmsg("cli_untar: size = %d\n", size);
- if((ret=cli_checklimits("cli_untar", ctx, size, 0, 0))!=CL_CLEAN)
- skipEntry++;
+ ret = cli_checklimits("cli_untar", ctx, size, 0, 0);
+ switch(ret) {
+ case CL_EMAXFILES: // Scan no more files
+ skipEntry++;
+ limitnear = 0;
+ break;
+ case CL_EMAXSIZE: // Either single file limit or total byte limit would be exceeded
+ cli_dbgmsg("cli_untar: would exceed limit, will try up to max");
+ limitnear = 1;
+ break;
+ default: // Ok based on reported content size
+ limitnear = 0;
+ break;
+ }
}
if(skipEntry) {
const int nskip = (size % BLOCKSIZE || !size) ? size + BLOCKSIZE - (size % BLOCKSIZE) : size;
if(nskip < 0) {
- cli_dbgmsg("cli_untar: got nagative skip size, giving up\n");
+ cli_dbgmsg("cli_untar: got negative skip size, giving up\n");
return CL_CLEAN;
}
cli_dbgmsg("cli_untar: skipping entry\n");
@@ -198,16 +293,40 @@
in_block = 1;
} else { /* write or continue writing file contents */
- const int nbytes = size>512? 512:size;
- const int nwritten = (int)write(fout, block, (size_t)nbytes);
+ int nbytes, nwritten;
+ int skipwrite = 0;
+ char err[128];
+
+ nbytes = size>512? 512:size;
+ if (nread && nread < nbytes)
+ nbytes = nread;
+
+ if (limitnear > 0) {
+ currsize += nbytes;
+ cli_dbgmsg("cli_untar: Approaching limit...\n");
+ if (cli_checklimits("cli_untar", ctx, (unsigned long)currsize, 0, 0) != CL_SUCCESS) {
+ // Limit would be exceeded by this file, suppress writing beyond limit
+ // Need to keep reading to get to end of file chunk
+ skipwrite++;
+ }
+ }
- if(nwritten != nbytes) {
- cli_errmsg("cli_untar: only wrote %d bytes to file %s (out of disc space?)\n",
- nwritten, fullname);
- close(fout);
- return CL_EWRITE;
+ if (skipwrite == 0) {
+ nwritten = (int)write(fout, block, (size_t)nbytes);
+
+ if(nwritten != nbytes) {
+ cli_errmsg("cli_untar: only wrote %d bytes to file %s (out of disc space?)\n",
+ nwritten, fullname);
+ close(fout);
+ return CL_EWRITE;
+ }
}
size -= nbytes;
+ if ((size != 0) && (nread == 0)) {
+ // Truncated tar file, so end file content like tar behavior
+ cli_dbgmsg("cli_untar: No bytes read! Forcing end of file content.\n");
+ size = 0;
+ }
}
if (size == 0)
in_block = 0;
diff -Nru clamav-0.97.3+dfsg/libclamav/version.h clamav-0.97.5+dfsg/libclamav/version.h
--- clamav-0.97.3+dfsg/libclamav/version.h 2011-10-17 12:05:32.000000000 -0400
+++ clamav-0.97.5+dfsg/libclamav/version.h 2012-06-15 10:05:05.000000000 -0400
@@ -0,0 +1 @@
+#define REPO_VERSION "devel-clamav-0.97.5"
diff -Nru clamav-0.97.3+dfsg/libltdl/Makefile.am clamav-0.97.5+dfsg/libltdl/Makefile.am
--- clamav-0.97.3+dfsg/libltdl/Makefile.am 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/libltdl/Makefile.am 2012-06-15 10:05:05.000000000 -0400
@@ -28,9 +28,6 @@
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#####
-# ClamAV: filter -Werror here
-CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
-
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS =
@@ -140,6 +137,12 @@
CLEANFILES += $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
EXTRA_DIST += COPYING.LIB \
+ \
+ \
+ \
+ \
+ \
+ \
README
## --------------------------- ##
@@ -154,7 +157,6 @@
# doesn't have one that works with the given compiler.
all-local $(lib_OBJECTS): $(ARGZ_H)
argz.h: argz_.h
- $(mkinstalldirs) .
cp $(srcdir)/argz_.h $@-t
mv $@-t $@
MOSTLYCLEANFILES += argz.h \
diff -Nru clamav-0.97.3+dfsg/libltdl/Makefile.in clamav-0.97.5+dfsg/libltdl/Makefile.in
--- clamav-0.97.3+dfsg/libltdl/Makefile.in 2011-10-17 12:09:20.000000000 -0400
+++ clamav-0.97.5+dfsg/libltdl/Makefile.in 2012-06-15 10:05:05.000000000 -0400
@@ -201,9 +201,7 @@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFGDIR = @CFGDIR@
-
-# ClamAV: filter -Werror here
-CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
+CFLAGS = @CFLAGS@
CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
CHECK_LIBS = @CHECK_LIBS@
CLAMAVGROUP = @CLAMAVGROUP@
@@ -962,7 +960,6 @@
# doesn't have one that works with the given compiler.
all-local $(lib_OBJECTS): $(ARGZ_H)
argz.h: argz_.h
- $(mkinstalldirs) .
cp $(srcdir)/argz_.h $@-t
mv $@-t $@
diff -Nru clamav-0.97.3+dfsg/Makefile.am clamav-0.97.5+dfsg/Makefile.am
--- clamav-0.97.3+dfsg/Makefile.am 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/Makefile.am 2012-06-15 10:05:05.000000000 -0400
@@ -19,7 +19,7 @@
ACLOCAL_AMFLAGS=-I m4
SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
bin_SCRIPTS=clamav-config
@@ -29,7 +29,7 @@
# don't complain that configuration files and databases are not removed, this is intended
distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
DISTCLEANFILES = target.h
-DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav --enable-distcheck-werror --enable-all-jit-targets --enable-llvm=yes
+DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes
lcov:
($(MAKE); cd unit_tests; $(MAKE) lcov)
quick-check:
diff -Nru clamav-0.97.3+dfsg/Makefile.in clamav-0.97.5+dfsg/Makefile.in
--- clamav-0.97.3+dfsg/Makefile.in 2012-07-12 11:19:11.000000000 -0400
+++ clamav-0.97.5+dfsg/Makefile.in 2012-07-12 11:19:13.000000000 -0400
@@ -344,7 +344,7 @@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map contrib
bin_SCRIPTS = clamav-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libclamav.pc
@@ -352,7 +352,7 @@
# don't complain that configuration files and databases are not removed, this is intended
distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
DISTCLEANFILES = target.h
-DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-distcheck-werror --enable-all-jit-targets --enable-llvm=yes
+DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes
all: clamav-config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -Nru clamav-0.97.3+dfsg/NEWS clamav-0.97.5+dfsg/NEWS
--- clamav-0.97.3+dfsg/NEWS 2011-10-17 09:21:17.000000000 -0400
+++ clamav-0.97.5+dfsg/NEWS 2012-06-15 10:05:05.000000000 -0400
@@ -1,8 +1,10 @@
-0.97.3
+0.97.5
------
-ClamAV 0.97.3 is a minor bugfix release and is recommended for all users.
-Please refer to the ChangeLog file for details.
+ClamAV 0.97.5 addresses possible evasion cases in some archive formats
+(CVE-2012-1457, CVE-2012-1458, CVE-2012-1459). It also addresses stability
+issues in portions of the bytecode engine. This release is recommended for all
+users.
--
The ClamAV team (http://www.clamav.net/team)
diff -Nru clamav-0.97.3+dfsg/README clamav-0.97.5+dfsg/README
--- clamav-0.97.3+dfsg/README 2011-10-17 09:20:31.000000000 -0400
+++ clamav-0.97.5+dfsg/README 2012-06-15 10:05:05.000000000 -0400
@@ -2,6 +2,28 @@
here may not be available in binary packages.
--
+0.97.5
+------
+
+ClamAV 0.97.5 addresses possible evasion cases in some archive formats
+(CVE-2012-1457, CVE-2012-1458, CVE-2012-1459). It also addresses stability
+issues in portions of the bytecode engine. This release is recommended for all
+users.
+
+--
+The ClamAV team (http://www.clamav.net/team)
+
+0.97.4
+------
+
+ClamAV 0.97.4 includes minor bugfixes, detection improvements and initial
+support for on-access scanning under Mac OS X (see contrib/ClamAuth).
+This update is recommended for all users.
+
+--
+The ClamAV team (http://www.clamav.net/team)
+
+
0.97.3
------
diff -Nru clamav-0.97.3+dfsg/shared/cdiff.c clamav-0.97.5+dfsg/shared/cdiff.c
--- clamav-0.97.3+dfsg/shared/cdiff.c 2011-08-03 09:45:21.000000000 -0400
+++ clamav-0.97.5+dfsg/shared/cdiff.c 2012-06-15 10:05:05.000000000 -0400
@@ -757,7 +757,7 @@
{
struct cdiff_ctx ctx;
FILE *fh;
- gzFile *gzh;
+ gzFile gzh;
char *line, *lbuf, buff[FILEBUFF], *dsig = NULL;
unsigned int lines = 0, cmds = 0;
unsigned int difflen, diffremain, line_size = CDIFF_LINE_SIZE;
diff -Nru clamav-0.97.3+dfsg/shared/optparser.c clamav-0.97.5+dfsg/shared/optparser.c
--- clamav-0.97.3+dfsg/shared/optparser.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/shared/optparser.c 2012-06-15 10:05:05.000000000 -0400
@@ -325,6 +325,8 @@
{ "MaxFiles", "max-files", 0, TYPE_NUMBER, MATCH_NUMBER, CLI_DEFAULT_MAXFILES, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Number of files to be scanned within an archive, a document, or any other\ncontainer file.\nThe value of 0 disables the limit.\nWARNING: disabling this limit or setting it too high may result in severe\ndamage to the system.", "10000" },
+ { "ClamAuth", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_CLAMD, "This option enables on-access scanning with ClamAuth on OS X (BETA).", "no" },
+
{ "ClamukoScanOnAccess", NULL, 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_CLAMD, "This option enables Clamuko. Dazuko needs to be already configured and\nrunning.", "no" },
{ "ClamukoScannerCount", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 3, NULL, 0, OPT_CLAMD, "The number of scanner threads that will be started (DazukoFS only).\nHaving multiple scanner threads allows Clamuko to serve multiple\nprocesses simultaneously. This is particularly beneficial on SMP machines.", "3" },
diff -Nru clamav-0.97.3+dfsg/shared/tar.c clamav-0.97.5+dfsg/shared/tar.c
--- clamav-0.97.3+dfsg/shared/tar.c 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/shared/tar.c 2012-06-15 10:05:05.000000000 -0400
@@ -47,7 +47,7 @@
};
#define TARBLK 512
-int tar_addfile(int fd, gzFile *gzs, const char *file)
+int tar_addfile(int fd, gzFile gzs, const char *file)
{
int s, bytes;
struct tar_header hdr;
diff -Nru clamav-0.97.3+dfsg/shared/tar.h clamav-0.97.5+dfsg/shared/tar.h
--- clamav-0.97.3+dfsg/shared/tar.h 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/shared/tar.h 2012-06-15 10:05:05.000000000 -0400
@@ -23,6 +23,6 @@
#include <zlib.h>
-int tar_addfile(int fd, gzFile *gzs, const char *file);
+int tar_addfile(int fd, gzFile gzs, const char *file);
#endif
diff -Nru clamav-0.97.3+dfsg/sigtool/sigtool.c clamav-0.97.5+dfsg/sigtool/sigtool.c
--- clamav-0.97.3+dfsg/sigtool/sigtool.c 2011-10-17 09:15:40.000000000 -0400
+++ clamav-0.97.5+dfsg/sigtool/sigtool.c 2012-06-15 10:05:05.000000000 -0400
@@ -71,7 +71,7 @@
#include "libclamav/readdb.h"
#include "libclamav/others.h"
-#define MAX_DEL_LOOKAHEAD 200
+#define MAX_DEL_LOOKAHEAD 5000
static const struct dblist_s {
const char *ext;
@@ -500,7 +500,7 @@
SHA256_CTX ctx;
struct stat sb;
FILE *scripth, *cdiffh;
- gzFile *gzh;
+ gzFile gzh;
unsigned int ver, osize;
int bytes;
@@ -629,7 +629,7 @@
const char *newcvd, *localdbdir = NULL;
struct cl_engine *engine;
FILE *cvd, *fh;
- gzFile *tar;
+ gzFile tar;
time_t timet;
struct tm *brokent;
struct cl_cvd *oldcvd;
diff -Nru clamav-0.97.3+dfsg/test/Makefile.am clamav-0.97.5+dfsg/test/Makefile.am
--- clamav-0.97.3+dfsg/test/Makefile.am 2011-01-10 12:48:28.000000000 -0500
+++ clamav-0.97.5+dfsg/test/Makefile.am 2012-06-15 10:05:05.000000000 -0400
@@ -16,7 +16,7 @@
cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@
clean-local:
- rm -f $(FILES)
+ rm -f clam*
EXTRA_DIST = .split
diff -Nru clamav-0.97.3+dfsg/test/Makefile.in clamav-0.97.5+dfsg/test/Makefile.in
--- clamav-0.97.3+dfsg/test/Makefile.in 2011-10-17 12:09:20.000000000 -0400
+++ clamav-0.97.5+dfsg/test/Makefile.in 2012-06-15 10:05:05.000000000 -0400
@@ -428,7 +428,7 @@
cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@
clean-local:
- rm -f $(FILES)
+ rm -f clam*
check: all
diff -Nru clamav-0.97.3+dfsg/unit_tests/valgrind.supp clamav-0.97.5+dfsg/unit_tests/valgrind.supp
--- clamav-0.97.3+dfsg/unit_tests/valgrind.supp 2011-10-10 12:24:05.000000000 -0400
+++ clamav-0.97.5+dfsg/unit_tests/valgrind.supp 2012-06-15 10:05:05.000000000 -0400
@@ -4,3 +4,9 @@
fun:*
fun:_dl_allocate_tls
}
+{
+ zlib-cond-jump-1.2.3
+ Memcheck:Cond
+ fun:inflateReset2
+ fun:inflateInit2_
+}
Reply to: