dovecot updated to 2.3.6, pigeonhole updated to 0.5.6

dovecot updated to 2.3.5.2
fixes CVE-2019-10691: Trying to login with 8bit username containing invalid UTF8 input causes auth process to crash if auth policy is enabled.
2019-05-02 17:36:52 +02:00 · 2019-04-18 15:03:49 +02:00 · 2019-03-28 17:41:58 +01:00 · 2019-03-06 18:20:14 +01:00 · 2019-01-09 18:20:00 +01:00 · 2018-10-03 16:45:19 +02:00
9 changed files with 138 additions and 205 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,122 +1,2 @@
-dovecot-2.0.rc3.tar.gz
-pigeonhole-snap01ee63b788c9.tar.bz2
-dovecot-2.0.rc4.tar.gz
-pigeonhole-snapcac6acdc4d0e.tar.bz2
-dovecot-2.0.rc5.tar.gz
-pigeonhole-snap0592366457df.tar.bz2
-/dovecot-2.0.0.tar.gz
-/pigeonhole-snap1ae9569b0383.tar.bz2
-/dovecot-2.0.1.tar.gz
-/pigeonhole-snapd51650c8af85.tar.bz2
-/dovecot-2.0.2.tar.gz
-/pigeonhole-snapfbcb05e7eda1.tar.bz2
-/dovecot-2.0.3.tar.gz
-/pigeonhole-snapcb4c1ebecff3.tar.bz2
-/dovecot-2.0.4.tar.gz
-/pigeonhole-snap824454514f08.tar.bz2
-/dovecot-2.0.5.tar.gz
-/pigeonhole-snapa50464354f5a.tar.bz2
-/dovecot-2.0.6.tar.gz
-/pigeonhole-snap2023f8c74250.tar.bz2
-/dovecot-2.0.7.tar.gz
-/pigeonhole-snapa8cc6294071e.tar.bz2
-/dovecot-2.0.8.tar.gz
-/pigeonhole-snap67d2240966ec.tar.bz2
-/dovecot-2.0-pigeonhole-0.2.2.tar.gz
-/dovecot-2.0.9.tar.gz
-/dovecot-2.0.11.tar.gz
-/dovecot-2.0.12.tar.gz
-/dovecot-2.0-pigeonhole-0.2.3.tar.gz
-/dovecot-2.0.13.tar.gz
-/dovecot-2.0.14.tar.gz
-/dovecot-2.0.15.tar.gz
-/dovecot-2.0.16.tar.gz
-/dovecot-2.1.rc1.tar.gz
-/dovecot-2.1-pigeonhole-b3bff60a18da.tar.bz2
-/dovecot-2.1.rc3.tar.gz
-/dovecot-2.1.rc5.tar.gz
-/dovecot-2.1-pigeonhole-a130a50f82e1.tar.bz2
-/dovecot-2.1.rc6.tar.gz
-/dovecot-2.1-pigeonhole-b2a456e15ed5.tar.bz2
-/dovecot-2.1.0.tar.gz
-/dovecot-2.1-pigeonhole-0.3.0.tar.gz
-/dovecot-2.1.1.tar.gz
-/pigeonhole-snap67950c9d3675.tar.bz2
-/dovecot-2.1.2.tar.gz
-/pigeonhole-snap08a2d2718a65.tar.bz2
-/dovecot-2.1.3.tar.gz
-/dovecot-2.1.4.tar.gz
-/dovecot-2.1.5.tar.gz
-/dovecot-2.1.6.tar.gz
-/dovecot-2.1.7.tar.gz
-/dovecot-2.1-pigeonhole-0.3.1.tar.gz
-/dovecot-2.1.8.tar.gz
-/dovecot-2.1.9.tar.gz
-/dovecot-2.1.10.tar.gz
-/dovecot-2.1-pigeonhole-0.3.3.tar.gz
-/dovecot-2.1.12.tar.gz
-/dovecot-2.1.13.tar.gz
-/dovecot-2.1.14.tar.gz
-/dovecot-2.1.15.tar.gz
-/dovecot-2.2.rc2.tar.gz
-/pigeonhole-99eec511aa2c.tar.bz2
-/dovecot-2.2.rc3.tar.gz
-/dovecot-2.2.rc4.tar.gz
-/dovecot-2.2.0.tar.gz
-/dovecot-2.2.1.tar.gz
-/pigeonhole-snape42a38f02d28.tar.bz2
-/dovecot-2.2-pigeonhole-0.4.0.tar.gz
-/dovecot-2.2.2.tar.gz
-/dovecot-2.2.3.tar.gz
-/dovecot-2.2.4.tar.gz
-/dovecot-2.2-pigeonhole-0.4.1.tar.gz
-/dovecot-2.2.5.tar.gz
-/dovecot-2.2.6.tar.gz
-/dovecot-2.2-pigeonhole-0.4.2.tar.gz
-/dovecot-2.2.7.tar.gz
-/dovecot-2.2.8.tar.gz
-/dovecot-2.2.9.tar.gz
-/dovecot-2.2.10.tar.gz
-/dovecot-2.2.11.tar.gz
-/dovecot-2.2.12.tar.gz
-/dovecot-2.2.13.tar.gz
-/dovecot-2.2.14.tar.gz
-/dovecot-2.2-pigeonhole-0.4.3.tar.gz
-/dovecot-2.2.15.tar.gz
-/pigeonhole-snapded0c5a467aa.tar.bz2
-/dovecot-2.2-pigeonhole-0.4.6.tar.gz
-/dovecot-2.2.16.tar.gz
-/dovecot-2.2.17.tar.gz
-/dovecot-2.2.18.tar.gz
-/dovecot-2.2-pigeonhole-0.4.7.tar.gz
-/dovecot-2.2-pigeonhole-0.4.8.tar.gz
-/dovecot-2.2.19.tar.gz
-/dovecot-2.2-pigeonhole-0.4.9.tar.gz
-/dovecot-2.2.20.tar.gz
-/dovecot-2.2.21.tar.gz
-/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.2.23.tar.gz
-/dovecot-2.2-pigeonhole-0.4.13.tar.gz
-/dovecot-2.2.24.tar.gz
-/dovecot-2.2-pigeonhole-0.4.14.tar.gz
-/dovecot-2.2.25.tar.gz
-/dovecot-2.2.26.0.tar.gz
-/dovecot-2.2-pigeonhole-0.4.16.tar.gz
-/dovecot-2.2.27.tar.gz
-/dovecot-2.2.28.tar.gz
-/dovecot-2.2-pigeonhole-0.4.17.tar.gz
-/dovecot-2.2.29.tar.gz
-/dovecot-2.2.29.1.tar.gz
-/dovecot-2.2-pigeonhole-0.4.18.tar.gz
-/dovecot-2.2.30.1.tar.gz
-/dovecot-2.2.30.2.tar.gz
-/dovecot-2.2.31.tar.gz
-/dovecot-2.2-pigeonhole-0.4.19.tar.gz
-/dovecot-2.2.32.tar.gz
-/dovecot-2.2-pigeonhole-0.4.20.tar.gz
-/dovecot-2.2.33.1.tar.gz
-/dovecot-2.2-pigeonhole-0.4.21.tar.gz
-/dovecot-2.2.33.2.tar.gz
+/dovecot-*.tar.gz
+/pigeonhole-*.tar.bz2
--- a/dovecot-2.0-defaultconfig.patch
+++ b/dovecot-2.0-defaultconfig.patch
@ -1,7 +1,7 @@
-diff -up dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf
--- dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf.default-settings	2014-06-02 13:50:10.000000000 +0200
-+++ dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf	2015-08-24 17:09:03.866648631 +0200
-@@ -283,6 +283,7 @@ namespace inbox {
+diff -up dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf
+--- dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf.default-settings	2018-02-28 15:28:57.000000000 +0100
+++ dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf	2018-03-01 10:29:38.208368555 +0100
+@@ -322,6 +322,7 @@ protocol !indexer-worker {
 # them simultaneously.
 #mbox_read_locks = fcntl
 #mbox_write_locks = dotlock fcntl
@ -9,9 +9,9 @@ diff -up dovecot-2.2.18/doc/example-config/conf.d/10-mail.conf.default-settings
 
 # Maximum time to wait for lock (all of them) before aborting.
 #mbox_lock_timeout = 5 mins
-diff -up dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf
--- dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf.default-settings	2014-10-03 16:36:00.000000000 +0200
-+++ dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf	2015-08-24 17:10:49.536071649 +0200
+diff -up dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf
+--- dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf.default-settings	2018-02-28 15:28:57.000000000 +0100
+++ dovecot-2.3.0.1/doc/example-config/conf.d/10-ssl.conf	2018-03-01 10:33:54.779499044 +0100
@@ -3,7 +3,9 @@
 ##
 
@ -23,11 +23,11 @@ diff -up dovecot-2.2.18/doc/example-config/conf.d/10-ssl.conf.default-settings d
 
 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
 # dropping root privileges, so keep the key file unreadable by anyone but
-@@ -50,6 +52,7 @@ ssl_key = </etc/ssl/private/dovecot.pem
- 
- # SSL ciphers to use
- #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
+@@ -57,6 +59,7 @@ ssl_key = </etc/ssl/private/dovecot.pem
+ #ssl_cipher_list = ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH
+ # To disable non-EC DH, use:
+ #ssl_cipher_list = ALL:!DH:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH
 +ssl_cipher_list = PROFILE=SYSTEM
 
- # Prefer the server's order of ciphers over client's.
- #ssl_prefer_server_ciphers = no
+ # Colon separated list of elliptic curves to use. Empty value (the default)
+ # means use the defaults from the SSL library. P-521:P-384:P-256 would be an
--- a/dovecot-2.1.10-waitonline.patch
+++ b/dovecot-2.1.10-waitonline.patch
@ -1,11 +1,11 @@
-diff -up dovecot-2.2.22/dovecot.service.in.waitonline dovecot-2.2.22/dovecot.service.in
--- dovecot-2.2.22/dovecot.service.in.waitonline	2016-03-16 13:36:49.426772606 +0100
-+++ 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
+diff -up dovecot-2.3.0.1/dovecot.service.in.waitonline dovecot-2.3.0.1/dovecot.service.in
+--- dovecot-2.3.0.1/dovecot.service.in.waitonline	2018-03-01 10:35:39.888371078 +0100
+++ dovecot-2.3.0.1/dovecot.service.in	2018-03-01 10:36:29.738784661 +0100
+@@ -12,6 +12,7 @@ After=local-fs.target network-online.tar
 
 [Service]
- Type=forking
+ Type=simple
 +ExecStartPre=/usr/libexec/dovecot/prestartscript
- ExecStart=@sbindir@/dovecot
+ ExecStart=@sbindir@/dovecot -F
 PIDFile=@rundir@/master.pid
 ExecReload=@bindir@/doveadm reload
--- a/dovecot-2.2.13-online.patch
+++ b/dovecot-2.2.13-online.patch
@ -1,12 +0,0 @@
-diff -up dovecot-2.2.22/dovecot.service.in.online dovecot-2.2.22/dovecot.service.in
--- dovecot-2.2.22/dovecot.service.in.online	2016-03-16 13:47:47.112491206 +0100
-+++ 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)
- Documentation=http://wiki2.dovecot.org/
-After=local-fs.target network.target
-+After=local-fs.target network-online.target
- 
- [Service]
- Type=forking
--- a/dovecot-2.2.20-initbysystemd.patch
+++ b/dovecot-2.2.20-initbysystemd.patch
@ -1,10 +1,9 @@
-diff -up dovecot-2.2.22/dovecot-init.service.initbysystemd dovecot-2.2.22/dovecot-init.service
--- dovecot-2.2.22/dovecot-init.service.initbysystemd	2016-03-16 13:48:25.996297203 +0100
-+++ dovecot-2.2.22/dovecot-init.service	2016-03-16 13:48:25.996297203 +0100
-@@ -0,0 +1,18 @@
+diff -up dovecot-2.3.0.1/dovecot-init.service.initbysystemd dovecot-2.3.0.1/dovecot-init.service
+--- dovecot-2.3.0.1/dovecot-init.service.initbysystemd	2018-03-01 10:38:22.059716008 +0100
+++ dovecot-2.3.0.1/dovecot-init.service	2018-03-01 10:38:22.059716008 +0100
+@@ -0,0 +1,13 @@
 +[Unit]
 +Description=One-time Dovecot init service
-+ConditionPathExists=|!/var/lib/dovecot/ssl-parameters.dat
 +ConditionPathExists=|!/etc/pki/dovecot/certs/dovecot.pem
 +
 +[Service]
@ -14,16 +13,12 @@ diff -up dovecot-2.2.22/dovecot-init.service.initbysystemd dovecot-2.2.22/doveco
 +if [ ! -f /etc/pki/dovecot/certs/dovecot.pem ]; \
 +then\
 +  SSLDIR=/etc/pki/dovecot/ OPENSSLCONFIG=/etc/pki/dovecot/dovecot-openssl.cnf /usr/libexec/dovecot/mkcert.sh /dev/null 2>&1;\
-+fi;\
-+if [ ! -f /var/lib/dovecot/ssl-parameters.dat ]; \
-+then\
-+  /usr/libexec/dovecot/ssl-params >/dev/null 2>&1; \
 +fi'
 +
-diff -up dovecot-2.2.22/dovecot.service.in.initbysystemd dovecot-2.2.22/dovecot.service.in
--- dovecot-2.2.22/dovecot.service.in.initbysystemd	2016-03-16 13:48:25.996297203 +0100
-+++ dovecot-2.2.22/dovecot.service.in	2016-03-16 13:49:17.619039641 +0100
-@@ -20,7 +20,8 @@
+diff -up dovecot-2.3.0.1/dovecot.service.in.initbysystemd dovecot-2.3.0.1/dovecot.service.in
+--- dovecot-2.3.0.1/dovecot.service.in.initbysystemd	2018-03-01 10:38:22.060716016 +0100
+++ dovecot-2.3.0.1/dovecot.service.in	2018-03-01 10:40:45.524901319 +0100
+@@ -8,7 +8,8 @@
 Description=Dovecot IMAP/POP3 email server
 Documentation=man:dovecot(1)
 Documentation=http://wiki2.dovecot.org/
@ -32,11 +27,11 @@ diff -up dovecot-2.2.22/dovecot.service.in.initbysystemd dovecot-2.2.22/dovecot.
 +Requires=dovecot-init.service
 
 [Service]
- Type=forking
-diff -up dovecot-2.2.22/Makefile.am.initbysystemd dovecot-2.2.22/Makefile.am
--- dovecot-2.2.22/Makefile.am.initbysystemd	2016-03-04 12:04:33.000000000 +0100
-+++ dovecot-2.2.22/Makefile.am	2016-03-16 13:48:25.996297203 +0100
-@@ -51,9 +51,10 @@ if HAVE_SYSTEMD
+ Type=simple
+diff -up dovecot-2.3.0.1/Makefile.am.initbysystemd dovecot-2.3.0.1/Makefile.am
+--- dovecot-2.3.0.1/Makefile.am.initbysystemd	2018-02-28 15:28:57.000000000 +0100
+++ dovecot-2.3.0.1/Makefile.am	2018-03-01 10:38:22.060716016 +0100
+@@ -63,9 +63,10 @@ if HAVE_SYSTEMD
 
 systemdsystemunit_DATA = \
         dovecot.socket \
--- a/dovecot-2.2.22-systemd_w_protectsystem.patch
+++ b/dovecot-2.2.22-systemd_w_protectsystem.patch
@ -1,14 +1,11 @@
-diff -up dovecot-2.2.28/dovecot.service.in.systemd_w_protectsystem dovecot-2.2.28/dovecot.service.in
--- dovecot-2.2.28/dovecot.service.in.systemd_w_protectsystem	2017-02-27 10:00:14.647423500 +0100
-+++ dovecot-2.2.28/dovecot.service.in	2017-02-27 10:02:18.051377067 +0100
-@@ -20,8 +20,8 @@ ExecReload=@bindir@/doveadm reload
+diff -up dovecot-2.3.2/dovecot.service.in.systemd_w_protectsystem dovecot-2.3.2/dovecot.service.in
+--- dovecot-2.3.2/dovecot.service.in.systemd_w_protectsystem	2018-07-09 12:00:13.359193526 +0200
+++ dovecot-2.3.2/dovecot.service.in	2018-07-09 12:00:46.387716884 +0200
+@@ -23,6 +23,7 @@ ExecReload=@bindir@/doveadm reload
 ExecStop=@bindir@/doveadm stop
 PrivateTmp=true
 NonBlocking=yes
-# Enable this if your systemd is new enough to support it:
-#ProtectSystem=full
-+# Enable this if your systemd is new enough to support it: (it will make /usr /boot /etc read only for dovecot)
-+ProtectSystem=full
- 
- # You can add environment variables with e.g.:
- #Environment='CORE_OUTOFMEM=1'
+# this will make /usr /boot /etc read only for dovecot
+ ProtectSystem=full
+ ProtectHome=no
+ PrivateDevices=true
--- a/dovecot-2.3.0.1-libxcrypt.patch
+++ b/dovecot-2.3.0.1-libxcrypt.patch
@ -0,0 +1,11 @@
+diff -up dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt dovecot-2.3.0.1/src/auth/mycrypt.c
+--- dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt       2018-02-28 15:28:58.000000000 +0100
+++ dovecot-2.3.0.1/src/auth/mycrypt.c 2018-03-27 10:57:38.447769201 +0200
+@@ -14,6 +14,7 @@
+ #  define _XPG6 /* Some Solaris versions require this, some break with this */
+ #endif
+ #include <unistd.h>
+#include <crypt.h>
+ 
+ #include "mycrypt.h"
+ 
--- a/dovecot.spec
+++ b/dovecot.spec
@ -3,19 +3,18 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.2.33.2
+Version: 2.3.6
 %global prever %{nil}
-Release: 5%{?dist}
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
-Group: System Environment/Daemons

 URL: http://www.dovecot.org/
-Source: http://www.dovecot.org/releases/2.2/%{name}-%{version}%{?prever}.tar.gz
+Source: http://www.dovecot.org/releases/2.3/%{name}-%{version}%{?prever}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-%global pigeonholever 0.4.21
-Source8: http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-%{pigeonholever}.tar.gz
+%global pigeonholever 0.5.6
+Source8: http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz
 Source9: dovecot.sysconfig
 Source10: dovecot.tmpfilesd

@ -29,27 +28,29 @@ Patch3: dovecot-1.0.rc7-mkcert-paths.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
+Patch10: dovecot-2.3.0.1-libxcrypt.patch

 Source15: prestartscript

-BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
+BuildRequires: gcc, gcc-c++, openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
 BuildRequires: libtool, autoconf, automake, pkgconfig
 BuildRequires: sqlite-devel
-BuildRequires: postgresql-devel
+BuildRequires: libpq-devel
 %if %{?fedora}0 < 280
 BuildRequires: mysql-devel
 BuildRequires: tcp_wrappers-devel
 %else
 BuildRequires: mariadb-connector-c-devel
+BuildRequires: libxcrypt-devel
 %endif
 BuildRequires: openldap-devel
 BuildRequires: krb5-devel
 BuildRequires: quota-devel
 BuildRequires: xz-devel
+BuildRequires: libsodium-devel

 # gettext-devel is needed for running autoconf because of the
 # presence of AM_ICONV
@ -98,7 +99,6 @@ The SQL drivers and authentication plug-ins are in their subpackages.
 %package pigeonhole
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: Sieve and managesieve plug-in for dovecot
-Group: System Environment/Daemons
 License: MIT and LGPLv2

 %description pigeonhole
@ -107,21 +107,18 @@ This package provides sieve and managesieve plug-in for dovecot LDA.
 %package pgsql
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: Postgres SQL back end for dovecot
-Group: System Environment/Daemons
 %description pgsql
 This package provides the Postgres SQL back end for dovecot-auth etc.

 %package mysql
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: MySQL back end for dovecot
-Group: System Environment/Daemons
 %description mysql
 This package provides the MySQL back end for dovecot-auth etc.

 %package devel
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: Development files for dovecot
-Group: Development/Libraries
 %description devel
 This package provides the development files for dovecot.

@ -131,11 +128,11 @@ This package provides the development files for dovecot.
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
 %patch6 -p1 -b .waitonline
-%patch7 -p1 -b .online
 %patch8 -p1 -b .initbysystemd
 %patch9 -p1 -b .systemd_w_protectsystem
+#%patch10 -p1 -b .libxcrypt

-#pushd dovecot-2*2-pigeonhole-%{pigeonholever}
+#pushd dovecot-2*3-pigeonhole-%{pigeonholever}
 #popd
 sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in

@ -184,7 +181,7 @@ sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10
 make %{?_smp_mflags}

 #pigeonhole
-pushd dovecot-2*2-pigeonhole-%{pigeonholever}
+pushd dovecot-2*3-pigeonhole-%{pigeonholever}

 # required for snapshot
 [ -f configure ] || autoreconf -fiv
@ -208,7 +205,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name} %{_builddir}/%{name}-%{version}%{?prever}/docinstall


