@@ -2749,8 +2749,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'

 ac_config_headers="$ac_config_headers clamav-config.h"

-LC_CURRENT=2

-LC_REVISION=6

+LC_CURRENT=3

+LC_REVISION=0

 LC_AGE=0

 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

@@ -4725,7 +4725,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 4727 "configure"' > conftest.$ac_ext

+  echo '#line 4728 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7463,11 +7463,11 @@ else

    -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:7465: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7466: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7469: \$? = $ac_status" >&5

+   echo "$as_me:7470: \$? = $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.

@@ -7753,11 +7753,11 @@ else

    -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:7755: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7756: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7759: \$? = $ac_status" >&5

+   echo "$as_me:7760: \$? = $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.

@@ -7857,11 +7857,11 @@ else

    -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:7859: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7860: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:7863: \$? = $ac_status" >&5

+   echo "$as_me:7864: \$? = $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

@@ -10219,7 +10219,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 10221 "configure"

+#line 10222 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10319,7 +10319,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 10321 "configure"

+#line 10322 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -12739,11 +12739,11 @@ else

    -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:12741: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:12742: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:12745: \$? = $ac_status" >&5

+   echo "$as_me:12746: \$? = $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.

@@ -12843,11 +12843,11 @@ else

    -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:12845: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:12846: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:12849: \$? = $ac_status" >&5

+   echo "$as_me:12850: \$? = $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

@@ -14420,11 +14420,11 @@ else

    -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:14422: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:14423: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:14426: \$? = $ac_status" >&5

+   echo "$as_me:14427: \$? = $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.

@@ -14524,11 +14524,11 @@ else

    -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:14526: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:14527: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:14530: \$? = $ac_status" >&5

+   echo "$as_me:14531: \$? = $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

@@ -16724,11 +16724,11 @@ else

    -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:16726: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:16727: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:16730: \$? = $ac_status" >&5

+   echo "$as_me:16731: \$? = $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.

@@ -17014,11 +17014,11 @@ else

    -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:17016: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:17017: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:17020: \$? = $ac_status" >&5

+   echo "$as_me:17021: \$? = $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.

@@ -17118,11 +17118,11 @@ else

    -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:17120: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:17121: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:17124: \$? = $ac_status" >&5

+   echo "$as_me:17125: \$? = $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

@@ -23,8 +23,8 @@ AC_CREATE_TARGET_H(target.h)

 AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`")

 AM_CONFIG_HEADER(clamav-config.h)

-LC_CURRENT=2

-LC_REVISION=6

+LC_CURRENT=3

+LC_REVISION=0

 LC_AGE=0

 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

 AC_SUBST(LIBCLAMAV_VERSION)

@@ -25,6 +25,7 @@ libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

 include_HEADERS = clamav.h

+

 libclamav_la_SOURCES = \

 	clamav.h \

         matcher-ac.c \

@@ -115,6 +116,11 @@ libclamav_la_SOURCES = \

 	regex/regerror.c \

 	regex/regexec.c \

 	regex/regfree.c \

+	regex/cclass.h \

+	regex/cname.h \

+	regex/regex.h \

+	regex/regex2.h \

+	regex/utils.h \

 	unrar/unrar15.c \

 	unrar/unrar20.h \

 	unrar/unrarcmd.h \

@@ -184,3 +190,4 @@ libclamav_la_SOURCES = \

 	lockdb.h

 lib_LTLIBRARIES = libclamav.la

+EXTRA_DIST = regex/engine.c

@@ -58,7 +58,7 @@ host_triplet = @host@

 target_triplet = @target@

 subdir = libclamav

 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

-	$(srcdir)/Makefile.in COPYING

+	$(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \

 	$(top_srcdir)/configure.in

@@ -331,6 +331,11 @@ libclamav_la_SOURCES = \

 	regex/regerror.c \

 	regex/regexec.c \

 	regex/regfree.c \

+	regex/cclass.h \

+	regex/cname.h \

+	regex/regex.h \

+	regex/regex2.h \

+	regex/utils.h \

 	unrar/unrar15.c \

 	unrar/unrar20.h \

 	unrar/unrarcmd.h \

@@ -400,6 +405,7 @@ libclamav_la_SOURCES = \

 	lockdb.h

 lib_LTLIBRARIES = libclamav.la

+EXTRA_DIST = regex/engine.c

 all: all-am

 .SUFFIXES:

@@ -755,6 +761,7 @@ distclean-tags:

 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

 distdir: $(DISTFILES)

+	$(mkdir_p) $(distdir)/regex

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

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

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