1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Make it buildable with clamav-0.101.X.

PR:		235002
Obtained from:	09b5bf11e1 (diff-e162ed934ed89d2014e496fc1961be01)
This commit is contained in:
Hajimu UMEMOTO 2019-01-17 13:15:23 +00:00
parent af23a62324
commit a695b90823
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=490560
2 changed files with 20 additions and 1 deletions

View File

@ -58,7 +58,6 @@ BACKUP_CONFIGURE_ENABLE=backup
CLAMAV_DESC= Use ClamAV
CLAMAV_CONFIGURE_WITH= clamav
CLAMAV_LIB_DEPENDS= libclamav.so:security/clamav
CLAMAV_BROKEN= Not buildable with latest clamav
HTTP_DESC= Enable HTTP support
HTTP_CONFIGURE_ENABLE= http
HTTP_LIB_DEPENDS= libical.so:devel/libical \

View File

@ -0,0 +1,20 @@
--- imap/cyr_virusscan.c.orig 2018-08-10 02:59:00 UTC
+++ imap/cyr_virusscan.c
@@ -193,8 +193,17 @@ int clamav_scanfile(void *state, const c
int r;
/* scan file */
+#ifdef CL_SCAN_STDOPT
r = cl_scanfile(fname, virname, NULL, st->av_engine,
CL_SCAN_STDOPT);
+#else
+ static struct cl_scan_options options;
+
+ memset(&options, 0, sizeof(struct cl_scan_options));
+ options.parse |= ~0; /* enable all parsers */
+
+ r = cl_scanfile(fname, virname, NULL, st->av_engine, &options);
+#endif
switch (r) {
case CL_CLEAN: