rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Enable clamav and mysql/mariadb support properly.

Browse Source 
For real, this time.
This commit is contained in:
Jason Tibbitts 2018-05-18 15:17:09 -05:00
parent 38ecc22e22
commit aa34e471a1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cyrus-imapd.spec
View File

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

2
patch-cyrus-managesieve-linking
View File

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