From 555323b5cdb73e0c67fe7ae421f0d777503899f1 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 26 Apr 2018 01:06:38 +0000
Subject: [PATCH] openldap: bump to 2.4.46, add debuginfo.

---
 ...p-2.4.45.recipe => openldap-2.4.46.recipe} | 62 ++++++++++++-------
 1 file changed, 38 insertions(+), 24 deletions(-)
 rename net-nds/openldap/{openldap-2.4.45.recipe => openldap-2.4.46.recipe} (66%)

diff --git a/net-nds/openldap/openldap-2.4.45.recipe b/net-nds/openldap/openldap-2.4.46.recipe
similarity index 66%
rename from net-nds/openldap/openldap-2.4.45.recipe
rename to net-nds/openldap/openldap-2.4.46.recipe
index 2731a6790..36215bce9 100644
--- a/net-nds/openldap/openldap-2.4.45.recipe
+++ b/net-nds/openldap/openldap-2.4.46.recipe
@@ -7,27 +7,31 @@ develop the OpenLDAP Suite and its related documentation."
 COPYRIGHT="1998-2016 The OpenLDAP Foundation"
 HOMEPAGE="http://www.openldap.org/"
 LICENSE="OpenLDAP Public License"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$portVersion.tgz"
-CHECKSUM_SHA256="cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"
+CHECKSUM_SHA256="9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="2.10.9"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVers="${portVersion%.*}"
+
 GLOBAL_WRITABLE_FILES="settings/openldap/ldap.conf keep-old"
 USER_SETTINGS_FILES="
 	settings/openldap/ldap.conf template data/openldap/ldap.conf.default
-"
+	"
 
 PROVIDES="
 	openldap$secondaryArchSuffix = $portVersion
-	lib:liblber$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	lib:liblber_2.4$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	lib:libldap$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	lib:libldap_2.4$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	lib:libldap_r$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	lib:libldap_r_2.4$secondaryArchSuffix = 2.10.8 compat >= 2.10
-"
+	lib:liblber$secondaryArchSuffix = $libVersionCompat
+	lib:liblber_$portVers$secondaryArchSuffix = $libVersionCompat
+	lib:libldap$secondaryArchSuffix = $libVersionCompat
+	lib:libldap_$portVers$secondaryArchSuffix = $libVersionCompat
+	lib:libldap_r$secondaryArchSuffix = $libVersionCompat
+	lib:libldap_r_$portVers$secondaryArchSuffix = $libVersionCompat
+	"
 if [ -z "$secondaryArchSuffix" ]; then
 	PROVIDES="$PROVIDES
 		cmd:ldapadd
@@ -40,33 +44,33 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:ldapsearch
 		cmd:ldapurl
 		cmd:ldapwhoami
-	"
+		"
 fi
 
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
-"
+	"
 
 PROVIDES_devel="
 	openldap${secondaryArchSuffix}_devel = $portVersion
-	devel:liblber$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	devel:liblber_2.4$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	devel:libldap$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	devel:libldap_2.4$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	devel:libldap_r$secondaryArchSuffix = 2.10.8 compat >= 2.10
-	devel:libldap_r_2.4$secondaryArchSuffix = 2.10.8 compat >= 2.10
-"
+	devel:liblber$secondaryArchSuffix = $libVersionCompat
+	devel:liblber_$portVers$secondaryArchSuffix = $libVersionCompat
+	devel:libldap$secondaryArchSuffix = $libVersionCompat
+	devel:libldap_$portVers$secondaryArchSuffix = $libVersionCompat
+	devel:libldap_r$secondaryArchSuffix = $libVersionCompat
+	devel:libldap_r_$portVers$secondaryArchSuffix = $libVersionCompat
+	"
 REQUIRES_devel="
 	openldap$secondaryArchSuffix == $portVersion base
-"
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
@@ -75,7 +79,12 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:soelim
-"
+	"
+
+defineDebugInfoPackage openldap$secondaryArchSuffix \
+	"$libDir"/liblber-$portVers.so.$libVersion \
+	"$libDir"/libldap-$portVers.so.$libVersion \
+	"$libDir"/libldap_r-$portVers.so.$libVersion
 
 PATCH()
 {
@@ -102,8 +111,13 @@ INSTALL()
 
 	rm $libDir/lib*.la
 
-	prepareInstalledDevelLibs liblber liblber-2.4 libldap libldap-2.4 \
-		libldap_r libldap_r-2.4
+	prepareInstalledDevelLibs \
+		liblber \
+		liblber-$portVers \
+		libldap \
+		libldap-$portVers \
+		libldap_r \
+		libldap_r-$portVers
 
 	mkdir -p $dataDir/openldap
 	mv $settingsDir/openldap/ldap.conf.default $dataDir/openldap/