Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d9196e9b34b0f7ba59d10987eac9eadd9c6783d9)

Chronological Thread  
    < 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 (d9196e9b34b0f7ba59d10987eac9eadd9c6783d9)
  • Date: Mon, 3 Sep 2018 07:29:51 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

devel/nlohmann_json/DETAILS | 2 -
devel/nlohmann_json/HISTORY | 3 ++
http/nghttp2/DETAILS | 4 +-
http/nghttp2/HISTORY | 4 ++
http/nghttp2/patches/libressl-2.8.patch | 43
++++++++++++++++++++------------
qt5-cmake/otter/DETAILS | 4 +-
qt5-cmake/otter/HISTORY | 3 ++
7 files changed, 43 insertions(+), 20 deletions(-)

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

nghttp2: => 1.33.0

commit 4c9487b330ab1e4c07b2ecc70baa4ed6dd0a6d10
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

otter: => 0.9.99.3

commit a2df84e267a607a59948fcb81cc6e0ffb664f989
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

nlohmann_json: => 3.2.0

diff --git a/devel/nlohmann_json/DETAILS b/devel/nlohmann_json/DETAILS
index e5642b0..c1f6b8e 100755
--- a/devel/nlohmann_json/DETAILS
+++ b/devel/nlohmann_json/DETAILS
@@ -1,7 +1,7 @@
#source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=nlohmann_json
SPELLX=json.hpp
- VERSION=3.1.2
+ VERSION=3.2.0
SOURCE=$SPELL-$VERSION
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/nlohmann_json/HISTORY b/devel/nlohmann_json/HISTORY
index c5e6f7c..f12bf85 100644
--- a/devel/nlohmann_json/HISTORY
+++ b/devel/nlohmann_json/HISTORY
@@ -1,3 +1,6 @@
+2018-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.0
+
2018-06-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.2
spell created
diff --git a/http/nghttp2/DETAILS b/http/nghttp2/DETAILS
index e592606..981b648 100755
--- a/http/nghttp2/DETAILS
+++ b/http/nghttp2/DETAILS
@@ -1,6 +1,6 @@
SPELL="nghttp2"
- VERSION=1.32.0
-
SOURCE_HASH=sha512:ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
+ VERSION=1.33.0
+
SOURCE_HASH=sha512:eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
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 910f245..06d7796 100644
--- a/http/nghttp2/HISTORY
+++ b/http/nghttp2/HISTORY
@@ -1,3 +1,7 @@
+2018-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.33.0
+ * patches/libressl-2.8.patch: update
+
2018-08-10 Treeve Jelbert <treeve AT sourcemage.org>
* patches/libressl-2.8.patch PRE_BUILD: added, fix for libressl-2.8.0

diff --git a/http/nghttp2/patches/libressl-2.8.patch
b/http/nghttp2/patches/libressl-2.8.patch
index 7f8166c..d27de0b 100644
--- a/http/nghttp2/patches/libressl-2.8.patch
+++ b/http/nghttp2/patches/libressl-2.8.patch
@@ -1,9 +1,19 @@
+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
@@ -12,21 +22,24 @@ index 74ca9e1..cb3e68f 100644
#else // !OPENSSL_1_1_API
unsigned char *id,
diff --git a/src/ssl_compat.h b/src/ssl_compat.h
-index 777b83c..c962d21 100644
+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)
-
+ # 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
+
diff --git a/qt5-cmake/otter/DETAILS b/qt5-cmake/otter/DETAILS
index bf081ad..15c568d 100755
--- a/qt5-cmake/otter/DETAILS
+++ b/qt5-cmake/otter/DETAILS
@@ -1,7 +1,7 @@
SPELL=otter
SPELLX=otter-browser
- VERSION=0.9.99.2
-
SOURCE_HASH=sha512:5d30e826a011847be8f2df53efa3d389be350d139ed39abbd21fa7de2555769b5098a6f7849794463866be793365b3c91c527cfd3b17e06f32f61ec526756139
+ VERSION=0.9.99.3
+
SOURCE_HASH=sha512:35a8f24e6c9daf8cdc7aac8467ac4e3e32ea8447df2ded4effe0f514da2d248fa783e5edec8db910c8374905dc7171c45f4ef2a5f1d1f8b430c459cf15fba6e2
SOURCE=$SPELLX-$VERSION.tar.gz

SOURCE_URL=https://github.com/OtterBrowser/otter-browser/archive/v${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5-cmake/otter/HISTORY b/qt5-cmake/otter/HISTORY
index 0c0a7e5..8d82c62 100644
--- a/qt5-cmake/otter/HISTORY
+++ b/qt5-cmake/otter/HISTORY
@@ -1,3 +1,6 @@
+2018-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.99.3
+
2018-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.99.2



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d9196e9b34b0f7ba59d10987eac9eadd9c6783d9), Treeve Jelbert, 09/03/2018

Archive powered by MHonArc 2.6.24.

Top of Page