From 74a10bb5f91748a0906ae01bd3b4b34dfb550cc5 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 19 Jan 2018 10:13:21 +0000 Subject: [PATCH] - updated to 2.2.33.2, partial PLD merge to keep spec in sync --- dovecot-disableSSLv3.patch | 9 +-- dovecot.spec | 145 +++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 74 deletions(-) diff --git a/dovecot-disableSSLv3.patch b/dovecot-disableSSLv3.patch index 3033e01..00be874 100644 --- a/dovecot-disableSSLv3.patch +++ b/dovecot-disableSSLv3.patch @@ -1,10 +1,9 @@ ---- doc/example-config/conf.d/10-ssl.conf.orig 2016-12-30 20:34:12.730416568 +0100 -+++ doc/example-config/conf.d/10-ssl.conf 2016-12-30 20:36:58.630402918 +0100 -@@ -46,10 +46,10 @@ - #ssl_dh_parameters_length = 1024 +--- dovecot-2.2.27/doc/example-config/conf.d/10-ssl.conf~ 2016-12-03 21:37:57.000000000 +0100 ++++ dovecot-2.2.27/doc/example-config/conf.d/10-ssl.conf 2016-12-03 21:38:42.082007401 +0100 +@@ -47,9 +47,10 @@ ssl = no # SSL protocols to use --#ssl_protocols = !SSLv3 + #ssl_protocols = !SSLv3 +ssl_protocols = !SSLv2 !SSLv3 # SSL ciphers to use diff --git a/dovecot.spec b/dovecot.spec index 7461b63..f1055b7 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -1,3 +1,4 @@ +# # Conditional build: %bcond_without gssapi # without GSSAPI support %bcond_without ldap # without LDAP auth @@ -10,13 +11,13 @@ 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.27 +Version: 2.2.33.2 Release: 1 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: 20133518f5bc0e64dd07ce55b83df2fb +# Source0-md5: 85c3e903870aee914be93889a6ea98ea Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}.sysconfig @@ -33,6 +34,7 @@ BuildRequires: curl-devel BuildRequires: expat-devel BuildRequires: gettext-tools %{?with_gssapi:BuildRequires: heimdal-devel} +BuildRequires: libapparmor-devel BuildRequires: libcap-devel BuildRequires: libicu-devel BuildRequires: libstemmer-devel @@ -61,7 +63,9 @@ Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: pam >= 0.79.0 Provides: group(dovecot) Provides: imapdaemon +Provides: pop3daemon Provides: user(dovecot) +%{?with_gssapi:Obsoletes: heimdal-daemons} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define no_install_post_check_so 1 @@ -128,6 +132,17 @@ Stan: - quota Maildir++ jest obsługiwana, ale twarda quota na systemach plików może być problematyczna +%package libs +Summary: Dovecot shared libraries +Summary(pl.UTF-8): Współdzielone biblioteki Dovecota +Group: Development/Libraries + +%description libs +Dovecot shared libraries. + +%description libs -l pl.UTF-8 +Współdzielone biblioteki Dovecota. + %package devel Summary: Development package for Dovecot plugins Summary(pl.UTF-8): Pakiet programistyczny do tworzenia wtyczek dla Dovecota @@ -140,35 +155,24 @@ Development package for Dovecot plugins. %description devel -l pl.UTF-8 Pakiet programistyczny do tworzenia wtyczek dla Dovecota. -%package libs -Summary: Dovecot shared libraries -Summary(pl.UTF-8): Współdzielone biblioteki Dovecota -Group: Development/Libraries - -%description libs -Dovecot shared libraries. - -%description libs -l pl.UTF-8 -Współdzielone biblioteki Dovecota. - %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p0 +%patch2 -p1 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf %build touch config.rpath %{__libtoolize} -%{__aclocal} -I . +%{__aclocal} -I . -I m4 %{__autoconf} %{__autoheader} %{__automake} %configure \ ac_cv_prog_VALGRIND=no \ - CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer" \ + CPPFLAGS="%{rpmcppflags} -I/usr/include/libstemmer -D_LINUX_QUOTA_VERSION=2" \ --disable-static \ %{?debug:--enable-debug} \ %{?with_ldap:--with-ldap=yes} \ @@ -295,41 +299,45 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} -%attr(755,root,root) %{_libdir}/%{name}/aggregator -%attr(755,root,root) %{_libdir}/%{name}/anvil -%attr(755,root,root) %{_libdir}/%{name}/auth -%attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply -%attr(755,root,root) %{_libdir}/%{name}/config -%attr(755,root,root) %{_libdir}/%{name}/decode2text.sh -%attr(755,root,root) %{_libdir}/%{name}/deliver -%attr(755,root,root) %{_libdir}/%{name}/dict -%attr(755,root,root) %{_libdir}/%{name}/director -%attr(755,root,root) %{_libdir}/%{name}/dns-client -%attr(755,root,root) %{_libdir}/%{name}/doveadm-server -%attr(755,root,root) %{_libdir}/%{name}/dovecot-lda -%attr(755,root,root) %{_libdir}/%{name}/gdbhelper -%attr(755,root,root) %{_libdir}/%{name}/imap -%attr(755,root,root) %{_libdir}/%{name}/imap-hibernate -%attr(755,root,root) %{_libdir}/%{name}/imap-login -%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth -%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth-login -%attr(755,root,root) %{_libdir}/%{name}/imap-urlauth-worker -%attr(755,root,root) %{_libdir}/%{name}/indexer -%attr(755,root,root) %{_libdir}/%{name}/indexer-worker -%attr(755,root,root) %{_libdir}/%{name}/ipc -%attr(755,root,root) %{_libdir}/%{name}/lmtp -%attr(755,root,root) %{_libdir}/%{name}/log -%attr(755,root,root) %{_libdir}/%{name}/maildirlock -%attr(755,root,root) %{_libdir}/%{name}/pop3 -%attr(755,root,root) %{_libdir}/%{name}/pop3-login -%attr(755,root,root) %{_libdir}/%{name}/quota-status -%attr(755,root,root) %{_libdir}/%{name}/rawlog -%attr(755,root,root) %{_libdir}/%{name}/replicator -%attr(755,root,root) %{_libdir}/%{name}/script -%attr(755,root,root) %{_libdir}/%{name}/script-login -%attr(755,root,root) %{_libdir}/%{name}/ssl-params -%attr(755,root,root) %{_libdir}/%{name}/stats -%attr(755,root,root) %{_libdir}/%{name}/xml2text +%if "%{_libexecdir}" != "%{_libdir}" +%dir %{_libexecdir}/%{name} +%endif +%attr(755,root,root) %{_libexecdir}/%{name}/aggregator +%attr(755,root,root) %{_libexecdir}/%{name}/anvil +%attr(755,root,root) %{_libexecdir}/%{name}/auth +%attr(755,root,root) %{_libexecdir}/%{name}/checkpassword-reply +%attr(755,root,root) %{_libexecdir}/%{name}/config +%attr(755,root,root) %{_libexecdir}/%{name}/decode2text.sh +%attr(755,root,root) %{_libexecdir}/%{name}/deliver +%attr(755,root,root) %{_libexecdir}/%{name}/dict +%attr(755,root,root) %{_libexecdir}/%{name}/director +%attr(755,root,root) %{_libexecdir}/%{name}/dns-client +%attr(755,root,root) %{_libexecdir}/%{name}/doveadm-server +%attr(755,root,root) %{_libexecdir}/%{name}/dovecot-lda +%attr(755,root,root) %{_libexecdir}/%{name}/gdbhelper +%attr(755,root,root) %{_libexecdir}/%{name}/imap +%attr(755,root,root) %{_libexecdir}/%{name}/imap-hibernate +%attr(755,root,root) %{_libexecdir}/%{name}/imap-login +%attr(755,root,root) %{_libexecdir}/%{name}/imap-urlauth +%attr(755,root,root) %{_libexecdir}/%{name}/imap-urlauth-login +%attr(755,root,root) %{_libexecdir}/%{name}/imap-urlauth-worker +%attr(755,root,root) %{_libexecdir}/%{name}/indexer +%attr(755,root,root) %{_libexecdir}/%{name}/indexer-worker +%attr(755,root,root) %{_libexecdir}/%{name}/ipc +%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}/pop3 +%attr(755,root,root) %{_libexecdir}/%{name}/pop3-login +%attr(755,root,root) %{_libexecdir}/%{name}/quota-status +%attr(755,root,root) %{_libexecdir}/%{name}/rawlog +%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}/xml2text +%attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so %dir %{_libdir}/%{name}/plugins %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so %dir %{_libdir}/%{name}/plugins/auth @@ -350,21 +358,6 @@ fi %{_mandir}/man1/dsync.1* %{_mandir}/man7/doveadm-search-query.7* -%files devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-fts.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so -%{_libdir}/%{name}/%{name}-config -%{_includedir}/%{name} -%{_aclocaldir}/dovecot.m4 - %files libs %defattr(644,root,root,755) %dir %{_libdir}/%{name} @@ -374,7 +367,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-fts.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0.0.0 -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so.0.0.0 +%{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so.0.0.0} %attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0.0.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0.0.0 @@ -385,8 +378,22 @@ fi %attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-fts.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0 -%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so.0 +%{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so.0} %attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0 %attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0 -%attr(755,root,root) %{_libdir}/%{name}/libdcrypt_openssl.so + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-fts.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so +%{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ldap.so} +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so +%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so +%{_libdir}/%{name}/%{name}-config +%{_includedir}/%{name} +%{_aclocaldir}/dovecot.m4 -- 2.44.0