From c70acd27d4c375a35344c66a6f07693b5efe3756f3c6efdb3a9163dfdc5e80f5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 3 Feb 2022 12:40:28 +0000
Subject: [PATCH] Accepting request 950732 from home:dimstar:Factory

- Fix dovecot-2.3.0-dont_use_etc_ssl_certs.patch: Align the
  certificate path/filenames to /etc/ssl/private/*.crt, which
  happens to match what the patch also does for mkert.sh
  (boo#1193909).
- Rebase dovecot-2.3.0-better_ssl_defaults.patch

OBS-URL: https://build.opensuse.org/request/show/950732
OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot23?expand=0&rev=101
---
 dovecot-2.3.0-better_ssl_defaults.patch    | 4 ++--
 dovecot-2.3.0-dont_use_etc_ssl_certs.patch | 2 +-
 dovecot23.changes                          | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dovecot-2.3.0-better_ssl_defaults.patch b/dovecot-2.3.0-better_ssl_defaults.patch
index 883561c..4be337d 100644
--- a/dovecot-2.3.0-better_ssl_defaults.patch
+++ b/dovecot-2.3.0-better_ssl_defaults.patch
@@ -6,9 +6,9 @@ Index: dovecot-2.3.17.1/doc/example-config/conf.d/10-ssl.conf
  # dropping root privileges, so keep the key file unreadable by anyone but
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
--ssl_cert = </etc/ssl/private/dovecot.pem
+-ssl_cert = </etc/ssl/private/dovecot.crt
 -ssl_key = </etc/ssl/private/dovecot.pem
-+#ssl_cert = </etc/ssl/private/dovecot.pem
++#ssl_cert = </etc/ssl/private/dovecot.crt
 +#ssl_key = </etc/ssl/private/dovecot.pem
  
  # If key file is password protected, give the password here. Alternatively
diff --git a/dovecot-2.3.0-dont_use_etc_ssl_certs.patch b/dovecot-2.3.0-dont_use_etc_ssl_certs.patch
index 1107360..bf05855 100644
--- a/dovecot-2.3.0-dont_use_etc_ssl_certs.patch
+++ b/dovecot-2.3.0-dont_use_etc_ssl_certs.patch
@@ -116,7 +116,7 @@ Index: dovecot-2.3.17.1/doc/example-config/conf.d/10-ssl.conf
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
 -ssl_cert = </etc/ssl/certs/dovecot.pem
-+ssl_cert = </etc/ssl/private/dovecot.pem
++ssl_cert = </etc/ssl/private/dovecot.crt
  ssl_key = </etc/ssl/private/dovecot.pem
  
  # If key file is password protected, give the password here. Alternatively
diff --git a/dovecot23.changes b/dovecot23.changes
index 0743b53..6378ed5 100644
--- a/dovecot23.changes
+++ b/dovecot23.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb  2 12:28:24 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix dovecot-2.3.0-dont_use_etc_ssl_certs.patch: Align the
+  certificate path/filenames to /etc/ssl/private/*.crt, which
+  happens to match what the patch also does for mkert.sh
+  (boo#1193909).
+- Rebase dovecot-2.3.0-better_ssl_defaults.patch
+
 -------------------------------------------------------------------
 Thu Dec 16 08:14:51 UTC 2021 - Fabian Vogt <fvogt@suse.com>