Browse Source

Merge pull request #11672 from lucize/clamup

clamav: update to 0.102.2
lilik-openwrt-22.03
Hannu Nyman 5 years ago
committed by GitHub
parent
commit
6b90684e97
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 216 deletions
  1. +3
    -2
      net/clamav/Makefile
  2. +0
    -10
      net/clamav/patches/001-compile.patch
  3. +0
    -167
      net/clamav/patches/002-Avoid-libxml-checks-if-disable-xml-is-used.patch
  4. +0
    -37
      net/clamav/patches/010-openssl-deprecated.patch

+ 3
- 2
net/clamav/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=clamav
PKG_VERSION:=0.101.4
PKG_VERSION:=0.102.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/
PKG_HASH:=0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd
PKG_HASH:=89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \
Lucian Cristian <lucian.cristian@gmail.com>
@ -97,6 +97,7 @@ define Package/clamav/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clamconf $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clamdscan $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clamscan $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clamonacc $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sigtool $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/lib


+ 0
- 10
net/clamav/patches/001-compile.patch View File

@ -1,10 +0,0 @@
--- a/clamdscan/proto.c
+++ b/clamdscan/proto.c
@@ -59,6 +59,7 @@
#include "shared/misc.h"
#include "shared/clamdcom.h"
+#include <sys/un.h>
#include "proto.h"
#include "client.h"

+ 0
- 167
net/clamav/patches/002-Avoid-libxml-checks-if-disable-xml-is-used.patch View File

@ -1,167 +0,0 @@
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

+ 0
- 37
net/clamav/patches/010-openssl-deprecated.patch View File

@ -1,37 +0,0 @@
--- a/libclamav/crypto.c
+++ b/libclamav/crypto.c
@@ -53,6 +53,10 @@
#include <openssl/evp.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define X509_CRL_get0_nextUpdate X509_CRL_get_nextUpdate
+#endif
+
#if !defined(_WIN32)
#include <unistd.h>
#endif
@@ -132,12 +136,14 @@ time_t timegm(struct tm *t)
*/
int cl_initialize_crypto(void)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_load_error_strings();
SSL_library_init();
OpenSSL_add_all_digests();
OpenSSL_add_all_algorithms();
OpenSSL_add_all_ciphers();
ERR_load_crypto_strings();
+#endif
return 0;
}
@@ -1140,7 +1146,7 @@ X509_CRL *cl_load_crl(const char *file)
if ((x)) {
ASN1_TIME *tme;
- tme = X509_CRL_get_nextUpdate(x);
+ tme = X509_CRL_get0_nextUpdate(x);
if (!tme || X509_cmp_current_time(tme) < 0) {
X509_CRL_free(x);
return NULL;

Loading…
Cancel
Save