Skip to Content.
Sympa Menu

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

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 (c0675b8d8a29ca2949e66e7a3ce7b753d0984bf7)
  • Date: Tue, 7 Feb 2017 01:14:12 +0000

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

http/firefox/HISTORY | 4 +
http/firefox/PRE_BUILD | 4 +
http/nghttp2/DEPENDS | 1
http/nghttp2/HISTORY | 3
libs/libevent/DETAILS | 4 -
libs/libevent/HISTORY | 8 +-
libs/libevent/PRE_BUILD | 4 +
libs/libevent/PRE_SUB_DEPENDS | 5 +
libs/libevent/REPAIR^none^PRE_SUB_DEPENDS | 5 +
libs/libevent/SUB_DEPENDS | 5 +
libs/libevent/libevent.gpg |binary
libs/libevent/libressl.patch | 106
++++++++++++++++++++++++++++++
12 files changed, 146 insertions(+), 3 deletions(-)

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

http/nghttp2: libevent with SSL is required

commit 1d996dc03b8e7b19112d6ead54a772ba59a19d8d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: added a libevent 2.1.8 fix from BLFS

commit 3f74b2759f95257913de827e5726369384969179
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/libevent: version 2.1.8

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 930e607..ac7645d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,6 +1,10 @@
+2017-02-06 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: added a libevent 2.1.8 fix from BLFS
+
2017-01-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS: remove optional dependency on rust, which leads to
compile
error if enabled
+
2017-01-27 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 51.0.1

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 547ce80..9e7ca41 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -6,6 +6,10 @@ apply_patch_dir patches &&
# To remove version suffix from some directories
sed 's;-$(MOZ_APP_VERSION);;g' -i config/baseconfig.mk &&

+# libevent 2.1.8 fix
+sed 's/_EVENT_SIZEOF/EVENT__SIZEOF/'
+ -i ipc/chromium/src/base/message_pump_libevent.cc &&
+
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
# Fun with modern GCC flags to fix breakage with modern GCC only.
if is_version_less "$(gcc --version | head -n 1 | cut -f 3 -d ' ')" 6; then
diff --git a/http/nghttp2/DEPENDS b/http/nghttp2/DEPENDS
index c36458c..2af0db9 100755
--- a/http/nghttp2/DEPENDS
+++ b/http/nghttp2/DEPENDS
@@ -1,5 +1,6 @@
depends -sub CXX gcc &&
depends cmake &&
+depends -sub WITHSSL libevent &&
depends pkgconfig &&

optional_depends -sub THREAD boost \
diff --git a/http/nghttp2/HISTORY b/http/nghttp2/HISTORY
index a91c11c..6651d1f 100644
--- a/http/nghttp2/HISTORY
+++ b/http/nghttp2/HISTORY
@@ -1,3 +1,6 @@
+2017-02-06 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: needs libevent with SSL
+
2017-02-03 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.19.0
* PRE_BUILD, nghttpx-psk-libressl.patch: added a libressl fix from
diff --git a/libs/libevent/DETAILS b/libs/libevent/DETAILS
index b9e6f97..5f59bef 100755
--- a/libs/libevent/DETAILS
+++ b/libs/libevent/DETAILS
@@ -1,11 +1,11 @@
SPELL=libevent
- VERSION=2.0.22
+ VERSION=2.1.8
SOURCE=$SPELL-$VERSION-stable.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
SOURCE_GPG=libevent.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-stable"
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/levent/$SOURCE
+
SOURCE_URL[0]=https://github.com/${SPELL}/${SPELL}/releases/download/release-${VERSION}-stable/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://libevent.org
ENTERED=20030419
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index a9a6fb7..0f502b7 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,9 @@
+2017-02-06 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.1.8, switched to GitHub
+ * PRE_BUILD, libressl…patch: added a libressl fix from upstream
+ * *SUB_DEPENDS: added WITHSSL sub_dependency
+ * libevent…gpg: new key, 8EF8686D, Azat Khuzhin <a3at.mail AT gmail.com>
+
2016-01-10 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: fix source URL

@@ -11,7 +17,7 @@
* DEPENDS: fix typo

2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+ * DEPENDS: openssl => SSL

