Skip to contentSkip to conversation

package/libopenssl: bump to version 1.1.1b

PATCH New Peter Korsgaard 1 participant 2 messages Mar 21, 2019 – Mar 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libopenssl: bump to version 1.1.1b

Drop patches 4..6 as they are now upstream.

Update the hash of the license file as the copyright dates changed.

---
 ...-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch |  46 ---
 ...t-Reduce-stack-usage-in-tls13_hkdf_expand.patch |  62 ---
 ...ix-some-SSL_export_keying_material-issues.patch | 426 ---------------------
 package/libopenssl/libopenssl.hash                 |   6 +-
 package/libopenssl/libopenssl.mk                   |   2 +-
 5 files changed, 4 insertions(+), 538 deletions(-)
 delete mode 100644 package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch
 delete mode 100644 package/libopenssl/0005-Revert-Reduce-stack-usage-in-tls13_hkdf_expand.patch
 delete mode 100644 package/libopenssl/0006-Fix-some-SSL_export_keying_material-issues.patch
package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch deleted +0 -46
deleted file mode 100644
index 83989fe742..0000000000
@@ -1,46 +0,0 @@
-From 4c992673890f1d1ecb9aa46112b2ca80db016b67 Mon Sep 17 00:00:00 2001
-From: Richard Levitte <[email protected]>
-Date: Mon, 12 Nov 2018 18:16:27 +0100
-Subject: [PATCH] apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.c
-
-This allows the user to override our defaults if needed, and in a
-consistent manner.
-
-Partial fix for #7607
-
-Upstream: https://github.com/openssl/openssl/pull/7624
-Signed-off-by: Patrick Havelange <[email protected]>
----
- apps/ocsp.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/apps/ocsp.c b/apps/ocsp.c
-index 7fd78624bb..315b072932 100644
---- a/apps/ocsp.c
-+++ b/apps/ocsp.c
-@@ -36,7 +36,21 @@ NON_EMPTY_TRANSLATION_UNIT
- # include <openssl/x509v3.h>
- # include <openssl/rand.h>
- 
--# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \
-+#ifndef HAVE_FORK
-+# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
-+#  define HAVE_FORK 0
-+# else
-+#  define HAVE_FORK 1
-+# endif
-+#endif
-+
-+#if HAVE_FORK
-+# undef NO_FORK
-+#else
-+# define NO_FORK
-+#endif
-+
-+# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
-      && !defined(OPENSSL_NO_POSIX_IO)
- #  define OCSP_DAEMON
- #  include <sys/types.h>
--- 
-2.17.1
-
package/libopenssl/0005-Revert-Reduce-stack-usage-in-tls13_hkdf_expand.patch deleted +0 -62

62 lines not on this page · raw message

package/libopenssl/0006-Fix-some-SSL_export_keying_material-issues.patch deleted +0 -426

426 lines not on this page · raw message

package/libopenssl/libopenssl.hash +3 -3
index 568d7e8b52..3a8192c46c 100644
@@ -1,5 +1,5 @@
-# From https://www.openssl.org/source/openssl-1.1.1a.tar.gz.sha256
-sha256	fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41	openssl-1.1.1a.tar.gz
+# From https://www.openssl.org/source/openssl-1.1.1b.tar.gz.sha256
+sha256	5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b	openssl-1.1.1b.tar.gz
 
 # License files
-sha256	350c7817af2ef980d3f3922bc5e0bb6a9d9f6cc21e784a699bcd2a31c74a84b1	LICENSE
+sha256	c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c	LICENSE
package/libopenssl/libopenssl.mk +1 -1
index a845f1da53..36623fa85f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBOPENSSL_VERSION = 1.1.1a
+LIBOPENSSL_VERSION = 1.1.1b
 LIBOPENSSL_SITE = https://www.openssl.org/source
 LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
 LIBOPENSSL_LICENSE = OpenSSL or SSLeay
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/libopenssl: bump to version 1.1.1b

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Drop patches 4..6 as they are now upstream.
Update the hash of the license file as the copyright dates changed.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard