Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f09779d0330c0c0ca9a8de3bb00b92bb1a2e76ab)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f09779d0330c0c0ca9a8de3bb00b92bb1a2e76ab)
  • Date: Wed, 26 Jun 2019 23:29:01 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/nghttp2/DETAILS | 4 +-
http/nghttp2/HISTORY | 4 ++
http/nghttp2/PRE_BUILD | 3 --
http/nghttp2/patches/libressl-2.8.patch | 45
--------------------------------
4 files changed, 6 insertions(+), 50 deletions(-)

New commits:
commit f09779d0330c0c0ca9a8de3bb00b92bb1a2e76ab
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/nghttp2: version 1.39.1

diff --git a/http/nghttp2/DETAILS b/http/nghttp2/DETAILS
index 64f404e..8305f78 100755
--- a/http/nghttp2/DETAILS
+++ b/http/nghttp2/DETAILS
@@ -1,6 +1,6 @@
SPELL="nghttp2"
- VERSION="1.37.0"
-
SOURCE_HASH="sha512:67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f"
+ VERSION="1.39.1"
+
SOURCE_HASH="sha512:36558ed03c59086086abbf144ec7c54c60de3fea00a9ea594feea7186a779781cbb66a08c9b34265892dea382b42b875f551e85331cfa0086e357f9b27b919fa"
SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]="https://github.com/${SPELL}/${SPELL}/releases/download/v${VERSION}/${SOURCE}";
diff --git a/http/nghttp2/HISTORY b/http/nghttp2/HISTORY
index 12da9b7..204fec1 100644
--- a/http/nghttp2/HISTORY
+++ b/http/nghttp2/HISTORY
@@ -1,3 +1,7 @@
+2019-06-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.39.1
+ * PRE_BUILD, patches/libressl-2.8.patch: dropped
+
2019-04-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.37.0

diff --git a/http/nghttp2/PRE_BUILD b/http/nghttp2/PRE_BUILD
deleted file mode 100755
index 922c0ab..0000000
--- a/http/nghttp2/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index d27de0b..0000000
--- a/http/nghttp2/patches/libressl-2.8.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7752178156e993213ec3f72da46df3cabdfbc952 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Fri, 10 Aug 2018 15:04:58 +0200
-Subject: [PATCH] libressl-2.8 fix
-
----
- src/shrpx_tls.cc | 2 +-
- src/ssl_compat.h | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-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 9574b7c..d135cc0 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
---
-2.18.0
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f09779d0330c0c0ca9a8de3bb00b92bb1a2e76ab), Pavel Vinogradov, 06/26/2019

Archive powered by MHonArc 2.6.24.

Top of Page