2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.21
diff --git a/libs/libevent/PRE_BUILD b/libs/libevent/PRE_BUILD
new file mode 100755
index 0000000..8bc7ab9
--- /dev/null
+++ b/libs/libevent/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -Np1 < ${SPELL_DIRECTORY}/libressl.patch
diff --git a/libs/libevent/PRE_SUB_DEPENDS b/libs/libevent/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4bd9f27
--- /dev/null
+++ b/libs/libevent/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+WITHSSL) is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} SSL) ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/libs/libevent/REPAIR^none^PRE_SUB_DEPENDS
b/libs/libevent/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4bd9f27
--- /dev/null
+++ b/libs/libevent/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+WITHSSL) is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} SSL) ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/libs/libevent/SUB_DEPENDS b/libs/libevent/SUB_DEPENDS
new file mode 100755
index 0000000..86e0350
--- /dev/null
+++ b/libs/libevent/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+WITHSSL) depends SSL "--enable-openssl" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/libs/libevent/libevent.gpg b/libs/libevent/libevent.gpg
index a6d86da..2e57574 100644
Binary files a/libs/libevent/libevent.gpg and b/libs/libevent/libevent.gpg
differ
diff --git a/libs/libevent/libressl.patch b/libs/libevent/libressl.patch
new file mode 100644
index 0000000..f338d73
--- /dev/null
+++ b/libs/libevent/libressl.patch
@@ -0,0 +1,106 @@
+From d057c45e8f48aa90d8b340cac4c8ae4cc8b5d0ac Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich AT FreeBSD.org>
+Date: Sat, 28 Jan 2017 16:42:13 +0000
+Subject: [PATCH] Unbreak build with LibreSSL after openssl 1.1 support added
+
+Fixes: 3e9e0a0d46e4 ("Make it build using OpenSSL 1.1.0")
+Fixes: #445
+---
+ openssl-compat.h | 4 ++--
+ sample/https-client.c | 6 +++---
+ sample/le-proxy.c | 2 +-
+ sample/openssl_hostname_validation.c | 2 +-
+ test/regress_ssl.c | 2 +-
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/openssl-compat.h b/openssl-compat.h
+index 69afc71..0f2dcb7 100644
+--- a/openssl-compat.h
++++ b/openssl-compat.h
+@@ -1,7 +1,7 @@
+ #ifndef OPENSSL_COMPAT_H
+ #define OPENSSL_COMPAT_H
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
+
+ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
+ {
+@@ -30,6 +30,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const
char *name)
+
+ #define TLS_method SSLv23_method
+
+-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
++#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER) */
+
+ #endif /* OPENSSL_COMPAT_H */
+diff --git a/sample/https-client.c b/sample/https-client.c
+index 7483956..7566683 100644
+--- a/sample/https-client.c
++++ b/sample/https-client.c
+@@ -312,7 +312,7 @@ main(int argc, char **argv)
+ }
+ uri[sizeof(uri) - 1] = '\0';
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
+ // Initialize OpenSSL
+ SSL_library_init();
+ ERR_load_crypto_strings();
+@@ -480,7 +480,7 @@ main(int argc, char **argv)
+ SSL_CTX_free(ssl_ctx);
+ if (type == HTTP && ssl)
+ SSL_free(ssl);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
+ EVP_cleanup();
+ ERR_free_strings();
+
+@@ -492,7 +492,7 @@ main(int argc, char **argv)
+ CRYPTO_cleanup_all_ex_data();
+
+ sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
+-#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */
++#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER) */
+
+ #ifdef _WIN32
+ WSACleanup();
+diff --git a/sample/le-proxy.c b/sample/le-proxy.c
+index 8d9b529..e2fbf45 100644
+--- a/sample/le-proxy.c
++++ b/sample/le-proxy.c
+@@ -259,7 +259,7 @@ main(int argc, char **argv)
+
+ if (use_ssl) {
+ int r;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
+ SSL_library_init();
+ ERR_load_crypto_strings();
+ SSL_load_error_strings();
+diff --git a/sample/openssl_hostname_validation.c
b/sample/openssl_hostname_validation.c
+index 40312f2..a60e38c 100644
+--- a/sample/openssl_hostname_validation.c
++++ b/sample/openssl_hostname_validation.c
+@@ -48,7 +48,7 @@ SOFTWARE.
+
+ #define HOSTNAME_MAX_SIZE 255
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
+ #define ASN1_STRING_get0_data ASN1_STRING_data
+ #endif
+
+diff --git a/test/regress_ssl.c b/test/regress_ssl.c
+index 681705f..490853f 100644
+--- a/test/regress_ssl.c
++++ b/test/regress_ssl.c
+@@ -186,7 +186,7 @@ get_ssl_ctx(void)
+ void
+ init_ssl(void)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
+ SSL_library_init();
+ ERR_load_crypto_strings();
+ SSL_load_error_strings();



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c0675b8d8a29ca2949e66e7a3ce7b753d0984bf7), Pavel Vinogradov, 02/06/2017

Archive powered by MHonArc 2.6.24.

Top of Page