From f80ddb54a06173c979013fb29916fa09efe596a0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Nov 2021 02:06:26 +0100 Subject: openkdap: update to 2.6.0 --- package/openldap/Makefile | 6 +- .../patches/patch-libraries_libldap_tls_o_c | 67 ---------------------- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 package/openldap/patches/patch-libraries_libldap_tls_o_c (limited to 'package/openldap') diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 34c6a6642..2471893d1 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.45 +PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 -PKG_HASH:= cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 +PKG_HASH:= b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f PKG_DESCR:= ldap client libraries PKG_SECTION:= libs/misc PKG_DEPENDS:= libsasl2 libdb libuuid libncurses libressl PKG_BUILDDEP:= cyrus-sasl db util-linux libressl PKG_NEEDS:= threads c++ PKG_URL:= http://www.openldap.org/ -PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ +PKG_SITES:= https://openldap.org/software/download/OpenLDAP/openldap-release/ PKG_LIBNAME:= libopenldap PKG_OPTS:= dev diff --git a/package/openldap/patches/patch-libraries_libldap_tls_o_c b/package/openldap/patches/patch-libraries_libldap_tls_o_c deleted file mode 100644 index f620c03f6..000000000 --- a/package/openldap/patches/patch-libraries_libldap_tls_o_c +++ /dev/null @@ -1,67 +0,0 @@ -Patch from Macports: -https://trac.macports.org/ticket/54275 ---- openldap-2.4.45.orig/libraries/libldap/tls_o.c 2017-06-01 22:01:07.000000000 +0200 -+++ openldap-2.4.45/libraries/libldap/tls_o.c 2017-10-08 19:45:58.513865858 +0200 -@@ -47,7 +47,7 @@ - #include - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) - #endif - -@@ -157,7 +157,7 @@ tlso_init( void ) - (void) tlso_seed_PRNG( lo->ldo_tls_randfile ); - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - OpenSSL_add_all_digests(); -@@ -205,7 +205,7 @@ static void - tlso_ctx_ref( tls_ctx *ctx ) - { - tlso_ctx *c = (tlso_ctx *)ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX ) - #endif - SSL_CTX_up_ref( c ); -@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, s - if (!x) return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, - return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -721,7 +721,7 @@ struct tls_data { - Sockbuf_IO_Desc *sbiod; - }; - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - #define BIO_set_init(b, x) b->init = x - #define BIO_set_data(b, x) b->ptr = x - #define BIO_clear_flags(b, x) b->flags &= ~(x) -@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str ) - return tlso_bio_write( b, str, strlen( str ) ); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) - struct bio_method_st { - int type; - const char *name; -- cgit v1.2.3