mirror of
https://github.com/coolsnowwolf/packages.git
synced 2025-05-01 11:51:33 +08:00
44783fd3f3
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>
38 lines
863 B
Diff
38 lines
863 B
Diff
--- 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;
|