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

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

[-- Attachment #1: Type: text/plain, Size: 4036 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.3
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: in progress

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)

So far it seems promising but will test more. I would appreciate if anyone else could test as well.

I have probably missed packages that need to be revbumped so please point them out in that case.

Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1
- [ ] libnfsidmap-2.5.4_2
- [ ] libreoffice-common-7.4.3.2_1
- [ ] libsmbclient-3.6.25_15
- [ ] lighttpd-1.4.68_1
- [ ] log4cxx-0.10.0_4
- [ ] lua51-lualdap-1.2.5_3
- [ ] lua52-lualdap-1.2.5_3
- [ ] lua53-lualdap-1.2.5_3
- [ ] lua54-lualdap-1.2.5_3
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [ ] monitoring-plugins-2.3.1_1
- [ ] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [ ] php-ldap-7.4.33_1
- [ ] php8.0-ldap-8.0.25_1
- [ ] php8.1-ldap-8.1.12_1
- [ ] postfix-3.7.3_1
- [ ] python3-ldap-3.2.0_5
- [ ] quota-4.09_1
- [ ] samba-4.14.12_2
- [ ] samba-libs-4.14.12_2
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2

[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)

It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.

The rest of the test suite does not seem to be a problem.

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: 30208 bytes --]

From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 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/27] openldap: update to 2.6.3

- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
  ignored if placed after the filter)
---
 common/shlibs                                 |   5 +-
 srcpkgs/openldap/files/slapd/run              |   2 +-
 .../fix-test079-musl-ignored-params.patch     | 106 ++++++++++++++++++
 srcpkgs/openldap/template                     |   8 +-
 4 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch

diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -700,9 +700,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 f7addfcbeea3..4fa2253b1825 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/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout	2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout	2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+ 
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+ 
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+     echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+     exit $RC
+ fi
+ 
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+     echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+ 
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+ 
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+     echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+     exit $RC
+ fi
+ 
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+     echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+ 
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+ 
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+     echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+     exit $RC
+ fi
+ 
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+     echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+     echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+         -D "cn=Manager,dc=local,dc=com" \
+         -H $URI2 \
+-        -w $PASSWD  2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++        -w $PASSWD  olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+     echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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.3
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
 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=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
 
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,7 @@ post_install() {
 	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/*
 }
 

From 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 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/27] 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 b259152139fd..d9646ed8a642 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

From 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/27] mit-krb5: update to 1.20.1

A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
 srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
 srcpkgs/mit-krb5/template               |  6 ++--
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch

diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
-     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- /* 1.1 standardizes constructor and destructor names, renaming
-  * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
-     return retval;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- /*
-  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
-     ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
-     ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
- 
- ASN1_SEQUENCE(DHxparams) = {
-     ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
-     ASN1_OPT(int_dhx942_dh, q, BIGNUM),
-     ASN1_OPT(int_dhx942_dh, j, BIGNUM),
-     ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
- 
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
 # if there is a bump in .so version,
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"
 makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://web.mit.edu/kerberos"
 distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
 
 post_patch() {
 	vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in

From 0f932cceee390c64c7e3511922eee66e7be35f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/27] evolution-data-server: revbump due to openldap update

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

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..35f4f0b009c7 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.46.3
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc

From 8ec6ed7bbaf70084ff93cdb283b4ecc55834f7e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/27] 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 c7cbe689f23a..46b596f0cac8 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnupg'
 pkgname=gnupg
 version=2.4.0
-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 15d36c50289800b0fc98059ee4657232e2d7ce7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/27] 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 b43aaa1f2e6e..1160c4ccbccc 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.23
-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 325e5aa61818527570d24c612fceb95d86990db1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/27] alpine: revbump due to openldap udpate

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

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..09525c2a9b4b 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

From b64b599316e42310f232a56797589e0dd624722d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/27] 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 b46d58aeafe3..668e17bdecda 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 2c222ffaaf41f92e6f0e1f55e0c6037250ddceff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/27] 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 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.54
-revision=2
+revision=3
 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 c91dc4ff95554f537acd264f169bcb6b490b25ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/27] 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 f1cd4363365a..ee50b73c6ed0 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 ecc41908f94a1a4dfd64111c698f9bfd26a111cb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/27] 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 7e1e4dab2f45..334d567f3781 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 46988486ece9278e06d64dbff484d686c5c1b2e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/27] 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 a9abc60e64e8..5f63d0ad92ca 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 599825e48ef4b1da393a15e06d370ed6073d014c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/27] 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 0fd87df7803e..b989ebf1d8e4 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 63d7743fd4c8fe6ec300d6efa58fb2fcf36c160d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/27] 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 45f410493436..787b29b6eab8 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=1
+revision=2
 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 9629197dcc971174701aea59f23cde74e47e494b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/27] 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 ac13321e4508..e4d168cc4f78 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=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot

From 324931e6d63a7a87885743f3967a412bde68b17f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/27] 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 b9a63af09955..5bd29173ac26 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.46.3
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DSYSCONF_INSTALL_DIR=/etc

From aa937be453cb137f7ecd369d4433e4ceff42b368 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/27] 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 c0c837477939..e86147006aa1 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 23fe44e1266b92fbf1ab04a917624a43b29fec2c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/27] 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 c4f6acdb87db..04439bfd22c1 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
 # Template file for 'kldap'
 pkgname=kldap
 version=22.12.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kdoctools"

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

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

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..89275388ff4b 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # 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>"

From a4593abb073d17ebd5d807d9508f6ccf7e331286 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/27] 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 252a7355b683..1ea23781caff 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 1ee5d6caf845624e866a48f5c314bfdfd78f1c0d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/27] 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 313d32a47fad..e9dfc54432ad 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.4.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
 nocross="Several dependencies are nocross=yes"

From 48179b47ef444b0c54db55b6bcb06c6b0f88ae88 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/27] 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 3ba93268973d..3e1199b70c5e 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 2a6cc4125db103abb7094b39697cfc025054a9ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/27] 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 fc84d9400749..c688aaca31f7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.68
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
  -Dwith_krb5=enabled -Dwith_ldap=enabled

From cb2f0395df26e45b9d0dcdd45aafe3d6c52a2371 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/27] 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 2f4905a16092..cc2e0ff73cb8 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cxx'
 pkgname=log4cxx
 version=0.10.0
-revision=4
+revision=5
 build_style=gnu-configure
 makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
 short_desc="A C++ Logging Library based on Log4J"

From 3849c6e26ab99cb2ac5bdd9162089db04530543c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/27] 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 4492dbeab650..8c03eef7ef4d 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 0cf4e7ea750e270d97505f8c03e32c2a1037a94c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/27] 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 9fec5562a9cc..20fbd13a5020 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 376009d6b964d7b3b2279bf533026026307dce8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/27] 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 92cbd75417b4..2b3a35ae85a3 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"