diff --git a/dovecot-2.1.10-waitonline.patch b/dovecot-2.1.10-waitonline.patch index af3ce19..20daf40 100644 --- a/dovecot-2.1.10-waitonline.patch +++ b/dovecot-2.1.10-waitonline.patch @@ -1,11 +1,11 @@ -diff -up dovecot-2.3.15/dovecot.service.in.waitonline dovecot-2.3.15/dovecot.service.in ---- dovecot-2.3.15/dovecot.service.in.waitonline 2021-06-21 20:19:19.560494654 +0200 -+++ dovecot-2.3.15/dovecot.service.in 2021-06-21 20:21:17.443066248 +0200 -@@ -15,6 +15,7 @@ After=local-fs.target network-online.tar +diff -up dovecot-2.3.19.1/dovecot.service.in.waitonline dovecot-2.3.19.1/dovecot.service.in +--- dovecot-2.3.19.1/dovecot.service.in.waitonline 2022-06-14 08:55:03.000000000 +0200 ++++ dovecot-2.3.19.1/dovecot.service.in 2022-11-08 20:28:37.550081709 +0100 +@@ -12,6 +12,7 @@ Description=Dovecot IMAP/POP3 email serv + Documentation=man:dovecot(1) + Documentation=https://doc.dovecot.org/ + After=local-fs.target network-online.target ++Wants=network-online.target [Service] Type=@systemdservicetype@ -+ExecStartPre=/usr/libexec/dovecot/prestartscript - ExecStart=@sbindir@/dovecot -F - ExecReload=@bindir@/doveadm reload - ExecStop=@bindir@/doveadm stop diff --git a/dovecot-2.2.20-initbysystemd.patch b/dovecot-2.2.20-initbysystemd.patch index 313e26b..7099960 100644 --- a/dovecot-2.2.20-initbysystemd.patch +++ b/dovecot-2.2.20-initbysystemd.patch @@ -25,9 +25,9 @@ diff -up dovecot-2.3.15/dovecot.service.in.initbysystemd dovecot-2.3.15/dovecot. -After=local-fs.target network-online.target +After=local-fs.target network-online.target dovecot-init.service +Requires=dovecot-init.service + Wants=network-online.target [Service] - Type=@systemdservicetype@ diff -up dovecot-2.3.15/Makefile.am.initbysystemd dovecot-2.3.15/Makefile.am --- dovecot-2.3.15/Makefile.am.initbysystemd 2021-06-21 20:21:49.250680889 +0200 +++ dovecot-2.3.15/Makefile.am 2021-06-21 20:24:26.676765849 +0200 diff --git a/dovecot.spec b/dovecot.spec index e89c6ba..2fc0d48 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -6,7 +6,7 @@ Name: dovecot Epoch: 1 Version: 2.3.19.1 %global prever %{nil} -Release: 5%{?dist} +Release: 6%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT and LGPLv2 @@ -480,6 +480,9 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Tue Nov 08 2022 Michal Hlavinka - 1:2.3.19.1-6 +- use Wants=network-online.target instead of preexec nm-online (#2095949) + * Tue Oct 11 2022 Michal Hlavinka - 1:2.3.19.1-5 - build with lua support (#2132420)