From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- net-nds/openldap/Manifest | 1 - .../openldap/files/openldap-2.4.45-libressl.patch | 65 ---------------------- 2 files changed, 66 deletions(-) delete mode 100644 net-nds/openldap/files/openldap-2.4.45-libressl.patch (limited to 'net-nds/openldap') diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index a3a42284da8a..07067197cea0 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -11,7 +11,6 @@ AUX openldap-2.4.35-contrib-smbk5pwd.patch 1626 BLAKE2B 309b08c5bc3042625741daff AUX openldap-2.4.40-slapd-conf 2059 BLAKE2B bc80677203c52304fd302288ea33face5b05504bcc8f98b202db3251b9cc85047db5a72f9596d51206e946298652bd1f277c1494bfae2f64d2b9bc4b7771e681 SHA512 7ce8a8262db74d86449a3d31b96b2efa9e8dae2f9992a1c3a6d6899fb65531eaf917f410d8728852cb74338d7ba3c8c3b52d2f6cdcbba4cb3b97f6c733099fa2 AUX openldap-2.4.42-mdb-unbundle.patch 3589 BLAKE2B 243dc22251aacd5d978120219b6078bf640df2b34034adfef3b1eb7cea70bf94926cebb60c7c199a74d91b594d39763c46b07ffc1b0d72e52a86fd36f5450802 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec AUX openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch 3542 BLAKE2B ffc226dc3dc2fe55d697667a49057ca9818d9bb85280bc68f1aa46e90abc92cca4ce18dbf3c735b83c1126a817e1c62911d486ef790de5a06c83468021733232 SHA512 326e73df430eb152fa5c53deb12071795f5958e6c48167021ebab83c6b1c4320ed56b0dfe5dd3475de463ff24e43cc8fe2c7cbf905e11cc1d48a70e350cb0ebc -AUX openldap-2.4.45-libressl.patch 2276 BLAKE2B 5db4802b2ed606879a1c6ae31068f9569bcf10db7ffca7c7b48bad5331396d1dd669ed77fc7af99e418570be10c47c6e229afea1eb2a7512ed2c99bad4d3343b SHA512 72d5177f67ce62053a66c241bedcc3a301544726c6ebf7055482c58337cf2a9fdab89336f910e039f90ef7f23fade4fdc167b8caab91acfb5ca5754780c962ab AUX openldap-2.4.47-libressl.patch 2071 BLAKE2B 8c8d14e849c40de698431484a8be31b4b8fa63e19387b59fba8d9ed7d5d6e2c0ccded94b8933f77b145965b9c2aac376713c7561971139c4446c39c54b808fd3 SHA512 e3a7fbf994a67ba224f1024f5c0ee260c9252cab67ca8e49279d20cab2d7a0eb4c6431a4800857f247185c9a875fc1d5e9a94200c9e2f90d4d664969c9659b75 AUX openldap-2.4.47-warnings.patch 1096 BLAKE2B d5843b0370a8785e42281ee4a760198450963e21de3babfc97bf1d69c3010360c9012c04956fedc4a9e5e3b993682b50a3aae44e7d17ba833d0c6b96a3db3e64 SHA512 7669f87e5838abae0d67b0ad42c08c51b9891507b2e4026d5910e0c770675ca71c70360e3dddfec2c077decdfce6c35cc7fb0f6332904beac12702a1db6de35f AUX openldap-2.4.6-evolution-ntlm.patch 5161 BLAKE2B edd265d9012c91c36a7cd6abe1a409e3aac384f49dcf410d1cf3f41e8ec3a988ec90995239dd4d9c5016a3b320e945526abdaeb6f3187b4a4323fdff97e73eeb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b diff --git a/net-nds/openldap/files/openldap-2.4.45-libressl.patch b/net-nds/openldap/files/openldap-2.4.45-libressl.patch deleted file mode 100644 index 20a65a4e0fd1..000000000000 --- a/net-nds/openldap/files/openldap-2.4.45-libressl.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- libraries/libldap/tls_o.c.orig 2017-06-04 16:31:28 UTC -+++ libraries/libldap/tls_o.c -@@ -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, struct berval * - 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, struct berval - 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