sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4cd050910ace1933b9088d004412361f306b5bbb)

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 (4cd050910ace1933b9088d004412361f306b5bbb)
Date: Sat, 29 Jun 2019 04:40:01 +0000

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

libs/libevent/DETAILS | 2
libs/libevent/HISTORY | 4
libs/libevent/PRE_BUILD | 3
libs/libevent/patches/0001-libressl.patch | 106 ---------
libs/libevent/patches/0002-Fix-build-with-LibreSSL-2.7.patch | 124
-----------
5 files changed, 5 insertions(+), 234 deletions(-)

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

libs/libevent: version 2.1.10

diff --git a/libs/libevent/DETAILS b/libs/libevent/DETAILS
index 5f59bef..bfb5e9a 100755
--- a/libs/libevent/DETAILS
+++ b/libs/libevent/DETAILS
@@ -1,5 +1,5 @@
SPELL=libevent
- VERSION=2.1.8
+ VERSION=2.1.10
SOURCE=$SPELL-$VERSION-stable.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index 42cb983..d0781e4 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,7 @@
+2019-06-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.1.10
+ * PRE_BUILD, patches/*: dropped
+
2018-04-05 Treeve Jelbert <treeve AT sourcemage.org>
* libressl-2.7.patch
* PRE_BUILD: apply all patches
diff --git a/libs/libevent/PRE_BUILD b/libs/libevent/PRE_BUILD
deleted file mode 100755
index e762f65..0000000
--- a/libs/libevent/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-apply_patch_dir patches
diff --git a/libs/libevent/patches/0001-libressl.patch
b/libs/libevent/patches/0001-libressl.patch
deleted file mode 100644
index f338d73..0000000
--- a/libs/libevent/patches/0001-libressl.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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();
diff --git a/libs/libevent/patches/0002-Fix-build-with-LibreSSL-2.7.patch
b/libs/libevent/patches/0002-Fix-build-with-LibreSSL-2.7.patch
deleted file mode 100644
index 51b86d7..0000000
--- a/libs/libevent/patches/0002-Fix-build-with-LibreSSL-2.7.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 28b8075400c70b2d2da2ce07e590c2ec6d11783d Mon Sep 17 00:00:00 2001
-From: Bernard Spil <brnrd AT FreeBSD.org>
-Date: Mon, 2 Apr 2018 13:18:27 +0200
-Subject: [PATCH 1/3] Fix build with LibreSSL 2.7
-
-LibreSSL 2.7 implements OpenSSL 1.1 API except for BIO_get_init()
-
-See also: https://bugs.freebsd.org/226900
-Signed-off-by: Bernard Spil <brnrd AT FreeBSD.org>
-Closes: #617 (cherry-pick)
----
- openssl-compat.h | 10 ++++++++--
- sample/https-client.c | 9 ++++++---
- sample/le-proxy.c | 3 ++-
- sample/openssl_hostname_validation.c | 3 ++-
- test/regress_ssl.c | 3 ++-
- 5 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/openssl-compat.h b/openssl-compat.h
-index bffd259..5d91ac6 100644
---- a/openssl-compat.h
-+++ b/openssl-compat.h
-@@ -4,7 +4,8 @@
- #include <openssl/bio.h>
- #include "util-internal.h"
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
-
- static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
- {
-@@ -33,6 +34,11 @@ static inline BIO_METHOD *BIO_meth_new(int type, const
char *name)
-
- #define TLS_method SSLv23_method
-
--#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER) */
-+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L) */
-+
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >=
0x20700000L
-+#define BIO_get_init(b) (b)->init
-+#endif
-
- #endif /* OPENSSL_COMPAT_H */
-diff --git a/sample/https-client.c b/sample/https-client.c
-index 8ef7598..4292f09 100644
---- a/sample/https-client.c
-+++ b/sample/https-client.c
-@@ -312,7 +312,8 @@ main(int argc, char **argv)
- }
- uri[sizeof(uri) - 1] = '\0';
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
- // Initialize OpenSSL
- SSL_library_init();
- ERR_load_crypto_strings();
-@@ -488,7 +489,8 @@ cleanup:
- SSL_CTX_free(ssl_ctx);
- if (type == HTTP && ssl)
- SSL_free(ssl);
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
- EVP_cleanup();
- ERR_free_strings();
-
-@@ -501,7 +503,8 @@ cleanup:
- CRYPTO_cleanup_all_ex_data();
-
- sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
--#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER) */
-+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L) */
-
- #ifdef _WIN32
- WSACleanup();
-diff --git a/sample/le-proxy.c b/sample/le-proxy.c
-index 4e1cf03..73c4888 100644
---- a/sample/le-proxy.c
-+++ b/sample/le-proxy.c
-@@ -261,7 +261,8 @@ main(int argc, char **argv)
-
- if (use_ssl) {
- int r;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
- 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 a60e38c..4036ccb 100644
---- a/sample/openssl_hostname_validation.c
-+++ b/sample/openssl_hostname_validation.c
-@@ -48,7 +48,8 @@ SOFTWARE.
-
- #define HOSTNAME_MAX_SIZE 255
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
- #define ASN1_STRING_get0_data ASN1_STRING_data
- #endif
-
-diff --git a/test/regress_ssl.c b/test/regress_ssl.c
-index 5004f7e..9202697 100644
---- a/test/regress_ssl.c
-+++ b/test/regress_ssl.c
-@@ -185,7 +185,8 @@ get_ssl_ctx(void)
- void
- init_ssl(void)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ||
defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
0x20700000L)
- SSL_library_init();
- ERR_load_crypto_strings();
- SSL_load_error_strings();
---
-2.17.0
-

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4cd050910ace1933b9088d004412361f306b5bbb), Pavel Vinogradov, 06/29/2019