From cf3cf58a8878402ab9c06319cd25a45c630d846c6dd8e3bac50be1ffe1aec00d Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sun, 24 Dec 2017 01:08:16 +0000 Subject: [PATCH 1/2] Accepting request 559672 from home:darix:playground - bump to dovecot 2.3 OBS-URL: https://build.opensuse.org/request/show/559672 OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot?expand=0&rev=11 --- dovecot-2.3-pigeonhole.configfiles | 4 ++++ dovecot-2.3.configfiles | 31 ++++++++++++++++++++++++++++++ dovecot.changes | 5 +++++ dovecot.spec | 4 +++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 dovecot-2.3-pigeonhole.configfiles create mode 100644 dovecot-2.3.configfiles diff --git a/dovecot-2.3-pigeonhole.configfiles b/dovecot-2.3-pigeonhole.configfiles new file mode 100644 index 0000000..d50fde7 --- /dev/null +++ b/dovecot-2.3-pigeonhole.configfiles @@ -0,0 +1,4 @@ +/etc/dovecot/conf.d/20-managesieve.conf +/etc/dovecot/conf.d/90-sieve-extprograms.conf +/etc/dovecot/conf.d/90-sieve.conf +/etc/dovecot/sieve-ldap.conf diff --git a/dovecot-2.3.configfiles b/dovecot-2.3.configfiles new file mode 100644 index 0000000..93ffe8f --- /dev/null +++ b/dovecot-2.3.configfiles @@ -0,0 +1,31 @@ +/etc/dovecot/README +/etc/dovecot/conf.d/10-auth.conf +/etc/dovecot/conf.d/10-director.conf +/etc/dovecot/conf.d/10-logging.conf +/etc/dovecot/conf.d/10-mail.conf +/etc/dovecot/conf.d/10-master.conf +/etc/dovecot/conf.d/10-ssl.conf +/etc/dovecot/conf.d/15-lda.conf +/etc/dovecot/conf.d/15-mailboxes.conf +/etc/dovecot/conf.d/20-imap.conf +/etc/dovecot/conf.d/20-lmtp.conf +/etc/dovecot/conf.d/20-pop3.conf +/etc/dovecot/conf.d/20-submission.conf +/etc/dovecot/conf.d/90-acl.conf +/etc/dovecot/conf.d/90-plugin.conf +/etc/dovecot/conf.d/90-quota.conf +/etc/dovecot/conf.d/auth-checkpassword.conf.ext +/etc/dovecot/conf.d/auth-deny.conf.ext +/etc/dovecot/conf.d/auth-dict.conf.ext +/etc/dovecot/conf.d/auth-ldap.conf.ext +/etc/dovecot/conf.d/auth-master.conf.ext +/etc/dovecot/conf.d/auth-passwdfile.conf.ext +/etc/dovecot/conf.d/auth-sql.conf.ext +/etc/dovecot/conf.d/auth-static.conf.ext +/etc/dovecot/conf.d/auth-system.conf.ext +/etc/dovecot/conf.d/auth-vpopmail.conf.ext +/etc/dovecot/dovecot-dict-auth.conf.ext +/etc/dovecot/dovecot-dict-sql.conf.ext +/etc/dovecot/dovecot-ldap.conf.ext +/etc/dovecot/dovecot-sql.conf.ext +/etc/dovecot/dovecot.conf diff --git a/dovecot.changes b/dovecot.changes index 4e9c8d5..374a3bc 100644 --- a/dovecot.changes +++ b/dovecot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 20 11:24:54 UTC 2017 - mrueckert@suse.de + +- bump to dovecot 2.3 + ------------------------------------------------------------------- Mon Jun 15 14:04:40 UTC 2015 - mrueckert@suse.de diff --git a/dovecot.spec b/dovecot.spec index a3147d7..2b41381 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -23,7 +23,7 @@ %endif Name: dovecot -Version: 2.2 +Version: 2.3 Release: 0 Summary: IMAP and POP3 Server Written Primarily with Security in Mind License: BSD-3-Clause and LGPL-2.1+ and MIT @@ -51,6 +51,8 @@ Source8: dovecot.service Source9: dovecot.socket Source10: dovecot-2.1-pigeonhole.configfiles Source11: dovecot-2.2-pigeonhole.configfiles +Source12: dovecot-2.3.configfiles +Source13: dovecot-2.3-pigeonhole.configfiles %description Dovecot is an IMAP and POP3 server for Linux and UNIX-like systems, From 38b804cbbbd5bf0f42d3d14bddadf612cbed942ff9017af389890c8ff7702118 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sun, 24 Dec 2017 02:20:59 +0000 Subject: [PATCH 2/2] Accepting request 559676 from home:darix:playground - bump recommends to 2.3 - copy example config from /usr/share/dovecot/example-config/ instead of the documentation directory. (boo#1070871) OBS-URL: https://build.opensuse.org/request/show/559676 OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot?expand=0&rev=12 --- dovecot.changes | 11 +++++++++++ dovecot.spec | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dovecot.changes b/dovecot.changes index 374a3bc..6a260ea 100644 --- a/dovecot.changes +++ b/dovecot.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Dec 24 02:10:16 UTC 2017 - mrueckert@suse.de + +- bump recommends to 2.3 + +------------------------------------------------------------------- +Sun Dec 24 02:07:20 UTC 2017 - mrueckert@suse.de + +- copy example config from /usr/share/dovecot/example-config/ + instead of the documentation directory. (boo#1070871) + ------------------------------------------------------------------- Wed Dec 20 11:24:54 UTC 2017 - mrueckert@suse.de diff --git a/dovecot.spec b/dovecot.spec index 2b41381..b9db3d2 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -30,7 +30,7 @@ License: BSD-3-Clause and LGPL-2.1+ and MIT Group: Productivity/Networking/Email/Servers Url: http://www.dovecot.org/ PreReq: dovecot-implementation -Recommends: dovecot22 +Recommends: dovecot23 #!BuildIgnore: dovecot-implementation %if %{with systemd} BuildRequires: pkgconfig(systemd) @@ -109,10 +109,10 @@ install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/dovecot.socket # we fail silently if the dovecot-implementation package is not # installed yet. This allows us to break a little build loop between # dovecot and dovecotXY. -if [ ! -e /etc/dovecot/dovecot.conf -a -e /usr/share/doc/packages/dovecot/example-config/dovecot.conf ] ; then +if [ ! -e %{_sysconfdir}/%{name}/dovecot.conf -a -e %{_datadir}/%{name}/example-config/dovecot.conf ] ; then # install default config echo "Did not find a /etc/dovecot/dovecot.conf. copying default configuration" - cp -na %{_docdir}/%{name}/example-config/* %{_sysconfdir}/%{name}/ + cp -na %{_datadir}/%{name}/example-config/* %{_sysconfdir}/%{name}/ # the chmod breaks the lda. lets use the more open permissions #chmod -Rv o= %{_sysconfdir}/%{name}/ fi