From 9777cde63e541bbd8395589fff6c4931c1b701ac311ed0de053b3e79aa26a9e5 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Mon, 17 Jun 2019 05:44:13 +0000
Subject: [PATCH] Accepting request 704275 from
 home:varkoly:branches:server:mail

- bsc#1134242 - upgrade from 42.3 to 15.1: dovecot shows Unknown
  protocol 'SSLv2'
  * remove !SSLv2 from existing ssl_protocols configuration
    during upgrade

OBS-URL: https://build.opensuse.org/request/show/704275
OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot23?expand=0&rev=49
---
 dovecot23.changes | 8 ++++++++
 dovecot23.spec    | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/dovecot23.changes b/dovecot23.changes
index 490bb09..157be03 100644
--- a/dovecot23.changes
+++ b/dovecot23.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 20 14:25:49 UTC 2019 - Peter Varkoly <varkoly@suse.com>
+
+- bsc#1134242 - upgrade from 42.3 to 15.1: dovecot shows Unknown
+  protocol 'SSLv2'
+  * remove !SSLv2 from existing ssl_protocols configuration
+    during upgrade
+ 
 -------------------------------------------------------------------
 Tue Apr 30 13:49:18 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/dovecot23.spec b/dovecot23.spec
index b8044e0..32287b0 100644
--- a/dovecot23.spec
+++ b/dovecot23.spec
@@ -472,6 +472,10 @@ if [ "$FIRST_ARG" -ge "1" ]; then
     fi
   %endif
 fi
+# remove !SSLv2 from ssl_protocols (no longer supported in openssl-1.1.0)
+if grep -s -q "ssl_protocols .*!SSLv2" /etc/dovecot/conf.d/10-ssl.conf; then
+  sed -i 's/^\(ssl_protocols.*\)[[:blank:]]!SSLv2\(.*\)$/\1\2/g' /etc/dovecot/conf.d/10-ssl.conf
+fi
 
 %post -p /sbin/ldconfig