@@ -1,3 +1,13 @@

+Thu Dec 13 21:47:53 CET 2007 (acab)

+-----------------------------------

+  * libclamav: merge the post 0.92 code

+    - NSIS: zlib compression now handled via system zlib

+    - NSIS: unmodified lzma state decoder now statically linked

+    - SIS: handler rewritten to support more recent sis archives

+    - PE: rewritten wwpack32 handler

+    - SPIN: cosmetic changes

+    - UNZIP: decompressor rewritten with bzip2 and deflate64 support

+

 Thu Dec 13 14:57:39 GMT 2007 (trog)

 -----------------------------------

   * libclamav/chmunpack.c: Code cleanup. Reduce dynamic memory footprint.

@@ -1,8 +1,8 @@

 Installation Instructions

 *************************

-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free

-Software Foundation, Inc.

+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,

+2006 Free Software Foundation, Inc.

 This file is free documentation; the Free Software Foundation gives

 unlimited permission to copy, distribute and modify it.

@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.

 Basic Installation

 ==================

-These are generic installation instructions.

+Briefly, the shell commands `./configure; make; make install' should

+configure, build, and install this package.  The following

+more-detailed instructions are generic; see the `README' file for

+instructions specific to this package.

    The `configure' shell script attempts to guess correct values for

 various system-dependent variables used during compilation.  It uses

@@ -23,9 +26,9 @@ debugging `configure').

    It can also use an optional file (typically called `config.cache'

 and enabled with `--cache-file=config.cache' or simply `-C') that saves

-the results of its tests to speed up reconfiguring.  (Caching is

+the results of its tests to speed up reconfiguring.  Caching is

 disabled by default to prevent problems with accidental use of stale

-cache files.)

+cache files.

    If you need to do unusual things to compile the package, please try

 to figure out how `configure' could check whether to do them, and mail

@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you

 may remove or edit it.

    The file `configure.ac' (or `configure.in') is used to create

-`configure' by a program called `autoconf'.  You only need

-`configure.ac' if you want to change it or regenerate `configure' using

-a newer version of `autoconf'.

+`configure' by a program called `autoconf'.  You need `configure.ac' if

+you want to change it or regenerate `configure' using a newer version

+of `autoconf'.

 The simplest way to compile this package is:

   1. `cd' to the directory containing the package's source code and type

-     `./configure' to configure the package for your system.  If you're

-     using `csh' on an old version of System V, you might need to type

-     `sh ./configure' instead to prevent `csh' from trying to execute

-     `configure' itself.

+     `./configure' to configure the package for your system.

-     Running `configure' takes awhile.  While running, it prints some

-     messages telling which features it is checking for.

+     Running `configure' might take a while.  While running, it prints

+     some messages telling which features it is checking for.

   2. Type `make' to compile the package.

@@ -78,7 +78,7 @@ details on some of the pertinent environment variables.

 by setting variables in the command line or in the environment.  Here

 is an example:

-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix

+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix

    *Note Defining Variables::, for more details.

@@ -87,17 +87,15 @@ Compiling For Multiple Architectures

 You can compile the package for more than one kind of computer at the

 same time, by placing the object files for each architecture in their

-own directory.  To do this, you must use a version of `make' that

-supports the `VPATH' variable, such as GNU `make'.  `cd' to the

+own directory.  To do this, you can use GNU `make'.  `cd' to the

 directory where you want the object files and executables to go and run

 the `configure' script.  `configure' automatically checks for the

 source code in the directory that `configure' is in and in `..'.

-   If you have to use a `make' that does not support the `VPATH'

-variable, you have to compile the package for one architecture at a

-time in the source code directory.  After you have installed the

-package for one architecture, use `make distclean' before reconfiguring

-for another architecture.

+   With a non-GNU `make', it is safer to compile the package for one

+architecture at a time in the source code directory.  After you have

+installed the package for one architecture, use `make distclean' before

+reconfiguring for another architecture.

 Installation Names

 ==================

@@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'.  For example:

      ./configure CC=/usr/local2/bin/gcc

 causes the specified `gcc' to be used as the C compiler (unless it is

-overridden in the site shell script).  Here is a another example:

+overridden in the site shell script).

-     /bin/bash ./configure CONFIG_SHELL=/bin/bash

+Unfortunately, this technique does not work for `CONFIG_SHELL' due to

+an Autoconf bug.  Until the bug is fixed you can use this workaround:

-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent

-configuration-related scripts to be executed by `/bin/bash'.

