From a920266b9cb5c1ab35c2ca50815e370555b0cff8 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 8 Dec 2021 11:16:54 +0800
Subject: [PATCH] openldap: upgrade 2.5.8 -> 2.5.9

OpenLDAP 2.5.9 Release (2021/10/25)
  Fixed slapo-accesslog to initialize minCSN on import of 2.4 databases (ITS#9720)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-support/openldap/openldap/install-strip.patch   | 2 +-
 .../openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch   | 2 +-
 meta-oe/recipes-support/openldap/openldap/use-urandom.patch | 2 +-
 .../openldap/{openldap_2.5.8.bb => openldap_2.5.9.bb}       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/openldap/{openldap_2.5.8.bb => openldap_2.5.9.bb} (98%)

diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
index b757aabb00..fb7ad8f59f 100644
--- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch
+++ b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
@@ -2,7 +2,7 @@
 # programs and libraries (LTINSTALL) work in a cross build
 # environment.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [embedded specific]
 
 --- a/build/top.mk
 +++ b/build/top.mk
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
index f551861a3e..8cfd0033c8 100644
--- a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
@@ -1,6 +1,6 @@
 From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/
 
-Upstream-status: Pending
+Upstream-Status: Pending
 
 --- a/configure.ac
 +++ b/configure.ac
diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
index 6783b5175b..0b7e3a28a6 100644
--- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
+++ b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
@@ -4,7 +4,7 @@ When we are cross-compiling, we want to assume
 that /dev/urandom exists.  We could change the source
 code to look for it, but this is the easy way out.
 
-Upstream-Status: pending
+Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Joe Slater <jslater@windriver.com>
 
diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.8.bb b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb
similarity index 98%
rename from meta-oe/recipes-support/openldap/openldap_2.5.8.bb
rename to meta-oe/recipes-support/openldap/openldap_2.5.9.bb
index 17e6f72dcf..d95d6912e1 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.8.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb
@@ -23,8 +23,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-ldif-filter-fix-parallel-build-failure.patch \
 "
 
-SRC_URI[md5sum] = "86e3ffce4adfc57cbb76ac0ff48b2614"
-SRC_URI[sha256sum] = "366ea1c3b24202de4481978b632128c0cfe4148d4ae13cabf93a1f38c56472dc"
+SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11"
+SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e"
 
 DEPENDS = "util-linux groff-native"
 
@@ -179,7 +179,7 @@ do_install:append() {
     # Installing slapd under ${sbin} is more FHS and LSB compliance
     mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd
     rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
-    SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema"
+    SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify"
     cd ${D}/${sbindir}/
     rm -f ${SLAPTOOLS}
     for i in ${SLAPTOOLS}; do ln -sf slapd $i; done