sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b850a29b5b4d28abbcec65907ad26fcfa22aa58)
- 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 (1b850a29b5b4d28abbcec65907ad26fcfa22aa58)
- Date: Thu, 21 Jun 2018 10:26:40 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
http/nghttp2/DETAILS
| 5
http/nghttp2/HISTORY
| 5
http/nghttp2/PRE_BUILD
| 4
http/nghttp2/patches/0001-check-for-BIO_-get-set-_data-and-BIO_set_init.patch
| 60 ----------
4 files changed, 8 insertions(+), 66 deletions(-)
New commits:
commit 1b850a29b5b4d28abbcec65907ad26fcfa22aa58
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
nghttp2: => 1.32.0 SECURITY FIX
diff --git a/http/nghttp2/DETAILS b/http/nghttp2/DETAILS
index fedffe7..e592606 100755
--- a/http/nghttp2/DETAILS
+++ b/http/nghttp2/DETAILS
@@ -1,6 +1,7 @@
SPELL="nghttp2"
- VERSION=1.31.0
-
SOURCE_HASH=sha512:00342b0517eb9e1044eced4649488d7ad35694e0a1303c4cba2d2be897fb86c5c70f1a5a157799d5c0cf448a6b983f2a2a57ee2bdb5ec762876647f9303446ca
+ VERSION=1.32.0
+
SOURCE_HASH=sha512:ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
+ SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]="https://github.com/${SPELL}/${SPELL}/releases/download/v${VERSION}/${SOURCE}"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/http/nghttp2/HISTORY b/http/nghttp2/HISTORY
index 6a4dba0..549a1ba 100644
--- a/http/nghttp2/HISTORY
+++ b/http/nghttp2/HISTORY
@@ -1,3 +1,8 @@
+2018-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.32.0
+ security_patch=1 fix CVE-2018-1000168
+ * PRE_BUILD patches: deleted
+
2018-04-07 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD patches/*: fix for libressl-2.7
diff --git a/http/nghttp2/PRE_BUILD b/http/nghttp2/PRE_BUILD
deleted file mode 100755
index 175e82b..0000000
--- a/http/nghttp2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches &&
-autoreconf -f -i --symlink
diff --git
a/http/nghttp2/patches/0001-check-for-BIO_-get-set-_data-and-BIO_set_init.patch
b/http/nghttp2/patches/0001-check-for-BIO_-get-set-_data-and-BIO_set_init.patch
deleted file mode 100644
index 167155a..0000000
---
a/http/nghttp2/patches/0001-check-for-BIO_-get-set-_data-and-BIO_set_init.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From dc775b0801610c12504f345d0899ac8eff738024 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa AT alpinelinux.org>
-Date: Mon, 2 Apr 2018 20:32:02 +0000
-Subject: [PATCH] check for BIO_{get,set}_data and BIO_set_init
-
-LibreSSL implements those functions since 2.7 so to fix build failure
-with newer LibreSSL we need to check if those functions are implemented
-in stead of just check for OpenSSL 1.1.
-
-fixes #1156
-
-Signed-off-by: Natanael Copa <ncopa AT alpinelinux.org>
----
- configure.ac | 5 +++++
- src/shrpx_connection.cc | 10 ++++++----
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4d66b4a..467044f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -359,6 +359,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
- if test "x${have_openssl}" = "xno"; then
- AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
- fi
-+save_LIBS=$LIBS
-+LIBS=$OPENSSL_LIBS
-+AC_CHECK_FUNCS(BIO_set_data BIO_get_data BIO_set_init)
-+LIBS=$save_LIBS
-+
-
- # c-ares (for src)
- PKG_CHECK_MODULES([LIBCARES], [libcares >= 1.7.5], [have_libcares=yes],
-diff --git a/src/shrpx_connection.cc b/src/shrpx_connection.cc
-index 06ad958..e5cf1be 100644
---- a/src/shrpx_connection.cc
-+++ b/src/shrpx_connection.cc
-@@ -44,13 +44,15 @@ using namespace nghttp2;
-
- namespace shrpx {
-
--#if !OPENSSL_1_1_API
--
-+#ifndef HAVE_BIO_GET_DATA
- void *BIO_get_data(BIO *bio) { return bio->ptr; }
-+#endif
-+#ifndef HAVE_BIO_SET_DATA
- void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; }
-+#endif
-+#ifndef HAVE_BIO_SET_INIT
- void BIO_set_init(BIO *bio, int init) { bio->init = init; }
--
--#endif // !OPENSSL_1_1_API
-+#endif
-
- Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl,
- MemchunkPool *mcpool, ev_tstamp write_timeout,
---
-2.17.0
-
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b850a29b5b4d28abbcec65907ad26fcfa22aa58), Treeve Jelbert, 06/21/2018
Archive powered by MHonArc 2.6.24.