+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash

 `configure' Invocation

 ======================

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

+# Makefile.in generated by automake 1.10 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -33,15 +33,11 @@

 #  MA 02110-1301, USA.

-srcdir = @srcdir@

-top_srcdir = @top_srcdir@

 VPATH = @srcdir@

 pkgdatadir = $(datadir)/@PACKAGE@

 pkglibdir = $(libdir)/@PACKAGE@

 pkgincludedir = $(includedir)/@PACKAGE@

-top_builddir = .

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-INSTALL = @INSTALL@

 install_sh_DATA = $(install_sh) -c -m 644

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

@@ -56,6 +52,7 @@ POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+subdir = .

 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \

 	$(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \

@@ -71,14 +68,13 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \

 	INSTALL NEWS config.guess config.sub depcomp install-sh \

 	ltmain.sh missing mkinstalldirs

-subdir = .

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

- configure.lineno configure.status.lineno

+ configure.lineno config.status.lineno

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = clamav-config.h

 CONFIG_CLEAN_FILES = clamav-config libclamav.pc \

@@ -93,10 +89,11 @@ SOURCES =

 DIST_SOURCES =

 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	html-recursive info-recursive install-data-recursive \

-	install-exec-recursive install-info-recursive \

-	install-recursive installcheck-recursive installdirs-recursive \

-	pdf-recursive ps-recursive uninstall-info-recursive \

-	uninstall-recursive

+	install-dvi-recursive install-exec-recursive \

+	install-html-recursive install-info-recursive \

+	install-pdf-recursive install-ps-recursive install-recursive \

+	installcheck-recursive installdirs-recursive pdf-recursive \

+	ps-recursive uninstall-recursive

 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

 am__vpath_adj = case $$p in \

     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

@@ -105,6 +102,8 @@ am__vpath_adj = case $$p in \

 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

 pkgconfigDATA_INSTALL = $(INSTALL_DATA)

 DATA = $(pkgconfig_DATA)

+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

+  distclean-recursive maintainer-clean-recursive

 ETAGS = etags

 CTAGS = ctags

 DIST_SUBDIRS = $(SUBDIRS)

@@ -120,16 +119,12 @@ GZIP_ENV = --best

 distuninstallcheck_listfiles = find . -type f -print

 distcleancheck_listfiles = find . -type f -print

 ACLOCAL = @ACLOCAL@

-AMDEP_FALSE = @AMDEP_FALSE@

-AMDEP_TRUE = @AMDEP_TRUE@

 AMTAR = @AMTAR@

 AR = @AR@

 AUTOCONF = @AUTOCONF@

 AUTOHEADER = @AUTOHEADER@

 AUTOMAKE = @AUTOMAKE@

 AWK = @AWK@

-BUILD_CLAMD_FALSE = @BUILD_CLAMD_FALSE@

-BUILD_CLAMD_TRUE = @BUILD_CLAMD_TRUE@

 CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

@@ -153,16 +148,13 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

-ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

-ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

 GREP = @GREP@

-HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

-HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

+INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

@@ -176,9 +168,8 @@ LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBOBJS = @LTLIBOBJS@

 MAINT = @MAINT@

-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@

-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@

 MAKEINFO = @MAKEINFO@

+MKDIR_P = @MKDIR_P@

 OBJEXT = @OBJEXT@

 PACKAGE = @PACKAGE@

 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

@@ -195,13 +186,13 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

+abs_builddir = @abs_builddir@

+abs_srcdir = @abs_srcdir@

+abs_top_builddir = @abs_top_builddir@

+abs_top_srcdir = @abs_top_srcdir@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@

 am__include = @am__include@

 am__leading_dot = @am__leading_dot@

 am__quote = @am__quote@

@@ -213,6 +204,7 @@ build_alias = @build_alias@

 build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

+builddir = @builddir@

 datadir = @datadir@

 datarootdir = @datarootdir@

 docdir = @docdir@

@@ -241,12 +233,15 @@ psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

+srcdir = @srcdir@

 sysconfdir = @sysconfdir@

 target = @target@

 target_alias = @target_alias@

 target_cpu = @target_cpu@

 target_os = @target_os@

 target_vendor = @target_vendor@

+top_builddir = @top_builddir@

+top_srcdir = @top_srcdir@

 SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

 EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL

 bin_SCRIPTS = clamav-config

@@ -293,7 +288,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

 clamav-config.h: stamp-h1

 	@if test ! -f $@; then \

 	  rm -f stamp-h1; \

-	  $(MAKE) stamp-h1; \

+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \

 	else :; fi

 stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status

@@ -330,7 +325,7 @@ docs/man/sigtool.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/sigtool

 	cd $(top_builddir) && $(SHELL) ./config.status $@

 install-binSCRIPTS: $(bin_SCRIPTS)

 	@$(NORMAL_INSTALL)

-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"

+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

 	@list='$(bin_SCRIPTS)'; for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  if test -f $$d$$p; then \

@@ -356,10 +351,9 @@ clean-libtool:

 distclean-libtool:

 	-rm -f libtool

-uninstall-info-am:

 install-pkgconfigDATA: $(pkgconfig_DATA)

 	@$(NORMAL_INSTALL)

-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"

+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"

 	@list='$(pkgconfig_DATA)'; for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  f=$(am__strip_dir) \

@@ -406,8 +400,7 @@ $(RECURSIVE_TARGETS):

 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \

 	fi; test -z "$$fail"

-mostlyclean-recursive clean-recursive distclean-recursive \

-maintainer-clean-recursive:

+$(RECURSIVE_CLEAN_TARGETS):

 	@failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

@@ -509,24 +502,22 @@ distclean-tags:

 distdir: $(DISTFILES)

 	$(am__remove_distdir)

-	mkdir $(distdir)

-	$(mkdir_p) $(distdir)/. $(distdir)/docs/man

-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \

-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

-	list='$(DISTFILES)'; for file in $$list; do \

-	  case $$file in \

-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \

-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \

-	  esac; \

+	test -d $(distdir) || mkdir $(distdir)

+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

+	list='$(DISTFILES)'; \

+	  dist_files=`for file in $$list; do echo $$file; done | \

