From: W. Michael Petullo <mike@flyn.org>
Date: Mon, 1 Feb 2021 03:05:03 +0000 (-0600)
Subject: openldap: update to 2.4.57
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=71e9077fa444967f225218b5250cc1f84ce4e572;p=feed%2Fpackages.git

openldap: update to 2.4.57

Fixes:

  * CVE-2020-36221
  * CVE-2020-36222
  * CVE-2020-36223
  * CVE-2020-36224
  * CVE-2020-36225
  * CVE-2020-36226
  * CVE-2020-36227
  * CVE-2020-36228
  * CVE-2020-36229
  * CVE-2020-36230

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index 60fdc8c048..d21e51ab74 100644
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
-PKG_VERSION:=2.4.56
+PKG_VERSION:=2.4.57
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-r
 	http://mirror.eu.oneandone.net/software/openldap/openldap-release/ \
 	http://mirror.switch.ch/ftp/software/mirror/OpenLDAP/openldap-release/ \
 	https://www.openldap.org/software/download/OpenLDAP/openldap-release/
-PKG_HASH:=25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0
+PKG_HASH:=c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a
 PKG_LICENSE:=OLDAP-2.8
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:openldap:openldap
diff --git a/libs/openldap/patches/800-implicit.patch b/libs/openldap/patches/800-implicit.patch
index 6a39d78b47..aa7e294847 100644
--- a/libs/openldap/patches/800-implicit.patch
+++ b/libs/openldap/patches/800-implicit.patch
@@ -1,6 +1,6 @@
 --- a/libraries/libldap/tls2.c
 +++ b/libraries/libldap/tls2.c
-@@ -41,6 +41,7 @@ static tls_impl *tls_imp = &ldap_int_tls_impl;
+@@ -41,6 +41,7 @@ static tls_impl *tls_imp = &ldap_int_tls
  #define HAS_TLS( sb )	ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, \
  				(void *)tls_imp->ti_sbio )