From 89d596fbb26b067730eea8174ec6d64dd1a2ef7e Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:23:01 +0100 Subject: [PATCH 01/39] openldap: update to 2.6.3. --- common/shlibs | 5 ++--- srcpkgs/openldap/template | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index 52a6d3e6d5fb..54c43cfcc68f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -699,9 +699,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/template b/srcpkgs/openldap/template index a8ba40d111c9..d2caa890ff7a 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 @@ -12,25 +12,26 @@ configure_args="--prefix=/usr --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 - --disable-static --with-yielding_select=yes --enable-modules" + --disable-static --with-yielding_select=yes --enable-modules + --enable-balancer=mod" hostmakedepends="pkg-config groff" -makedepends="openssl-devel libsasl-devel db-devel libltdl-devel" +makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libevent-devel" depends="openldap-tools>=${version}_${revision}" conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf" short_desc="OpenLDAP (Lightweight Directory Access Protocol)" -maintainer="Anthony Iliopoulos " +maintainer="Emil Tomczyk " 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" pre_configure() { - sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h - 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 + vsed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h + vsed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif} + vsed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in } post_install() { ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd @@ -38,7 +39,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 c4390b3d77cb3c0898c69b12c6ceb08a3a424592 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:34:53 +0100 Subject: [PATCH 02/39] mit-krb5: Rebuild for openldap-2.6.3 --- srcpkgs/mit-krb5/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index a67bae19764a..3abd880651a5 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.18.3 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="e2fsprogs-devel flex perl pkg-config" makedepends="e2fsprogs-devel libldap-devel" @@ -13,6 +13,7 @@ license="MIT" homepage="http://web.mit.edu/kerberos" distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz" checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719 +make_check=no # tests fail due to unresolvable hostname post_patch() { vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in From e832bb63c93c56fe8eb86e5f9f6c314d903d83f3 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:37:44 +0100 Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3 --- srcpkgs/alpine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 02c4f944515c..589929dc23c8 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 " -license="Apache-2.0" +license="Apache-2.0, BSD-4-Clause-UC" homepage="https://repo.or.cz/alpine.git" distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz" checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431 From 441519f6981c8c8e709171481731f833544966d6 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:40:55 +0100 Subject: [PATCH 04/39] anjuta: Rebuild for openldap-2.6.3 --- 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 c0e9281d1a1c311890f27ef578af628af04da35f Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:48:01 +0100 Subject: [PATCH 05/39] apache: Rebuild for openldap-2.6.3 --- srcpkgs/apache/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 4856267a8e26..2fc182c95336 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.54 -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 c107be10f69c61ae32013700c05764c669345dec Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:50:03 +0100 Subject: [PATCH 06/39] apr-util: Rebuild for openldap-2.6.3 --- 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 718b7238dfbd75a34cee5841a7ab89a49706ca9b Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:50:38 +0100 Subject: [PATCH 07/39] audit: Rebuild for openldap-2.6.3 --- 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 0da08ec435558776fc112949dbdda589ae3cddfb Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:58:42 +0100 Subject: [PATCH 08/39] nfs-utils: Rebuild for openldap-2.6.3 --- srcpkgs/nfs-utils/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index f1ee979213f0..5426e1a19e2d 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.5.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4 --with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss @@ -14,6 +14,7 @@ license="GPL-2.0-or-later" homepage="https://www.linux-nfs.org/" distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz" checksum=51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd +make_check=ci-skip # t0001-statd-basic-mon-unmon.sh fails only on CI replaces="rpcgen>=0" hostmakedepends="pkg-config libtirpc-devel rpcsvc-proto" From 211af84a2b0ee67bb25769147bfcdb143d083d98 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 16:59:13 +0100 Subject: [PATCH 09/39] sssd: Rebuild for openldap-2.6.3 --- srcpkgs/sssd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 3bfeb32ef10d..44e6f3b9a69d 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -1,7 +1,7 @@ # Template file for 'sssd' pkgname=sssd version=2.4.0 -revision=5 +revision=6 build_style=gnu-configure # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1; # until this is fixed upstream, manually define am_cv_python_version to circumvent From fd2aaff6fc7903ca768718eba9bed1c89a1f47b2 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:00:21 +0100 Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3 --- srcpkgs/autofs/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template index a9abc60e64e8..6d8024f37a1d 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" @@ -22,8 +22,7 @@ if [ -z "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" != "musl" ]; then fi pre_configure() { - vsed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch] - vsed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch] + vsed -i 's,__S_IEXEC,S_IXUSR,g' daemon/lookup.c modules/lookup_multi.c } pre_build() { From 8c27752edb7b07a828b2428a6c026447c1fa2b90 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:01:07 +0100 Subject: [PATCH 11/39] gnupg: Rebuild for openldap-2.6.3 --- srcpkgs/gnupg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template index 08751d2bea31..c14d5ba25f3a 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -1,7 +1,7 @@ # Template file for 'gnupg' pkgname=gnupg version=2.3.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable ldap) --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr From db3d7eb7f75e17967116a7c63d49b09860d5788c Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:01:39 +0100 Subject: [PATCH 12/39] claws-mail: Rebuild for openldap-2.6.3 --- 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 d9529d288ad7f868a47f2ab4c09d7744eb9f7638 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:02:57 +0100 Subject: [PATCH 13/39] cyrus-sasl: Rebuild for openldap-2.6.3 --- 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 3a4d16ff556c0559e3d904b68f1a4da7b750ab38 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:03:42 +0100 Subject: [PATCH 14/39] dovecot: Rebuild for openldap-2.6.3 --- 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 f587b663dd78bcd6e9941cfaafcbae6de2cb4a8f Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:04:59 +0100 Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: Rebuild for openldap-2.6.3 --- 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 a90f2a19199a0790af54c9edaa4d30813c4df613 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:06:33 +0100 Subject: [PATCH 16/39] evolution-data-server: Rebuild for openldap-2.6.3 --- 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 33b71f4524ed..629711df5f70 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.2 -revision=1 +revision=2 build_style=cmake build_helper="gir qemu" configure_args=" -DSYSCONF_INSTALL_DIR=/etc From fadc89682fb7ac3a8318dea570109f296c23a8ad Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:07:38 +0100 Subject: [PATCH 17/39] evolution: Rebuild for openldap-2.6.3 --- srcpkgs/evolution/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 2dfb497a2968..a4c3c70178b3 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,7 +1,7 @@ # Template file for 'evolution' pkgname=evolution version=3.46.2 -revision=1 +revision=2 build_style=cmake build_helper="qemu" configure_args="-DSYSCONF_INSTALL_DIR=/etc From 93e80bbf08c7e8ae8a9057602ea0d1aaffd15552 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:09:31 +0100 Subject: [PATCH 18/39] FreeRADIUS: Rebuild for openldap-2.6.3 --- 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 14d0264affdee7b438a2d4aaedca045278a391d5 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:10:41 +0100 Subject: [PATCH 19/39] gnupg1: Rebuild for openldap-2.6.3 --- 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 9287c1e211fcc67baa6f70130231f7bbea98f7d2 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:11:10 +0100 Subject: [PATCH 20/39] kldap: Rebuild for openldap-2.6.3 --- srcpkgs/kldap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template index 3bcfc43ea1b4..718054069183 100644 --- a/srcpkgs/kldap/template +++ b/srcpkgs/kldap/template @@ -1,7 +1,7 @@ # Template file for 'kldap' pkgname=kldap version=22.08.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 gettext kcoreaddons kdoctools" From 17539e548e11b5076536fff7fd782f0e0d0b82f4 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:12:37 +0100 Subject: [PATCH 21/39] ldapvi: Rebuild for openldap-2.6.3 --- srcpkgs/ldapvi/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 1dda3c2ae6e8..6865978e8d80 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 " 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-only" 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 6fbb9947c9f5f9b84878861ee6111a57f86a6de1 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:13:38 +0100 Subject: [PATCH 22/39] libreoffice: Rebuild for openldap-2.6.3 --- 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 55e92a402932f32d26f38eaf433231f65bdc7ca0 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:58:32 +0100 Subject: [PATCH 23/39] lighttpd: Rebuild for openldap-2.6.3 --- srcpkgs/lighttpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 0f4379940ce4..c2e5aa8a49c7 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,7 +1,7 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.67 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_brotli=false -Dwith_bzip=false -Dwith_krb5=true -Dwith_ldap=true From 30c1cc70553fc1944c65ea1153b15f33dc0895f0 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 17:59:28 +0100 Subject: [PATCH 24/39] log4cxx: Rebuild for openldap-2.6.3 --- srcpkgs/log4cxx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template index 8bac52dcf59b..a2f37dba89a8 100644 --- a/srcpkgs/log4cxx/template +++ b/srcpkgs/log4cxx/template @@ -1,10 +1,10 @@ # 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" +short_desc="C++ Logging Library based on Log4J" maintainer="John Regan " license="Apache-2.0" homepage="https://logging.apache.org/log4cxx/" From d75810c790a6bf9af1368b73c60a1db700e8a059 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:00:28 +0100 Subject: [PATCH 25/39] lua54-lualdap: Rebuild for openldap-2.6.3 --- 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 30e4c95496ce..dca2c377ad3f 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 4843520cdcafdba6c21ad7424fc2ce33564dea14 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:02:51 +0100 Subject: [PATCH 26/39] nss-pam-ldapd: Rebuild for openldap-2.6.3 --- 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" From 7b3f654e1a3f2e20b59a13f6878cecb1791600ff Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:03:24 +0100 Subject: [PATCH 27/39] php: Rebuild for openldap-2.6.3 --- srcpkgs/php/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 7e79418e3554..fa3b94359586 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template file for 'php' pkgname=php version=7.4.33 -revision=1 +revision=2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel From e7c1355a5f21d15b04475d245949340c829c4b24 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:05:09 +0100 Subject: [PATCH 28/39] php8.0: Rebuild for openldap-2.6.3 --- 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 74c50da0e46f..1c215d1f841a 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.25 -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 fcfc80f03aa29d6603d4dc76c4222fe6ea673ef9 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:07:09 +0100 Subject: [PATCH 29/39] php8.1: Rebuild for openldap-2.6.3 --- 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 f19688b52f6c..f14414697e79 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.12 -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 232b09d680795c0483ee733d7085931170845611 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:29:23 +0100 Subject: [PATCH 30/39] python3-ldap: Rebuild for openldap-2.6.3 --- srcpkgs/python3-ldap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template index cff7df055e78..d951e0445bc5 100644 --- a/srcpkgs/python3-ldap/template +++ b/srcpkgs/python3-ldap/template @@ -2,7 +2,7 @@ pkgname=python3-ldap _pkgname=python-ldap version=3.2.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel libldap-devel" @@ -16,5 +16,5 @@ distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz" checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e pre_build() { - sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg + vsed -i "s:^libs = .*:libs = ldap lber sasl2 ssl crypto:" setup.cfg } From b705a26eb6e65d0700cf50c991b7a589003fd678 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:30:08 +0100 Subject: [PATCH 31/39] quota: Rebuild for openldap-2.6.3 --- srcpkgs/quota/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template index a5dc7bbdb5f4..559efaee2994 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 f1cddf88a0a75ff64ea0ddc1dd2516c90f4df67a Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:31:16 +0100 Subject: [PATCH 32/39] samba: Rebuild for openldap-2.6.3 --- 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 ac68c3e52d14ffa7a42c34be921cca997dde633e Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:36:42 +0100 Subject: [PATCH 33/39] seahorse: Rebuild for openldap-2.6.3 --- srcpkgs/seahorse/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index be8ba454b4a8..da92234d8216 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 4f5bc561cbceaa92aa1b60b824106a0b9751504b Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:40:00 +0100 Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3 --- srcpkgs/squid/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 626972525bc0..613a3c1276ad 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -1,7 +1,7 @@ # Template file for 'squid' pkgname=squid version=5.3 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --sbindir=/usr/bin @@ -75,6 +75,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then LDFLAGS+=" -latomic" fi +pre_build() { + make -C src BUILDCXX=g++ cf_gen +} + post_install() { chmod u+s \ ${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \ From f2ac4853b9da2bfd0a2a007a169ad9fe278b3677 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:43:38 +0100 Subject: [PATCH 35/39] sylpheed: Rebuild for openldap-2.6.3 --- srcpkgs/sylpheed/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index 7fbf25276fbc..25aa753e6d4d 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 8e4da857eab1b0f359519d453f6e080032db5f89 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:44:17 +0100 Subject: [PATCH 36/39] virtuoso: Rebuild for openldap-2.6.3 --- srcpkgs/virtuoso/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template index 73e59023d35e..3ae6f97db7d0 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -1,7 +1,7 @@ # Template file for 'virtuoso' pkgname=virtuoso version=7.2.5.1 -revision=3 +revision=4 archs="x86_64* aarch64* ppc64le*" build_style=gnu-configure configure_args="--enable-static" @@ -9,7 +9,7 @@ hostmakedepends="automake libtool flex gperf net-tools" makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel" short_desc="Scalable cross-platform server of virtuoso" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-only" homepage="http://virtuoso.openlinksw.com/wiki/main/Main/" distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz" checksum=3e4807e94098b8265f8cf00867d1215bb1e9d0d274878e59a420742d2de471c2 From d44971bf5a843ff97ef8c6cc690d6ea7b608727c Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 18:50:24 +0100 Subject: [PATCH 37/39] x2goclient: Rebuild for openldap-2.6.3 --- srcpkgs/x2goclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template index ba2d57781c4d..70c9faec4d4e 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 f0db44cb509abc48f9860ac671b0fb9cdb4861a5 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 19:44:27 +0100 Subject: [PATCH 38/39] postfix: Rebuild for openldap-2.6.3 --- srcpkgs/postfix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 886a96352af0..93c08572f730 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,7 +1,7 @@ # Template file for 'postfix' pkgname=postfix version=3.7.3 -revision=1 +revision=2 hostmakedepends="perl m4" makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel postgresql-libs-devel sqlite-devel" From 2182a0570bc8e30e736da2d4b1bb5f70da4883bf Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Sun, 27 Nov 2022 20:10:41 +0100 Subject: [PATCH 39/39] monitoring-plugins: Rebuild for openldap-2.6.3 --- 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 1000998c221f..44cb21edb4a7 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.1 -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"