+	  sed -e "s|^$$srcdirstrip/||;t" \

+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \

+	case $$dist_files in \

+	  */*) $(MKDIR_P) `echo "$$dist_files" | \

+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \

+			   sort -u` ;; \

+	esac; \

+	for file in $$dist_files; do \

 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \

-	    dir="/$$dir"; \

-	    $(mkdir_p) "$(distdir)$$dir"; \

-	  else \

-	    dir=''; \

-	  fi; \

 	  if test -d $$d/$$file; then \

+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

 	    fi; \

@@ -540,7 +531,7 @@ distdir: $(DISTFILES)

 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

 	  if test "$$subdir" = .; then :; else \

 	    test -d "$(distdir)/$$subdir" \

-	    || $(mkdir_p) "$(distdir)/$$subdir" \

+	    || $(MKDIR_P) "$(distdir)/$$subdir" \

 	    || exit 1; \

 	    distdir=`$(am__cd) $(distdir) && pwd`; \

 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

@@ -548,6 +539,8 @@ distdir: $(DISTFILES)

 	      $(MAKE) $(AM_MAKEFLAGS) \

 	        top_distdir="$$top_distdir" \

 	        distdir="$$distdir/$$subdir" \

+		am__remove_distdir=: \

+		am__skip_length_check=: \

 	        distdir) \

 	      || exit 1; \

 	  fi; \

@@ -555,7 +548,7 @@ distdir: $(DISTFILES)

 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \

-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \

+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

 	|| chmod -R a+r $(distdir)

 dist-gzip: distdir

 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

@@ -630,7 +623,7 @@ distcheck: dist

 	$(am__remove_distdir)

 	@(echo "$(distdir) archives ready for distribution: "; \

 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'

+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

 distuninstallcheck:

 	@cd $(distuninstallcheck_dir) \

 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \

@@ -655,7 +648,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) clamav-config.h

 installdirs: installdirs-recursive

 installdirs-am:

 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \

-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \

+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \

 	done

 install: install-recursive

 install-exec: install-exec-recursive

@@ -703,12 +696,20 @@ info-am:

 install-data-am: install-pkgconfigDATA

+install-dvi: install-dvi-recursive

+

 install-exec-am: install-binSCRIPTS

+install-html: install-html-recursive

+

 install-info: install-info-recursive

 install-man:

+install-pdf: install-pdf-recursive

+

+install-ps: install-ps-recursive

+

 installcheck-am:

 maintainer-clean: maintainer-clean-recursive

@@ -729,27 +730,28 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-binSCRIPTS uninstall-info-am \

-	uninstall-pkgconfigDATA

+uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

-uninstall-info: uninstall-info-recursive

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

+	install-strip

-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \

-	check-am clean clean-generic clean-libtool clean-recursive \

-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \

-	dist-shar dist-tarZ dist-zip distcheck distclean \

+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

+	all all-am am--refresh check check-am clean clean-generic \

+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \

 	distclean-generic distclean-hdr distclean-libtool \

-	distclean-recursive distclean-tags distcleancheck distdir \

-	distuninstallcheck dvi dvi-am html html-am info info-am \

-	install install-am install-binSCRIPTS install-data \

-	install-data-am install-exec install-exec-am install-info \

-	install-info-am install-man install-pkgconfigDATA \

-	install-strip installcheck installcheck-am installdirs \

-	installdirs-am maintainer-clean maintainer-clean-generic \

-	maintainer-clean-recursive mostlyclean mostlyclean-generic \

-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \

-	tags tags-recursive uninstall uninstall-am \

-	uninstall-binSCRIPTS uninstall-info-am uninstall-pkgconfigDATA

+	distclean-tags distcleancheck distdir distuninstallcheck dvi \

+	dvi-am html html-am info info-am install install-am \

+	install-binSCRIPTS install-data install-data-am install-dvi \

+	install-dvi-am install-exec install-exec-am install-html \

+	install-html-am install-info install-info-am install-man \

+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \

+	install-ps-am install-strip installcheck installcheck-am \

+	installdirs installdirs-am maintainer-clean \

+	maintainer-clean-generic mostlyclean mostlyclean-generic \

+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

+	uninstall uninstall-am uninstall-binSCRIPTS \

+	uninstall-pkgconfigDATA

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

@@ -1,7 +1,7 @@

-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-

+# generated automatically by aclocal 1.10 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-# 2005  Free Software Foundation, Inc.

+# 2005, 2006  Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -11,6 +11,11 @@

 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A

 # PARTICULAR PURPOSE.

+m4_if(m4_PACKAGE_VERSION, [2.61],,

+[m4_fatal([this file was generated for autoconf 2.61.

+You have another version of autoconf.  If you want to use that,

+you should regenerate the build system entirely.], [63])])

+

 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

 # serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL

@@ -6592,7 +6597,7 @@ AC_SUBST([SED])

 AC_MSG_RESULT([$SED])

 ])

-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.

+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -6602,14 +6607,29 @@ AC_MSG_RESULT([$SED])

 # ----------------------------

 # Automake X.Y traces this macro to ensure aclocal.m4 has been

 # generated from the m4 files accompanying Automake X.Y.

-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])

+# (This private macro should not be called outside this file.)

+AC_DEFUN([AM_AUTOMAKE_VERSION],

+[am__api_version='1.10'

+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

+dnl require some minimum version.  Point them to the right macro.

+m4_if([$1], [1.10], [],

+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

+])

+

+# _AM_AUTOCONF_VERSION(VERSION)

+# -----------------------------

+# aclocal traces this macro to find the Autoconf version.

+# This is a private macro too.  Using m4_define simplifies

+# the logic in aclocal, which can simply ignore this definition.

+m4_define([_AM_AUTOCONF_VERSION], [])

 # AM_SET_CURRENT_AUTOMAKE_VERSION

 # -------------------------------

-# Call AM_AUTOMAKE_VERSION so it can be traced.

+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-	 [AM_AUTOMAKE_VERSION([1.9.6])])

+[AM_AUTOMAKE_VERSION([1.10])dnl

+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

@@ -6666,14 +6686,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005

+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006

 # Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

-# serial 7

+# serial 8

 # AM_CONDITIONAL(NAME, SHELL-CONDITION)

 # -------------------------------------

@@ -6682,8 +6702,10 @@ AC_DEFUN([AM_CONDITIONAL],

 [AC_PREREQ(2.52)dnl

  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],

 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl

-AC_SUBST([$1_TRUE])

-AC_SUBST([$1_FALSE])

+AC_SUBST([$1_TRUE])dnl

+AC_SUBST([$1_FALSE])dnl

+_AM_SUBST_NOTMAKE([$1_TRUE])dnl

+_AM_SUBST_NOTMAKE([$1_FALSE])dnl

 if $2; then

   $1_TRUE=

   $1_FALSE='#'

@@ -6697,15 +6719,14 @@ AC_CONFIG_COMMANDS_PRE(

 Usually this means the macro was only invoked conditionally.]])

 fi])])

-

-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005

+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006

 # Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

-# serial 8

+# serial 9

 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

 # written in clear, in which case automake, when reading aclocal.m4,

@@ -6733,6 +6754,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl

 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],

        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],

        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],

+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],

        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],

                    [depcc="$$1"   am_compiler_list=])

@@ -6798,6 +6820,7 @@ AC_CACHE_CHECK([dependency style of $depcc],

        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

          >/dev/null 2>conftest.err &&

+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

@@ -6850,7 +6873,8 @@ if test "x$enable_dependency_tracking" != xno; then

   AMDEPBACKSLASH='\'

 fi

 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])

-AC_SUBST([AMDEPBACKSLASH])

+AC_SUBST([AMDEPBACKSLASH])dnl

+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl

 ])

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

@@ -6875,8 +6899,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

   # some people rename them; so instead we look at the file content.

   # Grep'ing the first line is not enough: some people post-process

   # each Makefile.in and add a new line on top of each file to say so.

-  # So let's grep whole file.

-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then

+  # Grep'ing the whole file is not good either: AIX grep has a line

+  # limit of 2048, but all sed's we know have understand at least 4000.

+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

     dirpart=`AS_DIRNAME("$mf")`

   else

     continue

@@ -6935,8 +6960,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

 # Do all the work for Automake.                             -*- Autoconf -*-

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

-# Free Software Foundation, Inc.

+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

+# 2005, 2006 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -6959,16 +6984,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

 # arguments mandatory, and then we can depend on a new Autoconf

 # release and drop the old call support.

 AC_DEFUN([AM_INIT_AUTOMAKE],

-[AC_PREREQ([2.58])dnl

+[AC_PREREQ([2.60])dnl

 dnl Autoconf wants to disallow AM_ names.  We explicitly allow

 dnl the ones we care about.

 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl

 AC_REQUIRE([AC_PROG_INSTALL])dnl

-# test to see if srcdir already configured

-if test "`cd $srcdir && pwd`" != "`pwd`" &&

-   test -f $srcdir/config.status; then

-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

+if test "`cd $srcdir && pwd`" != "`pwd`"; then

+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output

+  # is not polluted with repeated "-I."

+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl

+  # test to see if srcdir already configured

+  if test -f $srcdir/config.status; then

+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

+  fi

 fi

 # test whether we have cygpath

@@ -6988,6 +7017,9 @@ m4_ifval([$2],

  AC_SUBST([PACKAGE], [$1])dnl

  AC_SUBST([VERSION], [$2])],

 [_AM_SET_OPTIONS([$1])dnl

+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.

+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,

+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl

  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl

  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl

@@ -7023,6 +7055,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],

                   [_AM_DEPENDENCIES(CXX)],

                   [define([AC_PROG_CXX],

                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

+AC_PROVIDE_IFELSE([AC_PROG_OBJC],

+                  [_AM_DEPENDENCIES(OBJC)],

+                  [define([AC_PROG_OBJC],

+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

 ])

 ])

@@ -7058,7 +7094,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

 # Define $install_sh.

 AC_DEFUN([AM_PROG_INSTALL_SH],

 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-install_sh=${install_sh-"$am_aux_dir/install-sh"}

+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

 AC_SUBST(install_sh)])

 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.

@@ -7136,14 +7172,14 @@ rm -f confinc confmf

 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005

+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005

 # Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

-# serial 4

+# serial 5

 # AM_MISSING_PROG(NAME, PROGRAM)

 # ------------------------------

@@ -7159,6 +7195,7 @@ AC_SUBST($1)])

 # If it does, set am_missing_run to use it, otherwise, to nothing.

 AC_DEFUN([AM_MISSING_HAS_RUN],

 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

+AC_REQUIRE_AUX_FILE([missing])dnl

 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

 # Use eval to expand $SHELL

 if eval "$MISSING --run true"; then

@@ -7169,7 +7206,7 @@ else

 fi

 ])

-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.

+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -7177,60 +7214,23 @@ fi

 # AM_PROG_MKDIR_P

 # ---------------

-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.

-#

-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories

-# created by `make install' are always world readable, even if the

-# installer happens to have an overly restrictive umask (e.g. 077).

-# This was a mistake.  There are at least two reasons why we must not

-# use `-m 0755':

-#   - it causes special bits like SGID to be ignored,

-#   - it may be too restrictive (some setups expect 775 directories).

-#

-# Do not use -m 0755 and let people choose whatever they expect by

-# setting umask.

-#

-# We cannot accept any implementation of `mkdir' that recognizes `-p'.

-# Some implementations (such as Solaris 8's) are not thread-safe: if a

-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'

-# concurrently, both version can detect that a/ is missing, but only

-# one can create it and the other will error out.  Consequently we

-# restrict ourselves to GNU make (using the --version option ensures

-# this.)

+# Check for `mkdir -p'.

 AC_DEFUN([AM_PROG_MKDIR_P],

-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then

-  # We used to keeping the `.' as first argument, in order to

-  # allow $(mkdir_p) to be used without argument.  As in

-  #   $(mkdir_p) $(somedir)

-  # where $(somedir) is conditionally defined.  However this is wrong

-  # for two reasons:

-  #  1. if the package is installed by a user who cannot write `.'

-  #     make install will fail,

-  #  2. the above comment should most certainly read

-  #     $(mkdir_p) $(DESTDIR)$(somedir)

-  #     so it does not work when $(somedir) is undefined and

-  #     $(DESTDIR) is not.

-  #  To support the latter case, we have to write

-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),

-  #  so the `.' trick is pointless.

-  mkdir_p='mkdir -p --'

-else

-  # On NextStep and OpenStep, the `mkdir' command does not

-  # recognize any option.  It will interpret all options as

-  # directories to create, and then abort because `.' already

-  # exists.

-  for d in ./-p ./--version;

-  do

-    test -d $d && rmdir $d

-  done

-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.

-  if test -f "$ac_aux_dir/mkinstalldirs"; then

-    mkdir_p='$(mkinstalldirs)'

-  else

-    mkdir_p='$(install_sh) -d'

-  fi

-fi

-AC_SUBST([mkdir_p])])

+[AC_PREREQ([2.60])dnl

+AC_REQUIRE([AC_PROG_MKDIR_P])dnl

+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,

+dnl while keeping a definition of mkdir_p for backward compatibility.

+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.

+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of

+dnl Makefile.ins that do not define MKDIR_P, so we do our own

+dnl adjustment using top_builddir (which is defined more often than

+dnl MKDIR_P).

+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl

+case $mkdir_p in

+  [[\\/$]]* | ?:[[\\/]]*) ;;

+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

+esac

+])

 # Helper functions for option handling.                     -*- Autoconf -*-

@@ -7342,9 +7342,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.

 if test "$cross_compiling" != no; then

   AC_CHECK_TOOL([STRIP], [strip], :)

 fi

-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"

+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

 AC_SUBST([INSTALL_STRIP_PROGRAM])])

+# Copyright (C) 2006  Free Software Foundation, Inc.

+#

+# This file is free software; the Free Software Foundation

+# gives unlimited permission to copy and/or distribute it,

+# with or without modifications, as long as this notice is preserved.

+

+# _AM_SUBST_NOTMAKE(VARIABLE)

+# ---------------------------

+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.

+# This macro is traced by Automake.

+AC_DEFUN([_AM_SUBST_NOTMAKE])

+

 # Check how to create a tarball.                            -*- Autoconf -*-

 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

+# Makefile.in generated by automake 1.10 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -32,15 +32,11 @@

 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 #  MA 02110-1301, USA.

-srcdir = @srcdir@

-top_srcdir = @top_srcdir@

 VPATH = @srcdir@

 pkgdatadir = $(datadir)/@PACKAGE@

 pkglibdir = $(libdir)/@PACKAGE@

 pkgincludedir = $(includedir)/@PACKAGE@

-top_builddir = ..

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-INSTALL = @INSTALL@

 install_sh_DATA = $(install_sh) -c -m 644

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

@@ -85,17 +81,18 @@ am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/cfgparser.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	clamav-milter.$(OBJEXT)

 clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)

 clamav_milter_LDADD = $(LDADD)

-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

 depcomp = $(SHELL) $(top_srcdir)/depcomp

 am__depfiles_maybe = depfiles

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \

-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \

-	$(AM_CFLAGS) $(CFLAGS)

+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

+	$(LDFLAGS) -o $@

 SOURCES = $(clamav_milter_SOURCES)

 DIST_SOURCES = $(am__clamav_milter_SOURCES_DIST)

 man8dir = $(mandir)/man8

@@ -105,16 +102,12 @@ ETAGS = etags

 CTAGS = ctags

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 ACLOCAL = @ACLOCAL@

-AMDEP_FALSE = @AMDEP_FALSE@

-AMDEP_TRUE = @AMDEP_TRUE@

 AMTAR = @AMTAR@

 AR = @AR@