From 754b3fc000a30529e63362a7b4921bf697468232 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 25 Dec 2019 06:16:32 -0600
Subject: user/*: Fix metadata

---
 user/openldap/APKBUILD | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'user/openldap')

diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD
index 3f84e64c7..ffff4c1a7 100644
--- a/user/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
@@ -1,5 +1,4 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
 #
 # secfixes:
 #   2.4.48-r0:
@@ -15,20 +14,20 @@ pkgname=openldap
 pkgver=2.4.48
 pkgrel=0
 pkgdesc="LDAP Server"
-url="http://www.openldap.org/"
+url="https://www.openldap.org/"
 arch="all"
 options="!check"  # Test suite takes > 2 hours to complete on each builder.
-license="custom"
+license="OLDAP-2.8"
 depends=""
-pkgusers="ldap"
-pkggroups="ldap"
 depends_dev="openssl-dev cyrus-sasl-dev util-linux-dev"
-makedepends="$depends_dev db-dev groff unixodbc-dev libtool
+makedepends="$depends_dev db-dev groff icu-dev unixodbc-dev
 	autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc
 	$pkgname-clients $pkgname-passwd-pbkdf2:passwd_pbkdf2
 	$pkgname-backend-all:_backend_all:noarch
 	$pkgname-overlay-all:_overlay_all:noarch"
+pkgusers="ldap"
+pkggroups="ldap"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
 source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz
 	openldap-2.4-ppolicy.patch
@@ -60,7 +59,7 @@ do
 done
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	update_config_sub
 
 	sed -i '/^STRIP/s,-s,,g' build/top.mk
@@ -68,8 +67,6 @@ prepare() {
 }
 
 build () {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -106,13 +103,10 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	# Install passwd pbkdf2.
@@ -124,8 +118,8 @@ package() {
 	rmdir var/lib/openldap/run
 
 	# Fix tools symlinks to slapd.
-	local path; for path in $(find usr/sbin/ -type l); do
-		ln -sf slapd $path
+	for _path in $(find usr/sbin/ -type l); do
+		ln -sf slapd $_path
 	done
 
 	# Move executable from lib to sbin.
@@ -149,7 +143,6 @@ package() {
 libldap() {
 	pkgdesc="OpenLDAP libraries"
 	depends=""
-	install=""
 
 	_submv "usr/lib/*.so*" etc/openldap/ldap.conf
 }
@@ -199,7 +192,7 @@ _overlay() {
 }
 
 _submv() {
-	local path; for path in "$@"; do
+	for path in "$@"; do
 		mkdir -p "$subpkgdir"/${path%/*}
 		mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
 	done
-- 
cgit v1.2.3-70-g09d2


From f1629f91edc731a940a390c9b5752edc47b41362 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 26 Feb 2020 03:21:56 +0000
Subject: user/openldap: Bump to 2.4.49

---
 user/openldap/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user/openldap')

diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD
index ffff4c1a7..30f2059ff 100644
--- a/user/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
@@ -11,7 +11,7 @@
 #     - CVE-2017-9287
 #
 pkgname=openldap
-pkgver=2.4.48
+pkgver=2.4.49
 pkgrel=0
 pkgdesc="LDAP Server"
 url="https://www.openldap.org/"
@@ -198,7 +198,7 @@ _submv() {
 	done
 }
 
-sha512sums="cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb  openldap-2.4.48.tgz
+sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49  openldap-2.4.49.tgz
 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38  openldap-2.4-ppolicy.patch
 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357  openldap-2.4.11-libldap_r.patch
 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177  fix-manpages.patch
-- 
cgit v1.2.3-70-g09d2