dovecot updated to 2.2.22

- auth: Auth caching was done too aggressively when %variables were
  used in default_fields, override_fields or LDAP pass/user_attrs.
  userdb result_* were also ignored when user was found from cache.
- imap: Fixed various assert-crashes caused v2.2.20+. Some of them
  caught actual hangs or otherwise unwanted behavior towards IMAP
  clients.
- Expunges were forgotten in some situations, for example when
  pipelining multiple IMAP MOVE commands.
- quota: Per-namespaces quota were broken for dict and count backends
  in v2.2.20+
- fts-solr: Search queries were using OR instead of AND as the
  separator for multi-token search queries in v2.2.20+.
- Single instance storage support wasn't really working in v2.2.16+
- dbox: POP3 message ordering wasn't working correctly.
- virtual plugin: Fixed crashes related to backend mailbox deletions.

.gitignore

@@ -97,3 +97,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.2-pigeonhole-0.4.10.tar.gz
 /dovecot-2.2-pigeonhole-0.4.11.tar.gz
 /dovecot-2.2-pigeonhole-0.4.12.tar.gz
+/dovecot-2.2.22.tar.gz

dovecot-2.1.10-waitonline.patch

@@ -1,11 +1,11 @@
-diff -up dovecot-2.2.19/dovecot.service.in.waitonline dovecot-2.2.19/dovecot.service.in
+diff -up dovecot-2.2.22/dovecot.service.in.waitonline dovecot-2.2.22/dovecot.service.in
---- dovecot-2.2.19/dovecot.service.in.waitonline	2015-10-05 12:51:42.578391891 +0200
+--- dovecot-2.2.22/dovecot.service.in.waitonline	2016-03-16 13:36:49.426772606 +0100
-+++ dovecot-2.2.19/dovecot.service.in	2015-10-05 12:53:20.143907826 +0200
++++ dovecot-2.2.22/dovecot.service.in	2016-03-16 13:47:23.923606903 +0100
 @@ -24,6 +24,7 @@ After=local-fs.target network.target
  
  [Service]
- Type=simple
+ Type=forking
 +ExecStartPre=/usr/libexec/dovecot/prestartscript
- ExecStart=@sbindir@/dovecot -F $OPTIONS
+ ExecStart=@sbindir@/dovecot
- ExecReload=@sbindir@/dovecot reload
+ PIDFile=@rundir@/master.pid
- PrivateTmp=true
+ ExecReload=@bindir@/doveadm reload

dovecot-2.2.13-online.patch

@@ -1,6 +1,6 @@
-diff -up dovecot-2.2.19/dovecot.service.in.online dovecot-2.2.19/dovecot.service.in
+diff -up dovecot-2.2.22/dovecot.service.in.online dovecot-2.2.22/dovecot.service.in
---- dovecot-2.2.19/dovecot.service.in.online	2015-10-05 12:53:55.985729999 +0200
+--- dovecot-2.2.22/dovecot.service.in.online	2016-03-16 13:47:47.112491206 +0100
-+++ dovecot-2.2.19/dovecot.service.in	2015-10-05 12:54:36.951526750 +0200
++++ dovecot-2.2.22/dovecot.service.in	2016-03-16 13:48:14.339355363 +0100
 @@ -20,7 +20,7 @@
  Description=Dovecot IMAP/POP3 email server
  Documentation=man:dovecot(1)
@@ -9,4 +9,4 @@ diff -up dovecot-2.2.19/dovecot.service.in.online dovecot-2.2.19/dovecot.service
 +After=local-fs.target network-online.target
  
  [Service]
- Type=simple
+ Type=forking

dovecot-2.2.20-initbysystemd.patch

@@ -1,6 +1,6 @@
-diff -up dovecot-2.2.20/dovecot-init.service.initbysystemd dovecot-2.2.20/dovecot-init.service
+diff -up dovecot-2.2.22/dovecot-init.service.initbysystemd dovecot-2.2.22/dovecot-init.service
---- dovecot-2.2.20/dovecot-init.service.initbysystemd	2015-12-08 18:44:31.264563464 +0100
+--- dovecot-2.2.22/dovecot-init.service.initbysystemd	2016-03-16 13:48:25.996297203 +0100
-+++ dovecot-2.2.20/dovecot-init.service	2015-12-08 18:44:31.264563464 +0100
++++ dovecot-2.2.22/dovecot-init.service	2016-03-16 13:48:25.996297203 +0100
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=One-time Dovecot init service
@@ -20,9 +20,9 @@ diff -up dovecot-2.2.20/dovecot-init.service.initbysystemd dovecot-2.2.20/doveco
 +  /usr/libexec/dovecot/ssl-params >/dev/null 2>&1; \
 +fi'
 +
