rpms/dovecot
5
0
Fork 0
Code Issues Pull Requests Releases Activity

dovecot updated to 2.3.0.1, pigeonhole updated to 0.5.0.1

Browse Source
This commit is contained in:
Michal Hlavinka 2018-03-01 14:04:22 +01:00
parent 203deaf4c3
commit 88a20bf4a4
8 changed files with 56 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -120,3 +120,5 @@ pigeonhole-snap0592366457df.tar.bz2
/dovecot-2.2.33.1.tar.gz /dovecot-2.2.33.1.tar.gz
/dovecot-2.2-pigeonhole-0.4.21.tar.gz /dovecot-2.2-pigeonhole-0.4.21.tar.gz
/dovecot-2.2.33.2.tar.gz /dovecot-2.2.33.2.tar.gz
/dovecot-2.3.0.1.tar.gz
/dovecot-2.3-pigeonhole-0.5.0.1.tar.gz

28
dovecot-2.0-defaultconfig.patch
View File

@ -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 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.2.18/doc/example-config/conf.d/10-mail.conf.default-settings 2014-06-02 13:50:10.000000000 +0200 --- 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.2.18/doc/example-config/conf.d/10-mail.conf 2015-08-24 17:09:03.866648631 +0200 +++ dovecot-2.3.0.1/doc/example-config/conf.d/10-mail.conf 2018-03-01 10:29:38.208368555 +0100
@@ -283,6 +283,7 @@ namespace inbox { @@ -322,6 +322,7 @@ protocol !indexer-worker {
# them simultaneously. # them simultaneously.
#mbox_read_locks = fcntl #mbox_read_locks = fcntl
#mbox_write_locks = dotlock 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. # Maximum time to wait for lock (all of them) before aborting.
#mbox_lock_timeout = 5 mins #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 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.2.18/doc/example-config/conf.d/10-ssl.conf.default-settings 2014-10-03 16:36:00.000000000 +0200 --- 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.2.18/doc/example-config/conf.d/10-ssl.conf 2015-08-24 17:10:49.536071649 +0200 +++ 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 @@ @@ -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 # 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 # dropping root privileges, so keep the key file unreadable by anyone but
@@ -50,6 +52,7 @@ ssl_key = </etc/ssl/private/dovecot.pem @@ -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_ciper_list = PROFILE=SYSTEM
# SSL ciphers to use # Colon separated list of elliptic curves to use. Empty value (the default)
#ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL # means use the defaults from the SSL library. P-521:P-384:P-256 would be an
+ssl_cipher_list = PROFILE=SYSTEM
# Prefer the server's order of ciphers over client's.
#ssl_prefer_server_ciphers = no

12
dovecot-2.1.10-waitonline.patch
View File

@ -1,11 +1,11 @@
diff -up dovecot-2.2.22/dovecot.service.in.waitonline dovecot-2.2.22/dovecot.service.in diff -up dovecot-2.3.0.1/dovecot.service.in.waitonline dovecot-2.3.0.1/dovecot.service.in
--- dovecot-2.2.22/dovecot.service.in.waitonline 2016-03-16 13:36:49.426772606 +0100 --- dovecot-2.3.0.1/dovecot.service.in.waitonline 2018-03-01 10:35:39.888371078 +0100
+++ dovecot-2.2.22/dovecot.service.in 2016-03-16 13:47:23.923606903 +0100 +++ dovecot-2.3.0.1/dovecot.service.in 2018-03-01 10:36:29.738784661 +0100
@@ -24,6 +24,7 @@ After=local-fs.target network.target @@ -12,6 +12,7 @@ After=local-fs.target network-online.tar
[Service] [Service]
Type=forking Type=simple
+ExecStartPre=/usr/libexec/dovecot/prestartscript +ExecStartPre=/usr/libexec/dovecot/prestartscript
ExecStart=@sbindir@/dovecot ExecStart=@sbindir@/dovecot -F
PIDFile=@rundir@/master.pid PIDFile=@rundir@/master.pid
ExecReload=@bindir@/doveadm reload ExecReload=@bindir@/doveadm reload

12
dovecot-2.2.13-online.patch
View File

@ -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

24
dovecot-2.2.20-initbysystemd.patch
View File

@ -1,6 +1,6 @@
diff -up dovecot-2.2.22/dovecot-init.service.initbysystemd dovecot-2.2.22/dovecot-init.service diff -up dovecot-2.3.0.1/dovecot-init.service.initbysystemd dovecot-2.3.0.1/dovecot-init.service
--- dovecot-2.2.22/dovecot-init.service.initbysystemd 2016-03-16 13:48:25.996297203 +0100 --- dovecot-2.3.0.1/dovecot-init.service.initbysystemd 2018-03-01 10:38:22.059716008 +0100
+++ dovecot-2.2.22/dovecot-init.service 2016-03-16 13:48:25.996297203 +0100 +++ dovecot-2.3.0.1/dovecot-init.service 2018-03-01 10:38:22.059716008 +0100
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+[Unit] +[Unit]
+Description=One-time Dovecot init service +Description=One-time Dovecot init service
@ -20,10 +20,10 @@ diff -up dovecot-2.2.22/dovecot-init.service.initbysystemd dovecot-2.2.22/doveco
+ /usr/libexec/dovecot/ssl-params >/dev/null 2>&1; \ + /usr/libexec/dovecot/ssl-params >/dev/null 2>&1; \
+fi' +fi'
+ +
diff -up dovecot-2.2.22/dovecot.service.in.initbysystemd dovecot-2.2.22/dovecot.service.in diff -up dovecot-2.3.0.1/dovecot.service.in.initbysystemd dovecot-2.3.0.1/dovecot.service.in
--- dovecot-2.2.22/dovecot.service.in.initbysystemd 2016-03-16 13:48:25.996297203 +0100 --- dovecot-2.3.0.1/dovecot.service.in.initbysystemd 2018-03-01 10:38:22.060716016 +0100
+++ dovecot-2.2.22/dovecot.service.in 2016-03-16 13:49:17.619039641 +0100 +++ dovecot-2.3.0.1/dovecot.service.in 2018-03-01 10:40:45.524901319 +0100
@@ -20,7 +20,8 @@ @@ -8,7 +8,8 @@
Description=Dovecot IMAP/POP3 email server Description=Dovecot IMAP/POP3 email server
Documentation=man:dovecot(1) Documentation=man:dovecot(1)
Documentation=http://wiki2.dovecot.org/ Documentation=http://wiki2.dovecot.org/
@ -32,11 +32,11 @@ diff -up dovecot-2.2.22/dovecot.service.in.initbysystemd dovecot-2.2.22/dovecot.
+Requires=dovecot-init.service +Requires=dovecot-init.service
[Service] [Service]
Type=forking Type=simple
diff -up dovecot-2.2.22/Makefile.am.initbysystemd dovecot-2.2.22/Makefile.am diff -up dovecot-2.3.0.1/Makefile.am.initbysystemd dovecot-2.3.0.1/Makefile.am
--- dovecot-2.2.22/Makefile.am.initbysystemd 2016-03-04 12:04:33.000000000 +0100 --- dovecot-2.3.0.1/Makefile.am.initbysystemd 2018-02-28 15:28:57.000000000 +0100
+++ dovecot-2.2.22/Makefile.am 2016-03-16 13:48:25.996297203 +0100 +++ dovecot-2.3.0.1/Makefile.am 2018-03-01 10:38:22.060716016 +0100
@@ -51,9 +51,10 @@ if HAVE_SYSTEMD @@ -63,9 +63,10 @@ if HAVE_SYSTEMD
systemdsystemunit_DATA = \ systemdsystemunit_DATA = \
dovecot.socket \ dovecot.socket \

19
dovecot-2.2.22-systemd_w_protectsystem.patch
View File

@ -1,14 +1,11 @@
diff -up dovecot-2.2.28/dovecot.service.in.systemd_w_protectsystem dovecot-2.2.28/dovecot.service.in diff -up dovecot-2.3.0.1/dovecot.service.in.systemd_w_protectsystem dovecot-2.3.0.1/dovecot.service.in
--- dovecot-2.2.28/dovecot.service.in.systemd_w_protectsystem 2017-02-27 10:00:14.647423500 +0100 --- dovecot-2.3.0.1/dovecot.service.in.systemd_w_protectsystem 2018-03-01 10:41:05.591067106 +0100
+++ dovecot-2.2.28/dovecot.service.in 2017-02-27 10:02:18.051377067 +0100 +++ dovecot-2.3.0.1/dovecot.service.in 2018-03-01 10:42:52.859959021 +0100
@@ -20,8 +20,8 @@ ExecReload=@bindir@/doveadm reload @@ -20,6 +20,7 @@ ExecReload=@bindir@/doveadm reload
ExecStop=@bindir@/doveadm stop ExecStop=@bindir@/doveadm stop
PrivateTmp=true PrivateTmp=true
NonBlocking=yes NonBlocking=yes
-# Enable this if your systemd is new enough to support it: +# this will make /usr /boot /etc read only for dovecot
-#ProtectSystem=full ProtectSystem=full
+# Enable this if your systemd is new enough to support it: (it will make /usr /boot /etc read only for dovecot) PrivateDevices=true
+ProtectSystem=full # disable this if you want to use apparmor plugin
# You can add environment variables with e.g.:
#Environment='CORE_OUTOFMEM=1'

26
dovecot.spec
View File

@ -3,19 +3,19 @@
Summary: Secure imap and pop3 server Summary: Secure imap and pop3 server
Name: dovecot Name: dovecot
Epoch: 1 Epoch: 1
Version: 2.2.33.2 Version: 2.3.0.1
%global prever %{nil} %global prever %{nil}
Release: 5%{?dist} Release: 1%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2 License: MIT and LGPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.dovecot.org/ 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 Source1: dovecot.init
Source2: dovecot.pam Source2: dovecot.pam
%global pigeonholever 0.4.21 %global pigeonholever 0.5.0.1
Source8: http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-%{pigeonholever}.tar.gz Source8: http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz
Source9: dovecot.sysconfig Source9: dovecot.sysconfig
Source10: dovecot.tmpfilesd Source10: dovecot.tmpfilesd
@ -29,7 +29,6 @@ Patch3: dovecot-1.0.rc7-mkcert-paths.patch
#wait for network #wait for network
Patch6: dovecot-2.1.10-waitonline.patch Patch6: dovecot-2.1.10-waitonline.patch
Patch7: dovecot-2.2.13-online.patch
Patch8: dovecot-2.2.20-initbysystemd.patch Patch8: dovecot-2.2.20-initbysystemd.patch
Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch
@ -131,11 +130,10 @@ This package provides the development files for dovecot.
%patch2 -p1 -b .mkcert-permissions %patch2 -p1 -b .mkcert-permissions
%patch3 -p1 -b .mkcert-paths %patch3 -p1 -b .mkcert-paths
%patch6 -p1 -b .waitonline %patch6 -p1 -b .waitonline
%patch7 -p1 -b .online
%patch8 -p1 -b .initbysystemd %patch8 -p1 -b .initbysystemd
%patch9 -p1 -b .systemd_w_protectsystem %patch9 -p1 -b .systemd_w_protectsystem
#pushd dovecot-2*2-pigeonhole-%{pigeonholever} #pushd dovecot-2*3-pigeonhole-%{pigeonholever}
#popd #popd
sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
@ -184,7 +182,7 @@ sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10
make %{?_smp_mflags} make %{?_smp_mflags}
#pigeonhole #pigeonhole
pushd dovecot-2*2-pigeonhole-%{pigeonholever} pushd dovecot-2*3-pigeonhole-%{pigeonholever}
# required for snapshot # required for snapshot
[ -f configure ] || autoreconf -fiv [ -f configure ] || autoreconf -fiv
@ -208,7 +206,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_docdir}/%{name} %{_builddir}/%{name}-%{version}%{?prever}/docinstall 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 make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole
@ -347,7 +345,7 @@ fi
%check %check
make check make check
cd dovecot-2*2-pigeonhole-%{pigeonholever} cd dovecot-2*3-pigeonhole-%{pigeonholever}
make check make check
%files %files
@ -410,7 +408,6 @@ make check
%dir %{_libdir}/dovecot %dir %{_libdir}/dovecot
%dir %{_libdir}/dovecot/auth %dir %{_libdir}/dovecot/auth
%dir %{_libdir}/dovecot/dict %dir %{_libdir}/dovecot/dict
%dir %{_libdir}/dovecot/stats
%{_libdir}/dovecot/doveadm %{_libdir}/dovecot/doveadm
%exclude %{_libdir}/dovecot/doveadm/*sieve* %exclude %{_libdir}/dovecot/doveadm/*sieve*
%{_libdir}/dovecot/*.so.* %{_libdir}/dovecot/*.so.*
@ -424,8 +421,6 @@ make check
%{_libdir}/dovecot/auth/libdriver_sqlite.so %{_libdir}/dovecot/auth/libdriver_sqlite.so
%{_libdir}/dovecot/dict/libdriver_sqlite.so %{_libdir}/dovecot/dict/libdriver_sqlite.so
%{_libdir}/dovecot/dict/libdict_ldap.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/libdriver_sqlite.so
%{_libdir}/dovecot/libssl_iostream_openssl.so %{_libdir}/dovecot/libssl_iostream_openssl.so
%{_libdir}/dovecot/libfs_compress.so %{_libdir}/dovecot/libfs_compress.so
@ -496,6 +491,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so %{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog %changelog
* 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 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:2.2.33.2-5
- Escape macros in %%changelog - Escape macros in %%changelog

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (dovecot-2.2.33.2.tar.gz) = 028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931 SHA512 (dovecot-2.3.0.1.tar.gz) = 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d
SHA512 (dovecot-2.2-pigeonhole-0.4.21.tar.gz) = 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de SHA512 (dovecot-2.3-pigeonhole-0.5.0.1.tar.gz) = 60016145caa444eeba13b49735f87ab2ebe7f178f104ad57283b5aa7e5119920d9f579032b775547e0866e86045a4ab653fd084068187d0cbe2e088cc15fc288