Re: [PR PATCH] [Updated] openldap: update to 2.6.6

[klarasm <klarasm@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948

openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6

Some shared libraries have changed name so this updates common/shlibs.

As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html

#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite

I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)

This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)

[ci skip] again.

#### Local build testing
(updated 2023-07-13, relevant PRs pulled in for testing)

- I built this PR locally for my native architecture, (x86_64-glibc). All packages build.  Test suite errors:
  - anjuta  (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
  - anjuta (already failing on master branch)
  - audit (already failing on master branch)
  - dovecot (already failing on master branch)
  - evolution-data-server (already failing on master branch)
  - nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)

- I built this PR locally for these architectures:
  - aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
  - armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
  - armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)

A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32293 bytes --]

From 85b7d8bfad654ea23604f6aa8c0dc6e56aa53093 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.6

- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
	https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
  cross-compiling)
- move ldapvc too openldap-tools
---
 common/shlibs                    |  5 ++---
 srcpkgs/openldap/files/slapd/run |  2 +-
 srcpkgs/openldap/template        | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3c3defa53d1b2..bd1483d5e6703 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -706,9 +706,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
 libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
 libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
 libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
 libevent-2.1.so.7 libevent-2.1.11_1
 libevent_core-2.1.so.7 libevent-2.1.11_1
 libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
 	chown $LDAPUSER:$LDAPGROUP /run/openldap
 fi
 exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..d10daef834a75 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,6 +1,6 @@
 # Template file for 'openldap'
 pkgname=openldap
-version=2.4.58
+version=2.6.6
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
  --sysconfdir=/etc
  --localstatedir=/var/lib/openldap
  --sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
  --enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
  --enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff"
 makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="OLDAP-2.0"
 homepage="http://www.openldap.org"
 distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
 
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
 	sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
 	sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
 }
