From dadb2364fa576f1b9d7e01fe26de6fae296c5844 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 1 Jun 2022 05:04:47 -0500
Subject: user/openldap: Update to 2.6.2

* Fix all tests.
  Suite now runs in ~20m instead of ~2h, so re-enable.

* Update our patches for 2.6.

* Build deps before all target to fix #720.
---
 user/openldap/APKBUILD | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'user/openldap/APKBUILD')

diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD
index 1743a4e6d..3f4874186 100644
--- a/user/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
@@ -13,17 +13,15 @@
 #     - CVE-2017-9287
 #
 pkgname=openldap
-pkgver=2.4.50
+pkgver=2.6.2
 pkgrel=0
 pkgdesc="LDAP Server"
 url="https://www.openldap.org/"
 arch="all"
-options="!check"  # Test suite takes > 2 hours to complete on each builder.
 license="OLDAP-2.8"
 depends=""
 depends_dev="openssl-dev cyrus-sasl-dev util-linux-dev"
-makedepends="$depends_dev db-dev groff icu-dev unixodbc-dev
-	autoconf automake libtool"
+makedepends="$depends_dev groff icu-dev unixodbc-dev libtool"
 subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc
 	$pkgname-clients $pkgname-passwd-pbkdf2:passwd_pbkdf2
 	$pkgname-backend-all:_backend_all:noarch
@@ -32,10 +30,10 @@ pkgusers="ldap"
 pkggroups="ldap"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
 source="https://www.$pkgname.org/software/download/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz
-	openldap-2.4-ppolicy.patch
-	openldap-2.4.11-libldap_r.patch
 	fix-manpages.patch
 	configs.patch
+	test063.patch
+	test079.patch
 
 	slapd.initd
 	slapd.confd
@@ -43,8 +41,7 @@ source="https://www.$pkgname.org/software/download/OpenLDAP/$pkgname-release/$pk
 
 # SLAPD backends
 _backends=""
-for _name in bdb dnssrv hdb ldap mdb meta monitor null passwd \
-	relay shell sql sock
+for _name in dnssrv ldap mdb meta null passwd relay sock
 do
 	subpackages="$subpackages $pkgname-back-$_name:_backend"
 	_backends="$_backends $pkgname-back-$_name"
@@ -60,14 +57,7 @@ do
 	_overlays="$_overlays $pkgname-overlay-$_name"
 done
 
-prepare() {
-	default_prepare
-
-	sed -i '/^STRIP/s,-s,,g' build/top.mk
-	libtoolize --force && aclocal && autoconf
-}
-
-build () {
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -80,22 +70,18 @@ build () {
 		--enable-crypt \
 		--enable-modules \
 		--enable-dynamic \
-		--enable-bdb=mod \
 		--enable-dnssrv=mod \
-		--enable-hdb=mod \
 		--enable-ldap=mod \
 		--enable-mdb=mod \
 		--enable-meta=mod \
-		--enable-monitor=mod \
 		--enable-null=mod \
 		--enable-passwd=mod \
 		--enable-relay=mod \
-		--enable-shell=mod \
 		--enable-sock=mod \
-		--enable-sql=mod \
 		--enable-overlays=mod \
 		--with-tls=openssl \
 		--with-cyrus-sasl
+	make depend
 	make
 
 	# Build passwd pbkdf2.
@@ -199,10 +185,10 @@ _submv() {
 	done
 }
 
-sha512sums="f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae  openldap-2.4.50.tgz
-5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38  openldap-2.4-ppolicy.patch
-44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357  openldap-2.4.11-libldap_r.patch
-8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177  fix-manpages.patch
-0d2e570ddcb7ace1221abad9fc1d3dd0d00d6948340df69879b449959a68feee6a0ad8e17ef9971b35986293e16fc9d8e88de81815fedd5ea6a952eb085406ca  configs.patch
+sha512sums="a490a760ec954710e78821877744e8a6caa4e4f47cc292baae8106af2a4b62c16b7e8003af05ae16f58b28464d89e5459f9e4cf33241fe440c0c6ca041364420  openldap-2.6.2.tgz
+0c026a5c8790ebb7d6784514363f1403c693d61defbeaacae574267c3b7833f198919d31604da1f49db3000c9a561cb6d36d95e021f7906761e45d1434cef15b  fix-manpages.patch
+1a1f669db968061eb8c9fb5e42768d0f12075d4eb4d8ae7085533276775027c56760c2f7413494deebec4d78b053f674661236e6e1506ecffadf510985c393c0  configs.patch
+26fbe3fa2182d80ee98e6885972f803d03ac45a72cb8478c31e76a6f07f45565e6fdcdbf528fcf61e77fd4f9e2068e4f82d9c9c178df7da103d4e9b714bf204e  test063.patch
+c7f2b32f2643d6b7ea5dbee6c1baad7cae53ea9d511cfae6c976edb8f8f85ae14351f612f02e560d15c6b577676804fd7b0a6f45f79cc1cdbe11f117e61ad088  test079.patch
 0c3606e4dad1b32f1c4b62f2bc1990a4c9f7ccd10c7b50e623309ba9df98064e68fc42a7242450f32fb6e5fa2203609d3d069871b5ae994cd4b227a078c93532  slapd.initd
 64dc4c0aa0abe3d9f7d2aef25fe4c8e23c53df2421067947ac4d096c9e942b26356cb8577ebc41b52d88d0b0a03b2a3e435fe86242671f9b36555a5f82ee0e3a  slapd.confd"
-- 
cgit v1.2.3-60-g2f50