oSoWoSo · zen0bit · Sep 17, 2023 · Sep 17, 2023 · Sep 17, 2023 · Sep 17, 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 <[email protected]>"
-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-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.48.4
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc

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/ffuf/template b/srcpkgs/ffuf/template
@@ -1,15 +1,15 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=2.0.0
-revision=4
+version=2.1.0
+revision=1
 build_style=go
 go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <[email protected]>"
 license="MIT"
 homepage="https://github.com/ffuf/ffuf"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80b42fe3dda8b24e10bade7b18651d402d1acf5031baedd0b344985721f3d8cd
+checksum=52d3daf5b97528a74b7b3305decd4bb01a553a8f18d39fc107ebc15dc3113de7
 
 post_install() {
 	vlicense LICENSE

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=23.08.0
+version=23.08.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <[email protected]>"
 license="GPL-3.0-or-later"
 homepage="http://kde.github.io/ghostwriter"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c4f7ef72de068b2e57abb35e1b6ea2fc8503f09f784c3ec2a6c0f5d15b58acaf
+checksum=fc7c1fbd2a45ca3c753e1ccd44ff42957f71141d3759841602984808142786cd
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

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/kbounce/template b/srcpkgs/kbounce/template
@@ -1,6 +1,6 @@
 # Template file for 'kbounce'
 pkgname=kbounce
-version=23.08.0
+version=23.08.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons
@@ -13,4 +13,4 @@ maintainer="Andrew Benson <[email protected]>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kbounce/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kbounce-${version}.tar.xz"
-checksum=5d2670d06dd51c72f8c6cf0757cb352bdfdd062ff9f2b8315258ee26faf49c8e
+checksum=c0fa948d2c97a748ebab3935f948425b062617f71fe312b69feec6d642c6c080
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 <[email protected]>"
 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 <[email protected]>"
+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/mkinitcpio/patches/setfont.patch b/srcpkgs/mkinitcpio/patches/setfont.patch
@@ -0,0 +1,31 @@
+https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/259
+
+From 889b1c39653e66b5492b01cd34892506a9a5e9ee Mon Sep 17 00:00:00 2001
+From: classabbyamp <[email protected]>
+Date: Tue, 12 Sep 2023 22:31:36 -0400
+Subject: [PATCH] install/consolefont: include setfont binary
+
+if not using the sd-vconsole hook (like on Void Linux, where there is no
+systemd), setfont is not available unless manually added to BINARIES.
+This also ensures this hook is fully modular and does not rely on other
+hooks to work.
+---
+ install/consolefont | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/install/consolefont b/install/consolefont
+index 0ec554e1..36451912 100644
+--- a/install/consolefont
++++ b/install/consolefont
+@@ -6,6 +6,8 @@ build() {
+     # shellcheck disable=SC2034
+     local KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP XKBLAYOUT XKBMODEL XKBVARIANT XKBOPTIONS
+
++    add_binary setfont
++
+     # subshell to avoid namespace pollution
+     (
+         # shellcheck disable=SC1091
+-- 
+GitLab
+
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=36
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"

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