[Pkg-clamav-commits] [libclamunrar] 01/01: Import libclamunrar_0.98.5.orig.tar.xz
Sebastian A. Siewior
bigeasy-guest at moszumanska.debian.org
Sat Nov 22 22:03:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
bigeasy-guest pushed a commit to branch upstream-unstable
in repository libclamunrar.
commit 1256542cf41587e62a048e687097f23cef1511f0
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date: Sat Nov 22 22:05:25 2014 +0100
Import libclamunrar_0.98.5.orig.tar.xz
---
aclocal.m4 | 7 +-
clamav-config.h.in | 3 +
configure | 104 +++++++++++++++++++++++------
configure.ac | 13 +++-
libclamunrar/Doxyfile | 22 ------
libclamunrar_iface/Doxyfile | 22 ------
libclamunrar_iface/unrar_iface.c | 1 +
m4/reorganization/code_checks/functions.m4 | 2 +-
m4/reorganization/libs/libconfig.m4 | 51 --------------
m4/reorganization/llvm.m4 | 28 +++++++-
m4/reorganization/version.m4 | 2 +-
11 files changed, 128 insertions(+), 127 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index e39a5d7..be48649 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -103,10 +103,9 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
diff --git a/clamav-config.h.in b/clamav-config.h.in
index ec3b775..b734679 100644
--- a/clamav-config.h.in
+++ b/clamav-config.h.in
@@ -139,6 +139,9 @@
/* have getaddrinfo() */
#undef HAVE_GETADDRINFO
+/* Define to 1 if you have the `getnameinfo' function. */
+#undef HAVE_GETNAMEINFO
+
/* Define to 1 if getpagesize() is available */
#undef HAVE_GETPAGESIZE
diff --git a/configure b/configure
index 87d2002..f5f0812 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ClamAV 0.98.5-beta1.
+# Generated by GNU Autoconf 2.69 for ClamAV 0.98.5.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='0.98.5-beta1'
-PACKAGE_STRING='ClamAV 0.98.5-beta1'
+PACKAGE_VERSION='0.98.5'
+PACKAGE_STRING='ClamAV 0.98.5'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
PACKAGE_URL='http://www.clamav.net/'
@@ -887,6 +887,7 @@ enable_clamdtop
with_libncurses_prefix
with_libpdcurses_prefix
enable_distcheck_werror
+with_system_llvm
enable_llvm
enable_sha_collector_for_internal_use
with_libcurl
@@ -1441,7 +1442,7 @@ if test "$ac_init_help" = "long"; then
# 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.98.5-beta1 to adapt to many kinds of systems.
+\`configure' configures ClamAV 0.98.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1512,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ClamAV 0.98.5-beta1:";;
+ short | recursive ) echo "Configuration of ClamAV 0.98.5:";;
esac
cat <<\_ACEOF
@@ -1594,6 +1595,9 @@ Optional Packages:
--without-libncurses-prefix don't search for libncurses in includedir and libdir
--with-libpdcurses-prefix[=DIR] search for libpdcurses in DIR/include and DIR/lib
--without-libpdcurses-prefix don't search for libpdcurses in includedir and libdir
+ --with-system-llvm Use system llvm instead of built-in, uses full path
+ to llvm-config (default= /usr/local or /usr if not
+ found in /usr/local)
--with-libcurl=DIR path to directory containing libcurl (default=
/usr/local or /usr if not found in /usr/local)
@@ -1674,7 +1678,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ClamAV configure 0.98.5-beta1
+ClamAV configure 0.98.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2097,7 +2101,7 @@ cat >config.log <<_ACEOF
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.98.5-beta1, which was
+It was created by ClamAV $as_me 0.98.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2952,8 +2956,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -3266,7 +3270,7 @@ fi
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='0.98.5-beta1'
+ VERSION='0.98.5'
# Some tools Automake needs.
@@ -5008,7 +5012,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-VERSION="0.98.5-beta1"
+VERSION="0.98.5"
LC_CURRENT=7
LC_REVISION=22
@@ -14317,7 +14321,7 @@ if test "$ac_res" != no; then :
fi
-for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise
+for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo
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"
@@ -21166,11 +21170,36 @@ fi
+
+# Check whether --with-system-llvm was given.
+if test "${with_system_llvm+set}" = set; then :
+ withval=$with_system_llvm; case "$withval" in
+ yes)
+ system_llvm="default"
+ ;;
+ no)
+ system_llvm="built-in"
+ ;;
+ *)
+ system_llvm=$withval
+ esac
+
+else
+ system_llvm="built-in"
+fi
+
+
# Check whether --enable-llvm was given.
if test "${enable_llvm+set}" = set; then :
enableval=$enable_llvm; enable_llvm=$enableval
else
- enable_llvm="auto"
+
+if test "x$system_llvm" != "xbuilt-in"; then
+ enable_llvm="yes"
+else
+ enable_llvm="auto"
+fi
+
fi
@@ -21186,6 +21215,8 @@ subdirs="$subdirs libclamav/c++"
+else
+ system_llvm="none"
fi
# Check whether --enable-sha-collector-for-internal-use was given.
@@ -21971,7 +22002,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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.98.5-beta1, which was
+This file was extended by ClamAV $as_me 0.98.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22038,7 +22069,7 @@ _ACEOF
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.98.5-beta1
+ClamAV config.status 0.98.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -24132,15 +24163,15 @@ if test "$subdirfailed" = "no"; then
fi
- $as_echo_n " jit : "
+ $as_echo_n " llvm : "
if test "x$enable_llvm" = "xno"; then :
- $as_echo "$have_jit (disabled)"
+ $as_echo "$have_jit, from $system_llvm (disabled)"
elif test "x$enable_llvm" = "xyes"; then :
- $as_echo "$have_jit"
+ $as_echo "$have_jit, from $system_llvm"
elif test "x$enable_llvm" = "x"; then :
- $as_echo "$have_jit"
+ $as_echo "$have_jit, from $system_llvm"
else
- $as_echo "$have_jit ($enable_llvm)"
+ $as_echo "$have_jit, from $system_llvm ($enable_llvm)"
fi
@@ -24198,9 +24229,10 @@ else
$as_echo "$want_unrar ($want_unrar)"
fi
+if test "x$LIBJSON_HOME" != "x"; then
- $as_echo_n " preclass : "
+ $as_echo_n " libjson : "
if test "x$have_json" = "xno"; then :
$as_echo "$LIBJSON_HOME (disabled)"
elif test "x$have_json" = "xyes"; then :
@@ -24211,6 +24243,36 @@ else
$as_echo "$LIBJSON_HOME ($have_json)"
fi
+fi
+if test "x$PCRE_HOME" = "x"; then
+
+
+ $as_echo_n " pcre : "
+ if test "x$have_pcre" = "xno"; then :
+ $as_echo "no (disabled)"
+elif test "x$have_pcre" = "xyes"; then :
+ $as_echo "no"
+elif test "x$have_pcre" = "x"; then :
+ $as_echo "no"
+else
+ $as_echo "no ($have_pcre)"
+fi
+
+else
+
+
+ $as_echo_n " pcre : "
+ if test "x$have_pcre" = "xno"; then :
+ $as_echo "$PCRE_HOME (disabled)"
+elif test "x$have_pcre" = "xyes"; then :
+ $as_echo "$PCRE_HOME"
+elif test "x$have_pcre" = "x"; then :
+ $as_echo "$PCRE_HOME"
+else
+ $as_echo "$PCRE_HOME ($have_pcre)"
+fi
+
+fi
if test "x$XML_LIBS" = "x"; then
diff --git a/configure.ac b/configure.ac
index 96ceba9..a53ea58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl MA 02110-1301, USA.
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([ClamAV], [0.98.5-beta1], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
+AC_INIT([ClamAV], [0.98.5], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
AH_BOTTOM([#include "platform.h"])
dnl put configure auxiliary into config
@@ -180,14 +180,21 @@ have_jit="no"
if test "$subdirfailed" = "no"; then
have_jit="yes"
fi
-CL_MSG_STATUS([jit ],[$have_jit],[$enable_llvm])
+CL_MSG_STATUS([llvm ],[$have_jit, from $system_llvm],[$enable_llvm])
CL_MSG_STATUS([mempool ],[$have_mempool],[$enable_mempool])
AC_MSG_NOTICE([Summary of engine detection features])
CL_MSG_STATUS([bzip2 ],[$bzip_check],[$want_bzip2])
CL_MSG_STATUS([zlib ],[$ZLIB_HOME],[yes])
CL_MSG_STATUS([unrar ],[$want_unrar],[$want_unrar])
-CL_MSG_STATUS([preclass ],[$LIBJSON_HOME],[$have_json])
+if test "x$LIBJSON_HOME" != "x"; then
+ CL_MSG_STATUS([libjson ],[$LIBJSON_HOME],[$have_json])
+fi
+if test "x$PCRE_HOME" = "x"; then
+ CL_MSG_STATUS([pcre ],[no],[$have_pcre])
+else
+ CL_MSG_STATUS([pcre ],[$PCRE_HOME],[$have_pcre])
+fi
if test "x$XML_LIBS" = "x"; then
CL_MSG_STATUS([dmg and xar ],[no],[])
else
diff --git a/libclamunrar/Doxyfile b/libclamunrar/Doxyfile
deleted file mode 100644
index 8d88b80..0000000
--- a/libclamunrar/Doxyfile
+++ /dev/null
@@ -1,22 +0,0 @@
-PROJECT_NAME = ClamAV - Libclamunrar
-OUTPUT_DIRECTORY = ../docs/libclamunrar
-WARNINGS = YES
-FILE_PATTERNS = *.c *.h
-PERL_PATH = /usr/bin/perl
-SEARCHENGINE = YES
-
-GENERATE_LATEX=NO
-OPTIMIZE_OUTPUT_FOR_C=YES
-HAVE_DOT=YES
-CALL_GRAPH=YES
-CALLER_GRAPH=YES
-JAVADOC_AUTOBRIEF=YES
-GENERATE_MAN=NO
-EXAMPLE_PATH=examples
-
-DOT_CLEANUP=NO
-MAX_DOT_GRAPH_DEPTH=3
-
-EXTRACT_ALL=YES
-INPUT = . \
- ../shared
diff --git a/libclamunrar_iface/Doxyfile b/libclamunrar_iface/Doxyfile
deleted file mode 100644
index 7929260..0000000
--- a/libclamunrar_iface/Doxyfile
+++ /dev/null
@@ -1,22 +0,0 @@
-PROJECT_NAME = ClamAV - Libclamunrar_iface
-OUTPUT_DIRECTORY = ../docs/libclamunrar_iface
-WARNINGS = YES
-FILE_PATTERNS = *.c *.h
-PERL_PATH = /usr/bin/perl
-SEARCHENGINE = YES
-
-GENERATE_LATEX=NO
-OPTIMIZE_OUTPUT_FOR_C=YES
-HAVE_DOT=YES
-CALL_GRAPH=YES
-CALLER_GRAPH=YES
-JAVADOC_AUTOBRIEF=YES
-GENERATE_MAN=NO
-EXAMPLE_PATH=examples
-
-DOT_CLEANUP=NO
-MAX_DOT_GRAPH_DEPTH=3
-
-EXTRACT_ALL=YES
-INPUT = . \
- ../shared
diff --git a/libclamunrar_iface/unrar_iface.c b/libclamunrar_iface/unrar_iface.c
index f53afb3..9262f40 100644
--- a/libclamunrar_iface/unrar_iface.c
+++ b/libclamunrar_iface/unrar_iface.c
@@ -172,6 +172,7 @@ static unrar_fileheader_t *read_block(int fd, header_type hdr_type)
unrar_dbgmsg("UNRAR: Head Size: %.4x\n", file_header->head_size);
if(lseek(fd, file_header->next_offset, SEEK_SET) != file_header->next_offset) {
unrar_dbgmsg("seek: %ld\n", file_header->next_offset);
+ free(file_header);
return NULL;
}
diff --git a/m4/reorganization/code_checks/functions.m4 b/m4/reorganization/code_checks/functions.m4
index 51dff43..b37e3ca 100644
--- a/m4/reorganization/code_checks/functions.m4
+++ b/m4/reorganization/code_checks/functions.m4
@@ -2,7 +2,7 @@ AX_CHECK_UNAME_SYSCALL
AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
-AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise])
+AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo])
AC_FUNC_FSEEKO
dnl Check if anon maps are available, check if we can determine the page size
diff --git a/m4/reorganization/libs/libconfig.m4 b/m4/reorganization/libs/libconfig.m4
deleted file mode 100644
index 2581b53..0000000
--- a/m4/reorganization/libs/libconfig.m4
+++ /dev/null
@@ -1,51 +0,0 @@
-dnl Check for libconfig
-AC_MSG_CHECKING([for libconfig installation])
-
-AC_ARG_WITH([libconfig],
-[ --with-libconfig=DIR path to directory containing libconfig (default=
- /usr/local or /usr if not found in /usr/local)],
-[
-if test "$withval"; then
- LIBCONFIG_HOME="$withval"
-fi
-], [
-LIBCONFIG_HOME=/usr/local
-if test ! -f "$LIBCONFIG_HOME/include/libconfig.h"
-then
- LIBCONFIG_HOME=/usr
-fi
-AC_MSG_RESULT([$LIBCONFIG_HOME])
-])
-
-if test ! -f "$LIBCONFIG_HOME/include/libconfig.h"
-then
- AC_MSG_ERROR([libconfig not found.])
-fi
-
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="-L$LIBCONFIG_HOME/lib -lconfig"
-AC_CHECK_LIB([config], [config_init], [FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$LIBCONFIG_HOME/lib -lconfig"],
- [AC_MSG_ERROR([Your libconfig installation is misconfigured])])
-
-CLAMSCAN_LIBS="$CLAMSCAN_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-CLAMD_LIBS="$CLAMD_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-CLAMMEM_LIBS="$CLAMMEM_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-CLAMDTOP_LIBS="$CLAMDTOP_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-CLAMBC_LIBS="$CLAMBC_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
-
-CLAMSCAN_CPPFLAGS="$FRESHCLAM_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMDSCAN_CPPFLAGS="$CLAMDSCAN_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMD_CPPFLAGS="$CLAMD_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMMEM_CPPFLAGS="$CLAMMEM_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMAV_MILTER_CPPFLAGS="$CLAMAV_MILTER_CPPFLAGS -I$LIBCONFIG_HOME/include"
-LIBCLAMAV_CPPFLAGS="$LIBCLAMAV_CPPFLAGS -I$LIBCONFIG_HOME/include"
-LIBCLAMSHARED_CPPFLAGS="$LIBCLAMSHARED_CPPFLAGS -I$LIBCONFIG_HOME/include"
-SIGTOOL_CPPFLAGS="$SIGTOOL_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMCONF_CPPFLAGS="$CLAMCONF_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMDTOP_CPPFLAGS="$CLAMDTOP_CPPFLAGS -I$LIBCONFIG_HOME/include"
-CLAMBC_CPPFLAGS="$CLAMBC_CPPFLAGS -I$LIBCONFIG_HOME/include"
-
-LDFLAGS="$save_ldflags"
diff --git a/m4/reorganization/llvm.m4 b/m4/reorganization/llvm.m4
index d82668b..3ffc581 100644
--- a/m4/reorganization/llvm.m4
+++ b/m4/reorganization/llvm.m4
@@ -1,8 +1,32 @@
+AC_ARG_WITH([system-llvm], AC_HELP_STRING([--with-system-llvm],
+[Use system llvm instead of built-in, uses full path to llvm-config (default=
+/usr/local or /usr if not found in /usr/local)]),
+[case "$withval" in
+ yes)
+ system_llvm="default"
+ ;;
+ no)
+ system_llvm="built-in"
+ ;;
+ *)
+ system_llvm=$withval
+ esac
+], [system_llvm="built-in"])
+
AC_ARG_ENABLE([llvm],AC_HELP_STRING([--enable-llvm],
- [Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),
- [enable_llvm=$enableval], [enable_llvm="auto"])
+[Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),
+[enable_llvm=$enableval],
+[
+if test "x$system_llvm" != "xbuilt-in"; then
+ enable_llvm="yes"
+else
+ enable_llvm="auto"
+fi
+])
if test "$enable_llvm" != "no"; then
dnl Try to configure subdir, optionally
AC_CONFIG_SUBDIRS_OPTIONAL([libclamav/c++])
+else
+ system_llvm="none"
fi
diff --git a/m4/reorganization/version.m4 b/m4/reorganization/version.m4
index 4e2591c..ea263b2 100644
--- a/m4/reorganization/version.m4
+++ b/m4/reorganization/version.m4
@@ -1,6 +1,6 @@
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
-VERSION="0.98.5-beta1"
+VERSION="0.98.5"
LC_CURRENT=7
LC_REVISION=22
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-clamav/libclamunrar.git
More information about the Pkg-clamav-commits
mailing list