+
+pre_build() {
+	make ${makejobs} ${make_build_args} depend
+}
+
 post_install() {
 	ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
 	vsv slapd
 	vlicense LICENSE
 	chmod 755 ${DESTDIR}/usr/lib/*.so.*
 	vmkdir usr/share/examples/openldap
-	mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+	mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
 	chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
 }
 
@@ -72,6 +77,7 @@ openldap-tools_package() {
 		vmove usr/bin/ldapwhoami
 		vmove usr/bin/ldapdelete
 		vmove usr/bin/ldapadd
+		vmove usr/bin/ldapvc
 		vmove usr/share/man/man1/ldapmodrdn.1
 		vmove usr/share/man/man1/ldapsearch.1
 		vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
 		vmove usr/share/man/man1/ldapwhoami.1
 		vmove usr/share/man/man1/ldapdelete.1
 		vmove usr/share/man/man1/ldapadd.1
+		vmove usr/share/man/man1/ldapvc.1
 	}
 }

From 9633e9da4dbf77f5e6e26dfbf65bceb784918b54 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 3ee25aeb11780..f9e745e93e11a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
 # keep in sync with libsasl
 pkgname=cyrus-sasl
 version=2.1.28
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

From 00759260ecfad636104181cff23ea8f7b2874e0c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update

---
 srcpkgs/gnupg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
 # minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
 pkgname=gnupg
 version=2.4.3
-revision=1
+revision=2
 # We're building outside of the source tree, because upstream told us to:
 # https://dev.gnupg.org/T6313#166339
 build_wrksrc=build

From 1e64f410a4dabfeb2a8714912c640837f628cd4b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 13d2ef286e22c..19af6a6066df8 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.26
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"

From 8af3bf489c929bf34fc3f998775c2d530bb43090 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate

also add BSD-4-Clause to licenses
---
 srcpkgs/alpine/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515cc..9789e303fc8af 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.26
-revision=1
+revision=2
 _githash=9726c098a739edfdca6218bc5dee104c310957e9
 _gitshort="${_githash:0:7}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ hostmakedepends="hunspell"
 makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
 short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
+license="Apache-2.0, BSD-4-Clause"
 homepage="https://repo.or.cz/alpine.git"
 distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
 checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431

From 4475be83420786af5b352d68b36a8e8e1d05babf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update

---
 srcpkgs/anjuta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
 # Template file for 'anjuta'
 pkgname=anjuta
 version=3.34.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir qemu"
 configure_args="--disable-compile-warnings --disable-schemas-compile

From 38a47c4ee6c188eca362554dc65405287f170cc8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update

---
 srcpkgs/apache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..5c8cc6b43554d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.56
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon

From 252e118bcc8393f1dba7683c2a51502129c03605 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update

---
 srcpkgs/audit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
 version=3.0.3
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"

From 99c294d1bf5cbe86e590f23e88e50cc62aa59307 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update

---
 srcpkgs/autofs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.8
-revision=2
+revision=3
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"

From 3c41515e5d8e6d3ca113af1318a22cb209d71cca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update

---
 srcpkgs/claws-mail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=4.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"

From bd977b82d9fe1c4231769cb8caa2e0971aa751b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8d..697788e5c2662 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.20
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From dbe8e47f676bd84d6f849118915df4e80571a5e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
 update

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
 version=0.5.20
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot

From 7cf493d67ac2d1df5f1c27cf72976de2359cf9b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update

---
 srcpkgs/evolution/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.48.4
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DSYSCONF_INSTALL_DIR=/etc

From aec6c68b7f1442c60c277df641997ed9e98cac89 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update

---
 srcpkgs/gnupg1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
 # Template file for 'gnupg1'
 pkgname=gnupg1
 version=1.4.23
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-threads=posix --enable-noexecstack
  gnupg_cv_regex_broken=no"

From 4a14e0c18d8e6f725b0e03163f3b9c70c69671df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update

---
 srcpkgs/kldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
 # Template file for 'kldap'
 pkgname=kldap
 version=23.04.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kdoctools"

From d9694cab15d52e8cad3525c5d2eea770c5ab3b1f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update

also fix some linting problems
---
 srcpkgs/ldapvi/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e83..88401b722197a 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,15 +1,15 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-sha"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
-license="GPL-2"
+short_desc="Interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
 distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
 checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
 

From e66a35920d96dc11685cf097bec8072a3488c4f8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update

---
 srcpkgs/nfs-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
 version=2.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
  --with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss

From 991e4f84c121411dbdfada98e15f5d3c6f44b929 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update

---
 srcpkgs/samba/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
 version=4.14.12
-revision=2
+revision=3
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"

From 59dc31edf6aeb006c72d835ab1fc272982aba15f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f5..310e0c9674ae7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.71
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
  -Dwith_krb5=enabled -Dwith_ldap=enabled

From 1d7ea31d906579174fc8d3e19635e2a35cedb6f4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update

---
 srcpkgs/lua54-lualdap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-lualdap'
 pkgname=lua54-lualdap
 version=1.2.5
-revision=3
+revision=4
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config"

From eeed3679b1ba021951f211f12d640173719b6717 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 9fec5562a9cc3..20fbd13a50203 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"

From a3027712c99afa63f95daecb7d9384bc15dfc724 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update

---
 srcpkgs/nss-pam-ldapd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
 # Template file for 'nss-pam-ldapd'
 pkgname=nss-pam-ldapd
 version=0.9.12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
 conf_files="/etc/nslcd.conf"

From 786eaea34507b6c742da8fd3665845b838891c36 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update

---
 srcpkgs/quota/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
 # Template file for 'quota'
 pkgname=quota
 version=4.09
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="V=1"
 conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"

From 227a8cf79839c81449099b60648412178ed34ff3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update

---
 srcpkgs/seahorse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse'
 pkgname=seahorse
 version=43.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel

From 98e8e8e0e81207f7493b1354f4f4c164af03e74e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index ca758380e900d..7bbe58e719c0f 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=5.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sysconfdir=/etc/squid

From 44ebbbcce98f4f81683b24f5755696b48fc36eef Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 11c821fdf826d..4ba13475b3330 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.8.2
-revision=1
+revision=2
 # upstream explicitly hardcodes to use glibc:
 # https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
 archs="~*-musl"

From 2c5128e9d7a892d71da682a6f436e881116ccdfc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update

---
 srcpkgs/sylpheed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 7fbf25276fbc5..25aa753e6d4db 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"

From 406c1120ab4c10b7de8f438b631bebc2e1bf3a7e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update

---
 srcpkgs/x2goclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
 # Template file for 'x2goclient'
 pkgname=x2goclient
 version=4.1.2.2
-revision=2
+revision=3
 build_style=gnu-makefile
 build_helper=qmake
 make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"

From d9503a2086ff27089775c49eaf485db0a2a2cf3c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update

---
 srcpkgs/virtuoso/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df3..7ee867bda0db9 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.10
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64le*"
 build_style=gnu-configure
 configure_args="--without-internal-zlib --with-readline --with-layout=debian"

From e944c315b73b6c58fec1c169b9d7af1a8fca35dc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update

---
 srcpkgs/python3-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ldap'
 pkgname=python3-ldap
 version=3.4.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
 makedepends="python3-devel libldap-devel"

From 1e6bf96974c1637fff2e71d2bb90d8595dc19f2f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update

---
 srcpkgs/log4cxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cxx'
 pkgname=log4cxx
 version=1.0.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config zip"
 makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"

From 7e14868424eba562b9545a8dbd93f3ff53fb9784 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..55f6ea38850fb 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From 5454a1cf9457c3772d0631f25f90c63efb3fa04f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update

---
 srcpkgs/mit-krb5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 683c7e8d32a03..0d181cdf62c06 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.21.1
-revision=1
+revision=2
 _distver=$(echo $version | cut -d. -f-2)
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et

From fc33972838ba3506cdd173385ae0deef27f73fa0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f3..ef8d4e52fad2b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.8.1
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
  postgresql-libs-devel sqlite-devel"

From 8bd115c6e4a6718f7a12504cfba2799a4fbb2dcd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update

---
 srcpkgs/php8.0/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index c8c0045252290..96652cfb52ad8 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0'
 pkgname=php8.0
 version=8.0.29
-revision=1
+revision=2
 _php_version=8.0
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From 08efa6cbb53c5125fcc9f73e6a808b6d497a4b6d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update

---
 srcpkgs/php8.1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..6e371545bef70 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.21
-revision=1
+revision=2
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From d7744782503090a889f54ad1c50f0aa3126e93cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update

---
 srcpkgs/php8.2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..3706daecb8659 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
 version=8.2.8
-revision=1
+revision=2
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

From e0bef8978946dc4bff81e1fc836de36e812ed208 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index a5ade73cc1969..520308cbc58f7 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.5.2
-revision=2
+revision=3
 build_style=meta
 make_build_target="build"
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz