From 0cf02cb94cc30e0bba133e346700fd0dab976d52 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 2 Nov 2022 21:04:46 +0100 Subject: [PATCH 01/37] 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 | 21 ++++++++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 82107af453333..b5ca5599725f2 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 2118b54421006..d10daef834a75 100644 --- 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 " 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 33ee7139e9a6a2fa1833e0ad0772275990320d00 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 02:20:19 +0100 Subject: [PATCH 02/37] 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 7e2129261dfdbadc91b50db7e5f17d08f50d7940 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:14:31 +0100 Subject: [PATCH 03/37] alpine: revbump due to openldap udpate also add BSD-4-Clause to licenses --- srcpkgs/alpine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 0a73307c23650..c383fedbc9e4f 100644 --- 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 " -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 5f8d4a709a3d3d03ff0a42a7b3b1a8b166996e6c Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:18:27 +0100 Subject: [PATCH 04/37] 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 e318fb3408c7a851a40e652696dbbfa5658a2f8c Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:26:54 +0100 Subject: [PATCH 05/37] 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 52e77b69eb9c889f9d0d87ec1a41a992eb34c356 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:28:15 +0100 Subject: [PATCH 06/37] 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 316499576374a4c1deb6869ac944a83f7a54c046 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:29:04 +0100 Subject: [PATCH 07/37] 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 6e0ebc9d4eaec4a2b5e420e2433555c6cff5932e Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:32:32 +0100 Subject: [PATCH 08/37] 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 2b6182769f42e79d13ed9eba3a297d60e02d430e Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:33:45 +0100 Subject: [PATCH 09/37] 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 39ed72c6d91e0c5a8942befbe6282f84556f6525 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:35:27 +0100 Subject: [PATCH 10/37] 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 86d1fb101ddfa6db088893fbec19f47a3d70166a Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:36:50 +0100 Subject: [PATCH 11/37] 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 50dfc24eed8af4af5fac559080bf145824f1a910 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:37:27 +0100 Subject: [PATCH 12/37] ldapvi: revbump due to openldap update also fix some linting problems --- srcpkgs/ldapvi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 89275388ff4b0..88401b722197a 100644 --- 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 " 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 " +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 90649ee3f0b5fb85f1a07e09e8b8ff1b6ed9804f Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:40:34 +0100 Subject: [PATCH 13/37] 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 210e5f5bd0ebd91f582a970842d5996fae4d83f1 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:45:51 +0100 Subject: [PATCH 14/37] 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 61c64f795d5de8c80e938de3acbae9e1dcba8be1 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:55:25 +0100 Subject: [PATCH 15/37] 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 ca3df077e66348d85c394c74b358fe29a9a2e444 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:57:12 +0100 Subject: [PATCH 16/37] 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 0365ac0caa1b20371f6e9e19d817508e141e5806 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 16:23:39 +0100 Subject: [PATCH 17/37] 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 9f0adcbdcc609fb07e3831257fd9f8b4a6c03438 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 16:36:22 +0100 Subject: [PATCH 18/37] 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 8d31510079aaea1371fed18df475db5b49ef6e27 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 16:43:58 +0100 Subject: [PATCH 19/37] 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 787d17eeb678f22bcb7f9de54715edec9f762685 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 6 Mar 2023 20:52:58 +0100 Subject: [PATCH 20/37] 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 0fbc36c8a7915c8e9b349068dce1745e3cecab2c Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 6 Mar 2023 20:55:47 +0100 Subject: [PATCH 21/37] 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 f80b73c4ce2a9981bee728087ab3bac74366c919 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 12 Jul 2023 17:50:27 +0200 Subject: [PATCH 22/37] 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 From 794555c685d8d6dbe766a4edd2ab135cc2c560b0 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:13:25 +0200 Subject: [PATCH 23/37] cyrus-sasl: revbump due to openldap update --- srcpkgs/libsasl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template index 79afba2f332dd..76d1811f128af 100644 --- 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 From a046d77f01b67e5795c03b2800e08c5fe370d51d Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:13:52 +0200 Subject: [PATCH 24/37] 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 19af6a6066df8..90a4c662bc994 100644 --- 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" From dbf2d11db51e4385b4fc5e75ea32d9e767aee34a Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:14:12 +0200 Subject: [PATCH 25/37] apache: revbumpe 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 5c8cc6b43554d..ad9b3e23a722c 100644 --- 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 From 1c9db7078759875ab658eebf35b75c6f3ee2cd6e Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:14:50 +0200 Subject: [PATCH 26/37] 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 697788e5c2662..c859f0846a959 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=3 +revision=4 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 22b3b3813094f477cf43b2cc4782106f0bc4b869 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:15:56 +0200 Subject: [PATCH 27/37] lighttpd: 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 310e0c9674ae7..07875c1099eca 100644 --- 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 From b382d8c51fd175565e6fa981b9ec18642939dc31 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:16:30 +0200 Subject: [PATCH 28/37] 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 20fbd13a50203..1d917e5eabafc 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=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" From 16c790565cb497a8de33af9c37ecd69dab8d715f Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:17:03 +0200 Subject: [PATCH 29/37] 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 7bbe58e719c0f..51059a075c3b8 100644 --- 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 From 1fe76b87b491c2f003a8a7f6d4a15b52a8f84cbc Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:17:26 +0200 Subject: [PATCH 30/37] 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 4ba13475b3330..a8fcc51d14b24 100644 --- 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" From b0ab3eb5be2ba1befc9ce50221a6ccbcbf420e2d Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:17:48 +0200 Subject: [PATCH 31/37] 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 25aa753e6d4db..a2ee05c6f3517 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -1,7 +1,7 @@ # Template file for 'sylpheed' pkgname=sylpheed version=3.7.0 -revision=9 +revision=10 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 d2f8cbea55b592c8db704c9eb099ce51c8167a47 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:18:16 +0200 Subject: [PATCH 32/37] 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 7ee867bda0db9..ca05654788844 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -1,7 +1,7 @@ # Template file for 'virtuoso' pkgname=virtuoso version=7.2.10 -revision=2 +revision=3 archs="x86_64* aarch64* ppc64le*" build_style=gnu-configure configure_args="--without-internal-zlib --with-readline --with-layout=debian" From 808e8e3fb7eabe6c2a775616115c77d51d6e45bf Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:19:50 +0200 Subject: [PATCH 33/37] 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 56804533e1dd3..ca4f6bbe24951 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.3 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr From 631887ce36458bb1138a814a9320e796e01ada64 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:20:15 +0200 Subject: [PATCH 34/37] 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 a1b85efd468c9..1d7f004a53986 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.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 From de24a6e84cbaaeb1586e5565b8f781697aba1231 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:20:36 +0200 Subject: [PATCH 35/37] 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 ef8d4e52fad2b..c8abbe9791f5b 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,7 +1,7 @@ # Template file for 'postfix' pkgname=postfix version=3.8.1 -revision=3 +revision=4 hostmakedepends="perl m4" makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel postgresql-libs-devel sqlite-devel" From b0ae571bed9d04c0de25cb95a56e145f0dfe87df Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:21:06 +0200 Subject: [PATCH 36/37] 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 6e371545bef70..9e4cbfef1d4b9 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=2 +revision=3 _php_version=8.1 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel From 0ffd44a31bda2dd28fffb47a22992de659fce348 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 28 Aug 2023 14:21:27 +0200 Subject: [PATCH 37/37] 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 3706daecb8659..add04b4d3d562 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=2 +revision=3 _php_version=8.2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel