Date: Thu, 17 Jan 2019 13:15:23 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490560 - in head/mail/cyrus-imapd30: . files Message-ID: <201901171315.x0HDFNOa014377@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Thu Jan 17 13:15:23 2019 New Revision: 490560 URL: https://svnweb.freebsd.org/changeset/ports/490560 Log: Make it buildable with clamav-0.101.X. PR: 235002 Obtained from: https://github.com/cyrusimap/cyrus-imapd/commit/09b5bf11e12185727d53a6ae06d71a767952a537#diff-e162ed934ed89d2014e496fc1961be01 Added: head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c (contents, props changed) Modified: head/mail/cyrus-imapd30/Makefile Modified: head/mail/cyrus-imapd30/Makefile ============================================================================== --- head/mail/cyrus-imapd30/Makefile Thu Jan 17 13:15:22 2019 (r490559) +++ head/mail/cyrus-imapd30/Makefile Thu Jan 17 13:15:23 2019 (r490560) @@ -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 \ Added: head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c Thu Jan 17 13:15:23 2019 (r490560) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901171315.x0HDFNOa014377>