Merge branch 'master' into f29

ClamAV was updated in the stable Fedora branches to a version which
changes both the library version and the API.  This requires a rebuild
to avoid broken dependencies, but the rebuild requires a patch to
support the new API.

The patch was sent upstream in
https://github.com/cyrusimap/cyrus-imapd/issues/2621

cyrus-imapd.spec

@@ -693,38 +693,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 - Update to 3.0.10.
 - Drop upstreamed patch.
 
-* Thu May 16 2019 Pavel Zhukov <pzhukov@redhat.com> - 3.0.9-2
-- Run sscg as mail group for proper certs permissions
-
-* Thu Mar 14 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.9-1
-- Update to 3.0.9.
-
-* Mon Feb 11 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-10
-- Add pam configuration file for httpd auth.  Thanks to Jeroen van Meeuwen.
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 24 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-8
-- Update Perl linkage patch.
-
-* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 3.0.8-7
-- Rebuild for ICU 63
-
-* Wed Jan 23 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-6
-- Re-enable --as-needed, now that PCRE has been patched.
-- Add workaround for improper linking of some Perl modules.
-
-* Tue Jan 15 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-5
-- Disable passing --as-needed to to the linker.  This breaks cyrus horribly.
-- Re-enable Cassandane run.
-
-* Tue Jan 15 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-4
-- Allow building against ClamAV 0.101.
-- Add build dependency on glibc-langpack-en to slience some Perl complaints.
-
-* Thu Dec 13 2018 Pavel Zhukov <pzhukov@redhat.com> - 3.0.8-3
-- Temporary disable cassandane in master branch
+* Tue Jan 15 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-3
+- Add patch to allow a rebuild against the updated ClamAV.
 
 * Sun Oct 28 2018 Nils Philippsen <nils@tiptoe.de> - 3.0.8-2
 - remove jmap from list of httpmodules