* [PR PATCH] openldap: update to 2.6.3.
@ 2022-11-27 20:46 Emru1
2022-11-29 21:33 ` [PR PATCH] [Updated] " Emru1
` (21 more replies)
0 siblings, 22 replies; 35+ messages in thread
From: Emru1 @ 2022-11-27 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 895 bytes --]
There is a new pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
[ci skip]
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 30499 bytes --]
From b4e7195a2cf333ff2bb9398a42b646dd6b82a867 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 15 ++++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 74ae97843d38..ac6cda908858 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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..03b762a1f157 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,17 +12,18 @@ 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"
-depends="openldap-tools>=${version}_${revision}"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libevent-devel"
+depends="openldap-tools>=${version}_${revision} libevent"
conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 +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 c83fbe976199bbc40f04cb91c6698a43ad1576f4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..964629c5b347 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"
From 633046bebbfd9b627a87da46b86fd73fd622c668 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
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 4705d7c3fb19c52c41e11873e9190f5bf972951a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 51be0ca0583b806a4769474ae639eb06962b0d29 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 53cef5c9cf432d63c2b7f55eb5b9bc02f6cfb619 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 efa43738b17a784f81ecdc3e166e51833443fdb2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 20a08e7b146ebe359e1f5fcd49f60fe552ec4f32 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 10e72d3054c8..f1ee979213f0 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=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 2f701e5fa8a94138af167b0c3ceb2890b6009e86 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d57d4f47c84e..eddb17b1a611 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 a952f3dff487b8b43e190285af5e9e724172fc6e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 9a11d83185ad477ce20b20a5195cba7f73de0c9e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4120c694d019ae94c3149f1e7eb6e336779e6644 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e924573e18b3318d58516283dd04223bd52b49fa Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7e80b87fefff06dc51da3d95a16a778f73a0c4c3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 6d87029d8106e4a527f95e78f4c89c24ea7ef7a7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 7963bfb607153517a607b025ec2e564a2caa467e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 1d1850fc79775301b53ddff74cb07e86641949e3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From a359bc29854d37fb1ec2146bed402a3c22b95e25 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 46d3abb70393ff20bbdb4dc2e49cf12aae4f814f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 1b5f2f99a486cce1f0f3c36434440a89fd6cf0f8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a4eb7a3de2331124a6c4145c7b0b6ac5673daab5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:12:37 +0100
Subject: [PATCH 21/39] ldapvi: Rebuild for openldap-2.6.3
---
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 0acc541faccb424ed96bf37490ce3f2bd679a0c3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From e3418ccbdb4c93b94613d5885016cc8f338bfc4e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fbc96cd1f736e9364f6f76ac6a3dade319602fae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:59:28 +0100
Subject: [PATCH 24/39] log4cxx: Rebuild for openldap-2.6.3
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 8bac52dcf59b..886de9596fd8 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 1cf6f485a8f403d5d3e0f302c2388b27210d5123 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4022aaa54119efaf6f607f4911a04c10e7ae8019 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4d1211348e52d4c8166913c7a86e51eb84891625 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 668eff4ffc78abb34bd58ca7cb785799696c9c23 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 98d8f3b38fbf735baa1bccaadc0e2edae9f9aa26 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f7816bf94982e1460ea7f04263f702fdb9ae65b8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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..20887723a907 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
+ sed -i "s:^libs = .*:libs = ldap lber sasl2 ssl crypto:" setup.cfg
}
From d6c939712f80eaaff622a18f86c1f00b3aaf774c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d5fab8d398be8f79a024029ab9f59a03800775cd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cf937047af25afe6fe8e8bf01a58260357a92967 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From d39b6d748efaea18e60e964aa137dad6788a8023 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From b6cf8e3d23f8fe54581ed90796d9bb44250b8239 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 c8bea5cd7fab00527052ce2be38fa465092c7ed8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:44:17 +0100
Subject: [PATCH 36/39] virtuoso: Rebuild for openldap-2.6.3
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..32eb9398c783 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"
From a0ba1b9acc82f635900a13869f327b2417ae348a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 9632725c6bb2f2c374f5320323b6c888b0ab42a2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 14ac0d1ef5fc324f3a1e68646d6bdf05a1a03bb8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
@ 2022-11-29 21:33 ` Emru1
2022-12-06 19:01 ` Emru1
` (20 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-11-29 21:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
[ci skip]
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 31920 bytes --]
From b4e7195a2cf333ff2bb9398a42b646dd6b82a867 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 15 ++++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 74ae97843d38..ac6cda908858 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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..03b762a1f157 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,17 +12,18 @@ 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"
-depends="openldap-tools>=${version}_${revision}"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libevent-devel"
+depends="openldap-tools>=${version}_${revision} libevent"
conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 +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 c83fbe976199bbc40f04cb91c6698a43ad1576f4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..964629c5b347 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"
From 3cd77ffe31f82ec2663b394b3f2640a3be4169ea Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
srcpkgs/alpine/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..022958983b13 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
@@ -29,7 +29,3 @@ do_build() {
CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS="$BUILD_LDFLAGS"
make ${makejobs} all CC="$CC"
}
-
-post_install() {
- vlicense NOTICE
-}
From 12491a938a51842ef8abc7a6ea91089922128efb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 67885d9b5933ff59bc2ac37ecfab61d195eadf26 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cff911efa2143af004079649177bc55d7652b812 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b279bc53a0804c67f310e622103e3c203ac62810 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cf399c3972c801a3de4a5ddd18f8d958623a995a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 10e72d3054c8..f1ee979213f0 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=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 9f07cb53b8943047a5b45921ec38133e7e7ae186 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d57d4f47c84e..eddb17b1a611 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 66846d377d8ae2fc26d1f525ed87aa8ac624d1c2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 9a2f8d6ce668a2fb23e0d11ad5c0a80b392f8c14 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 8ace6fe5310f153dedc39cc1fdf9343847a0b508 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 707b8087af174f8d67815d25518f595166ee2b4c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 dd6066a93851ce32b4780486d7b6e77aabecdbf8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 ff8f4509603f8f7b15c2eb77094b4f35e597eb5c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 4eff3acc6ec21fc79063ec4b5f99df59817667fc Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 4b80bfb051dd9f72bddd7e45ebc44c971d7193a4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From e6dace32ee6310d9d7d54524dc843d9d1ffd31fb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4113c1cae2b217c3fc411894021a7dd35b95c60c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ddf3dded15882e80f3722946e8b6c26bb3cf5708 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e25d725e3426f417866302bf4bafb5ddcc44e299 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 5843623f9a54bde5ae7bd147ce11d36cf3697e5d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 967686b3d759393e819fb58441038cc9cbc4b230 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 12d2b196d23b7fb04a292910c0dc8cbdff75e661 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From f9fd7c84e65da5988d23d1fb015408fe15d89287 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 32040fa155822304b3181ae5bbd0c4ae7d0ee86c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 67fd5181ed60eccb03055afa6cb38120eeb7f86c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 690bbdea489b61065b8d315aed0b5993978365f6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4f3be36fdac6add3695fec32d709e4727039f74a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 626341241b56a12dcf7bb315c54d54ffcbe808e5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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..20887723a907 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
+ sed -i "s:^libs = .*:libs = ldap lber sasl2 ssl crypto:" setup.cfg
}
From a1179852f07fe19a527931b034af3abf69869a45 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2c6c9a918606dc9b77f09c47fb669ab7cf7399a9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a52232ba0d14b94f1988b5f4c6cc2dca0b82d5c2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From f8c90f589c985f02b863377259282a3352454667 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From 7b5be8fbad75bc8155d682fc11eb3e8570d61ca7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ef3b50b6d42e06c2809a81df5876be0212753807 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 6e3bc6939ca6bf4679baecf61bad9ad8b6efc434 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 50708e8e8d2bc1197590fdef615820bb3c17baa0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 618ae40cab3176e984a5eddfc15bcade30129ade Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
2022-11-29 21:33 ` [PR PATCH] [Updated] " Emru1
@ 2022-12-06 19:01 ` Emru1
2022-12-14 22:20 ` [PR PATCH] [Updated] " Emru1
` (19 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-06 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#issuecomment-1339836454
Comment:
is there any problem with this PR?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
2022-11-29 21:33 ` [PR PATCH] [Updated] " Emru1
2022-12-06 19:01 ` Emru1
@ 2022-12-14 22:20 ` Emru1
2022-12-14 23:07 ` [PR REVIEW] " CameronNemo
` (18 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-14 22:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 910 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
[ci skip]
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 31920 bytes --]
From 4829735cdbfc6d6aca93eedd784443a99d007c34 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 15 ++++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..38997ee74d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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..03b762a1f157 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,17 +12,18 @@ 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"
-depends="openldap-tools>=${version}_${revision}"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libevent-devel"
+depends="openldap-tools>=${version}_${revision} libevent"
conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 +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 8d731ebd4d90be39bcdf5b778f225f3087cf857f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..964629c5b347 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"
From c9b7a15251733b7d27e6fb6df9ca481dee992950 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
srcpkgs/alpine/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..022958983b13 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
@@ -29,7 +29,3 @@ do_build() {
CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS="$BUILD_LDFLAGS"
make ${makejobs} all CC="$CC"
}
-
-post_install() {
- vlicense NOTICE
-}
From 3227c9be5ff863e77d93ce08d41b865f6640a7c8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6936b387339bd338979fb43e67b9c79ec62c81ad Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 85799f39f836c7708ab4e842fa999fb3e820639f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a6db2b3a10e842ae59e4a3c8dd1a7bd6724d4957 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f1cb85dc321fadeabc0ddb6bee9cd467726dc242 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index f1ee979213f0..9405afcc1829 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
From b50fe305ce723e4d363eaf1c699ae4e2bb0c51a6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4193367528b7486cb90be70de64e8322d5eb99cc Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 eefb93bf764d8bdd412bb70402f92328ac9a1de4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 704f47db653a6b8097c1a7a270059aa5b82b4432 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 eaf0f36260a974a2931c04b5f79cf68175db01fe Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 516da7f441df6df79484174ebd16912c376c5221 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 b4e6914d9c9d5be42ee9d745bcb1246146be3669 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From c969fda511ca55aedc12eaf7eb26926bed0bda66 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From ad0dafcb6323f75485c6a8b3c48cb438245919c2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 68c4e04ac82f1ecf434b0c4f4cfac7494c68c818 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 21713b0c6bc47ed35ea6e58993c7a6e8b92cd8d2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 9a3e7cb4160af62a114c8ec4e868eaaffb189816 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 57b59c93d0f50b6dd275fc7f0222cd97633dda79 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 79bb2bcc661380eafe27c41eb8f9aafad55383dd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 74980f548c06941cae7d4c5758f881af7d17403d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0c1949954c46700fcc33e4eb5c328c2330eb269a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From 561fa4af23383feb683ff84d22ca0095d0f3c75d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d203f168fed004ab950e509f61c177ce9b8e9c5e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 63256234200037d74b050067f819892c96ceedca Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 299c584c02488f23f4fe91ccf4e33e36f3825af2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 5e926dbdce245e9c4c2960aebf51a8f3550907d6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 694d9802e895f63ea217ed859e794364606e5a5b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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..20887723a907 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
+ sed -i "s:^libs = .*:libs = ldap lber sasl2 ssl crypto:" setup.cfg
}
From 1d2ddee44b5e8f90972d06cdb0cefb4b5efa8e1c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 3473c0ccef942d26541d9ee1235ff86990e34a48 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 40964a6f3cbc392254d6d475b06a63883fbd69a1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 074a0fa6a8082092f5cf155c684e56cb80323bae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From fe1d7d7d1d378571db06137d56d2f6653e016929 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 98efce4121c0029598eafc33c5f0ecc779c769d0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 d4b07ee4c616e5935aec1ab207af77ddbeaf112b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0a3395855f657f46ad55c78994d75d585e112cdd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 86cf1ac869c1865025c1c6eef56a9e140625a1be Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (2 preceding siblings ...)
2022-12-14 22:20 ` [PR PATCH] [Updated] " Emru1
@ 2022-12-14 23:07 ` CameronNemo
2022-12-14 23:15 ` classabbyamp
` (17 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: CameronNemo @ 2022-12-14 23:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#discussion_r1049058690
Comment:
The libevent dependency will 99% likelihood be auto-detected, you should not have to add it manually.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (3 preceding siblings ...)
2022-12-14 23:07 ` [PR REVIEW] " CameronNemo
@ 2022-12-14 23:15 ` classabbyamp
2022-12-14 23:27 ` [PR PATCH] [Updated] " Emru1
` (16 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2022-12-14 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#discussion_r1049063281
Comment:
make this a vsed
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (4 preceding siblings ...)
2022-12-14 23:15 ` classabbyamp
@ 2022-12-14 23:27 ` Emru1
2022-12-14 23:27 ` [PR REVIEW] " Emru1
` (15 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-14 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 910 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
[ci skip]
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 31858 bytes --]
From 7765c70b79837fc401944820e1f79f366edce7da Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 13 +++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..38997ee74d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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..d9c85029ad9a 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,17 +12,18 @@ 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 <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 +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 37d4e6312677b082e4a5f64d0893cce8c5d2a456 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..964629c5b347 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"
From 71670f1272cc5362c17d7bec7d07ec2d66b04247 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
srcpkgs/alpine/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..022958983b13 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
@@ -29,7 +29,3 @@ do_build() {
CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS="$BUILD_LDFLAGS"
make ${makejobs} all CC="$CC"
}
-
-post_install() {
- vlicense NOTICE
-}
From 370f74bb8e6cea09a421decd47e3a38006e81767 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 5894cac33685d0485b377502607d650166e94ecc Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 300342f97cb98a7f56bf8e209d6d59196a66de18 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 5e029c8f54e114b65ecececd5c3605096f1a9adc Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 79d1a3ce09a0de4e91a2c825da376bc51555a81e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index f1ee979213f0..9405afcc1829 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
From d39ecbdda323e66e2b3816fbc49660d7ff84598a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 96d3863636c936e091fcc054e147402e96aa9b39 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 b5d04948baf2c83338266773ff35ba8132813686 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 c0b991644f0649c9118331a9699f74a939ac5fd3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f35c280568e1cc184003d436030351fc1b77c5b8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 002d31484da68718d42d4ccdf5810b126dc03890 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 5798e6837cdbd16f74d88dca79f8d6938c835dfb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 653daf51f5cbcea567b1a13a8ced7c67f277626d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From cf98e9ac77f9c2625a1496e8889ed27c2cfb4cd7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From a21e285c0a54487d8e6e61e45d6a31520634326e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b7447012e8a6a24858b04beb31cf77480f6885a1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 67724dc821cb448d5d795150109c3ede9b4f5e17 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 feda3bb81fb6aaba7ab8ed0e7d458f1e1c571045 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 2c39caf420571b73c72013c2c541d54083e8ecb3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 33099ec6f91088f1b9ca32e3a70909ca248fd412 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 88cfcd80243f7ed69eabd87336453027a7b58a86 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From 3de5b69f07c2bb3057e5962fe23c3e2e51f3fcd1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 9bbe0d3443aeae327e7b1fa140d4c64245e3d082 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7af7da4006054c3ba7b1385f2ec1fab68fd01d83 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 c24dcd7b22a337e13541c4a66e29a0aa73d4372a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2e3f4026b053ef3dbff084b40e53c97262568915 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2030f262c93b468a50ee460def05adec66a2c79c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0aa7a5c2bab2aa0d666e8da9ad038ce7bdfe1f1d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 eacc04e899414a1acabde38bff552350d1325dab Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b977299b572aadd5c6fd7b0df8a233370d9a26d5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 9d45d58c6ad6b0dc79af275883d0ca782cee3a93 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From 0e9f4e0008ce6099d9a5c5f9fbb4f7eac346befb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 4656adca7a75c8dff37bcd508886575223a652be Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 b6d6141066b9c8d9277905f31d151b20a2fb0fdc Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 614d02ac9c7d9418320c629fb9771ae283e0eb9a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cf8f1df67ad2e9c5a1fce26a9a061e6016b0e039 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (5 preceding siblings ...)
2022-12-14 23:27 ` [PR PATCH] [Updated] " Emru1
@ 2022-12-14 23:27 ` Emru1
2022-12-14 23:27 ` Emru1
` (14 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-14 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#discussion_r1049069594
Comment:
removed from depends, `xbps-query` still shows `libevent` in `run_depends`
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (6 preceding siblings ...)
2022-12-14 23:27 ` [PR REVIEW] " Emru1
@ 2022-12-14 23:27 ` Emru1
2022-12-14 23:37 ` [PR PATCH] [Updated] " Emru1
` (13 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-14 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New review comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#discussion_r1049069669
Comment:
done
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (7 preceding siblings ...)
2022-12-14 23:27 ` Emru1
@ 2022-12-14 23:37 ` Emru1
2022-12-15 10:31 ` Emru1
` (12 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-14 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 32726 bytes --]
From f385afbba6b01a9c0df682b9c9b08ac6cf1faf5b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b9fecc044025..38997ee74d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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 <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 d49d6c39b57448f569afc246a9d87308a091f55a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..964629c5b347 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"
From e5ed9a3145f0feeae6bb991a2534c5a2c9978bd1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
srcpkgs/alpine/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..022958983b13 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
@@ -29,7 +29,3 @@ do_build() {
CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS="$BUILD_LDFLAGS"
make ${makejobs} all CC="$CC"
}
-
-post_install() {
- vlicense NOTICE
-}
From 907bf2a6fa9f45516b4e30a1f5abdb9e6d064ac7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 dabbe5c8d2183a26bc9e30276a166a4a8d94112b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b8d7a291723e388131345b87ce836284761c9553 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 125940f9206282844b17b3ca293dc2ef3c17dc3a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 1229b839a97fbc02a119509ad21cfc28a37ce141 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index f1ee979213f0..9405afcc1829 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
From e34ec238a5555f7033b0be135411d0ca1f25e011 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 85000c01a6794f7240d8d0070f605b9fcd56f3a0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 2c92e8267bd4f3a008627f3024f5e851641a273c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 97c4d6c85be0f0c80e11c284e676cf170947cc40 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 5549e5ce12a5b688223a15c22a497ae7ea6e5371 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cb59d48e7cf89147e8506fbce27776b7b6f05f88 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 d8d9f630f841b5d70e9907d5b94f3f1335fdb64e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 1fcef3b6435e59a24b3fe3a01906d864ba2d4f32 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From a0bb7f9af651abc20cc17ffb92e7a8ad868aa9c6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 3a981b104a6cfff0e8daaec7dd20c61d183fd853 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 8f174def433d02134740c76fc412995bac764981 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 594228e21016c91cf7d423290cd20ecaf4222739 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 11ef09a6b7e2866d180a1c7705017f4b0fc96b00 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 77a543840735dceddbc42233126e3475c0bf1e80 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 7a20268fcc34ecff501145587b1d27569be18e70 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d394599ea29138a9a44560559747f95b92065307 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From cdac5273272db97c1c289666c0992e71ade28c9f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e4b467872a83040994bbe9ccb4cc836a6837804f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0e7e4da5c795c3aa6ee7f03de4e615830896d4ef Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 87f6b83b75a3437625dff0d9c2dca20ee4102c44 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 1cc4d998e886027628cf650225a033a448c6e3bf Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 5ac65e525fba5ffa28bafb964a8052c9f7c24fee Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6cd523b72e442a71b9968d5b7649254f255896c7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 23a77dbd53152a750f89b592da6e0fa4abbbfb7c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2aa30f6b98591b32a54300f552996eca8d9b0e2d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From e1ae9cd9dc7a60c0687deba08abf82fc4494f108 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From 08bcbab12a0c93263e20bea9528483a0aecf4d7e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 50e5a1d8ff9a27adf26bf5d266927d282d195a90 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 3d77cc18aa612ae994c059535bdde1b9552ee787 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f144f5dace4c3bdc15bc3d4c188e89c657e28c9f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 db26a6d564296fe6700624bcf1515371f04d9a98 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (8 preceding siblings ...)
2022-12-14 23:37 ` [PR PATCH] [Updated] " Emru1
@ 2022-12-15 10:31 ` Emru1
2022-12-15 11:48 ` Emru1
` (11 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-15 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 33080 bytes --]
From f385afbba6b01a9c0df682b9c9b08ac6cf1faf5b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b9fecc044025..38997ee74d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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 <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 8fe2452853d8fda8fcdd56c82a6c6b97a1f5b361 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fcb182ee45bcda55736d2dfcfbeaef64f64cde99 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
srcpkgs/alpine/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..022958983b13 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
@@ -29,7 +29,3 @@ do_build() {
CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS="$BUILD_LDFLAGS"
make ${makejobs} all CC="$CC"
}
-
-post_install() {
- vlicense NOTICE
-}
From 7f6fabcb0f30b15fdc0cf65c1c6f7702de3b2252 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2817c6eed49ee21b982b4e79bcf6bcd876e2530d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 993dbf40093cf904d3d0ee5a75c6b292ced9161b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 47758fbba4e93cc0480c366b4cc93e6bf682f201 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 96230676d92c85306d57edf1a1121a736187a3e5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index f1ee979213f0..9405afcc1829 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
From 9fe1f2bd59c21a385efafee313bff199777c8bcd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 06797a1ee12b4cf52f0d510bb09dac2653ad1007 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 e79ee62128bc35d2474dc5d24974d8d64fb0334d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0f5e9f3add1e1e5005713d74352f9c1d2ebcf99f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d47951b1a0a8365feb0b0020cb8f95887412845d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cbdf166eb19847b07741bf78b517c78a8a73d921 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 dee3a612219931316f5c6f3640a102c98746464b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 7798006165dd8a68e227edebbd3a9e01c4d9e5a4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 6d893eb11440aa299cb773d3008284d8e5581871 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 43998cb035700a1f2d37cd2ca814bf547744a596 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a6dcb46b0a216592d9c546a321ff297a017883a1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 9f5ea8e44428ea6724e4531b15d8a5c0090b06f1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0447685d17503a46a83f9c76a225a6b68503de94 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 ed1298e0aab0f8589a5d8430af09b06a83e03483 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From b1f2b5003b7fef1d17abcfd5bb49a5353cd83ded Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f1ae9bbd3cc56c31452c296a017e090b02c41c07 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From 6af8e14d8213a34b819e586fc1d12eb87235d42b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d75cb83dce1c1b4ce4dc68d29879fb2e851b28ec Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 42a808a34a8eb2d8beb5be14caf24c8252ee89da Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e07bae6323ce1ba494060a89183a52f374b23ae7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 c2ac4e5b5c0cabd7e1f8e3f9be6a7f315de3ea08 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b2916155c194bf7430502639adcd7b75a85a3039 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b730620b262cc0a1734668cc0ddb3fbd10ce1ab0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 679521e7f07344cf5bd4abeeddc9bb3425e86388 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 cecc332469e37bd3036443bd0e00be06623fcef2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 1200e29f6ca43f9c2a2eb40bc599b028372cb54d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From da54e07c9bc429583413b4af7731013db6ba44c1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 1628d43032256f45dba597c55fc93ad8c78559a4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 a6f4f1692b64023038620a6efd809de1f8fa5904 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6cf650e08d0e1e06ce55111be8f4ac84e4a7271b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7ce6ddf4756a708e0d0314bf766b3cc145b5144a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (9 preceding siblings ...)
2022-12-15 10:31 ` Emru1
@ 2022-12-15 11:48 ` Emru1
2022-12-15 16:03 ` [PR REVIEW] " paper42
` (10 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-15 11:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 33478 bytes --]
From f385afbba6b01a9c0df682b9c9b08ac6cf1faf5b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b9fecc044025..38997ee74d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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 <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 8fe2452853d8fda8fcdd56c82a6c6b97a1f5b361 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fcb182ee45bcda55736d2dfcfbeaef64f64cde99 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/39] alpine: Rebuild for openldap-2.6.3
---
srcpkgs/alpine/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..022958983b13 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
@@ -29,7 +29,3 @@ do_build() {
CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= LDFLAGS="$BUILD_LDFLAGS"
make ${makejobs} all CC="$CC"
}
-
-post_install() {
- vlicense NOTICE
-}
From 7f6fabcb0f30b15fdc0cf65c1c6f7702de3b2252 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2817c6eed49ee21b982b4e79bcf6bcd876e2530d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 993dbf40093cf904d3d0ee5a75c6b292ced9161b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 47758fbba4e93cc0480c366b4cc93e6bf682f201 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 df486626b0218bb848e1b37cad00220cb5b08cab Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 56a882156335e59d74f95fb3806d300ef1159e9f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 0ec1764815f28f36fd7d7968cab2168506ce44ce Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 3b78594c2a4e7873100e370648f283f7f2ca635f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 c669384fc1a44b61cc41825d6fda5d0cdf6ef9a1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 36c2f4727a9220419376ad487ce14869dba9cd7a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e2887b632a2dbf9f9594533eaed417304084dbb2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 23e9c876b0ab6f9924602743b600227eda1c7efe Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 9f87bb0f14112a1fa90f13c886223dcfc94bf88f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 4905fb6d5c242d4571851c1677decaf86f7d62ad Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 164a574d2be64dfab8d920dacfd8efd63b9704ad Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 1e2ca4876429060c39a3ebe195ded0dc34361152 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fdf302ab7ab68dcb2666e9c64dc4b773dde8d85e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b81d122dea391b892dc4e480775974445d575e2a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 c19fb87a47ff7d6d46b83cd84e1c8ed37c5bff51 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From f7f595ac9d38d532e57008c6c89a6e510f677eee Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 22a563dd3cbaecdac66d1417fca588d661390504 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From 972b6abeef72028f477d9ed81d932f6c57f045f2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 9934f185e198b52ffc8f905d8083c7727c9c79f7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 bddf1774ab4b03e4993f1b8099400481e44d830c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad5e33fee5933a6402ac770d9a960dc5da88899a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a63fa6d543d7a3022459f6d3ccbac0a49420f640 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ff1226a1d40591fd7ea8692ddc568b23b82a9d56 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 090cfce9437c86ed9a9c285f4bee92719e68005f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 70daf44c2c2c3a2285cd24a4a9957367dc6b1039 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a68ef3c48069fea20fee91631dd8d2952475cf4f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 28c819d3638379d54cf1572c84156cb9a6d21f67 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 34/39] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..085c9385bceb 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
From a84d1a659607683b0a6154053dd1f8768e620aae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 8c4deeeabe7197bd71915172ffac82b6228e0df4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 4d4449e19c2c4620329f2399c8fbfb043150141e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 213b0dddbb00fb31d06fafa4ea9e05276c5a5c49 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e7fb58bf03090d64b44d4c4c1ad131bbead27d23 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (10 preceding siblings ...)
2022-12-15 11:48 ` Emru1
@ 2022-12-15 16:03 ` paper42
2022-12-16 2:43 ` ahesford
` (9 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-12-15 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#discussion_r1049833508
Comment:
are you sure we can remove this? NOTICE doesn't match Apache-2.0 exactly
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (11 preceding siblings ...)
2022-12-15 16:03 ` [PR REVIEW] " paper42
@ 2022-12-16 2:43 ` ahesford
2022-12-22 11:22 ` [PR PATCH] [Updated] " Emru1
` (8 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: ahesford @ 2022-12-16 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#issuecomment-1354105477
Comment:
To fix `squid`, try pre-building `cf_gen` for the host:
```bash
pre_build() {
make -C src BUILDCXX=g++ cf_gen
}
```
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (12 preceding siblings ...)
2022-12-16 2:43 ` ahesford
@ 2022-12-22 11:22 ` Emru1
2023-01-03 13:17 ` Emru1
` (7 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2022-12-22 11:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 34007 bytes --]
From f385afbba6b01a9c0df682b9c9b08ac6cf1faf5b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b9fecc044025..38997ee74d20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,9 +696,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 <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 8fe2452853d8fda8fcdd56c82a6c6b97a1f5b361 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 861cc1ea48ce4f7cef6e6e012ab7e2f915fa3c92 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <leah@vuxu.org>"
-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 521b0efbfe2d14f2c25c3eb8c0ff4fe67845a45d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 36d99c2e3275ad6da1f8af4c78fae81f7de2f20b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 9f14b524863004769b9b4aae3cfd699cb5e04852 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 12e95f78f118e3a273515995b9a9b23ab32bc7f8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f850f429fdf43eb1962cb8fbb75dfd7564cb02f7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 a4c8e2b28812c8ea067748ee8b7233282fb5cc4a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 04fd6a947c98b361c592d46b533ff7781b081a73 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 10/39] autofs: Rebuild for openldap-2.6.3
---
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 0e019c6b73332647262950633fdd32e4f94b3cb3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2f53b3755075e54635aab2989d662a71c99447ce Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 e59691a868174749b11b3501bb3095786bd894bb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 11d195fd026d5b5a67596027160ca06f0c89e68e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 ad24df3aa81a..e85cf61dafb7 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.19.1
-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 0610b65c771a97b2b7ad1de64ceac5c374687091 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 65b39c3357f1..88ff272f9f02 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.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 672d5bee1631d73988ec3936e91636a9b4f8875f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6304e8cc5b34..543b2b75314b 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.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 6b11df5b257a33783e26d52c09b285949104f50b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 fd9d12a73e74..d8379034bc23 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 383888c9e5c2dc78f896a1acca5dde6f0943e5fd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 48a5225e2ec706b9348d12858a3a061fcf5299f0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 3173a00bce2c2ea1794f1b5466ed5ff353d96b10 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 55902f75facf84acb3e14003fec675c16cb6eb47 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <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-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 6cda2ea8eff89ea1ac7aeb6d7a7926cba2f788f0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7d1004672fa3..69779030648b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.2.3
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 1818fd07cb485a749dd5f68958e2e7ec8bca50eb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 25327fa71f15be8db255db3a9b5ba958a2edef1f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From a1552c9879796352d4f5b72204758b6bfc3c2c3f Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 6d20c3854ab7210d3f1907405f34176b60824989 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 dc52f1e6d477795ad58190bda4179b790680a7f4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 f4b0d2ef83401ffccbe9065990a239589b3acf36 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 b4a5fb68760122e3aede024f18de6d87cd27796e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 68e4027bb1ae38e2b5d87ce09eae71eb6041ddf9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 2fc279f93565a8a31c1406a555e0db8bb568b906 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 3264abdf9246089e821c6c0c910017e734cd1ed1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d7e289d110fbc19b2862a0b5e6c4f10d0370b3ff Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 29ea1021534e..43811ac6fbec 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=41.0
-revision=2
+revision=3
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 88816a08ba1bde1447ac0825bb13c2bbbbbafad1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 d2740a92208b35819d5dc04b20032a27c944db7e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 c299334ae3560414102ed1684b1f1855c9ffe4fb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 b8d5529a514109530ba8c53fafd11d72f234b1e2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7ea79c0df33bc0a6f433250d81d899f3afffaf08 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 7025283e3d3504656491169c630fa2dc71a522b9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (13 preceding siblings ...)
2022-12-22 11:22 ` [PR PATCH] [Updated] " Emru1
@ 2023-01-03 13:17 ` Emru1
2023-02-09 19:53 ` Emru1
` (6 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2023-01-03 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 34304 bytes --]
From 89d596fbb26b067730eea8174ec6d64dd1a2ef7e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <ailiop@altatus.com>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <leah@vuxu.org>"
-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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <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-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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <john@jrjrtech.com>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From d75810c790a6bf9af1368b73c60a1db700e8a059 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <orphan@voidlinux.org>"
-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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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 <emil.tomczyk@skni.umcs.pl>
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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (14 preceding siblings ...)
2023-01-03 13:17 ` Emru1
@ 2023-02-09 19:53 ` Emru1
2023-02-09 20:11 ` Emru1
` (5 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2023-02-09 19:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 32799 bytes --]
From 070066812af577ea8624f63386fd1ab0e0d3ffae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:23:01 +0100
Subject: [PATCH 01/38] 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 504d29f4cb98..632855cd8e65 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/template b/srcpkgs/openldap/template
index 85fe79d77d1e..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="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 1659b53afe4c9c4c00462e0939b835a19680cbe8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:34:53 +0100
Subject: [PATCH 02/38] 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 c46402b497d76b5097ba95cf1a36316dd8a99eb2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/38] 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 <leah@vuxu.org>"
-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 f539ef30f338d1cc4c56aed86458ac22ea34e1a8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:40:55 +0100
Subject: [PATCH 04/38] 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 e89462a2a2e213ba59f5eeed678f77a34e36f42a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:50:03 +0100
Subject: [PATCH 05/38] 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 fe214b1a1752a867f6df9503d112bfc414312708 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:50:38 +0100
Subject: [PATCH 06/38] 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 54e42921eb629625292e7b1f1afa6a69d22f0220 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:58:42 +0100
Subject: [PATCH 07/38] nfs-utils: Rebuild for openldap-2.6.3
---
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 663f982946df1ebb7208fe4d4902311998c2acce Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:59:13 +0100
Subject: [PATCH 08/38] 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 d90da40b8c10f679f64c872e765363f014359621 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 09/38] 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 89d4cbf8c0cdaae267703e7d7d09badcee227bc6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:01:07 +0100
Subject: [PATCH 10/38] 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 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 82ed5e644c3f06dfb154ca97ac9a3008244ddcd7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:01:39 +0100
Subject: [PATCH 11/38] 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 32ac27e7d28a9c1d87bac8deb82f2c4b013e7d0e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:02:57 +0100
Subject: [PATCH 12/38] 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 2351cf253cb615ffaadc5b7a3d2bbdc3f89c2f25 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:03:42 +0100
Subject: [PATCH 13/38] 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 b0461646140e77c622d96ea8b0c0557080631940 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:04:59 +0100
Subject: [PATCH 14/38] 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 21372e50f15ea1f8ddf83fff56f1c7434ae5dde9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:06:33 +0100
Subject: [PATCH 15/38] 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 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 e25298857e0d125518ce9ebd3793fc318e7f6428 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:07:38 +0100
Subject: [PATCH 16/38] 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 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 10b0929e3c16251c307e1342aa8ad134d5fb0fab Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:09:31 +0100
Subject: [PATCH 17/38] 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 ee2059a373b4..5b2d6fcb74f3 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-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 2acbfa55fef3c637639096223ff47ed44ca48db8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:10:41 +0100
Subject: [PATCH 18/38] 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 46c59611f007995eec762d5dbf4fdf9aa0befb78 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:11:10 +0100
Subject: [PATCH 19/38] 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 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 b9fc41e20b28c581963a02f80d28aab273f61bba Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:12:37 +0100
Subject: [PATCH 20/38] 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 <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-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 9d47930c440d797a4ab77e63bdcd5ead10e2309e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:13:38 +0100
Subject: [PATCH 21/38] 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 67663103bb4cea5bc96c1deb297df3484e8dda51 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:58:32 +0100
Subject: [PATCH 22/38] 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 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 143847f7a43891f4829f442adb477a49dcb21256 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:59:28 +0100
Subject: [PATCH 23/38] log4cxx: Rebuild for openldap-2.6.3
---
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 2e4344b31f7355c59342978bece164bbbe7600f0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:00:28 +0100
Subject: [PATCH 24/38] 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 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 7f9e5212df3584cffa8b2de4b19c4ea9ea04ddc3 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:02:51 +0100
Subject: [PATCH 25/38] 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 c3ddb208485f150786fe3d7cb5398459128ec875 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:03:24 +0100
Subject: [PATCH 26/38] 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 39e4d161b648..e9c6f6024631 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 7c18153b4ff03f6e399b4de778119646e019ec0e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:05:09 +0100
Subject: [PATCH 27/38] 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 54a66b414eb75ec6d81bcc5095f67152bab14ab2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:07:09 +0100
Subject: [PATCH 28/38] 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 a01cfcc0d93c40c38f9932e5c045e929499d3270 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:29:23 +0100
Subject: [PATCH 29/38] 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 e33e636656c7e2feff50b7e2748ac73cc78a8495 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:30:08 +0100
Subject: [PATCH 30/38] 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 70ef218a36f36fe4f72f68eacd60a2f8bf0d709e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:31:16 +0100
Subject: [PATCH 31/38] 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 a6c59cce6088a5bad39fee077c341487d3888381 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:36:42 +0100
Subject: [PATCH 32/38] 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 83aa0c27544b8490ccbf827b378f5b9d04778217 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 33/38] squid: Rebuild for openldap-2.6.3
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 49b9eb9d7b91..2238d1c7df52 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
From 8f46f872f161a837e05c069248e880b4440e4f1d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:43:38 +0100
Subject: [PATCH 34/38] 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 53cd583265642e931de5adaf279e16066adab5be Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:44:17 +0100
Subject: [PATCH 35/38] 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 <orphan@voidlinux.org>"
-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 91de07b451054e061eeda2fcc483fb3e8be0956a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:50:24 +0100
Subject: [PATCH 36/38] 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 0d7b583e9d5da866920bc294396f994f38c5a571 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 19:44:27 +0100
Subject: [PATCH 37/38] 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 b1c2cd4e8090..997a242b9191 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 205968add69ecfac85dc6cb7107e3891533ef38a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 20:10:41 +0100
Subject: [PATCH 38/38] 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 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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (15 preceding siblings ...)
2023-02-09 19:53 ` Emru1
@ 2023-02-09 20:11 ` Emru1
2023-02-10 12:52 ` Emru1
` (4 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2023-02-09 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 33182 bytes --]
From 070066812af577ea8624f63386fd1ab0e0d3ffae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:23:01 +0100
Subject: [PATCH 01/38] 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 504d29f4cb98..632855cd8e65 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/template b/srcpkgs/openldap/template
index 85fe79d77d1e..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="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 1659b53afe4c9c4c00462e0939b835a19680cbe8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:34:53 +0100
Subject: [PATCH 02/38] 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 c46402b497d76b5097ba95cf1a36316dd8a99eb2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/38] 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 <leah@vuxu.org>"
-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 f539ef30f338d1cc4c56aed86458ac22ea34e1a8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:40:55 +0100
Subject: [PATCH 04/38] 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 e89462a2a2e213ba59f5eeed678f77a34e36f42a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:50:03 +0100
Subject: [PATCH 05/38] 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 fe214b1a1752a867f6df9503d112bfc414312708 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:50:38 +0100
Subject: [PATCH 06/38] 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 54e42921eb629625292e7b1f1afa6a69d22f0220 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:58:42 +0100
Subject: [PATCH 07/38] nfs-utils: Rebuild for openldap-2.6.3
---
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 663f982946df1ebb7208fe4d4902311998c2acce Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:59:13 +0100
Subject: [PATCH 08/38] 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 d90da40b8c10f679f64c872e765363f014359621 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 09/38] 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 89d4cbf8c0cdaae267703e7d7d09badcee227bc6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:01:07 +0100
Subject: [PATCH 10/38] 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 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 82ed5e644c3f06dfb154ca97ac9a3008244ddcd7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:01:39 +0100
Subject: [PATCH 11/38] 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 32ac27e7d28a9c1d87bac8deb82f2c4b013e7d0e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:02:57 +0100
Subject: [PATCH 12/38] 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 2351cf253cb615ffaadc5b7a3d2bbdc3f89c2f25 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:03:42 +0100
Subject: [PATCH 13/38] 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 b0461646140e77c622d96ea8b0c0557080631940 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:04:59 +0100
Subject: [PATCH 14/38] 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 21372e50f15ea1f8ddf83fff56f1c7434ae5dde9 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:06:33 +0100
Subject: [PATCH 15/38] 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 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 e25298857e0d125518ce9ebd3793fc318e7f6428 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:07:38 +0100
Subject: [PATCH 16/38] 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 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 10b0929e3c16251c307e1342aa8ad134d5fb0fab Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:09:31 +0100
Subject: [PATCH 17/38] 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 ee2059a373b4..5b2d6fcb74f3 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-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 2acbfa55fef3c637639096223ff47ed44ca48db8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:10:41 +0100
Subject: [PATCH 18/38] 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 46c59611f007995eec762d5dbf4fdf9aa0befb78 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:11:10 +0100
Subject: [PATCH 19/38] 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 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 b9fc41e20b28c581963a02f80d28aab273f61bba Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:12:37 +0100
Subject: [PATCH 20/38] 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 <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-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 9d47930c440d797a4ab77e63bdcd5ead10e2309e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:13:38 +0100
Subject: [PATCH 21/38] 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 67663103bb4cea5bc96c1deb297df3484e8dda51 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:58:32 +0100
Subject: [PATCH 22/38] 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 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 264dbb63c7099da6413e1bf0182961d7c3391e2e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:59:28 +0100
Subject: [PATCH 23/38] 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 2f4905a16092..33612b9134e9 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="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From 2f9c67b8445db8f14db7ed6b88b6750a23210559 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:00:28 +0100
Subject: [PATCH 24/38] 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 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 7375e2f4c43d63162d21c8ff64043ce503af4c50 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:02:51 +0100
Subject: [PATCH 25/38] 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 4662525e13815be8414b1e1372281a0bc98c069e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:03:24 +0100
Subject: [PATCH 26/38] 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 39e4d161b648..e9c6f6024631 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 2b0606e10dbe37e9a5b0954cedb8653db61c64e2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:05:09 +0100
Subject: [PATCH 27/38] 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 58dcf848235cc4f3c0d800422c7a35cccb7a8b91 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:07:09 +0100
Subject: [PATCH 28/38] 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 ee3b4d46275bae65cb0f0fefb1912b1ee964eec5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:29:23 +0100
Subject: [PATCH 29/38] 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 4484286401b1d516b51b021f08841d7bb57a7bdf Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:30:08 +0100
Subject: [PATCH 30/38] 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 aac7a2611598c3646b5f1d6a962b0f90f029e5a5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:31:16 +0100
Subject: [PATCH 31/38] 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 a250c9040810428cc37ac41997db6b81cbec5bc6 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:36:42 +0100
Subject: [PATCH 32/38] 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 61a95cc4e990168bc6e5a16038835eee24e789ae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 33/38] 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 49b9eb9d7b91..edfc2cbc3ba3 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
@@ -69,6 +69,10 @@ pre_configure() {
export BUILDCXXFLAGS="-O2"
}
+pre_build() {
+ make -C src BUILDCXX=g++ cf_gen
+}
+
post_install() {
chmod u+s \
${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
From b7d092c62e14dd2b5133328823031ff125dce4cf Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:43:38 +0100
Subject: [PATCH 34/38] 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 433598a31bcd6f6fe1ddeab91d29ea08b36e6634 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:44:17 +0100
Subject: [PATCH 35/38] 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 <orphan@voidlinux.org>"
-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 e201bdd8f3589ca55ae6d12da5ff64a3fd7f4a0c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:50:24 +0100
Subject: [PATCH 36/38] 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 472e842087f5d1df3b212fef9030546eca6b9ee4 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 19:44:27 +0100
Subject: [PATCH 37/38] 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 b1c2cd4e8090..997a242b9191 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From e0e52013b294a3a95a59ce4f96029f7beb1991c1 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 20:10:41 +0100
Subject: [PATCH 38/38] 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 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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (16 preceding siblings ...)
2023-02-09 20:11 ` Emru1
@ 2023-02-10 12:52 ` Emru1
2023-02-25 19:57 ` mhmdanas
` (3 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2023-02-10 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages openldap
https://github.com/void-linux/void-packages/pull/40812
openldap: update to 2.6.3.
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
A patch file from https://github.com/void-linux/void-packages/pull/40812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-40812.patch --]
[-- Type: text/x-diff, Size: 34404 bytes --]
From 070066812af577ea8624f63386fd1ab0e0d3ffae Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:23:01 +0100
Subject: [PATCH 01/38] 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 504d29f4cb98..632855cd8e65 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/template b/srcpkgs/openldap/template
index 85fe79d77d1e..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="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
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 1659b53afe4c9c4c00462e0939b835a19680cbe8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:34:53 +0100
Subject: [PATCH 02/38] 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 c46402b497d76b5097ba95cf1a36316dd8a99eb2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:37:44 +0100
Subject: [PATCH 03/38] 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 <leah@vuxu.org>"
-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 f539ef30f338d1cc4c56aed86458ac22ea34e1a8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:40:55 +0100
Subject: [PATCH 04/38] 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 6209ae6e2fa8803f7bccd42b6d17216a6ccefbb5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:50:03 +0100
Subject: [PATCH 05/38] apr-util: update to 1.6.3.
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 6 +++---
2 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/apr-util/patches/mysql.patch
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
-
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
- my_init();
-+#endif
- mysql_thread_init();
-
- /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..32662c44fe23 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
+version=1.6.3
+revision=14
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://apr.apache.org/"
distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
# fails to build tests
make_check=no
From b8e4c1691395b36eadf9485e630eebfe4e05fd69 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:50:38 +0100
Subject: [PATCH 06/38] 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 dd055462a198eac11978b118a62f06331b5e9656 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:58:42 +0100
Subject: [PATCH 07/38] nfs-utils: Rebuild for openldap-2.6.3
---
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 4583fc4c82a8b8973ed7db7b303939229e14c3f7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 16:59:13 +0100
Subject: [PATCH 08/38] 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 d4ccf72a4c7cb690147ef438c051a1f55665c73a Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:00:21 +0100
Subject: [PATCH 09/38] 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 e3cb551a84ff2c006e35a7111ad25a40b2477d0b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:01:07 +0100
Subject: [PATCH 10/38] 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 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 3b41f77d8b6616de7a74c202f1319de33c26670b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:01:39 +0100
Subject: [PATCH 11/38] 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 6cdc8e36d2f5a1e1f3b86e8b22c7609e3a7d5bed Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:02:57 +0100
Subject: [PATCH 12/38] 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 99d0b87c46fc10ceb4d55e04f5d3ae0ea4b62dd0 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:03:42 +0100
Subject: [PATCH 13/38] 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 d9aa4287da5ab4590073b42f802d943ae8211898 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:04:59 +0100
Subject: [PATCH 14/38] 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 4e080de2611c4827cf9bfb8f8b9b4d7d781e6afd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:06:33 +0100
Subject: [PATCH 15/38] 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 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 9dce34f5ca64b8b9b9de8186fd2d89b1855abec2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:07:38 +0100
Subject: [PATCH 16/38] 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 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 f3b07b7b2fd19b1f3b6b64ceba94abf8e50a6505 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:09:31 +0100
Subject: [PATCH 17/38] 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 ee2059a373b4..5b2d6fcb74f3 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-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 fb3ede830ee9f639d51e3938815608607b96afe2 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:10:41 +0100
Subject: [PATCH 18/38] 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 02a05a94755d5a134d57b8198b618c0d56235feb Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:11:10 +0100
Subject: [PATCH 19/38] 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 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 aff0e0ca7f88550a6784803ba18ee7af68158f56 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:12:37 +0100
Subject: [PATCH 20/38] 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 <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-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 897705e77fd7a21f55d9dfd9a85865791baa1f49 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:13:38 +0100
Subject: [PATCH 21/38] 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 5acb0d0d61a617428e08f83164c87efcd8a61e35 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:58:32 +0100
Subject: [PATCH 22/38] 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 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 3e1ae7ca1652f50e97db047d7462fa11e7424f4d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 17:59:28 +0100
Subject: [PATCH 23/38] 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 2f4905a16092..33612b9134e9 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="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
From 9e05bd0721838464d6a2d875168904402cc6cb91 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:00:28 +0100
Subject: [PATCH 24/38] 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 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 ccae57d6a6ed98df2ff5da21ea195d75319997aa Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:02:51 +0100
Subject: [PATCH 25/38] 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 fd5ec6a29adeb83b0044befbe4bfea0805c4d349 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:03:24 +0100
Subject: [PATCH 26/38] 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 39e4d161b648..e9c6f6024631 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 c3b09ea43144bd2eb433995b38b5c1e132dbcd44 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:05:09 +0100
Subject: [PATCH 27/38] 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 653a550cddef418d6f94285efb9bd2d3aec8efd7 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:07:09 +0100
Subject: [PATCH 28/38] 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 8295ce7f1307da5e2887e6a205b287baf1629a04 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:29:23 +0100
Subject: [PATCH 29/38] 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 4f2b6bc143ac949284dbf3d3837951c3a99773e5 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:30:08 +0100
Subject: [PATCH 30/38] 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 0439e551354195ab3187463b78a655459103f1d8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:31:16 +0100
Subject: [PATCH 31/38] 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 24d8207dda6d138955dd412aa9633f2369d97cf8 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:36:42 +0100
Subject: [PATCH 32/38] 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 de4b5bdbd58493efd1961641ddfcd21511ba535b Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:40:00 +0100
Subject: [PATCH 33/38] 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 49b9eb9d7b91..edfc2cbc3ba3 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
@@ -69,6 +69,10 @@ pre_configure() {
export BUILDCXXFLAGS="-O2"
}
+pre_build() {
+ make -C src BUILDCXX=g++ cf_gen
+}
+
post_install() {
chmod u+s \
${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
From d8d867729e2345fb343d227d8fcb307fa75f0e33 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:43:38 +0100
Subject: [PATCH 34/38] 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 bc8b4491f0a1a284fef09b3b69b0aa35c8f8cafd Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:44:17 +0100
Subject: [PATCH 35/38] 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 <orphan@voidlinux.org>"
-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 42da39bbbe2ad705c2113f6de22f8a806ae99835 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 18:50:24 +0100
Subject: [PATCH 36/38] 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 5f16faf3d3a3005f669810334671e6f56d02911c Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 19:44:27 +0100
Subject: [PATCH 37/38] 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 b1c2cd4e8090..997a242b9191 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From c4b3ee5af9ccbcc8e06cf12aa3f79380c828c50e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sun, 27 Nov 2022 20:10:41 +0100
Subject: [PATCH 38/38] 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 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"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (17 preceding siblings ...)
2023-02-10 12:52 ` Emru1
@ 2023-02-25 19:57 ` mhmdanas
2023-02-26 22:48 ` [PR PATCH] [Closed]: " Emru1
` (2 subsequent siblings)
21 siblings, 0 replies; 35+ messages in thread
From: mhmdanas @ 2023-02-25 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#issuecomment-1445192261
Comment:
You may want to close this in favor of https://github.com/void-linux/void-packages/pull/41948.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Closed]: openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (18 preceding siblings ...)
2023-02-25 19:57 ` mhmdanas
@ 2023-02-26 22:48 ` Emru1
2023-02-28 16:23 ` klarasm
2023-03-01 8:52 ` Emru1
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2023-02-26 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There's a closed pull request on the void-packages repository
openldap: update to 2.6.3.
https://github.com/void-linux/void-packages/pull/40812
Description:
OpenLDAP update to 2.6.3
This update changes naming of libraries, from `libldap-2.4.so.2` to `libldap.so.2`, so it demanded changes in `common/shlibs`
Also, `libldap_r` was deprecated and merged with `libldap` [https://lists.openldap.org/hyperkitty/list/openldap-announce@openldap.org/thread/BH3VDPG6IYYF5L5U6LZGHHKMJY5HFA3L/](url)
I've built new version and checked build status on x86_64 for those packages which were given by `xrevshlib` as dependent on `openldap` or `libldap`.
I've never made PR this big to void-packages, please, check if everything with this PR is ok
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (19 preceding siblings ...)
2023-02-26 22:48 ` [PR PATCH] [Closed]: " Emru1
@ 2023-02-28 16:23 ` klarasm
2023-03-01 8:52 ` Emru1
21 siblings, 0 replies; 35+ messages in thread
From: klarasm @ 2023-02-28 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#issuecomment-1448475016
Comment:
I just want to say that I did not notice this PR when I created mine (I should probably have looked harder).
@Emru1, I am sorry, I did not want to duplicate your work. If you want to continue here I can close my PR and help with testing this instead.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: openldap: update to 2.6.3.
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
` (20 preceding siblings ...)
2023-02-28 16:23 ` klarasm
@ 2023-03-01 8:52 ` Emru1
21 siblings, 0 replies; 35+ messages in thread
From: Emru1 @ 2023-03-01 8:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/40812#issuecomment-1449599077
Comment:
@klarasm
no, no, that's okay :)
I am happy that someone picked this up, as I had shortage in my free time recently, so I could not polish this up properly.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (10 preceding siblings ...)
2023-02-03 17:20 ` klarasm
@ 2023-02-03 17:41 ` klarasm
11 siblings, 0 replies; 35+ messages in thread
From: klarasm @ 2023-02-03 17:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096076449
Comment:
I actually don't think that expression changes anything here. openldap 2.6 does not provide `ldap_r` anymore, it's `ldap`. I have tried removing the pre_build and it builds and checks fine still.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (9 preceding siblings ...)
2023-02-03 17:16 ` klarasm
@ 2023-02-03 17:20 ` klarasm
2023-02-03 17:41 ` klarasm
11 siblings, 0 replies; 35+ messages in thread
From: klarasm @ 2023-02-03 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096055951
Comment:
Okay, will try that
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (8 preceding siblings ...)
2023-02-03 17:05 ` paper42
@ 2023-02-03 17:16 ` klarasm
2023-02-03 17:20 ` klarasm
2023-02-03 17:41 ` klarasm
11 siblings, 0 replies; 35+ messages in thread
From: klarasm @ 2023-02-03 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096052524
Comment:
#42055
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (7 preceding siblings ...)
2023-02-03 16:49 ` klarasm
@ 2023-02-03 17:05 ` paper42
2023-02-03 17:16 ` klarasm
` (2 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096042803
Comment:
NOTICE suggests license should probably be `Apache-2.0, BSD-4-Clause`
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (6 preceding siblings ...)
2023-02-03 16:46 ` klarasm
@ 2023-02-03 16:49 ` klarasm
2023-02-03 17:05 ` paper42
` (3 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: klarasm @ 2023-02-03 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096022912
Comment:
Will do
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (5 preceding siblings ...)
2023-02-03 16:46 ` paper42
@ 2023-02-03 16:46 ` klarasm
2023-02-03 16:49 ` klarasm
` (4 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: klarasm @ 2023-02-03 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096020625
Comment:
xlint complained that license Apache-2.0 should not be installed. I don't know if there's another solution
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (4 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:46 ` paper42
2023-02-03 16:46 ` klarasm
` (5 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096014014
Comment:
`distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"`
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (2 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (7 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096010600
Comment:
why are you removing this?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (10 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096016103
Comment:
can we switch to vsed here?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
2023-02-03 16:45 ` [PR REVIEW] " paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (9 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096013288
Comment:
zip and pkg-config should probably be in hostmakedepends
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
2023-02-03 16:45 ` [PR REVIEW] " paper42
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (8 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096016969
Comment:
Could you open a separate PR for this fix?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] " klarasm
` (3 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:46 ` paper42
` (6 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2023-02-03 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1096014014
Comment:
```suggestion distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
```
^ permalink raw reply [flat|nested] 35+ messages in thread
end of thread, other threads:[~2023-03-01 8:52 UTC | newest]
Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-27 20:46 [PR PATCH] openldap: update to 2.6.3 Emru1
2022-11-29 21:33 ` [PR PATCH] [Updated] " Emru1
2022-12-06 19:01 ` Emru1
2022-12-14 22:20 ` [PR PATCH] [Updated] " Emru1
2022-12-14 23:07 ` [PR REVIEW] " CameronNemo
2022-12-14 23:15 ` classabbyamp
2022-12-14 23:27 ` [PR PATCH] [Updated] " Emru1
2022-12-14 23:27 ` [PR REVIEW] " Emru1
2022-12-14 23:27 ` Emru1
2022-12-14 23:37 ` [PR PATCH] [Updated] " Emru1
2022-12-15 10:31 ` Emru1
2022-12-15 11:48 ` Emru1
2022-12-15 16:03 ` [PR REVIEW] " paper42
2022-12-16 2:43 ` ahesford
2022-12-22 11:22 ` [PR PATCH] [Updated] " Emru1
2023-01-03 13:17 ` Emru1
2023-02-09 19:53 ` Emru1
2023-02-09 20:11 ` Emru1
2023-02-10 12:52 ` Emru1
2023-02-25 19:57 ` mhmdanas
2023-02-26 22:48 ` [PR PATCH] [Closed]: " Emru1
2023-02-28 16:23 ` klarasm
2023-03-01 8:52 ` Emru1
2023-01-29 23:49 [PR PATCH] " klarasm
2023-02-03 16:45 ` [PR REVIEW] " paper42
2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
2023-02-03 16:46 ` paper42
2023-02-03 16:46 ` klarasm
2023-02-03 16:49 ` klarasm
2023-02-03 17:05 ` paper42
2023-02-03 17:16 ` klarasm
2023-02-03 17:20 ` klarasm
2023-02-03 17:41 ` klarasm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).