update to serf-1.3.9, similar diff from Sven Falempin, ok stsp

This commit is contained in:
sthen 2021-02-03 22:22:42 +00:00
parent 77931af376
commit a215fca685
5 changed files with 36 additions and 9 deletions

View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:48 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2021/02/03 22:22:42 sthen Exp $
COMMENT = high performance HTTP client library
DISTNAME = serf-1.3.8
DISTNAME = serf-1.3.9
SHARED_LIBS = serf-1 1.0 # 1.3.0
CATEGORIES = net
HOMEPAGE = https://code.google.com/p/serf/
HOMEPAGE = https://serf.apache.org/
MAINTAINER = Stefan Sperling <stsp@openbsd.org>
REVISION = 0
# APLv2
PERMIT_PACKAGE = Yes
WANTLIB = apr-1 aprutil-1 crypto db expat iconv pthread ssl z
MASTER_SITES = https://serf.googlecode.com/svn/src_releases/
MASTER_SITES = https://www.apache.org/dist/serf/
EXTRACT_SUFX = .tar.bz2
MODULES = devel/scons

View File

@ -1,2 +1,2 @@
SHA256 (serf-1.3.8.tar.bz2) = 4FAL4GXbvOSQRJg3uyq2JORtZPwLCQR02ayqh8grJZA=
SIZE (serf-1.3.8.tar.bz2) = 143337
SHA256 (serf-1.3.9.tar.bz2) = VJwtIcV3qKnARQ+stcyoCfJlkfBI5GZVIkCUe996h8w=
SIZE (serf-1.3.9.tar.bz2) = 145132

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-buckets_ssl_buckets_c,v 1.3 2021/02/03 22:22:42 sthen Exp $
Index: buckets/ssl_buckets.c
--- buckets/ssl_buckets.c.orig
+++ buckets/ssl_buckets.c
@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
}
#endif
-#ifdef USE_OPENSSL_1_1_API
+#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
OPENSSL_malloc_init();
#else
CRYPTO_malloc_init();

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-test_server_test_sslserver_c,v 1.1 2021/02/03 22:22:42 sthen Exp $
Index: test/server/test_sslserver.c
--- test/server/test_sslserver.c.orig
+++ test/server/test_sslserver.c
@@ -228,7 +228,7 @@ init_ssl_context(serv_ctx_t *serv_ctx,
/* Init OpenSSL globally */
if (!init_done)
{
-#ifdef USE_OPENSSL_1_1_API
+#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
OPENSSL_malloc_init();
#else
CRYPTO_malloc_init();

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2015/05/22 11:31:17 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2021/02/03 22:22:42 sthen Exp $
include/serf-1/
include/serf-1/serf.h
include/serf-1/serf_bucket_types.h
include/serf-1/serf_bucket_util.h
lib/libserf-1.a
@static-lib lib/libserf-1.a
@lib lib/libserf-1.so.${LIBserf-1_VERSION}
lib/pkgconfig/serf-1.pc