the-maldridge · Sep 17, 2023 · Nov 2, 2022 · Feb 1, 2023 · Feb 1, 2023 · Feb 1, 2023
diff --git a/common/shlibs b/common/shlibs
@@ -698,9 +698,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/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.26
-revision=2
+revision=3
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
@@ -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

diff --git 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

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.56
-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

diff --git 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.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr

diff --git 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"

diff --git 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"

diff --git 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"

diff --git 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.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.21
-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

diff --git 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

diff --git 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

diff --git 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"

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

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
@@ -4,12 +4,12 @@ version=1.7
 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
 

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

diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
@@ -2,7 +2,7 @@
 # keep in sync with cyrus-sasl
 pkgname=libsasl
 version=2.1.28
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-cram --enable-digest --enable-auth-sasldb
  --enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm

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

diff --git 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"

diff --git 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"

diff --git 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.2
-revision=2
+revision=3
 _distver=$(echo $version | cut -d. -f-2)
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et

diff --git 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=2
+revision=3
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"

diff --git 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

diff --git 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"

diff --git 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
@@ -1,28 +1,28 @@
 # Template file for 'openldap'
 pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
  --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
 	}
 }
diff --git 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=2
+revision=3
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

diff --git 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=2
+revision=3
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel

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

diff --git 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"

diff --git 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"

diff --git 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"

diff --git 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

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

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