cyrus-imapd-clamav-0.101.patch

   1 Support clamav >= 0.101.0, based on changes introduced in:
   2
   3 https://github.com/Cisco-Talos/clamav-devel/commit/048a88e61558726bd9ba66ec3195b63d61d8a430
   4
   5 --- cyrus-imapd-3.0.8/imap/cyr_virusscan.c.orig 2018-08-10 04:59:00.000000000 +0200
   6 +++ cyrus-imapd-3.0.8/imap/cyr_virusscan.c      2018-12-10 10:51:08.776406893 +0100
   7 @@ -193,8 +193,17 @@
   8      int r;
   9
  10      /* scan file */
  11 +#if LIBCLAMAV_MAJORVER < 9
  12      r = cl_scanfile(fname, virname, NULL, st->av_engine,
  13                      CL_SCAN_STDOPT);
  14 +#else
  15 +    static struct cl_scan_options options;
  16 +
  17 +    memset(&options, 0, sizeof(struct cl_scan_options));
  18 +    options.parse |= ~0; /* enable all parsers */
  19 +
  20 +    r = cl_scanfile(fname, virname, NULL, st->av_engine, &options);
  21 +#endif
  22
  23      switch (r) {
  24      case CL_CLEAN:
  25 --- cyrus-imapd-3.0.8/Makefile.am.orig  2018-12-10 12:15:51.580494168 +0100
  26 +++ cyrus-imapd-3.0.8/Makefile.am       2018-12-10 12:14:59.394460523 +0100
  27 @@ -879,6 +879,7 @@
  28  imap_cyr_sphinxmgr_LDADD = $(LD_UTILITY_ADD)
  29
  30  imap_cyr_virusscan_SOURCES = imap/cli_fatal.c imap/cyr_virusscan.c imap/mutex_fake.c
  31 +imap_cyr_virusscan_CFLAGS = $(AM_CFLAGS) $(CLAMAV_CFLAGS) $(CFLAG_VISIBILITY)
  32  imap_cyr_virusscan_LDADD = $(LD_UTILITY_ADD) $(CLAMAV_LIBS)
  33
  34  imap_ctl_zoneinfo_SOURCES = imap/cli_fatal.c imap/ctl_zoneinfo.c imap/mutex_fake.c imap/zoneinfo_db.c