-diff -up dovecot-2.2.20/dovecot.service.in.initbysystemd dovecot-2.2.20/dovecot.service.in
+diff -up dovecot-2.2.22/dovecot.service.in.initbysystemd dovecot-2.2.22/dovecot.service.in
---- dovecot-2.2.20/dovecot.service.in.initbysystemd	2015-12-08 18:44:31.263563465 +0100
+--- dovecot-2.2.22/dovecot.service.in.initbysystemd	2016-03-16 13:48:25.996297203 +0100
-+++ dovecot-2.2.20/dovecot.service.in	2015-12-08 18:44:31.264563464 +0100
++++ dovecot-2.2.22/dovecot.service.in	2016-03-16 13:49:17.619039641 +0100
 @@ -20,7 +20,8 @@
  Description=Dovecot IMAP/POP3 email server
  Documentation=man:dovecot(1)
@@ -32,11 +32,11 @@ diff -up dovecot-2.2.20/dovecot.service.in.initbysystemd dovecot-2.2.20/dovecot.
 +Requires=dovecot-init.service
  
  [Service]
- Type=simple
+ Type=forking
-diff -up dovecot-2.2.20/Makefile.am.initbysystemd dovecot-2.2.20/Makefile.am
+diff -up dovecot-2.2.22/Makefile.am.initbysystemd dovecot-2.2.22/Makefile.am
---- dovecot-2.2.20/Makefile.am.initbysystemd	2015-12-08 18:46:35.452435316 +0100
+--- dovecot-2.2.22/Makefile.am.initbysystemd	2016-03-04 12:04:33.000000000 +0100
-+++ dovecot-2.2.20/Makefile.am	2015-12-08 18:46:40.046430706 +0100
++++ dovecot-2.2.22/Makefile.am	2016-03-16 13:48:25.996297203 +0100
-@@ -54,9 +54,10 @@ if HAVE_SYSTEMD
+@@ -51,9 +51,10 @@ if HAVE_SYSTEMD
  
  systemdsystemunit_DATA = \
          dovecot.socket \

dovecot-2.2.22-systemd_w_protectsystem.patch

@@ -0,0 +1,12 @@
+diff -up dovecot-2.2.22/dovecot.service.in.systemd_w_protectsystem dovecot-2.2.22/dovecot.service.in
+--- dovecot-2.2.22/dovecot.service.in.systemd_w_protectsystem	2016-03-16 13:49:46.678894652 +0100
++++ dovecot-2.2.22/dovecot.service.in	2016-03-16 13:49:46.690894592 +0100
+@@ -33,7 +33,7 @@ ExecStop=@bindir@/doveadm stop
+ PrivateTmp=true
+ NonBlocking=yes
+ # Enable this if your systemd is new enough to support it:
+-#ProtectSystem=full
++ProtectSystem=full
+ 
+ [Install]
+ WantedBy=multi-user.target

dovecot.spec

@@ -3,9 +3,9 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.2.21
+Version: 2.2.22
 %global prever %{nil}
-Release: 4%{?dist}
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -27,13 +27,12 @@ Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-Patch5: dovecot-2.1-privatetmp.patch
-
 #wait for network
 Patch6: dovecot-2.1.10-waitonline.patch
 Patch7: dovecot-2.2.13-online.patch
 
 Patch8: dovecot-2.2.20-initbysystemd.patch
+Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch
 
 Source15: prestartscript
 
@@ -126,10 +125,10 @@ This package provides the development files for dovecot.
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
-%patch5 -p1 -b .privatetmp
 %patch6 -p1 -b .waitonline
 %patch7 -p1 -b .online
 %patch8 -p1 -b .initbysystemd
+%patch9 -p1 -b .systemd_w_protectsystem
 #pushd dovecot-2*2-pigeonhole-%{pigeonholever}
 #popd
 sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
@@ -479,6 +478,24 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Wed Mar 16 2016 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.22-1
+- dovecot updated to 2.2.22
+- auth: Auth caching was done too aggressively when %variables were
+  used in default_fields, override_fields or LDAP pass/user_attrs.
+  userdb result_* were also ignored when user was found from cache.
+- imap: Fixed various assert-crashes caused v2.2.20+. Some of them
+  caught actual hangs or otherwise unwanted behavior towards IMAP
+  clients.
+- Expunges were forgotten in some situations, for example when
+  pipelining multiple IMAP MOVE commands.
+- quota: Per-namespaces quota were broken for dict and count backends
+  in v2.2.20+
+- fts-solr: Search queries were using OR instead of AND as the
+  separator for multi-token search queries in v2.2.20+.
+- Single instance storage support wasn't really working in v2.2.16+
+- dbox: POP3 message ordering wasn't working correctly.
+- virtual plugin: Fixed crashes related to backend mailbox deletions.
+
 * Mon Feb 08 2016 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.21-4
 - pigeonhole updated to 0.4.12
 - multiscript: Fixed bug in handling of (implicit) keep; final keep action was

sources

@@ -1,2 +1,2 @@
-28c39ab78a20f00701c26960d9190cf0  dovecot-2.2.21.tar.gz
+bc8057bd5bdfa0f8e80e2fef1082a241  dovecot-2.2.22.tar.gz
 eb96e65be62c71f987a3b5ad2d782b7b  dovecot-2.2-pigeonhole-0.4.12.tar.gz