openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-02 04:51:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
1b5a0c901b
packages/net/clamav/patches/002-Avoid-libxml-checks-if-disable-xml-is-used.patch
hue715 44783fd3f3 clamav:sync with openwrt 19.07（Update to version 0.101.4） 
1、 clamav: avoid host pickup of libxml2
If libxml2 is installed in the host, then the host library is used and
compilation fails.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2、 clamav: Update to version 0.101.4
Change deprecated options to a new one:
DetectBrokenExecutables to AlertBrokenExecutables
ArchiveBlockEncrypted to AlertEncrypted

Fixes: CVE-2019-12900 and CVE-2019-12625

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
3、 clamav: Update init scripts

This replaces the use of uci_validate_section() with
uci_load_validate(), which removes the need to declare local variables
for every config option.

This also removes some unnecessary curly brackets.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
4、 clamav: don't install dev files into package

This avoids copying /usr/include, unversioned *.so files, pkgconfig,
/usr/lib/*.la, and the build-time libs/cflags configuration utility
clamav-config.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry-picked from 815e05e)
5、 clamav: Change depends from uclibcxx to CXX_DEPENDS

The build system allows changing uclibc++ to libstdcpp globally. This
avoids an unnecessary depends in the case of libstdcpp usage.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
6、 clamav: enable clamav-milter

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
7、 clamav: fix invalid zlib version error

ClamAV's configure script uses grep to check for bugy zlib version
1.2.1. Since current OpenWrt zlib version is 1.2.11 this check passes
and build fails. This patch will disable this unneeded check and make
sure we are looking for zlib on the right location.

clamdtop was beeing built without it's ncurses dependency. Build system
would link it to the host's ncurses making the program fail at run time.
This patch will disable building of optional clamdtop, otherwise we need
to add ncurses as a dependency and fix the search path.

Increase PKG_RELEASE to reflect changes.

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
2020-02-11 22:28:09 +08:00

168 lines
5.2 KiB
Diff
Raw Blame History

From de943f313fa5c17bf9cbd560a7578796991b24b5 Mon Sep 17 00:00:00 2001
From: Eneas U de Queiroz <cotequeiroz@gmail.com>
Date: Sat, 10 Aug 2019 19:43:20 -0300
Subject: [PATCH] Avoid libxml checks if --disable-xml is used
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
---
m4/reorganization/libs/xml.m4 | 126 +++++++++++++++++-----------------
1 file changed, 62 insertions(+), 64 deletions(-)
diff --git a/m4/reorganization/libs/xml.m4 b/m4/reorganization/libs/xml.m4
index 77b2c13a8..0709d2914 100644
--- a/m4/reorganization/libs/xml.m4
+++ b/m4/reorganization/libs/xml.m4
@@ -12,87 +12,85 @@ if test "X$want_xml" != "Xno"; then
@<:@default=/usr/local or /usr if not found in /usr/local@:>@]),
[with_xml_val=$withval]
)
-fi
-
-AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""],
- [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"],
- [XML_HOME="$with_xml_val"])
-AS_IF([test "x$XML_HOME" != "x"], [
- AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""])
- ])
+ AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""],
+ [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"],
+ [XML_HOME="$with_xml_val"])
-AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [
- AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"])
- ])
+ AS_IF([test "x$XML_HOME" != "x"], [
+ AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""])
+ ])
-if test "x$XML_HOME" != "x"; then
- AC_MSG_RESULT([$XML_HOME])
-else
- AC_MSG_RESULT([not found])
-fi
+ AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [
+ AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"])
+ ])
-found_xml="no"
-XMLCONF_VERSION=""
-XML_CPPFLAGS=""
-XML_LIBS=""
-if test "x$XML_HOME" != "x"; then
- AC_MSG_CHECKING([xml2-config version])
- XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
- if test "x%XMLCONF_VERSION" != "x"; then
- AC_MSG_RESULT([$XMLCONF_VERSION])
- found_xml="yes"
- XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
- XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
- AS_ECHO("$XML_CPPFLAGS")
- AS_ECHO("$XML_LIBS")
+ if test "x$XML_HOME" != "x"; then
+ AC_MSG_RESULT([$XML_HOME])
else
- AC_MSG_ERROR([xml2-config failed])
+ AC_MSG_RESULT([not found])
+ fi
+
+ found_xml="no"
+ XMLCONF_VERSION=""
+ XML_CPPFLAGS=""
+ XML_LIBS=""
+ if test "x$XML_HOME" != "x"; then
+ AC_MSG_CHECKING([xml2-config version])
+ XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
+ if test "x%XMLCONF_VERSION" != "x"; then
+ AC_MSG_RESULT([$XMLCONF_VERSION])
+ found_xml="yes"
+ XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
+ XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
+ AS_ECHO("$XML_CPPFLAGS")
+ AS_ECHO("$XML_LIBS")
+ else
+ AC_MSG_ERROR([xml2-config failed])
+ fi
fi
-fi
-working_xml="no"
-if test "X$found_xml" != "Xno"; then
- AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
+ working_xml="no"
+ if test "X$found_xml" != "Xno"; then
+ AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
- if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
- AC_MSG_RESULT([not found])
- else
- AC_MSG_RESULT([found])
- save_LIBS="$LIBS"
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $XML_LIBS"
+ if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
+ AC_MSG_RESULT([not found])
+ else
+ AC_MSG_RESULT([found])
+ save_LIBS="$LIBS"
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $XML_LIBS"
- AS_ECHO("CPPFLAGS: $CPPFLAGS")
- AS_ECHO("LD_FLAGS: $LDFLAGS")
+ AS_ECHO("CPPFLAGS: $CPPFLAGS")
+ AS_ECHO("LD_FLAGS: $LDFLAGS")
- AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"], [$XML_LIBS])
+ AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"], [$XML_LIBS])
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ fi
fi
-fi
-if test "$working_xml" = "yes"; then
- AC_DEFINE([HAVE_LIBXML2],1,[Define to 1 if you have the 'libxml2' library (-lxml2).])
- AC_SUBST(XML_CPPFLAGS)
- AC_SUBST(XML_LIBS)
- AC_MSG_NOTICE([Compiling and linking with libxml2 from $XML_HOME])
-else
- if test "$want_xml" = "yes"; then
- AC_MSG_ERROR([****** Please install libxml2 packages!])
+ if test "$working_xml" = "yes"; then
+ AC_DEFINE([HAVE_LIBXML2],1,[Define to 1 if you have the 'libxml2' library (-lxml2).])
+ AC_SUBST(XML_CPPFLAGS)
+ AC_SUBST(XML_LIBS)
+ AC_MSG_NOTICE([Compiling and linking with libxml2 from $XML_HOME])
else
- if test "$want_xml" != "no"; then
+ if test "$want_xml" = "yes"; then
+ AC_MSG_ERROR([****** Please install libxml2 packages!])
+ else
AC_MSG_NOTICE([****** libxml2 support unavailable])
fi
+ XML_CPPFLAGS=""
+ XML_LIBS=""
+ AC_SUBST(XML_CPPFLAGS)
+ AC_SUBST(XML_LIBS)
fi
- XML_CPPFLAGS=""
- XML_LIBS=""
- AC_SUBST(XML_CPPFLAGS)
- AC_SUBST(XML_LIBS)
fi
AM_CONDITIONAL([HAVE_LIBXML2], test "x$HAVE_LIBXML2" = "xyes")
--
2.21.0
Reference in New Issue View Git Blame Copy Permalink