Browse Source

Merge pull request #7340 from neheb/openldap

openldap: Backport patch to fix compilation without deprecated APIs
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
3e6acdb603
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
  1. +1
    -1
      libs/openldap/Makefile
  2. +26
    -0
      libs/openldap/patches/800-openssl-deprecated.patch

+ 1
- 1
libs/openldap/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openldap PKG_NAME:=openldap
PKG_VERSION:=2.4.46 PKG_VERSION:=2.4.46
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \ PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \


+ 26
- 0
libs/openldap/patches/800-openssl-deprecated.patch View File

@ -0,0 +1,26 @@
From d7a778004b0e0c7453075f1c7d429537162df436 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Fri, 21 Sep 2018 18:41:20 +0100
Subject: [PATCH] ITS#8809 add missing includes
---
libraries/libldap/tls_o.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index 010f311d7..99626ec15 100644
--- a/libraries/libldap/tls_o.c
+++ b/libraries/libldap/tls_o.c
@@ -43,6 +43,9 @@
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/safestack.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dh.h>
#elif defined( HAVE_SSL_H )
#include <ssl.h>
#endif
--
2.19.1

Loading…
Cancel
Save