Skip to Content.
Sympa Menu

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

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 (921ff8aeb60437eb9cb93532fc3b1c9b12dc493c)
  • Date: Sat, 7 Apr 2018 07:39:22 +0000

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

http/nghttp2/HISTORY
| 3
http/nghttp2/PRE_BUILD
| 4

http/nghttp2/patches/0001-check-for-BIO_-get-set-_data-and-BIO_set_init.patch
| 60 ++++++++++
printer/cups-filters/DETAILS
| 4
printer/cups-filters/HISTORY
| 3
5 files changed, 72 insertions(+), 2 deletions(-)

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

nghttp2 - fix for libressl-2.7

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

cups-filters: => 1.20.2

diff --git a/http/nghttp2/HISTORY b/http/nghttp2/HISTORY
index da0c41f..6a4dba0 100644
--- a/http/nghttp2/HISTORY
+++ b/http/nghttp2/HISTORY
@@ -1,3 +1,6 @@
+2018-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/*: fix for libressl-2.7
+
2018-03-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.31.0

diff --git a/http/nghttp2/PRE_BUILD b/http/nghttp2/PRE_BUILD
new file mode 100755
index 0000000..175e82b
--- /dev/null
+++ b/http/nghttp2/PRE_BUILD
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..167155a
--- /dev/null
+++
b/http/nghttp2/patches/0001-check-for-BIO_-get-set-_data-and-BIO_set_init.patch
@@ -0,0 +1,60 @@
+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
+
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index 90f6f37..3d21060 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
SPELL=cups-filters
- VERSION=1.20.1
-
SOURCE_HASH=sha512:9c0fc3c821a24db99a55b0d5e1750946b294e3b265edae4d4701b4bb3ff9d0f19cb282ff44ec8880a0f643a2703ea3419b03d3d32a5e045d86a2d37031cef108
+ VERSION=1.20.2
+
SOURCE_HASH=sha512:94cc2a452b8dc1ed5f03b98e0530d7489dd5a369413b0ab0e7b054fcb198e8fee283507de2ef836df8ce9fb7f217794737fa4851baba72e5b79e38ad02ee61ea
SECURITY_PATCH=3
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index f47df86..5048b4e 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2018-04-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.20.2
+
2018-03-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.20.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (921ff8aeb60437eb9cb93532fc3b1c9b12dc493c), Treeve Jelbert, 04/07/2018

Archive powered by MHonArc 2.6.24.

Top of Page