Enable clamav and mysql/mariadb support properly.

For real, this time.

cyrus-imapd.spec

@@ -9,7 +9,7 @@
 
 Name: cyrus-imapd
 Version: 3.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
 
@@ -244,11 +244,13 @@ autoreconf -vi
     --disable-silent-rules \
     \
     --libexecdir=%cyrexecdir \
+    --with-clamav \
     --with-extraident="%release Fedora" \
     --with-krbimpl=mit \
     --with-ldap=/usr \
-    --with-pgsql \
     --with-libwrap=no \
+    --with-mysql \
+    --with-pgsql \
     --with-perl=%__perl \
     --with-snmp \
     --with-syslogfacility=MAIL \
@@ -264,7 +266,6 @@ autoreconf -vi
     --enable-replication \
     --enable-unit-tests \
     --enable-xapian \
-    --without-clamav \
 #
 
 # The configure script will set up the Perl makefiles, but not in the way
@@ -619,6 +620,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-2
+- Really enable mysql and clamav support.
+
 * Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-1
 - Update to 3.0.7.
 - Update Cassandane checkout.

patch-cyrus-managesieve-linking

@@ -7,7 +7,7 @@ index 2bb715d..422504d 100644
      'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
      'MYEXTLIB'  => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
 -    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
-+    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ -lsqlite3 -lpq"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ -lsqlite3 -lpq -lmariadb"],
      'CCFLAGS'	=> '@GCOV_CFLAGS@',
      'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
      'INC'	=> "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",