- enable Lua support (bcond)

[packages/dovecot.git] / dovecot.spec

diff --git a/dovecot.spec b/dovecot.spec
index 50235ffe3e7773c653fd038f6fa5b7c3e3dc2bbd..7c1893d17d7a235a9cd03e989dc0d1866b26d46e 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without gssapi  # without GSSAPI support
 %bcond_without ldap    # without LDAP auth
+%bcond_without lua     # without Lua auth
 %bcond_without mysql   # without MySQL auth
 %bcond_without pgsql   # without PostgreSQL auth
 %bcond_without sqlite  # without SQLite3 auth
@@ -11,21 +12,19 @@
 Summary:       IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:          dovecot
-Version:       2.2.35
+Version:       2.3.5
 Release:       2
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
-Source0:       http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
-# Source0-md5: 6998a3b16c42a8b3c7086b03fa781fba
+Source0:       http://dovecot.org/releases/2.3/%{name}-%{version}.tar.gz
+# Source0-md5: 825bdeb8d5d505c43dadecbdff12e816
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-rpath.patch
-Patch2:                %{name}-local_name.patch
-Patch3:                %{name}-disableSSLv3.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -42,6 +41,7 @@ BuildRequires:        libicu-devel
 BuildRequires: libstemmer-devel
 BuildRequires: libexttextcat-devel
 BuildRequires: libtool
+%{?with_lua:BuildRequires:     lua53-devel}
 BuildRequires: lz4-devel
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.3}
@@ -162,8 +162,6 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
@@ -178,12 +176,14 @@ touch config.rpath
        ac_cv_prog_VALGRIND=no \
        CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer -D_LINUX_QUOTA_VERSION=2" \
        --disable-static \
+       --enable-hardening \
        %{?debug:--enable-debug} \
        %{?with_ldap:--with-ldap=yes} \
        %{?with_mysql:--with-mysql} \
        %{?with_pgsql:--with-pgsql} \
        %{?with_sqlite:--with-sqlite} \
        %{?with_gssapi:--with-gssapi=plugin} \
+       %{?with_lua:--with-lua=plugin} \
        --with-lucene \
        --with-stemmer \
        --with-solr \
@@ -340,6 +340,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/lmtp
 %attr(755,root,root) %{_libexecdir}/%{name}/log
 %attr(755,root,root) %{_libexecdir}/%{name}/maildirlock
+%attr(755,root,root) %{_libexecdir}/%{name}/old-stats
 %attr(755,root,root) %{_libexecdir}/%{name}/pop3
 %attr(755,root,root) %{_libexecdir}/%{name}/pop3-login
 %attr(755,root,root) %{_libexecdir}/%{name}/quota-status
@@ -347,8 +348,9 @@ fi
 %attr(755,root,root) %{_libexecdir}/%{name}/replicator
 %attr(755,root,root) %{_libexecdir}/%{name}/script
 %attr(755,root,root) %{_libexecdir}/%{name}/script-login
-%attr(755,root,root) %{_libexecdir}/%{name}/ssl-params
 %attr(755,root,root) %{_libexecdir}/%{name}/stats
+%attr(755,root,root) %{_libexecdir}/%{name}/submission
+%attr(755,root,root) %{_libexecdir}/%{name}/submission-login
 %attr(755,root,root) %{_libexecdir}/%{name}/xml2text
 %attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so
 %dir %{_libdir}/%{name}/plugins
@@ -359,8 +361,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/plugins/dict/*.so
 %dir %{_libdir}/%{name}/plugins/doveadm
 %attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so
-%dir %{_libdir}/%{name}/plugins/stats
-%attr(755,root,root) %{_libdir}/%{name}/plugins/stats/*.so
+%dir %{_libdir}/%{name}/plugins/old-stats
+%attr(755,root,root) %{_libdir}/%{name}/plugins/old-stats/*.so
 %{_datadir}/dovecot
 %{systemdunitdir}/dovecot.service
 %{systemdunitdir}/dovecot.socket