From 6ce29523a53f5a18f5ecf2b23e9d678e9b09fe3a Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Thu, 5 Nov 2020 20:10:32 +0800 Subject: [PATCH] Add prestartscript from github --- dovecot.prestartscript | 3 +++ dovecot.spec | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 dovecot.prestartscript diff --git a/dovecot.prestartscript b/dovecot.prestartscript new file mode 100644 index 0000000..dd954ec --- /dev/null +++ b/dovecot.prestartscript @@ -0,0 +1,3 @@ +#!/bin/sh +/bin/systemctl -q is-enabled NetworkManager.service >/dev/null 2>&1 \ + && /usr/bin/nm-online -q --timeout 30 ||: diff --git a/dovecot.spec b/dovecot.spec index fca7f88..58e53b9 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -6,7 +6,7 @@ Name: dovecot Version: 2.3.10.1 -Release: 3 +Release: 4 Summary: Dovecot Secure imap server License: MIT and LGPLv2 URL: http://www.dovecot.org/ @@ -18,6 +18,7 @@ Source2: dovecot.pam Source8: http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz Source9: dovecot.sysconfig Source10: dovecot.tmpfilesd +Source11: https://raw.githubusercontent.com/QMailToaster/dovecot/master/dovecot.prestartscript Patch6000: CVE-2015-3420.patch Patch6001: CVE-2016-8652.patch @@ -35,7 +36,6 @@ Patch6009: CVE-2020-12674.patch Patch6010: CVE-2020-12100-1.patch Patch6011: CVE-2020-12100-2.patch - BuildRequires: gcc-c++ openssl-devel pam-devel zlib-devel bzip2-devel libcap-devel BuildRequires: libtool autoconf automake pkgconfig sqlite-devel libpq-devel BuildRequires: mariadb-connector-c-devel libxcrypt-devel openldap-devel krb5-devel @@ -114,6 +114,7 @@ install -m 644 AUTHORS ChangeLog COPYING COPYING.LGPL INSTALL NEWS README $RPM_B cd - install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot +install -p -D -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_libexecdir}/dovecot/prestartscript install -d $RPM_BUILD_ROOT%{ssldir}/certs install -d $RPM_BUILD_ROOT%{ssldir}/private @@ -285,6 +286,9 @@ make check %changelog +* Thu Nov 5 2020 Guoshuai Sun - 2.3.10.1-4 +- Add prestartscript from github + * Tue Oct 27 2020 wangyue - 2.3.10.1-3 - Fix CVE-2020-12673 CVE-2020-12674 CVE-2020-12100 -- Gitee