Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (73c2e67ed7773c60e6dbb43fa72e689096b67d17)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (73c2e67ed7773c60e6dbb43fa72e689096b67d17)
  • Date: Fri, 10 Aug 2018 13:03:57 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

http/nghttp2/HISTORY | 3 +++
http/nghttp2/PRE_BUILD | 3 +++
http/nghttp2/patches/libressl-2.8.patch | 32
++++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+)

New commits:
commit 73c2e67ed7773c60e6dbb43fa72e689096b67d17
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

nghttp2 - fix for libresssl-2.8.0

diff --git a/http/nghttp2/HISTORY b/http/nghttp2/HISTORY
index 549a1ba..910f245 100644
--- a/http/nghttp2/HISTORY
+++ b/http/nghttp2/HISTORY
@@ -1,3 +1,6 @@
+2018-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/libressl-2.8.patch PRE_BUILD: added, fix for libressl-2.8.0
+
2018-06-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.32.0
security_patch=1 fix CVE-2018-1000168
diff --git a/http/nghttp2/PRE_BUILD b/http/nghttp2/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/http/nghttp2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/http/nghttp2/patches/libressl-2.8.patch
b/http/nghttp2/patches/libressl-2.8.patch
new file mode 100644
index 0000000..7f8166c
--- /dev/null
+++ b/http/nghttp2/patches/libressl-2.8.patch
@@ -0,0 +1,32 @@
+diff --git a/src/shrpx_tls.cc b/src/shrpx_tls.cc
+index 74ca9e1..cb3e68f 100644
+--- a/src/shrpx_tls.cc
++++ b/src/shrpx_tls.cc
+@@ -362,7 +362,7 @@ int tls_session_new_cb(SSL *ssl, SSL_SESSION *session) {
+
+ namespace {
+ SSL_SESSION *tls_session_get_cb(SSL *ssl,
+-#if OPENSSL_1_1_API
++#if OPENSSL_1_1_API || LIBRESSL_2_8_API
+ const unsigned char *id,
+ #else // !OPENSSL_1_1_API
+ unsigned char *id,
+diff --git a/src/ssl_compat.h b/src/ssl_compat.h
+index 777b83c..c962d21 100644
+--- a/src/ssl_compat.h
++++ b/src/ssl_compat.h
+@@ -32,12 +32,14 @@
+ #define LIBRESSL_IN_USE 1
+ #define LIBRESSL_LEGACY_API (LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define LIBRESSL_2_7_API (LIBRESSL_VERSION_NUMBER >= 0x20700000L)
++#define LIBRESSL_2_8_API (LIBRESSL_VERSION_NUMBER >= 0x20800000L)
+ #else // !defined(LIBRESSL_VERSION_NUMBER)
+ #define OPENSSL_1_1_API (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
+ #define OPENSSL_1_1_1_API (OPENSSL_VERSION_NUMBER >= 0x10101000L)
+ #define LIBRESSL_IN_USE 0
+ #define LIBRESSL_LEGACY_API 0
+ #define LIBRESSL_2_7_API 0
++#define LIBRESSL_2_8_API 0
+ #endif // !defined(LIBRESSL_VERSION_NUMBER)
+
+ #endif // OPENSSL_COMPAT_H



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (73c2e67ed7773c60e6dbb43fa72e689096b67d17), Treeve Jelbert, 08/10/2018

Archive powered by MHonArc 2.6.24.

Top of Page