From fc87bd7e122197d40aac5034d1b93e7ea8adbd01d41227fe60099f063d49a9be Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Tue, 31 Mar 2020 14:27:13 +0000
Subject: [PATCH] Accepting request 790182 from
 home:vitezslav_cizek:branches:security:tls

- Update to 1.1.1f
  * Revert the unexpected EOF reporting via SSL_ERROR_SSL
- refresh openssl-1.1.0-no-html.patch

OBS-URL: https://build.opensuse.org/request/show/790182
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=66
---
 openssl-1.1.0-no-html.patch |  8 ++++----
 openssl-1.1.1e.tar.gz       |  3 ---
 openssl-1.1.1e.tar.gz.asc   | 11 -----------
 openssl-1.1.1f.tar.gz       |  3 +++
 openssl-1.1.1f.tar.gz.asc   | 11 +++++++++++
 openssl-1_1.changes         |  7 +++++++
 openssl-1_1.spec            |  2 +-
 7 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 openssl-1.1.1e.tar.gz
 delete mode 100644 openssl-1.1.1e.tar.gz.asc
 create mode 100644 openssl-1.1.1f.tar.gz
 create mode 100644 openssl-1.1.1f.tar.gz.asc

diff --git a/openssl-1.1.0-no-html.patch b/openssl-1.1.0-no-html.patch
index 0b35e05..2d7ab85 100644
--- a/openssl-1.1.0-no-html.patch
+++ b/openssl-1.1.0-no-html.patch
@@ -1,7 +1,7 @@
-Index: openssl-1.1.1d/Configurations/unix-Makefile.tmpl
+Index: openssl-1.1.1f/Configurations/unix-Makefile.tmpl
 ===================================================================
---- openssl-1.1.1d.orig/Configurations/unix-Makefile.tmpl	2019-09-11 15:38:17.788265421 +0200
-+++ openssl-1.1.1d/Configurations/unix-Makefile.tmpl	2019-09-11 15:38:35.640368636 +0200
+--- openssl-1.1.1f.orig/Configurations/unix-Makefile.tmpl	2020-03-31 16:07:11.764502217 +0200
++++ openssl-1.1.1f/Configurations/unix-Makefile.tmpl	2020-03-31 16:07:45.036664229 +0200
 @@ -544,7 +544,7 @@ install_sw: install_dev install_engines
  
  uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
@@ -10,4 +10,4 @@ Index: openssl-1.1.1d/Configurations/unix-Makefile.tmpl
 +install_docs: install_man_docs
  
  uninstall_docs: uninstall_man_docs uninstall_html_docs
- 	$(RM) -r $(DESTDIR)$(DOCDIR)
+ 	$(RM) -r "$(DESTDIR)$(DOCDIR)"
diff --git a/openssl-1.1.1e.tar.gz b/openssl-1.1.1e.tar.gz
deleted file mode 100644
index ce0db29..0000000
--- a/openssl-1.1.1e.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe
-size 9792634
diff --git a/openssl-1.1.1e.tar.gz.asc b/openssl-1.1.1e.tar.gz.asc
deleted file mode 100644
index eea7f7a..0000000
--- a/openssl-1.1.1e.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAl5w3zsACgkQ2cTSbQ5g
-RJGAhAgAuX8zgGf2QK/fx1H1zmyR3j0oetXHb+tohlqITZYWl1V3nG4rciL0awOI
-vBXNFQHKLBC+yY8AwXUqymGyOUTCEANT+ENeC9bfKigoEgo26V+bMzkU5dST3khy
-scaYT4TEAjNVHeDb3Bt5jh8H/dNeUIKKan9ng29zrSfSHd7nXMEgPQMCgxSLdyYQ
-Ej1VnFhuIc4e6I4tXWPUUhG3jqezpuOJi6h29DUg3mG+4UIyFXAUJr8vIg3ldasG
-/A1QNVRMKROUHe1Bhm5v6zS7p9OnVHPkXPcoJTtIaciIU4wGMeeo/zoEgng+opin
-X5+7jkfapyP9z+7CSl85BcrW3xrK+g==
-=+Xvm
------END PGP SIGNATURE-----
diff --git a/openssl-1.1.1f.tar.gz b/openssl-1.1.1f.tar.gz
new file mode 100644
index 0000000..6518e33
--- /dev/null
+++ b/openssl-1.1.1f.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35
+size 9792828
diff --git a/openssl-1.1.1f.tar.gz.asc b/openssl-1.1.1f.tar.gz.asc
new file mode 100644
index 0000000..7cb56d0
--- /dev/null
+++ b/openssl-1.1.1f.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAl6DNO8ACgkQ2cTSbQ5g
+RJEcRQf+PEPY47eqigmUqN26vlOu/QUjYFlB5R9K90DFJvS+UM/KoS4UwdTSuska
+hk010MFZlhlFKvzFX6pkyq4AHW1Ta3la3VqRwHAv/TYVCWKIsSKpm07tW6Z/aF4w
+N4JAciN9I1+nsnEYvVZUbDvXw64B35Hxgd6mRc6gRbp8yQwkPNUspZxS6DcUIPPV
+bgU/s/+aB1kqjG6oBbe7HFBqD8xbnvL8/unsi3OLLxUp2dUvndHDmKX/sW6+T8S2
+BL3Czskk25hV2fYMZY/97oiUDkTNH3Tfa1WlwLRF/NPAakem2m47biwgJv74mKAm
+8D6M7om3dh3FsBYMq2JkfHIfUTvhRw==
+=WoEF
+-----END PGP SIGNATURE-----
diff --git a/openssl-1_1.changes b/openssl-1_1.changes
index 7af4c6b..7706f15 100644
--- a/openssl-1_1.changes
+++ b/openssl-1_1.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 31 14:05:24 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
+
+- Update to 1.1.1f
+  * Revert the unexpected EOF reporting via SSL_ERROR_SSL
+- refresh openssl-1.1.0-no-html.patch
+
 -------------------------------------------------------------------
 Fri Mar 20 11:58:08 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
 
diff --git a/openssl-1_1.spec b/openssl-1_1.spec
index c2f852e..8aa9bf5 100644
--- a/openssl-1_1.spec
+++ b/openssl-1_1.spec
@@ -21,7 +21,7 @@
 %define _rname  openssl
 Name:           openssl-1_1
 # Don't forget to update the version in the "openssl" package!
-Version:        1.1.1e
+Version:        1.1.1f
 Release:        0
 Summary:        Secure Sockets and Transport Layer Security
 License:        OpenSSL