From owner-svn-ports-head@freebsd.org Thu Jan 17 13:15:26 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2ACC1494E1C; Thu, 17 Jan 2019 13:15:25 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 908B58D661; Thu, 17 Jan 2019 13:15:25 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2674B1AA47; Thu, 17 Jan 2019 13:15:24 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0HDFOtg014379; Thu, 17 Jan 2019 13:15:24 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0HDFNOa014377; Thu, 17 Jan 2019 13:15:23 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201901171315.x0HDFNOa014377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Thu, 17 Jan 2019 13:15:23 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: ume X-SVN-Commit-Paths: in head/mail/cyrus-imapd30: . files X-SVN-Commit-Revision: 490560 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 908B58D661 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 13:15:26 -0000 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: