cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to openldap-2.4.52

Browse Source
This commit is contained in:
sthen 2020-09-01 13:23:10 +00:00
parent 371e7dfe60
commit af9a6c6402
3 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/openldap/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.178 2020/08/17 19:58:02 sthen Exp $
# $OpenBSD: Makefile,v 1.179 2020/09/01 13:23:10 sthen Exp $
DPB_PROPERTIES = parallel
COMMENT-main = open-source LDAP software (client)
COMMENT-server = open-source LDAP software (server)
DISTNAME = openldap-2.4.51
DISTNAME = openldap-2.4.52
PKGNAME-main = ${DISTNAME:S/-/-client-/}
PKGNAME-server = ${DISTNAME:S/-/-server-/}

4
databases/openldap/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openldap-2.4.51.tgz) = 9JB3XqTGUGtyEO5VoQLI9KrP6dHI6qYzxzFtM6cUvmI=
SIZE (openldap-2.4.51.tgz) = 5876819
SHA256 (openldap-2.4.52.tgz) = J3tFP44Vk9dZ5tb0yHRPIEL6hD5Vj44mfxx4kLjDVQg=
SIZE (openldap-2.4.52.tgz) = 5878365

44
databases/openldap/patches/patch-libraries_libldap_tls_o_c
View File

@ -1,44 +0,0 @@
$OpenBSD: patch-libraries_libldap_tls_o_c,v 1.4 2019/07/25 22:07:47 sthen Exp $
Unknown if these are still needed, the current state of locking code
in libressl is unclear.
Index: libraries/libldap/tls_o.c
--- libraries/libldap/tls_o.c.orig
+++ libraries/libldap/tls_o.c
@@ -68,7 +68,7 @@ static void tlso_info_cb( const SSL *ssl, int where, i
static int tlso_verify_cb( int ok, X509_STORE_CTX *ctx );
static int tlso_verify_ok( int ok, X509_STORE_CTX *ctx );
static int tlso_seed_PRNG( const char *randfile );
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
/*
* OpenSSL 1.1 API and later has new locking code
*/
@@ -234,7 +234,7 @@ tlso_destroy( void )
BIO_meth_free( tlso_bio_method );
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
EVP_cleanup();
#if OPENSSL_VERSION_NUMBER < 0x10000000
ERR_remove_state(0);
@@ -453,7 +453,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls
SSL_CTX_set_verify( ctx, i,
lo->ldo_tls_require_cert == LDAP_OPT_X_TLS_ALLOW ?
tlso_verify_ok : tlso_verify_cb );
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
SSL_CTX_set_tmp_rsa_callback( ctx, tlso_tmp_rsa_cb );
#endif
#ifdef HAVE_OPENSSL_CRL
@@ -1225,7 +1225,7 @@ tlso_report_error( void )
}
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
static RSA *
tlso_tmp_rsa_cb( SSL *ssl, int is_export, int key_length )
{