packages/dovecot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!15 Add prestartscript from github

Browse Source 
From: @si-gui
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-11-05 21:36:08 +08:00 committed by Gitee
commit 8b7bb32a12
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dovecot.prestartscript Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
/bin/systemctl -q is-enabled NetworkManager.service >/dev/null 2>&1 \
&& /usr/bin/nm-online -q --timeout 30 ||:

7
dovecot.spec
View File

@ -6,7 +6,7 @@
Name: dovecot Name: dovecot
Version: 2.3.10.1 Version: 2.3.10.1
Release: 3 Release: 4
Summary: Dovecot Secure imap server Summary: Dovecot Secure imap server
License: MIT and LGPLv2 License: MIT and LGPLv2
URL: http://www.dovecot.org/ 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 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
Source11: https://raw.githubusercontent.com/QMailToaster/dovecot/master/dovecot.prestartscript
Patch6000: CVE-2015-3420.patch Patch6000: CVE-2015-3420.patch
Patch6001: CVE-2016-8652.patch Patch6001: CVE-2016-8652.patch
@ -113,6 +114,7 @@ install -m 644 AUTHORS ChangeLog COPYING COPYING.LGPL INSTALL NEWS README $RPM_B
cd - cd -
install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot 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}/certs
install -d $RPM_BUILD_ROOT%{ssldir}/private install -d $RPM_BUILD_ROOT%{ssldir}/private
@ -284,6 +286,9 @@ make check
%changelog %changelog
* Thu Nov 5 2020 Guoshuai Sun <sunguoshuai@huawei.com> - 2.3.10.1-4
- Add prestartscript from github
* Tue Oct 27 2020 wangyue <wangyue92@huawei.com> - 2.3.10.1-3 * Tue Oct 27 2020 wangyue <wangyue92@huawei.com> - 2.3.10.1-3
- Fix CVE-2020-12673 CVE-2020-12674 CVE-2020-12100 - Fix CVE-2020-12673 CVE-2020-12674 CVE-2020-12100