-pushd dovecot-2*2-pigeonhole-%{pigeonholever}
+pushd dovecot-2*3-pigeonhole-%{pigeonholever}
 make install DESTDIR=$RPM_BUILD_ROOT

 mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole
@ -347,7 +344,7 @@ fi

 %check
 make check
-cd dovecot-2*2-pigeonhole-%{pigeonholever}
+cd dovecot-2*3-pigeonhole-%{pigeonholever}
 make check

 %files
@ -384,6 +381,7 @@ make check
 %config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-imap.conf
 %config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-lmtp.conf
 %config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-pop3.conf
+%config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-submission.conf
 %config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-acl.conf
 %config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-quota.conf
 %config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-plugin.conf
@ -410,7 +408,6 @@ make check
 %dir %{_libdir}/dovecot
 %dir %{_libdir}/dovecot/auth
 %dir %{_libdir}/dovecot/dict
-%dir %{_libdir}/dovecot/stats
 %{_libdir}/dovecot/doveadm
 %exclude %{_libdir}/dovecot/doveadm/*sieve*
 %{_libdir}/dovecot/*.so.*
@ -424,8 +421,6 @@ make check
 %{_libdir}/dovecot/auth/libdriver_sqlite.so
 %{_libdir}/dovecot/dict/libdriver_sqlite.so
 %{_libdir}/dovecot/dict/libdict_ldap.so
-%{_libdir}/dovecot/stats/libstats_auth.so
-%{_libdir}/dovecot/stats/libstats_mail.so
 %{_libdir}/dovecot/libdriver_sqlite.so
 %{_libdir}/dovecot/libssl_iostream_openssl.so
 %{_libdir}/dovecot/libfs_compress.so
@ -433,6 +428,8 @@ make check
 %{_libdir}/dovecot/libfs_mail_crypt.so
 %{_libdir}/dovecot/libdcrypt_openssl.so
 %{_libdir}/dovecot/lib20_var_expand_crypt.so
+%{_libdir}/dovecot/old-stats/libold_stats_mail.so
+%{_libdir}/dovecot/old-stats/libstats_auth.so

 %dir %{_libdir}/dovecot/settings

@ -496,6 +493,71 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so

 %changelog
+* Thu May 02 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.6-1
+- dovecot updated to 2.3.6, pigeonhole updated to 0.5.6
+
+* Thu Apr 18 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.5.2-1
+- dovecot updated to 2.3.5.2
+- fixes CVE-2019-10691: Trying to login with 8bit username containing
+  invalid UTF8 input causes auth process to crash if auth policy is enabled.
+
+* Thu Mar 28 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.5.1-1
+- dovecot updated to 2.3.5.1
+- CVE-2019-7524: Missing input buffer size validation leads into
+  arbitrary buffer overflow when reading fts or pop3 uidl header
+  from Dovecot index.
+
+* Wed Mar 06 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.5-1
+- dovecot updated to 2.3.5, pigeonhole updated to 0.5.5
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1:2.3.4-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Wed Jan 09 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.4-1
+- dovecot updated to 2.3.4, pigeonhole updated to 0.5.4
+
+* Tue Oct 02 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.3-1
+- dovecot updated to 2.3.3, pigeonhole pdated to 0.5.3
+- doveconf hides more secrets now in the default output
+- NUL bytes in mail headers can cause truncated replies when fetched. 
+- virtual plugin: Some searches used 100% CPU for many seconds 
+- dsync assert-crashed with acl plugin in some situations. 
+- imapc: Fixed various assert-crashes when reconnecting to server. 
+
+
+* Tue Oct 02 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.2.1-4
+- fix dovecot-init service syntax error (#1635017)
+
+* Mon Aug 13 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.2.1-3
+- do not try to generate ssl-params as its obsolete (#1614640)
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.2.1-1
+- SSL/TLS servers may have crashed during client disconnection
+
+* Mon Jul 09 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.2-1
+- dovecot updated to 2.3.2, pigeonhole to 0.5.2
+
+* Wed Mar 28 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.1-2
+- fix ftbfs - murmurhash3 check fail
+
+* Wed Mar 28 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.1-1
+- dovecot updated to 2.3.1, pigeonhole updated to 0.5.1
+
+* Tue Mar 27 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.0.1-3
+- use libxcrypt for Fedora >= 28, part of ftbfs fix (#1548520)
+
+* Wed Mar 07 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.0.1-2
+- add gcc buildrequire
+
+* Thu Mar 01 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.0.1-1
+- dovecot updated to 2.3.0.1, pigeonhole updated to 0.5.0.1
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.2.33.2-5
 - Escape macros in %%changelog

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (dovecot-2.2.33.2.tar.gz) = 028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931
-SHA512 (dovecot-2.2-pigeonhole-0.4.21.tar.gz) = 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
+SHA512 (dovecot-2.3.6.tar.gz) = ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
+SHA512 (dovecot-2.3-pigeonhole-0.5.6.tar.gz) = 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
Author	SHA1	Message	Date
Michal Hlavinka	98052505fb	dovecot updated to 2.3.6, pigeonhole updated to 0.5.6	2019-05-02 17:36:52 +02:00
Michal Hlavinka	22a633e2b1	dovecot updated to 2.3.5.2 fixes CVE-2019-10691: Trying to login with 8bit username containing invalid UTF8 input causes auth process to crash if auth policy is enabled.	2019-04-18 15:03:49 +02:00
Michal Hlavinka	2bf6cc8b23	dovecot updated to 2.3.5.1 CVE-2019-7524: Missing input buffer size validation leads into arbitrary buffer overflow when reading fts or pop3 uidl header from Dovecot index.	2019-03-28 17:41:58 +01:00
Michal Hlavinka	33ac779663	dovecot updated to 2.3.5, pigeonhole updated to 0.5.5	2019-03-06 18:20:14 +01:00
Michal Hlavinka	ab85bbd503	dovecot updated to 2.3.4, pigeonhole updated to 0.5.4	2019-01-09 18:20:00 +01:00
Michal Hlavinka	1ff06cf3ca	dovecot updated to 2.3.3, pigeonhole pdated to 0.5.3 doveconf hides more secrets now in the default output NUL bytes in mail headers can cause truncated replies when fetched. virtual plugin: Some searches used 100% CPU for many seconds dsync assert-crashed with acl plugin in some situations. imapc: Fixed various assert-crashes when reconnecting to server.	2018-10-03 16:45:19 +02:00
Michal Hlavinka	982dbab10d	dovecot updated to 2.2.36, pigeonhole updated to 0.4.24	2018-06-07 10:13:37 +02:00
Michal Hlavinka	9fca5a8f12	include crypt.h explicitely	2018-04-19 16:32:15 +02:00
Michal Hlavinka	7c795df415	dovecot updated to 2.2.35, pigeonhole updated to 0.4.23	2018-03-21 17:22:51 +01:00
Peter Robinson	13bc0975bb	use wildcards in source file names	2018-03-04 16:29:58 +00:00
Peter Robinson	f4082ac83a	Merge branch 'f27' into f28	2018-03-04 16:28:20 +00:00
Michal Hlavinka	c75d4e7107	upload new tarballs	2018-03-02 10:41:27 +01:00
Michal Hlavinka	a27cafd2e8	dovecot updated to 2.2.34, pigeonhole updated to 0.4.22 fixes CVE-2017-15130: TLS SNI config lookups may lead to excessive memory usage, causing imap-login/pop3-login VSZ limit to be reached and the process restarted. This happens only if Dovecot config has local_name { } or local { } configuration blocks and attacker uses randomly generated SNI servernames. fixes CVE-2017-14461: Parsing invalid email addresses may cause a crash or leak memory contents to attacker. For example, these memory contents might contain parts of an email from another user if the same imap process is reused for multiple users. fixes CVE-2017-15132: Aborted SASL authentication leaks memory in login process.	2018-03-02 10:38:35 +01:00
Michal Hlavinka	8e92fc5f66	dovecot updated to 2.2.33.2 doveadm: Fix crash in proxying (or dsync replication) if remote is running older than v2.2.33 auth: Fix memory leak in %{ldap_dn} dict-sql: Fix data types to work correctly with Cassandra	2017-10-24 12:33:15 +02:00
Michal Hlavinka	d5df6cbf02	pigeonhole updated to 0.4.20 Made the retention period for redirect duplicate identifiers configurable. Changed the default retention period from 24 to 12 hours. sieve-filter: Fixed memory leak: forgot to clean up script binary at end of execution managesieve-login: Fixed handling of AUTHENTICATE command. A second authenticate command would be parsed wrong.	2017-09-07 09:02:32 +02:00