-diff -ur clamav-0.97.5/clamav-milter/Makefile.am clamav-0.97.5-am/clamav-milter/Makefile.am
---- clamav-0.97.5/clamav-milter/Makefile.am 2012-06-12 15:36:05.000000000 +0200
-+++ clamav-0.97.5-am/clamav-milter/Makefile.am 2012-06-28 11:10:21.205378306 +0200
-@@ -45,7 +45,7 @@
- endif
+diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
+--- clamav-0.103.0.org/configure.ac 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/configure.ac 2021-04-06 16:39:49.284297541 +0200
+@@ -50,6 +50,7 @@ dnl the date in the version
+ AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
- DEFS = @DEFS@ -DCL_NOLIBCLAMAV
--CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
-+AM_CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
- LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
- AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
- CLEANFILES=*.gcda *.gcno
-diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac
---- clamav-0.97.5/configure.ac 2012-06-28 11:10:46.795377403 +0200
-+++ clamav-0.97.5-am/configure.ac 2012-06-28 11:01:44.658245193 +0200
-@@ -54,6 +54,8 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-+AM_PROG_AR
-+AM_PROG_CC_C_O
+ m4_include([m4/reorganization/version.m4])
++m4_include([m4/reorganization/build_tools.m4])
LT_CONFIG_LTDL_DIR([libltdl])
LT_INIT([dlopen disable-static])
-@@ -469,7 +471,7 @@
+@@ -58,7 +59,6 @@ PKG_PROG_PKG_CONFIG(0.16)
- if test "$enable_check_ut" != "no" ; then
- AC_LIB_FIND([check],[check.h],
-- AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
-+ [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
- [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"],
- [])
+ m4_include([m4/reorganization/libclamav-only.m4])
+
+-m4_include([m4/reorganization/build_tools.m4])
+ m4_include([m4/reorganization/headers.m4])
+
+ AC_CONFIG_FILES([libltdl/Makefile])
+@@ -394,7 +394,7 @@ if test "X$have_json" = "Xyes" && test "
+ ])
fi
-@@ -1549,8 +1551,8 @@
- if test "$enable_clamdtop" != "no"; then
- AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
+-if test "x$clamonacc-curl" = "xdeprecated"; then
++if test "x$clamonacc_curl" = "xdeprecated"; then
+ AC_MSG_WARN([m4_normalize([
+ ****** your libcurl (e.g. libcurl-devel) is older than the recommended version. Installing ClamAV with clamonacc requires libcurl 7.40 or higher to use fdpassing.
+ ****** fdpassing with clamonacc will be disabled on your system.
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/build_tools.m4 clamav-0.103.0/m4/reorganization/build_tools.m4
+--- clamav-0.103.0.org/m4/reorganization/build_tools.m4 2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/build_tools.m4 2021-04-06 16:39:49.284297541 +0200
+@@ -1,3 +1,5 @@
++AM_PROG_AR
++AM_PROG_CC_C_O
+ AC_PROG_CC
+ AM_PROG_LEX
+ AC_PROG_YACC
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/clamdtop.m4 clamav-0.103.0/m4/reorganization/clamdtop.m4
+--- clamav-0.103.0.org/m4/reorganization/clamdtop.m4 2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/clamdtop.m4 2021-04-06 16:39:49.284297541 +0200
+@@ -13,8 +13,8 @@ PKG_CHECK_MODULES(NCURSES, [ncurses], [
+
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+ AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
- AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
- [initscr(); KEY_RESIZE;]),
+ [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
[CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
CURSES_INCLUDE="<ncurses/ncurses.h>"],
[])
-@@ -1558,8 +1560,8 @@
+@@ -23,8 +23,8 @@ fi
if test "X$HAVE_LIBNCURSES" != "Xyes"; then
HAVE_LIBNCURSES=
AC_LIB_FIND([ncurses], [ncurses.h],
[CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
CURSES_INCLUDE="<ncurses.h>"],
[])
-@@ -1567,8 +1569,8 @@
+@@ -32,8 +32,8 @@ fi
if test "X$HAVE_LIBNCURSES" != "Xyes"; then
AC_LIB_FIND([pdcurses],[curses.h],
[CURSES_CPPFLAGS="$INCPDCURSES";
CURSES_LIBS="$LTLIBPDCURSES";
CURSES_INCLUDE="<curses.h>"],
-diff -ur clamav-0.97.5/m4/resolv.m4 clamav-0.97.5-am/m4/resolv.m4
---- clamav-0.97.5/m4/resolv.m4 2012-06-12 15:36:05.000000000 +0200
-+++ clamav-0.97.5-am/m4/resolv.m4 2012-06-28 11:09:01.312047789 +0200
-@@ -18,7 +18,7 @@
- [
- AC_CACHE_CHECK([for dn_expand in std libs], [ac_cv_have_lresolv_std], [
- ac_cv_have_lresolv_std='no'
-- AC_LINK_IFELSE([
-+ AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-@@ -28,14 +28,14 @@
- [
- ac_cv_have_lresolv_std='yes'
- ac_cv_have_lresolv=''
-- ])
-+ ])])
- ])
- if test "x$ac_cv_have_lresolv" = "xno"; then
- bklibs=$LIBS
- LIBS=-lresolv
- AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv_lresolv], [
- ac_cv_have_lresolv_lresolv='yes'
-- AC_LINK_IFELSE([
-+ AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-@@ -45,7 +45,7 @@
- [
- ac_cv_have_lresolv_lresolv='yes'
- ac_cv_have_lresolv=' -lresolv'
-- ])
-+ ])])
- ])
- LIBS=$bklibs;
- fi
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4 clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4
+--- clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4 2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4 2021-04-06 16:39:49.284297541 +0200
+@@ -19,7 +19,7 @@ case "$host_os" in
+ esac
+
+ AC_LIB_FIND([check],[check.h],
+- AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
++ [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
+ [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
+ [])
+
+diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/curl.m4 clamav-0.103.0/m4/reorganization/libs/curl.m4
+--- clamav-0.103.0.org/m4/reorganization/libs/curl.m4 2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/m4/reorganization/libs/curl.m4 2021-04-06 16:39:49.284297541 +0200
+@@ -64,12 +64,12 @@ if test "X$have_curl" = "Xyes"; then
+ dnl end of section
+
+ AM_COND_IF([BUILD_CLAMONACC],
+- $enable_clamonacc="yes"
++ enable_clamonacc="yes"
+
+- clamonacc_curl = "current"
++ clamonacc_curl="current"
+ dnl if version less than to (7.40 0x072800)
+ [if test $curl_version -lt 468992; then
+- clamonacc_curl = "deprecated"
++ clamonacc_curl="deprecated"
+ fi]
+ )
+
projects / packages / clamav.git / blobdiff