* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
@ 2023-01-31 23:28 ` klarasm
2023-01-31 23:31 ` klarasm
` (103 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-01-31 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2433 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
This is very preliminary.
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
[ci skip] for now.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 10580 bytes --]
From 97690dc83c5bda3a8582eecc823f431d464fd113 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 1/3] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..df102e574337 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8fc9af369ed6f14228053d6447b20b5fd9451919 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 2/3] cyrus-sasl: revbump due to openldap update
---
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 ae9b6ebe53de892353835ae2e51c92f5952582f5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 3/3] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
2023-01-31 23:28 ` [PR PATCH] [Updated] " klarasm
@ 2023-01-31 23:31 ` klarasm
2023-01-31 23:55 ` [PR PATCH] [Updated] " klarasm
` (102 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-01-31 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1411216414
Comment:
Turns out test079 fails because arguments after the filter for ldapsearch seem to be ignored on musl. Added a patch that moves the filter last.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
2023-01-31 23:28 ` [PR PATCH] [Updated] " klarasm
2023-01-31 23:31 ` klarasm
@ 2023-01-31 23:55 ` klarasm
2023-02-01 0:32 ` klarasm
` (101 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-01-31 23:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2384 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 10580 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 1/3] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 2/3] cyrus-sasl: revbump due to openldap update
---
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 5d45bd3002f5798e6b03a05b1985a5bcb5372191 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 3/3] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (2 preceding siblings ...)
2023-01-31 23:55 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 0:32 ` klarasm
2023-02-01 0:47 ` [PR PATCH] [Updated] " klarasm
` (100 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1411266518
Comment:
The test suite for mit-krb5 seems to fail now instead. That package is out of date as well. May try to update it and see if it solves the problem.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (3 preceding siblings ...)
2023-02-01 0:32 ` klarasm
@ 2023-02-01 0:47 ` klarasm
2023-02-01 1:22 ` klarasm
` (99 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2384 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 13024 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 1/3] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 2/3] cyrus-sasl: revbump due to openldap update
---
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 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 3/3] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (4 preceding siblings ...)
2023-02-01 0:47 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 1:22 ` klarasm
2023-02-01 2:11 ` klarasm
` (98 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 1:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2384 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 14479 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 1/5] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 2/5] cyrus-sasl: revbump due to openldap update
---
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 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 3/5] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 0f932cceee390c64c7e3511922eee66e7be35f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 4/5] evolution-data-server: revbump due to openldap update
---
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 8ec6ed7bbaf70084ff93cdb283b4ecc55834f7e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 5/5] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (5 preceding siblings ...)
2023-02-01 1:22 ` klarasm
@ 2023-02-01 2:11 ` klarasm
2023-02-01 14:20 ` [PR PATCH] [Updated] " klarasm
` (97 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 2:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1411348035
Comment:
Still lacking a few revbumps. Will look into them later.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (6 preceding siblings ...)
2023-02-01 2:11 ` klarasm
@ 2023-02-01 14:20 ` klarasm
2023-02-01 14:29 ` klarasm
` (96 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3840 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [ ] FreeRADIUS-3.0.23_1
- [ ] alpine-2.26_1
- [ ] anjuta-3.34.0_4
- [ ] apache-2.4.54_2
- [ ] apr-util-ldap-1.6.1_13
- [ ] audit-3.0.3_4
- [ ] autofs-5.1.8_2
- [ ] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [ ] dovecot-plugin-ldap-2.3.20_1
- [ ] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [ ] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [ ] gnupg1-1.4.23_1
- [ ] kldap-22.08.2_1
- [ ] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1
- [ ] libnfsidmap-2.5.4_2
- [ ] libreoffice-common-7.4.3.2_1
- [ ] libsmbclient-3.6.25_15
- [ ] lighttpd-1.4.68_1
- [ ] log4cxx-0.10.0_4
- [ ] lua51-lualdap-1.2.5_3
- [ ] lua52-lualdap-1.2.5_3
- [ ] lua53-lualdap-1.2.5_3
- [ ] lua54-lualdap-1.2.5_3
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [ ] monitoring-plugins-2.3.1_1
- [ ] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [ ] php-ldap-7.4.33_1
- [ ] php8.0-ldap-8.0.25_1
- [ ] php8.1-ldap-8.1.12_1
- [ ] postfix-3.7.3_1
- [ ] python3-ldap-3.2.0_5
- [ ] quota-4.09_1
- [ ] samba-4.14.12_2
- [ ] samba-libs-4.14.12_2
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 17311 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 1/9] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 2/9] cyrus-sasl: revbump due to openldap update
---
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 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 3/9] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 0f932cceee390c64c7e3511922eee66e7be35f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 4/9] evolution-data-server: revbump due to openldap update
---
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 8ec6ed7bbaf70084ff93cdb283b4ecc55834f7e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 5/9] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 15d36c50289800b0fc98059ee4657232e2d7ce7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 6/9] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 325e5aa61818527570d24c612fceb95d86990db1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 7/9] alpine: revbump due to openldap udpate
---
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 b64b599316e42310f232a56797589e0dd624722d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 8/9] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 2c222ffaaf41f92e6f0e1f55e0c6037250ddceff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 9/9] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (7 preceding siblings ...)
2023-02-01 14:20 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 14:29 ` klarasm
2023-02-01 14:37 ` klarasm
` (95 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3919 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [ ] apr-util-ldap-1.6.1_13
- [ ] audit-3.0.3_4
- [ ] autofs-5.1.8_2
- [ ] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [ ] dovecot-plugin-ldap-2.3.20_1
- [ ] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [ ] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [ ] gnupg1-1.4.23_1
- [ ] kldap-22.08.2_1
- [ ] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1
- [ ] libnfsidmap-2.5.4_2
- [ ] libreoffice-common-7.4.3.2_1
- [ ] libsmbclient-3.6.25_15
- [ ] lighttpd-1.4.68_1
- [ ] log4cxx-0.10.0_4
- [ ] lua51-lualdap-1.2.5_3
- [ ] lua52-lualdap-1.2.5_3
- [ ] lua53-lualdap-1.2.5_3
- [ ] lua54-lualdap-1.2.5_3
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [ ] monitoring-plugins-2.3.1_1
- [ ] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [ ] php-ldap-7.4.33_1
- [ ] php8.0-ldap-8.0.25_1
- [ ] php8.1-ldap-8.1.12_1
- [ ] postfix-3.7.3_1
- [ ] python3-ldap-3.2.0_5
- [ ] quota-4.09_1
- [ ] samba-4.14.12_2
- [ ] samba-libs-4.14.12_2
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 20127 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/13] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/13] cyrus-sasl: revbump due to openldap update
---
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 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/13] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 0f932cceee390c64c7e3511922eee66e7be35f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/13] evolution-data-server: revbump due to openldap update
---
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 8ec6ed7bbaf70084ff93cdb283b4ecc55834f7e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/13] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 15d36c50289800b0fc98059ee4657232e2d7ce7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/13] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 325e5aa61818527570d24c612fceb95d86990db1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/13] alpine: revbump due to openldap udpate
---
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 b64b599316e42310f232a56797589e0dd624722d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/13] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 2c222ffaaf41f92e6f0e1f55e0c6037250ddceff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/13] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From c91dc4ff95554f537acd264f169bcb6b490b25ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/13] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 ecc41908f94a1a4dfd64111c698f9bfd26a111cb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/13] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 46988486ece9278e06d64dbff484d686c5c1b2e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/13] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 599825e48ef4b1da393a15e06d370ed6073d014c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/13] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (8 preceding siblings ...)
2023-02-01 14:29 ` klarasm
@ 2023-02-01 14:37 ` klarasm
2023-02-01 14:57 ` klarasm
` (94 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 14:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4036 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [ ] dovecot-plugin-ldap-2.3.20_1
- [ ] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [ ] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [ ] gnupg1-1.4.23_1
- [ ] kldap-22.08.2_1
- [ ] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1
- [ ] libnfsidmap-2.5.4_2
- [ ] libreoffice-common-7.4.3.2_1
- [ ] libsmbclient-3.6.25_15
- [ ] lighttpd-1.4.68_1
- [ ] log4cxx-0.10.0_4
- [ ] lua51-lualdap-1.2.5_3
- [ ] lua52-lualdap-1.2.5_3
- [ ] lua53-lualdap-1.2.5_3
- [ ] lua54-lualdap-1.2.5_3
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [ ] monitoring-plugins-2.3.1_1
- [ ] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [ ] php-ldap-7.4.33_1
- [ ] php8.0-ldap-8.0.25_1
- [ ] php8.1-ldap-8.1.12_1
- [ ] postfix-3.7.3_1
- [ ] python3-ldap-3.2.0_5
- [ ] quota-4.09_1
- [ ] samba-4.14.12_2
- [ ] samba-libs-4.14.12_2
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 24420 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/19] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/19] cyrus-sasl: revbump due to openldap update
---
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 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/19] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 0f932cceee390c64c7e3511922eee66e7be35f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/19] evolution-data-server: revbump due to openldap update
---
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 8ec6ed7bbaf70084ff93cdb283b4ecc55834f7e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/19] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 15d36c50289800b0fc98059ee4657232e2d7ce7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/19] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 325e5aa61818527570d24c612fceb95d86990db1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/19] alpine: revbump due to openldap udpate
---
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 b64b599316e42310f232a56797589e0dd624722d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/19] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 2c222ffaaf41f92e6f0e1f55e0c6037250ddceff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/19] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From c91dc4ff95554f537acd264f169bcb6b490b25ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/19] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 ecc41908f94a1a4dfd64111c698f9bfd26a111cb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/19] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 46988486ece9278e06d64dbff484d686c5c1b2e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/19] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 599825e48ef4b1da393a15e06d370ed6073d014c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/19] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 63d7743fd4c8fe6ec300d6efa58fb2fcf36c160d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/19] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 9629197dcc971174701aea59f23cde74e47e494b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/19] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 324931e6d63a7a87885743f3967a412bde68b17f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/19] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 aa937be453cb137f7ecd369d4433e4ceff42b368 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/19] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 23fe44e1266b92fbf1ab04a917624a43b29fec2c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/19] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 f33f550eff6d5ab1ca2ffb1c985f53828d9d1401 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/19] ldapvi: revbump due to openldap update
---
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>"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (9 preceding siblings ...)
2023-02-01 14:37 ` klarasm
@ 2023-02-01 14:57 ` klarasm
2023-02-01 15:24 ` klarasm
` (93 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4036 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1
- [ ] libnfsidmap-2.5.4_2
- [ ] libreoffice-common-7.4.3.2_1
- [ ] libsmbclient-3.6.25_15
- [ ] lighttpd-1.4.68_1
- [ ] log4cxx-0.10.0_4
- [ ] lua51-lualdap-1.2.5_3
- [ ] lua52-lualdap-1.2.5_3
- [ ] lua53-lualdap-1.2.5_3
- [ ] lua54-lualdap-1.2.5_3
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [ ] monitoring-plugins-2.3.1_1
- [ ] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [ ] php-ldap-7.4.33_1
- [ ] php8.0-ldap-8.0.25_1
- [ ] php8.1-ldap-8.1.12_1
- [ ] postfix-3.7.3_1
- [ ] python3-ldap-3.2.0_5
- [ ] quota-4.09_1
- [ ] samba-4.14.12_2
- [ ] samba-libs-4.14.12_2
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 30208 bytes --]
From 5bf4f910cb1bc058a59f0c1bd8e94a32ac1b1e65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/27] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 62cb2f451da873ef1db6f7a2fd939f0cc1bbf150 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/27] cyrus-sasl: revbump due to openldap update
---
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 42b633dedfec4ae73f1338e2b3ac36ae7966e240 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/27] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 0f932cceee390c64c7e3511922eee66e7be35f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/27] evolution-data-server: revbump due to openldap update
---
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 8ec6ed7bbaf70084ff93cdb283b4ecc55834f7e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/27] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 15d36c50289800b0fc98059ee4657232e2d7ce7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/27] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 325e5aa61818527570d24c612fceb95d86990db1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/27] alpine: revbump due to openldap udpate
---
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 b64b599316e42310f232a56797589e0dd624722d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/27] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 2c222ffaaf41f92e6f0e1f55e0c6037250ddceff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/27] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From c91dc4ff95554f537acd264f169bcb6b490b25ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/27] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 ecc41908f94a1a4dfd64111c698f9bfd26a111cb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/27] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 46988486ece9278e06d64dbff484d686c5c1b2e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/27] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 599825e48ef4b1da393a15e06d370ed6073d014c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/27] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 63d7743fd4c8fe6ec300d6efa58fb2fcf36c160d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/27] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 9629197dcc971174701aea59f23cde74e47e494b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/27] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 324931e6d63a7a87885743f3967a412bde68b17f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/27] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 aa937be453cb137f7ecd369d4433e4ceff42b368 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/27] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 23fe44e1266b92fbf1ab04a917624a43b29fec2c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/27] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 f33f550eff6d5ab1ca2ffb1c985f53828d9d1401 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/27] ldapvi: revbump due to openldap update
---
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 a4593abb073d17ebd5d807d9508f6ccf7e331286 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/27] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 1ee5d6caf845624e866a48f5c314bfdfd78f1c0d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/27] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 48179b47ef444b0c54db55b6bcb06c6b0f88ae88 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/27] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 2a6cc4125db103abb7094b39697cfc025054a9ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/27] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 cb2f0395df26e45b9d0dcdd45aafe3d6c52a2371 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/27] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 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 3849c6e26ab99cb2ac5bdd9162089db04530543c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/27] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 0cf4e7ea750e270d97505f8c03e32c2a1037a94c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/27] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 376009d6b964d7b3b2279bf533026026307dce8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/27] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (10 preceding siblings ...)
2023-02-01 14:57 ` klarasm
@ 2023-02-01 15:24 ` klarasm
2023-02-01 15:44 ` klarasm
` (92 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4256 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1 (this package)
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] libsmbclient-3.6.25_15 (actually samba-libs, out of date, newest version is 4.17.5)
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (out of date, newest version is 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (out of date, newest version is 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2
- [x] samba-libs-4.14.12_2
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 35013 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/33] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/33] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/33] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/33] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/33] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/33] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 cf8dc14eef3914b9c4ad5129625b1aafd4e95cdc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/33] alpine: revbump due to openldap udpate
---
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 779e99445591a401b693f4f724443d3f4183f224 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/33] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 f9f72812f67c1b8b58f65488e1f1f6a5a8376273 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/33] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 3aa60941ba413628869e42291a877413a18778e1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/33] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 1378ddd48f40e13d212c5cf2f5bef3991672c7e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/33] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 0ae7da0482dde30b65ff484c2b192f56b7f4c676 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/33] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 a38bf10beace47ced2005126e080c532cb0aafec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/33] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 f96e112ca3dbc34e5c01239b164ff9bc4b378832 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/33] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 4330398590d7f1bf936cf6cc28b387184cf6a4a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/33] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 e1e05466fc16e39198d6586ebbe3cbca09a7bb77 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/33] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 9b37d7648fad327162c8a2e012c645bd702287ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/33] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 9e4e066f51b3b5bf9e31d5b1ff7eed20a8274c66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/33] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 d8ebbb083da81b6c932f3cd76a1d272b72b446f2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/33] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..95a61fb92a75 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"
-homepage="http://www.lichteblau.com/ldapvi/"
short_desc="An interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.lichteblau.com/ldapvi/"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 7f82a9c9f444639f5c95646cd0ceaf1ba5467d07 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/33] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 b1ae8d83df550e8b237892eed18b02d43f5f2089 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/33] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 a8f42575730b22ad358c33b6f0692d062bc025b3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/33] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 3215febbdd9427b3078b04228cc0d89913ccefb4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/33] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 af933a3b180604f8673f337fefdc7c3e303f6bcc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/33] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 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 154b1dc5fdadac1aef226c82f4a0780d1c0469eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/33] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 34efb7ba7b7b4816aadb33e6b839798a9cb6dfb1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/33] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 04c2bd3841f0eea07b19bcf9f3d06a31162f99f6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/33] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 d60278ec12dedb8cfd1e9e0a7e99fce4aed2fe29 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/33] php: revbump due to openldap update
---
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 88c00f10603573d5d27fcd40c465781d7324cd78 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/33] php8.0: revbump due to openldap update
---
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 6ad74aeb67dd82ac55b91ee66c4de9268b48006a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/33] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 72416cc529257d1e2a1c2098f4681c2c7468c54d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/33] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 150d570dc113d0a8df3e4764d09a522e1b58be7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/33] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From ae4a17daa8214c483fabce25431e14929d7039f0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/33] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (11 preceding siblings ...)
2023-02-01 15:24 ` klarasm
@ 2023-02-01 15:44 ` klarasm
2023-02-01 15:53 ` klarasm
` (91 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4177 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1 (this package)
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (out of date, newest version is 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (out of date, newest version is 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [ ] seahorse-43.0_1
- [ ] smbclient-4.14.12_2
- [ ] squid-5.3_1
- [ ] sssd-2.4.0_5
- [ ] sylpheed-3.7.0_8
- [ ] virtuoso-base-7.2.5.1_3
- [ ] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 39473 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 cf8dc14eef3914b9c4ad5129625b1aafd4e95cdc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
---
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 779e99445591a401b693f4f724443d3f4183f224 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 f9f72812f67c1b8b58f65488e1f1f6a5a8376273 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 3aa60941ba413628869e42291a877413a18778e1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 1378ddd48f40e13d212c5cf2f5bef3991672c7e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 0ae7da0482dde30b65ff484c2b192f56b7f4c676 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 a38bf10beace47ced2005126e080c532cb0aafec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 f96e112ca3dbc34e5c01239b164ff9bc4b378832 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 4330398590d7f1bf936cf6cc28b387184cf6a4a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 e1e05466fc16e39198d6586ebbe3cbca09a7bb77 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 9b37d7648fad327162c8a2e012c645bd702287ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 9e4e066f51b3b5bf9e31d5b1ff7eed20a8274c66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 d60952596a9e67b8273885d441539186ff5863aa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From a23c6de9867b86f598528bff58275425b9a92b6e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 63f638897099f9da02980d5f994f870e0afb6ad5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 ae1269fc84f6ae924bc386a1a18573785e728c1e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 754a574e478b9e00063606dda682425a841805e6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 8af81b1bafdb60a9ca74bf9420f3e4f6218455d6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: revbump due to openldap update
also fix a linting issue
---
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 e6525d7fa702e905888cbb4a7e8004705bbc39b3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 4b06b3a9208089179d8198cde353ac08047a6793 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 43b3f1924bdfab9ffd9cee33bfddf431759431c9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 1e9dc53f3b22e60e8efafb5d8ec3aa3ae61a340b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 8f8d2f825a6e02a19b4ccea5a8d95ca5a810a326 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 08e0988fa3e0b8db8ce6b3d34931a7a9e6fc19c4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 a356cfa1ee5cb16e879a9ce50907199ae22a1ab0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 2f80a72e291a0113cc71d2cec0afba51c5664e7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 2e28d355b17591880ae4f9a4924d892edfae0a09 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 e2782bf502ccfe69163b849bcb56bcfb7a81cab2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 4a9c1442f08fc68c60144e5571c657f0325c317a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 32e41e3df817760441f79ed33e306fe0a060f190 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 4a59184da2d93329ce72707229c1bd9d19190e42 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 d38528efdf6b3b9560b061e90bbfa02109788551 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 b0bbfa34e035f245f49cf90adf876f20444a394a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (12 preceding siblings ...)
2023-02-01 15:44 ` klarasm
@ 2023-02-01 15:53 ` klarasm
2023-02-01 16:01 ` klarasm
` (90 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4265 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1 (this package)
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (out of date, newest version is 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (out of date, newest version is 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [x] virtuoso-base-7.2.5.1_3
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 40026 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 cf8dc14eef3914b9c4ad5129625b1aafd4e95cdc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
---
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 779e99445591a401b693f4f724443d3f4183f224 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 f9f72812f67c1b8b58f65488e1f1f6a5a8376273 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 3aa60941ba413628869e42291a877413a18778e1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 1378ddd48f40e13d212c5cf2f5bef3991672c7e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 0ae7da0482dde30b65ff484c2b192f56b7f4c676 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 a38bf10beace47ced2005126e080c532cb0aafec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 f96e112ca3dbc34e5c01239b164ff9bc4b378832 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 4330398590d7f1bf936cf6cc28b387184cf6a4a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 e1e05466fc16e39198d6586ebbe3cbca09a7bb77 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 9b37d7648fad327162c8a2e012c645bd702287ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 9e4e066f51b3b5bf9e31d5b1ff7eed20a8274c66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 d60952596a9e67b8273885d441539186ff5863aa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From a23c6de9867b86f598528bff58275425b9a92b6e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 63f638897099f9da02980d5f994f870e0afb6ad5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 ae1269fc84f6ae924bc386a1a18573785e728c1e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 754a574e478b9e00063606dda682425a841805e6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 8af81b1bafdb60a9ca74bf9420f3e4f6218455d6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: revbump due to openldap update
also fix a linting issue
---
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 e6525d7fa702e905888cbb4a7e8004705bbc39b3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 4b06b3a9208089179d8198cde353ac08047a6793 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 43b3f1924bdfab9ffd9cee33bfddf431759431c9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 1e9dc53f3b22e60e8efafb5d8ec3aa3ae61a340b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 8f8d2f825a6e02a19b4ccea5a8d95ca5a810a326 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 08e0988fa3e0b8db8ce6b3d34931a7a9e6fc19c4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 a356cfa1ee5cb16e879a9ce50907199ae22a1ab0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 2f80a72e291a0113cc71d2cec0afba51c5664e7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 2e28d355b17591880ae4f9a4924d892edfae0a09 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 e2782bf502ccfe69163b849bcb56bcfb7a81cab2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 4a9c1442f08fc68c60144e5571c657f0325c317a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 32e41e3df817760441f79ed33e306fe0a060f190 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 4a59184da2d93329ce72707229c1bd9d19190e42 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 62180c857f0e9a98734ed05933b1b4efb64930cc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: revbump due to openldap update
als fix a linting issue
---
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 8a7548cb9849ed33431d31a91a6992b31d3aa8fa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (13 preceding siblings ...)
2023-02-01 15:53 ` klarasm
@ 2023-02-01 16:01 ` klarasm
2023-02-01 16:04 ` klarasm
` (89 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4265 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date, newest version is 1.7.1)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9
- [x] cyrus-sasl-modules-ldap-2.1.27_9
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libldap-devel-2.4.58_1 (this package)
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (out of date, newest version is 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] openldap-2.4.58_1
- [x] openldap-tools-2.4.58_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (out of date, newest version is 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [x] virtuoso-base-7.2.5.1_3
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 40252 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20f9f103d3830b2195cfdba53ed96f8597a725b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also don't install Apache-2.0 license
---
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 094985131e9b01cb167e5ec51a95a0e3631d6d6f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 ef01a6fe0636380ded5d0ec780013e9cdc7dbb8a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 09fe577fb381909814db59e1ce8a072989350482 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 09948a385df7469d9192451ec14750acd7f2d9b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 619ca2ecf0602ac2d35d22aad6b13285a817888b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 0197d9a70759f2fb42b19a8e10396a66a068cfd2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 706c6eeb0ee009f174d10f2aa3ac62c6e8b8b651 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 b802c5eb4b655be3a1de8aa87d77c6422985eebd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 9ea4da354abad9db821dfa1d1164ed817c1db309 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 5183fda9b79bdf3b214f64f1b17ca30c4dd5de7a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 288264204f653ea496829cd0a10aa5a833666f49 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 cd1b0228171b37065e3e43a91278f04cca48bfe2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 6adebf71e078151dc35fc7241fdef00adb886e98 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 52ea445b665a3a02a7ff046b229274362a9e3535 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 23d05e1eb34d5bdedec0619b6c262eec80ea0c52 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 d46d0d3139583e6d3b52f967eed9c554147d2006 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 760bed43782ce06adc92334be7cbafe883bf06a3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: revbump due to openldap update
also fix a linting issue
---
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 19365498f725953c5eaf9b99def86a8762b69317 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 93dd4a0602a17286dd8afa2afe87c5ef87f2f1d8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 805bb03acae73a63cca75b447fa6f690525ab4cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 ed30fbd94e98ef53efc2b5d1d50ecaac16c3b276 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 21b2d1af678debcde2b7f2d02a6174c53af64caf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 386da67ae9aeb3b5befae3ba68c775e43ccdb5d0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 c27aae5e4c4ec4a22054f875dd6ef4a135fca19c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 26ddd516f8bc883476616ef1f7b71d218ba39d91 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 09a8fc952e6533b0510ed5f226e1044e4e9d836d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 3e3360115145bf086f24244ecbce2b6ca6c067ac Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 f9fb48b4139cb547e05729f19721f1fef4168be6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 42259ffbe35bedc6569a9ea124e05341edad642d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 80c57b9979dd9b726b7d50edb2959ac072d769ef Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 97614331254b2661b758df6b7531f0ab953991ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: revbump due to openldap update
als fix a linting issue
---
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 6fd0263f003e86b5498c5601ad8cd3aa043c3b3a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (14 preceding siblings ...)
2023-02-01 16:01 ` klarasm
@ 2023-02-01 16:04 ` klarasm
2023-02-01 19:47 ` [PR PATCH] [Updated] " klarasm
` (88 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 16:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1412310595
Comment:
That should be most revbumps. Now to see about build testing.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (15 preceding siblings ...)
2023-02-01 16:04 ` klarasm
@ 2023-02-01 19:47 ` klarasm
2023-02-01 19:50 ` klarasm
` (87 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4419 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (build fails, missing webkit/webkit.h header. Seems anjuta is not developed anymore)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (out of date and distfiles fails to fetch, newest version is 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (out of date, test suite fails, newest version is 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (out of date, tries to link with ldap_r which is not provided by openldap-2.6, newest version is 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [x] virtuoso-base-7.2.5.1_3 (out of date, test suite fails, newest version is 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 53932 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20f9f103d3830b2195cfdba53ed96f8597a725b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also don't install Apache-2.0 license
---
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 094985131e9b01cb167e5ec51a95a0e3631d6d6f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 ef01a6fe0636380ded5d0ec780013e9cdc7dbb8a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From ed0ac02041eb2df9340bca5e21daf668606222bd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 1f53af42044327849b7309993a33e4a186538049 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 5a57376430e8e00184d89795104e313cf5879e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 068fe60ed8d5d1214d6118855c019a4258fb7c5b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 340f0bb60a5c78494466c7bae15c48f6e2c3a74d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 220f2b4e6584f4fb5ed3122b17e178dbc45b67fc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 6041648649af11ebbc35023bcd80c0918c72de41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 1e7a6c925e79875c86919a4d26ab9c72f03ef540 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 789aa2c59f3f19de4bb4ffd976f904e3c649096f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 209af69a6428fed7e9534592f0bd1e2af1771cd8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From d995de8b91c19871771dbacabf64b9a9639cbedb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 1f7d83b8f4b458f1a5bc66da59729a8702f0ead8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 19445ca617e31e1191c4a0e2cead917bfcb088b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 2e64cd0610d752efa82ca6d44d7cdeaeef76899f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 e8817b4c3038a7c249323f9330fb2531581f953a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
also fix a linting issue
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 12 +--
6 files changed, 6 insertions(+), 185 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..6de9ace71a33 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,15 +1,15 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel pkg-config boost-devel zip"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
From 6b0d0674b6961abaf0b15519356910eb28e6fa34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 b951a77c4c82cfd10efa561d71e942522cda9137 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From a61615c98f36549d6272f73dc4b73d6c5787674c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 0e4a97c34e76791916ae25be3e8db93d083d9e24 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 05f20bc3d390253e8f81ad66dcbaefc5689f4818 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 01582ad993edd84780564a4b85a3efe974820a12 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 c6418dfc2d29231010f52e4f08b0c5db3fb0f171 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 29ce176ebb5426a0397cfe218c60ac6b648436b7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
---
srcpkgs/python3-ldap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..960b3d68ebf0 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
pre_build() {
sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
From e4cfffe85095584e685b1084e006ef5d9af694c1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 4e04e9d1553e0a546443dd76e4beada41165e72c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update and allow
building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 13 +++++++++++++
srcpkgs/seahorse/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..bb904d10451f
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index e29b532236e5543682832725d79dea0c7e49f8bf..23d0b54f567c112249fc72ddb91ac8e40218c60b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
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 6cd12baef6eb6bdd3fb527ba2a8ba07984fc4dbb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 9e2a27ebe462b862eccb9433a733f750a27c5bcc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 cc3c75db2290c79846339c442e90eae1197750a4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 2865a8ccc84a6b67d8eaa4c30b5ef6eefdcbd6ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: revbump due to openldap update
als fix a linting issue
---
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 6d5d79723db86810bd452eb65ab8410ebc6263f8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (16 preceding siblings ...)
2023-02-01 19:47 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 19:50 ` klarasm
2023-02-01 20:49 ` [PR PATCH] [Updated] " klarasm
` (86 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1412634001
Comment:
Fix some build issues. Still have failures in anjuta, log4cxx and virtuoso.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (17 preceding siblings ...)
2023-02-01 19:50 ` klarasm
@ 2023-02-01 20:49 ` klarasm
2023-02-01 20:50 ` klarasm
` (85 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 20:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4283 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [ ] anjuta-3.34.0_4 (build fails, missing webkit/webkit.h header. Seems anjuta is not developed anymore)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [ ] log4cxx-0.10.0_4 (update to 1.0.0, has switched to cmake, need to adjust)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [ ] virtuoso-base-7.2.5.1_3 (out of date, test suite fails, newest version is 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 54108 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20f9f103d3830b2195cfdba53ed96f8597a725b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also don't install Apache-2.0 license
---
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 094985131e9b01cb167e5ec51a95a0e3631d6d6f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 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 ef01a6fe0636380ded5d0ec780013e9cdc7dbb8a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From ed0ac02041eb2df9340bca5e21daf668606222bd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 1f53af42044327849b7309993a33e4a186538049 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 5a57376430e8e00184d89795104e313cf5879e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 068fe60ed8d5d1214d6118855c019a4258fb7c5b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 340f0bb60a5c78494466c7bae15c48f6e2c3a74d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 220f2b4e6584f4fb5ed3122b17e178dbc45b67fc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 6041648649af11ebbc35023bcd80c0918c72de41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 1e7a6c925e79875c86919a4d26ab9c72f03ef540 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 789aa2c59f3f19de4bb4ffd976f904e3c649096f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 209af69a6428fed7e9534592f0bd1e2af1771cd8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From d995de8b91c19871771dbacabf64b9a9639cbedb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 1f7d83b8f4b458f1a5bc66da59729a8702f0ead8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 19445ca617e31e1191c4a0e2cead917bfcb088b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 2e64cd0610d752efa82ca6d44d7cdeaeef76899f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 17632bb3ba3b1a92ec929d78bfa5f7c12befaf3c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 13 ++-
6 files changed, 6 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..ae70917535e0 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,21 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel pkg-config boost-devel zip"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From b60beedc2a92b4c1ae6835829fccd381e80776cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 0b51273ec76e7e41b2b399ff357270b9d4792e58 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From f3e08878b6fb5d3489dacab1ea4d9212a9885550 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 e1409f9a8c77a1b27ac5681df799ac34f179ea1a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 2e652a9a6fb6dade622232edb226941ed8a6276e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 20e9ec0cf126368ad6b0957010c26276bce8d93b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 2ed515c5555bb3b30bdb7f6a9ca8c94f9a276f67 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 ca994ba992fbf60342fbfd64ae9dfb650cf2f2ba Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
---
srcpkgs/python3-ldap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..960b3d68ebf0 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
pre_build() {
sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
From a95f9fd103b511587497bb918ba78952d53f0e7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 fde23410ae6bbf4360dc11e9c6909cf771a01edd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update and allow
building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 13 +++++++++++++
srcpkgs/seahorse/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..bb904d10451f
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index e29b532236e5543682832725d79dea0c7e49f8bf..23d0b54f567c112249fc72ddb91ac8e40218c60b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
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 5df5cc5694a038aa9901f576b7858e51ce398792 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 3af3fdb2d875e23a014fd0136f956cda2429d009 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 7d07e8a1c41ca2ecd1f28b00e06e4c4fd04c84eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 89615c835f4dc1a4a8a14f214fe7925c48d08bda Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: revbump due to openldap update
als fix a linting issue
---
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 b14d47650b65d99afbc4c14b98d9cc21209c01ac Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (18 preceding siblings ...)
2023-02-01 20:49 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 20:50 ` klarasm
2023-02-01 21:49 ` [PR PATCH] [Updated] " klarasm
` (84 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1412703217
Comment:
Fix log4cxx build issue.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (19 preceding siblings ...)
2023-02-01 20:50 ` klarasm
@ 2023-02-01 21:49 ` klarasm
2023-02-01 21:50 ` klarasm
` (83 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4244 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [ ] anjuta-3.34.0_4 (build fails, missing webkit/webkit.h header. Seems anjuta is not developed anymore)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [ ] virtuoso-base-7.2.5.1_3 (out of date, test suite fails, newest version is 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 55513 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20f9f103d3830b2195cfdba53ed96f8597a725b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also don't install Apache-2.0 license
---
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 1ad4972c05b2d9d658bb4f0adcfd747851acd13f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 30ee398b16d5959bdb37c7bed2e2ad4ed552764d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 352da1ec102ff72730aae7f3f14e3dd0d3dbda9d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 0e06bed8549487d7c62e1d843ed34ded82efb315 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 c3bf92249c7bb3dea4cc8ac57d85612211341d30 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 a784dcfb7f9c27874dc42814c4bd75ec21859da6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 6fac2678766c0975d54be517a7537b5214cc633e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 b5bc95fcffee62cdc9ae4adaf54d8f7898572933 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 5349876184a45730addab19d084d60e3f50804d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 8de1cbd7ddb7b8d1bdd815efe539a12ffa35080d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 aa560f15297766d1542e907900c8e2aaf071df90 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 84a0234cb597ad6d1f82ed13fb87788253cfbd3d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 62e5d5be24238b3e4030a825705a35df4d4a6d08 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 47bfeac1b1af20a453c047a6104987a6e8bdcaa6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 cddcf98370657ab2f0bf60ddaccb35fa1b85ebc3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 c9a6f54db4f139daf4fa6faca1787e142a826d34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 912146f4e802cd383cc05e65cffb17bf5fee95b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 13 ++-
6 files changed, 6 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..ae70917535e0 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,21 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel pkg-config boost-devel zip"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 63a804657a204ae6d6e483eaab3174a875b9dc71 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 9edf4ea92df539cd29aa6a61dc1dff2811fccd05 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 58c9a64f69556f6a34fafd155f9337b1372ba36d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 8737cad41d0594f9fed8b64001afc72869d6e364 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 fe50691537957fdf9aa8f014e0deb0637f96ea76 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 1413780c355e46849a2a703ed139539f52b4bfa5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 c35ae0304c3ef5961b7354c8da8c6e44eadc97e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 3f02bf48230ed3038ed79ad46a6ea92e0a3dc1fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
---
srcpkgs/python3-ldap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..960b3d68ebf0 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
pre_build() {
sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
From c51d8a2f28c59b01bb96b343b17712213c66498a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 5b6d60320cad33e055ab08958460f5d13f6dad41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update and allow
building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 13 +++++++++++++
srcpkgs/seahorse/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..bb904d10451f
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index e29b532236e5543682832725d79dea0c7e49f8bf..23d0b54f567c112249fc72ddb91ac8e40218c60b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
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 f84f84e76dd5e3d7bef6aa705832f51f6dbff294 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 3ddbb6420fe01709283ec4cf90d421469f7c3254 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 1876871949a131d10f3680c6c8a27750fa247a4b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 a6ef10b468cc82272c7cd30f95285e194d5a7bf6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: revbump due to openldap update
als fix a linting issue
---
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 c86b5c7b30c5a08edfc41a0220910de1f13cd7d5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (20 preceding siblings ...)
2023-02-01 21:49 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 21:50 ` klarasm
2023-02-01 22:59 ` [PR PATCH] [Updated] " klarasm
` (82 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1412783160
Comment:
Fixed anjuta build issue.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (21 preceding siblings ...)
2023-02-01 21:50 ` klarasm
@ 2023-02-01 22:59 ` klarasm
2023-02-01 23:01 ` klarasm
` (81 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4196 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [ ] virtuoso-base-7.2.5.1_3 (out of date, test suite fails, newest version is 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 108022 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20f9f103d3830b2195cfdba53ed96f8597a725b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also don't install Apache-2.0 license
---
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 1ad4972c05b2d9d658bb4f0adcfd747851acd13f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 30ee398b16d5959bdb37c7bed2e2ad4ed552764d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 352da1ec102ff72730aae7f3f14e3dd0d3dbda9d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 0e06bed8549487d7c62e1d843ed34ded82efb315 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 c3bf92249c7bb3dea4cc8ac57d85612211341d30 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 a784dcfb7f9c27874dc42814c4bd75ec21859da6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 6fac2678766c0975d54be517a7537b5214cc633e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 b5bc95fcffee62cdc9ae4adaf54d8f7898572933 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 5349876184a45730addab19d084d60e3f50804d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 8de1cbd7ddb7b8d1bdd815efe539a12ffa35080d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 aa560f15297766d1542e907900c8e2aaf071df90 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 84a0234cb597ad6d1f82ed13fb87788253cfbd3d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 62e5d5be24238b3e4030a825705a35df4d4a6d08 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 47bfeac1b1af20a453c047a6104987a6e8bdcaa6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 cddcf98370657ab2f0bf60ddaccb35fa1b85ebc3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 c9a6f54db4f139daf4fa6faca1787e142a826d34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 912146f4e802cd383cc05e65cffb17bf5fee95b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 13 ++-
6 files changed, 6 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..ae70917535e0 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,21 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel pkg-config boost-devel zip"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 63a804657a204ae6d6e483eaab3174a875b9dc71 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 9edf4ea92df539cd29aa6a61dc1dff2811fccd05 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 58c9a64f69556f6a34fafd155f9337b1372ba36d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 8737cad41d0594f9fed8b64001afc72869d6e364 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 fe50691537957fdf9aa8f014e0deb0637f96ea76 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 1413780c355e46849a2a703ed139539f52b4bfa5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 c35ae0304c3ef5961b7354c8da8c6e44eadc97e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 3f02bf48230ed3038ed79ad46a6ea92e0a3dc1fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
---
srcpkgs/python3-ldap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..960b3d68ebf0 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
pre_build() {
sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
From c51d8a2f28c59b01bb96b343b17712213c66498a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 5b6d60320cad33e055ab08958460f5d13f6dad41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update and allow
building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 13 +++++++++++++
srcpkgs/seahorse/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..bb904d10451f
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index e29b532236e5543682832725d79dea0c7e49f8bf..23d0b54f567c112249fc72ddb91ac8e40218c60b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
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 f84f84e76dd5e3d7bef6aa705832f51f6dbff294 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 3ddbb6420fe01709283ec4cf90d421469f7c3254 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 1876871949a131d10f3680c6c8a27750fa247a4b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 8e3dc78a686d8eba3d713ad54667840adfdddbb8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 15 +-
10 files changed, 17 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..c8b46ef49f95 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,17 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +44,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +59,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 24b93eb0ce266bcca26b27682a3ae76ed1d83747 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (22 preceding siblings ...)
2023-02-01 22:59 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 23:01 ` klarasm
2023-02-01 23:33 ` [PR PATCH] [Updated] " klarasm
` (80 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 23:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1412859888
Comment:
Managed to get newest version of virtuoso to build but it still fails the test suite.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (23 preceding siblings ...)
2023-02-01 23:01 ` klarasm
@ 2023-02-01 23:33 ` klarasm
2023-02-01 23:35 ` klarasm
` (79 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 23:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4181 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: in progress
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8 (out of date, latest version is 7.2.8)
- [ ] virtuoso-base-7.2.5.1_3 (update to 7.2.8, test suite still fails)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 108121 bytes --]
From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 8e992d03087abe4a204b007fdd3489f1fafcdb8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 6ad8901b06c9eaaf849df683c493f3a310c06e66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 6 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..e767cf9ba934 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From d3c6db2255a6a87aad8403867fc1fe8eee10a3a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 97fe55d6f7d6a1ef85041a01fb4e3772336a7f21 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d888f9ea44e8ea20b8e725fc2d4dcbfec8c74581 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20f9f103d3830b2195cfdba53ed96f8597a725b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also don't install Apache-2.0 license
---
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 1ad4972c05b2d9d658bb4f0adcfd747851acd13f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 30ee398b16d5959bdb37c7bed2e2ad4ed552764d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 352da1ec102ff72730aae7f3f14e3dd0d3dbda9d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 0e06bed8549487d7c62e1d843ed34ded82efb315 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 c3bf92249c7bb3dea4cc8ac57d85612211341d30 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 a784dcfb7f9c27874dc42814c4bd75ec21859da6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 6fac2678766c0975d54be517a7537b5214cc633e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 b5bc95fcffee62cdc9ae4adaf54d8f7898572933 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 5349876184a45730addab19d084d60e3f50804d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 8de1cbd7ddb7b8d1bdd815efe539a12ffa35080d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 aa560f15297766d1542e907900c8e2aaf071df90 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 84a0234cb597ad6d1f82ed13fb87788253cfbd3d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 62e5d5be24238b3e4030a825705a35df4d4a6d08 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 47bfeac1b1af20a453c047a6104987a6e8bdcaa6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 cddcf98370657ab2f0bf60ddaccb35fa1b85ebc3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 c9a6f54db4f139daf4fa6faca1787e142a826d34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 912146f4e802cd383cc05e65cffb17bf5fee95b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 13 ++-
6 files changed, 6 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..ae70917535e0 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,21 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel pkg-config boost-devel zip"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 63a804657a204ae6d6e483eaab3174a875b9dc71 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 9edf4ea92df539cd29aa6a61dc1dff2811fccd05 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 58c9a64f69556f6a34fafd155f9337b1372ba36d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 8737cad41d0594f9fed8b64001afc72869d6e364 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 fe50691537957fdf9aa8f014e0deb0637f96ea76 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 1413780c355e46849a2a703ed139539f52b4bfa5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 c35ae0304c3ef5961b7354c8da8c6e44eadc97e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 3f02bf48230ed3038ed79ad46a6ea92e0a3dc1fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
---
srcpkgs/python3-ldap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..960b3d68ebf0 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
pre_build() {
sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
From c51d8a2f28c59b01bb96b343b17712213c66498a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 5b6d60320cad33e055ab08958460f5d13f6dad41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update and allow
building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 13 +++++++++++++
srcpkgs/seahorse/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..bb904d10451f
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index e29b532236e5543682832725d79dea0c7e49f8bf..23d0b54f567c112249fc72ddb91ac8e40218c60b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
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 f84f84e76dd5e3d7bef6aa705832f51f6dbff294 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 3ddbb6420fe01709283ec4cf90d421469f7c3254 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 1876871949a131d10f3680c6c8a27750fa247a4b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 9404b2dd0a0d2582fc22e7cb2a2997b834474736 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From f29c8fecbe98c1b0f0843fdb9e89fed26aa1bce1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (24 preceding siblings ...)
2023-02-01 23:33 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-01 23:35 ` klarasm
2023-02-02 11:50 ` klarasm
` (78 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-01 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1412907050
Comment:
The test suite for vitruoso was failing due to missing checkdepends...
That was probably the cause on the previous version as well.
All revbumped or updated packages now complete their test suite if they have one on x86_64-glibc. I'm going to run this on x86_64-musl as well but it will take longer as that machine is a lot less powerful.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (25 preceding siblings ...)
2023-02-01 23:35 ` klarasm
@ 2023-02-02 11:50 ` klarasm
2023-02-02 13:38 ` klarasm
` (77 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-02 11:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5421 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1413613574
Comment:
On x86_64-musl tests fail for audit, dovecot-plugin-pigeonhole, dovecot, evolution-data-server, evolution and nss-pam-ldapd.
Additionally sssd fails to build.
nss-pam-ldapd and sssd are expected as musl lacks support for nsswitch.
On dovecot and dovecot-plugin-pigeonhole a single test fails:
```
test-common.c:245: Assert failed: suppress == TRUE
Error: mmap_anon(.test_file_cache, 4096) failed: Out of memory
test-common.c:245: Assert failed: suppress == TRUE
Error: mremap_anon(.test_file_cache, 8192) failed: Out of memory
file_cache_errors .................................................... : FAILED
```
audit fails in auparse test:
```
make[4]: Entering directory '/builddir/audit-3.0.3/auparse/test'
test "../.." = "../.." || \
cp ../../auparse/test/test*.log .
LC_ALL=C \
./auparse_test > auparse_test.cur
Config file /etc/audit/auditd.conf doesn't exist, skipping
make[4]: *** [Makefile:709: check-local] Error 1
make[4]: Leaving directory '/builddir/audit-3.0.3/auparse/test'
make[3]: *** [Makefile:580: check-am] Error 2
make[3]: Leaving directory '/builddir/audit-3.0.3/auparse/test'
make[2]: *** [Makefile:2040: check-recursive] Error 1
make[2]: Leaving directory '/builddir/audit-3.0.3/auparse'
make[1]: *** [Makefile:2192: check] Error 2
make[1]: Leaving directory '/builddir/audit-3.0.3/auparse'
make: *** [Makefile:467: check-recursive] Error 1
=> ERROR: audit-3.0.3_5: do_check: '${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}' exited with 2
=> ERROR: in do_check() at common/build-style/gnu-configure.sh:33
```
For evolution and evolution-data-server a bunch of tests fail with similar output to:
```
Start 2: test-ebook-get-contact
2/90 Test #2: test-ebook-get-contact ....................SIGTRAP***Exception: 2.58 sec
# random seed: R02Sd090595520940fe58d9ab8434502e157
1..2
# Start of EBook tests
# Start of GetContact tests
# GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation memory (GMemorySettingsBackend) for *gsettings-backend*
# GLib-GIO-DEBUG: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
dbus-daemon[30863]: [session uid=1000 pid=30863] Activating service name='org.gnome.evolution.dataserver.Sources5' requested by ':1.0' (uid=1000 pid=30861 comm
="/builddir/evolution-data-server-3.46.3/build/tests")
dbus-daemon[30863]: [session uid=1000 pid=30863] Successfully activated service 'org.gnome.evolution.dataserver.Sources5'
dbus-daemon[30863]: [session uid=1000 pid=30863] Activating service name='org.gnome.evolution.dataserver.AddressBook10' requested by ':1.0' (uid=1000 pid=30861
comm="/builddir/evolution-data-server-3.46.3/build/tests")
dbus-daemon[30863]: [session uid=1000 pid=30863] Successfully activated service 'org.gnome.evolution.dataserver.AddressBook10'
Bail out! e-test-server-utils-FATAL-ERROR: Unable to create the test book: Message recipient disconnected from message bus without replying
(/builddir/evolution-data-server-3.46.3/build/tests/libebook/test-ebook-get-contact:30861): e-test-server-utils-ERROR **: 10:03:46.504: Unable to create the te
st book: Message recipient disconnected from message bus without replying
cleaning up pid 30863
```
[audit.log](https://github.com/void-linux/void-packages/files/10568583/audit.log)
[dovecot.log](https://github.com/void-linux/void-packages/files/10568549/dovecot.log)
[dovecot-plugin-pigeonhole.log](https://github.com/void-linux/void-packages/files/10568550/dovecot-plugin-pigeonhole.log)
[evolution.log](https://github.com/void-linux/void-packages/files/10568551/evolution.log)
[evolution-data-server.log](https://github.com/void-linux/void-packages/files/10568552/evolution-data-server.log)
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (26 preceding siblings ...)
2023-02-02 11:50 ` klarasm
@ 2023-02-02 13:38 ` klarasm
2023-02-02 20:20 ` klarasm
` (76 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-02 13:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1775 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1413761571
Comment:
Did some tests on the master branch and x86_64-musl.
audit, dovecot and evloution-data-server already fails so those may not be related to this PR.
evolution did not find any test for some reason and thus passed.
When I looked closer on dovecot-plugin-pigeonhole it fails in this PR because it couldn't build dovecot as the test suite is failing. If I build dovecot first without checks dovecot-plugin-pigeonhole it succeeds with the commits in this PR.
Updated log for dovecot pigeonhole in this PR:
[dovecot-plugin-pigeonhole.log](https://github.com/void-linux/void-packages/files/10569418/dovecot-plugin-pigeonhole.log)
Logs from builds on master branch:
[audit.log](https://github.com/void-linux/void-packages/files/10569284/audit.log)
[dovecot.log](https://github.com/void-linux/void-packages/files/10569285/dovecot.log)
[dovecot-plugin-pigeonhole.log](https://github.com/void-linux/void-packages/files/10569286/dovecot-plugin-pigeonhole.log)
[evolution.log](https://github.com/void-linux/void-packages/files/10569287/evolution.log)
[evolution-data-server.log](https://github.com/void-linux/void-packages/files/10569288/evolution-data-server.log)
So from what I can see there are no new failures caused by this PR. I'll do some more crossbuilds but I think after that this PR is starting to be ready.
Regarding the backup/restore of the ldap database, should that be notified on upgrade? Skipping this step can potentially corrupt the database but I guess anyone using openldap in server mode should be aware of that and have periodic backups anyway but I don't know if that's something we can depend on.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (27 preceding siblings ...)
2023-02-02 13:38 ` klarasm
@ 2023-02-02 20:20 ` klarasm
2023-02-03 15:41 ` dkwo
` (75 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-02 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1414325318
Comment:
I feel confident enough about the changes that I will mark this as ready. Please tell me if there's any other testing or changes that should be done.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (28 preceding siblings ...)
2023-02-02 20:20 ` klarasm
@ 2023-02-03 15:41 ` dkwo
2023-02-03 15:50 ` dkwo
` (74 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: dkwo @ 2023-02-03 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416043710
Comment:
Do you mind checking that these build with openssl 3?
If not, I can do it, but I think `squid` may need update to 5.7 to work.
#37681
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (29 preceding siblings ...)
2023-02-03 15:41 ` dkwo
@ 2023-02-03 15:50 ` dkwo
2023-02-03 16:01 ` klarasm
` (73 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: dkwo @ 2023-02-03 15:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416055244
Comment:
See https://github.com/void-linux/void-packages/pull/42054
I'll close it if you prefer to do it here.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (30 preceding siblings ...)
2023-02-03 15:50 ` dkwo
@ 2023-02-03 16:01 ` klarasm
2023-02-03 16:21 ` kruceter
` (72 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-03 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416072401
Comment:
I'll give openssl 3 a go. I don't mind you updating squid in the separate PR, but will pull in that as well in my testing. This will probably take longer to merge than your PR.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (31 preceding siblings ...)
2023-02-03 16:01 ` klarasm
@ 2023-02-03 16:21 ` kruceter
2023-02-03 16:26 ` klarasm
` (71 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: kruceter @ 2023-02-03 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416097270
Comment:
sssd is already faulty as is.
I was trying to update it in https://github.com/void-linux/void-packages/pull/40846, but I have no means to test it since I have nothing to set it up for.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (32 preceding siblings ...)
2023-02-03 16:21 ` kruceter
@ 2023-02-03 16:26 ` klarasm
2023-02-03 16:29 ` kruceter
` (70 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-03 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 758 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416103176
Comment:
> sssd is already faulty as is.
>
> I was trying to update it in #40846, but I have no means to test it since I have nothing to set it up for.
sssd will probably not work on musl as musl lacks native support for nsswitch. There is musl-nscd that implements this via nscd but I haven't been able to get that to work when I tried it earlier.
Maybe sssd could be patched so only the pam portion gets built but that would limit the functionality of it. At that point it's probably better to use them pam portion of nss-pam-ldapd or pam-krb5.
I could spin up a void linux machine with glibc to test sssd though.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (33 preceding siblings ...)
2023-02-03 16:26 ` klarasm
@ 2023-02-03 16:29 ` kruceter
2023-02-03 16:34 ` klarasm
` (69 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: kruceter @ 2023-02-03 16:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416107243
Comment:
> sssd will probably not work on musl
I tested it briefly and it works on musl, plus alpine has it (but with disabled tests).
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (34 preceding siblings ...)
2023-02-03 16:29 ` kruceter
@ 2023-02-03 16:34 ` klarasm
2023-02-03 16:45 ` [PR REVIEW] " paper42
` (68 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-03 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416112253
Comment:
> > sssd will probably not work on musl
>
> I tested it briefly and it works on musl, plus alpine has it (but with disabled tests).
Okay, that would be great! I'll do some testing on your branch in that case
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (35 preceding siblings ...)
2023-02-03 16:34 ` klarasm
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (67 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (36 preceding siblings ...)
2023-02-03 16:45 ` [PR REVIEW] " paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (66 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (37 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (65 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (38 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:45 ` paper42
` (64 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (39 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:45 ` paper42
2023-02-03 16:46 ` paper42
` (63 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (40 preceding siblings ...)
2023-02-03 16:45 ` paper42
@ 2023-02-03 16:46 ` paper42
2023-02-03 16:46 ` klarasm
` (62 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (41 preceding siblings ...)
2023-02-03 16:46 ` paper42
@ 2023-02-03 16:46 ` klarasm
2023-02-03 16:49 ` klarasm
` (61 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (42 preceding siblings ...)
2023-02-03 16:46 ` klarasm
@ 2023-02-03 16:49 ` klarasm
2023-02-03 17:05 ` paper42
` (60 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (43 preceding siblings ...)
2023-02-03 16:49 ` klarasm
@ 2023-02-03 17:05 ` paper42
2023-02-03 17:16 ` klarasm
` (59 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (44 preceding siblings ...)
2023-02-03 17:05 ` paper42
@ 2023-02-03 17:16 ` klarasm
2023-02-03 17:20 ` klarasm
` (58 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (45 preceding siblings ...)
2023-02-03 17:16 ` klarasm
@ 2023-02-03 17:20 ` klarasm
2023-02-03 17:30 ` klarasm
` (57 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (46 preceding siblings ...)
2023-02-03 17:20 ` klarasm
@ 2023-02-03 17:30 ` klarasm
2023-02-03 17:41 ` [PR REVIEW] " klarasm
` (56 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-03 17:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416182119
Comment:
@dkwo Finished building this PR with #37681 on glibc, have not run the test suites yet. With #42054 squid builds ok. I get failures in packages FreeRADIUS, php8.0 and php (php8.1 is fine though). FreeRADIUS may be able to be resolved by updating.
[FreeRADIUS.log](https://github.com/void-linux/void-packages/files/10581241/FreeRADIUS.log)
[php.log](https://github.com/void-linux/void-packages/files/10581242/php.log)
[php8.0.log](https://github.com/void-linux/void-packages/files/10581243/php8.0.log)
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (47 preceding siblings ...)
2023-02-03 17:30 ` klarasm
@ 2023-02-03 17:41 ` klarasm
2023-02-03 18:14 ` [PR PATCH] [Updated] " klarasm
` (55 subsequent siblings)
104 siblings, 0 replies; 111+ 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] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (48 preceding siblings ...)
2023-02-03 17:41 ` [PR REVIEW] " klarasm
@ 2023-02-03 18:14 ` klarasm
2023-02-03 18:34 ` dkwo
` (54 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-03 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5429 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 108862 bytes --]
From 0c655f98b00897ea5117d2b6ec07714d72d7be6a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 17388db496acf4807164a09dcf1df411e893016a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 5d1c231b3cf6849d280d765e9c87195e14f7e3e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From f52a7180131c0c46f0bd370348f6b9e740b34af7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 b962cf5626ec72a56dfd867e3b1444cf4c09835e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 fe0598fd307eee839583de3f29c1d393e8304dcd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 62d361276e515e46bf3bf684f98d60bb42e78916 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 844d71b8daff7a33542d90c49880055ffda6a2e5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 202e3994afe39fd9ff67d3ae2a4908227b9efa38 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 4dca2e405d1c95fc1470fe3a29c3523542d1d1db Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From a306ed83a5243d233a9e5b4bee68afd949cbeeda Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 63681e8415242b87bea936f9c9ff158c7a37cf7c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 ca20d10d7651bc528b6693b31e3109ad13a9382b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 23b9b2b7672f2f63c726ac2d8970aabeb630d456 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 6e9b32f7efb0035abf35dad7b969f19dfe7877aa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 0535854902033415905177db875b5ac2b81a0862 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 c0045dd30acc18e8a9418cc30e66375c3f64945c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 bfc2a6ef1216bbf2b1b327b53934bc6fdc4a6032 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 bfce760734e338ac23c56b432645314c29ab8615 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From ceb1a87a0e43812ab38cbbc0b7dbc9105c02c9b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 d45ecd210b8745b396aa68473a944d7d6a9b1b44 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 5e69206e4bf1f9fa704279a3cd09ecb1363b7ce3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 c4e054bda3bfde012877673f3f736892aa40366c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 9de0802d343079f2e14602a71daaa66897dbdb1c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 7f4eb5147c15dc0c97fb7f9a05fd1590267097b1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 9d741c3f21827ad2b00e11f584502a54f03f2bcc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From fdcb6b47c17e8d7bdb01ae2bd07dadc07892e55b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 a842be25e689877b2e6ab388cee69eff0969cf2b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 4f92debc04ce51429daa02b697b72c23105ee827 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 5b3a6ce93347ac297a043d1d2e01d202f739a6f3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 66f0d4aa58f7102346a8378c2e9190643f494d6e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 e03883015244a67729022da452c26ef023b50d6c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From f4532f2413a00022b90fa98316ecfc75513f9828 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 c34b04400340eb1df36b1a4ed5ff4d6cfccbc9b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update and allow
building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 25 +++++++++++++++++++
srcpkgs/seahorse/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..fca2c139b3c6
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
+--
+2.39.1
+
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 9e18d9302523780a220ec50d02f9be43c134b8d2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 5c4711fee4e13224009ac30b332b6e673679be6a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 250fd0cdfb35a8022054f8e85a38e8a7fab927ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 8605f6595f94135db285cac534feae6784ef1cec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 3d2337677f2e62b40b652e896a205b141a8adf83 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (49 preceding siblings ...)
2023-02-03 18:14 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-03 18:34 ` dkwo
2023-02-04 0:25 ` [PR PATCH] [Updated] " klarasm
` (53 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: dkwo @ 2023-02-03 18:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1416250956
Comment:
Thanks, see #42059 I'm aware of the other two.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (50 preceding siblings ...)
2023-02-03 18:34 ` dkwo
@ 2023-02-04 0:25 ` klarasm
2023-02-06 17:32 ` klarasm
` (52 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-04 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5429 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 107599 bytes --]
From c4acfe288f146379744a51104abc45ef71283fa3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..90b250132d4f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 c09db7eac1f02fcbead97675802fb33d50a7a57f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 cd110cedb455819b7dd4f74a02d1597c50907ae3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From c163133ef411be31a0e3f3c05fcf7e507d48f19b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 e731708814c26de659676f4597572cd04cc7c141 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 d33a8aadfda5508c62fc21123c1e6d762ebed8be Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 1ac898a5aa71c3993e53052310ac1d8296c17e41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 26b546c4597b0d7efa429c3e67601e2bdd50ebc4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 36d471568f84ebc9aa8b770bf0842cebe7ec7d4f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 05f2c76f8904111cd5f31288e70bab436bc08113 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From ee7392aae36572ede67803a96ff1141ada312290 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 f32e7dd772a3937d9081c0179da02a5b8c6a210d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 6cac3ea88cc519b8089cf6229b32b6fd1ae1f242 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 d1c26ec465b8b6e4f488908cdd10a585b30f1c8b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 400f11713e85a6dd7b665f190fd6ffd12e633262 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 d9962c211032893002cce2efaf9afc412f0620d8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 b77b5e66b9f4850729348d509ca1d1cda6f2535d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 527f21ec0934f068356ed08b7f556cbfdb31d89e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 505efe5d7751978c6ab15fb0213ccd5dce0c399a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From e905207f8fe066cb0d3f319cd738c693db2df0b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 a3b3d7665c250b54e2907d413f88b9334a90f448 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 3aebc9a76d6e07cf4180c364fc96a7fce03d45f2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 d809b9c09f3e17aef58164ab72eb5c17b73c09bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 d3f4545bb44d9d2ecf9850c44b45ebe5ef59d5ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 49af922475953bb40dce06e91c345631ff112863 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 5a4e2e04de5a61d915e57ae5422683273e4066ac Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 7c3dd40822ccc481b6e4dc493d289cc78c92d85a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 c631a1d2df9536285c8ca78718c2fa81ec27e3d0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 dec23f03b5a5cd923bdd7b1a6c3439b59653d947 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 7b302aa58f63693788ca285f01ea6f53f79ea41a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 7c5a24dcf1593157c6687c8489f1c6eee8d09582 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 ff2758d3d8a85fdbe31be97cec4a7cae9a73ae4e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From 044ebad4d577cc21f08efa8d53ecb868d59c3cd7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 f94c0cb2cb8a50de10d338b936fa1ba0db2d45ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 30245d42eece439f1480026be4e8a64c84cd145c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 f8d54d0486f2f32b8c4a6e8ca6f7c90e11e35d8b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 72c650468df9381d6757bd3edc82727c15ab2f17 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 198bfe34bbbfb21dcaa65f6c76025a11a5657e49 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 3cd038c340aa12dd4e69cf9bd70d7bc5705dc7a4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (51 preceding siblings ...)
2023-02-04 0:25 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-06 17:32 ` klarasm
2023-02-14 20:51 ` klarasm
` (51 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-06 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5429 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 107604 bytes --]
From dad35c207f24874a0f05591288d0ea81a65540ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.3
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- add patch fixing test079 on musl (for some reason arguments are
ignored if placed after the filter)
---
common/shlibs | 5 +-
srcpkgs/openldap/files/slapd/run | 2 +-
.../fix-test079-musl-ignored-params.patch | 106 ++++++++++++++++++
srcpkgs/openldap/template | 8 +-
4 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
diff --git a/common/shlibs b/common/shlibs
index 3042ced11d4b..82907133d466 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
new file mode 100644
index 000000000000..8ba1832901c8
--- /dev/null
+++ b/srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
@@ -0,0 +1,106 @@
+--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100
++++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100
+@@ -139,10 +139,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -150,10 +150,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -171,10 +171,10 @@
+
+ echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -182,10 +182,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
+@@ -235,10 +235,10 @@
+
+ echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -246,10 +246,10 @@
+ exit $RC
+ fi
+
+-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -339,10 +339,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW - 2`
+ echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 0 ; then
+ echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
+@@ -354,10 +354,10 @@
+ NOW=`date +%s`
+ sleep `expr $CONN_EXPIRES - $NOW + 2`
+ echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
+-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
++$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
+ -D "cn=Manager,dc=local,dc=com" \
+ -H $URI2 \
+- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
++ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
+ RC=$?
+ if test $RC != 1 ; then
+ echo "Error: LDAP connection to remote LDAP server was not closed"
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..30d2d9893cb8 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
@@ -16,13 +16,13 @@ configure_args="--prefix=/usr
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 1427d85e3fd8bc4e0962a041bb2b5fc11c4fb136 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 0ae802ee43b6e81bead93a4f7db4201580e18cf8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 0f6609da4694007ec62bcc6ea8b9ea8dc29b37c8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 4feaa5165532767b764e0194ad7f54acd9efc055 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 32c704bf2307e9dbc46d334f874431a9cc5f6304 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 2e24d1d280b5c97db52952ddccd422f8d8e014fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 5eaa96f9a023aa3d5cb94082af9d0c119601ca41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 7026fe77d64f2da154d0f19e33ab605882b30941 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 39bc6cea7102b824313f50bef78589fccecb7906 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 9a76a479fb6aa3fa3dd657beaf448a0728097f51 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 ef7e829354a5c286f6ffaebb8494d1af2abdd661 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 72b3ea0476fa2ee5110c55113459f1d07cd073d7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 11027334ecfddc6d997d56ec8681c49b478eef9d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 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 6a367385a5fd64a16d97ef3851760e14ca75ff8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 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 a2f773c94289717cb45b6381107dbd1372c0832f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 eb74d470d30fe2913496888e88b3754ac8e1350e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 9871411c55f4e879aae5b03796062f751eba9bf2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 a91d8c3c18e64826f253333a70670f568fdb13ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 5f95206e2adc9bed7bf2b82b05d0b3a74f78f68f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 a86316212c999a0850d6316eff0fcc89789b49cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 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 8598b60648d8d800335f5d76801b89fc6d86d674 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 4363a520bbc916d654e19b84caf5d4c5d9fb368e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 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 e5c81fd2b9bafd6711b74ccda94f1f1e5977d5eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 6860cd341b6fb250a89260ed440d23d13f283619 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 637f611db8851fbe82b0187f75475ff97285ad16 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From ff758b1547846d1ecb9c6aac93c92411215b8a00 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 bb1b37560733f0b21d29c0df06aaf31bdf21ee7d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 dd98db1d7059c83038930518d8c20208fcf177c3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 b34a83e265f4db3dac20d3dd4862de0647fc8a7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 610792a0cc25465f53df9cce6d0b0be0a43bc4ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 c4a065d86e263bb1035a44c5cac8906dc10dda72 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From d96ec375fc02e3653fcb37fbd9ee7bcd728ce458 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 977248e1cc6a89a51845e882874310b32c933e2c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 3e5040c56c18d4039ae41d85910ec900b4bcae16 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 5f65f0db3cb51add802c26ee9a55c3c24e8ff1a5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 81733e4104116407ea70702346383010749d05bc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 3b3d46a585d9a0822711cd015fac87fa45da6599 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 6954e90b2768edeae0bc83614eb4220ba09105b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (52 preceding siblings ...)
2023-02-06 17:32 ` klarasm
@ 2023-02-14 20:51 ` klarasm
2023-02-15 0:34 ` [PR PATCH] [Updated] " klarasm
` (50 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-14 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1430358321
Comment:
Upstream has released 2.6.4. This has an upstream fix for test079 failing on musl (https://git.openldap.org/openldap/openldap/-/commit/a858f892b35d463b5b3324063579bd22504f06e8 https://bugs.openldap.org/show_bug.cgi?id=9931).
Will update the PR once I have rerun a few tests.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.3
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (53 preceding siblings ...)
2023-02-14 20:51 ` klarasm
@ 2023-02-15 0:34 ` klarasm
2023-02-15 16:22 ` [PR PATCH] [Updated] openldap: update to 2.6.4 klarasm
` (49 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-15 0:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5429 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.3
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.23_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.1_1
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.3_1 (out of date, latest version is 5.7)
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 102207 bytes --]
From e188edc79db45eaaa8158d05961fdda10c1e83ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- add libssp-devel to makedepends
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 14 +++++++-------
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f9a0d7794b79..df55e3f2ad0f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..c2a3d16e6332 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
-makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libssp-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 c9653f3151179c0e7a6fa6799f9c08fc6f02df7c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 89da408dcda16ced1f36214475969248e1f8cdb0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 9428b04412abaa733a6ef22a6674d4bda54fc017 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 3f15bf5004afd911b12c22fa4da1bfe9d23f9ae1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 ef34a45d13bf4cb7c34bcfc533535a52bcda7117 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 b94ee0b5e8775eb1f5b05f36de925ce52ffcce23 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From ebafb7e88ed147b54327987b084b36071efbaa7d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 4735ae4d383580619156f9b7458944ebdb1a06d8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 62ea399fae6989d41cc85bbb548746f16878c758 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 876b61a34a894b560027f227b027f90d9e1428bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 0ea6abd66e2b83b0d5c3ec4aef0dcbd806c81cb4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 7da0112c0f7e612c7cf9c69500c3a09b2c37f7f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 e86146c3765a3db4bd4da86ff1e122f89ed3bb78 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 4b7d825939082cdac8a5585730f5a7cccb00e304 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 6ee359d44c548c991d111335f358298fe8c690b9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 851e6aef1c16d32df28cf7034571c84edf6c6418 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 610a704e088a3316c2e45827e02c10962ba9a6dd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 f165e7799534d7c2b1c91fa4e74fb9f087e47274 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 3210bd0b371de17c6e7b2ce4b952d47f0717a335 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 3919f73589efb89261e552f31a31aee4ae8f2d08 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 f40549f21a16a286033ed30f8421c65b36ff517d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 eb47c82bfec3608639e50ac21c1c1b99cf733289 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 961b866db6605530736d1b9f6e4c94854194ffa8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 72f508bc03a48f663fd9b53a68e0048e617808d7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 cf119b0a3deb841c8faa0999488ca1373963fbe6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 68ede7a73758e5d0d04add13c29d10045d2007c9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 f49fce5c96a6bbad72e1cdd758a49bfdf1d9f5c3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 cb68727c7174e409e1b38d11f00a1e071519f187 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 b0fcaccebb9531efd764be94de1dda35fbca9522 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 19c46ded81a0d80984a6ff4607cfd809431641be Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 6085071a1c6d4992bd2929e1e8d071df30bd1401 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From 907eab33da93a573b5c1cceeeae44e93467e4498 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 b9e80735be02474c8ff2df0e459390c79f7ad4b3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 eeb71466f68670f68db68f2cfcf1abf460f4f4d1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 91d8668cdf75e429a74b4686a8b650b74fab29d4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 d7f65f0d96989ae8b927e3865d618a49fc420eb0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 12ee504632d05d286b6c9cf47fe8c58f9df6e47d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 9f593835732eeb304de84087d6721ecc1af29ca8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (54 preceding siblings ...)
2023-02-15 0:34 ` [PR PATCH] [Updated] " klarasm
@ 2023-02-15 16:22 ` klarasm
2023-02-15 16:23 ` klarasm
` (48 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-15 16:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5431 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 102091 bytes --]
From 2173d3c4e05cd6e953f3d0ee446ced1d298c24bd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f9a0d7794b79..df55e3f2ad0f 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 650566890a1c67ddefa4e4442ef1a77febe63a89 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 a6eaeff4320913d0f1e6af1d7baf6a1931b2fe2a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From f3139c258054f5394732784f682daedf3625fc1b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 dd68419cac9798c350aaa8705fa27a99031d6dac Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 a88f20089fb1bfbd3420d2b20d5a23d9560c2745 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 be7fc1f24c866171de9175971287de50b75d1984 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 40eaf2f40f44ef826e9e5e51e719989db10794e8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
also fix detection of webkit2gtk
---
srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch | 11 +++++++++++
srcpkgs/anjuta/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
diff --git a/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
new file mode 100644
index 000000000000..17c0db911cba
--- /dev/null
+++ b/srcpkgs/anjuta/patches/fix-webkit2gtk-detection.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2019-09-08 19:33:57.000000000 +0200
++++ b/configure.ac 2023-02-01 22:41:54.639943897 +0100
+@@ -246,7 +246,7 @@
+ *webkit2gtk-3.0*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+- *webkit2gtk-4.0*)
++ *webkit2gtk-4.*)
+ AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ ;;
+ esac
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index b46d58aeafe3..0777e1b92e57 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
@@ -14,7 +14,7 @@ hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
libgda-devel devhelp-devel sqlite-devel apr-util-devel
- neon-devel subversion-devel python3-devel gdl-devel"
+ neon-devel subversion-devel python3-devel gdl-devel webkit2gtk-devel"
depends="autogen"
short_desc="GNOME Integrated Development Environment"
maintainer="Enno Boland <gottox@voidlinux.org>"
From f0d74daea4e248be533bdd178b051167ae252f7e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From f76a78542c10d035a3ce7b20f1a6c6e3ac0504d1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 403855ed47a59345ec79afab0bbc5c7103cb9c6b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 d056b24346e3c6d9c32be78fb82cddd4300ecb3d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 b8d4d76cd5043ebcb6882ea82cb4fc7bf0e3500b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 64e576c7950632ea6e3d5a309b33040c078b7685 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 c643bb52b93a0b72afec252df31a0430b3362205 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 138cfd76eac0e47b8c3b6ea831c2e7b95308a0e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 79a59ea71004a8e4805994366b161d5fc548986e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 471ff0621ddd52bb02a411d85b62893e3bc7f4c4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 6e36e856bd3d439091a82bd4dc0809ab0e24bd0e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From bf64f5d1d2a632dd2066698753795043838e17af Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 6af78acb3bfea313b2e008db05774cf5f05d0260 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 2138b121d51d055eb861ab3c6c8f1a33604a550c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 53790975acc1a507b3d4fb12f1097e52d4157e7a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From c4fe2705aae1abedc03260ab891f376d78954046 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 8a9878b7c883730e425f743b5ff0458b2f08d9d5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 34f2f62ea679c968319072e3bbd3d42a0022b9e6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 55a21633579e31c8f30b6abf36662ba6fcdb1378 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 8616570e2f22d1250762b4b26e81ef393afdd121 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 cdda86784d58ba137aa286e6a339ece3e1120350 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 14871d11aa52382d9838196a91aa8ebd463e5c35 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 4aa5950c621726d83632c4f9a7c7b808e7dde5de Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 0baa61d409d253c5dc4dcdb4027cc26272b59eeb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From d2770851542fe16609ff8d326efa6fd500ef2640 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 e53e84b5f64748dc77043784f7a63c16d5dfef18 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 41921e1f67cf7d4885aa2d29f71fde3f1e6bf29d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 f061f7001dcb200adb0c5693af555ac88da9d968 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 a643e22da3044fd69d5c4430bca145d8fbc7c027 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 8e8f83084d416bb8f31c62e57cd16ee553fdc9bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 3ff4643db00f2edd8f9f96a99969f0eb2b0933fa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (55 preceding siblings ...)
2023-02-15 16:22 ` [PR PATCH] [Updated] openldap: update to 2.6.4 klarasm
@ 2023-02-15 16:23 ` klarasm
2023-02-16 11:59 ` klarasm
` (47 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-15 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1431636197
Comment:
Earlier I added `libssp-devel` to the hostmakedepends of openldap because a build failure on musl. Turns out I didn't need that and it was old packages in my hostdir that caused the failure.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (56 preceding siblings ...)
2023-02-15 16:23 ` klarasm
@ 2023-02-16 11:59 ` klarasm
2023-02-23 19:50 ` paper42
` (46 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-16 11:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1431636197
Comment:
Earlier I added `libssp-devel` to the makedepends of openldap because a build failure on musl. Turns out I didn't need that and it was old packages in my hostdir that caused the failure.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (57 preceding siblings ...)
2023-02-16 11:59 ` klarasm
@ 2023-02-23 19:50 ` paper42
2023-02-23 21:05 ` [PR PATCH] [Updated] " klarasm
` (45 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: paper42 @ 2023-02-23 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1442343378
Comment:
I applied the anjuta build fix separately in 4dfec0707c7472d401c49cef60b5a8e1beae4d80, thanks
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (58 preceding siblings ...)
2023-02-23 19:50 ` paper42
@ 2023-02-23 21:05 ` klarasm
2023-03-02 14:53 ` klarasm
` (44 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-02-23 21:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5431 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
Patched issue with test079:
It builds and the test suite is ok on x86_64-glibc but fails on x86_64-musl (if I remember correctly from earlier testing the 2.5 branch had the same test suite error).
[openldap-2.6.3-test079.log](https://github.com/void-linux/void-packages/files/10530843/openldap-2.6.3-test079.log)
[openldap-2.6.3-no-tests.log](https://github.com/void-linux/void-packages/files/10530903/openldap-2.6.3-no-tests.log)
[openldap-2.6.3-all-tests.log](https://github.com/void-linux/void-packages/files/10530929/openldap-2.6.3-all-tests.log)
It seems that test 79 also fails on alpine: https://git.alpinelinux.org/aports/tree/main/openldap/APKBUILD#n227
I'll have to look closer into the specific test and why it fails, but if it's not critical it may be ok to ignore it.
The rest of the test suite does not seem to be a problem.
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 100686 bytes --]
From 228d6157dc34f65db4b731279e08d25a7bfb0865 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 282f0583d2b1..ebdee745f8db 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 9390c3aa2ef6ba174a6782d4defdfc3bf3645cd8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 d3360e27c1b5e802c99ced769a0cb99addf29898 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 40be69078af601f2fdf500282932e336006025b8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 d4e350cd16de9f986d7eb7770620f71661a69021 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 860779f5bba113844ae8cc77a0d376f73280e75b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 0c59dce52bd4622f82ed59fe92c59ca63b2f8214 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 42b979fb2db38112ff262e4a9925c75c17d7ecc7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 3df046d884fb..0777e1b92e57 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 053a5567b3eea9029cec00c5d77c7bad2d063c39 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 2c3497682dc17df6427288c48ca7757f996b7bed Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From fa3af1b70553f9597c49f1a0e497716527efa57e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 96587a97c84ea1a572d4d3beea4fba84880f7bcd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 82d6ded639ce7d2634526c0bc5b9bc768e940d83 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 1c199f11e1ab379ab00b838da5e9af9417413930 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 aadf3e3a1d9f71f6b9f58aacc74e94489eafbbce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From b07bf85f3174440a9967fe07458522b0a5b50e06 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 604783b1bc26010462b12f6c50a08697fd020498 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 e1f3770ca4d75de655593f4531e8aa4299562527 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 7eced6d5a8fab5d13e67354c209f526f328348d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From ce4d357dc91b3414593de181ff2c5999791fedae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 834b143cd118ad38e529eca6e60b7313860b3c6d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 78557fbcd5d63916fe7b930fc02d7804c85578c0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 3ae928bf48cd4a3dfb7180c346a521c855d8a070 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 1902f00e597ecda3e34adc9bb507dfff1280a881 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From de79d78706416a194765aeba81b9cc6fed1372d0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 0238fe31ac94b5bb6a7b2282bcc7d7890298f214 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 371d7dfba874430ecf1e02bc4ab5e217f2aedf0c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 ab5ea77e61e93255562895347ce4539d21059964 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 23277dac39d2d36e9b9f0754d7e3ba8d7b17a627 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 6c48ee1e6469e91e3dac93b6298aa48d3a71c9ad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 ba43041fef8b0199099aff3efbe94c5d1906edc0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 2f0867c0ca558ce89b2c12c397168aae8aa70f30 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From 9bf5be86854733eecca08bb38f43110cc0f36875 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 7a06aaf5e55b7997ea19c10c5b7b81e3be059fa1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 5ec5decc276fee40468c033a73a1c243b4a7d014 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 27018c273611bb29df3a9e0c5acafe99e37f3bcc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 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 7fc610c049a73822c3d1d083ece353a04a4c7732 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 27ac53f6e17bed10f75f1c0458c4edba3cc8fed2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 9e9d50bf232e7a6f0765224ce6a904e353fcca90 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (59 preceding siblings ...)
2023-02-23 21:05 ` [PR PATCH] [Updated] " klarasm
@ 2023-03-02 14:53 ` klarasm
2023-03-05 21:05 ` klarasm
` (43 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-03-02 14:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4578 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 100625 bytes --]
From a568b855613b5c90f07d29f975b491233731944a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0f9c75af44bc..eead4562f504 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 64bd08e0c73258a52aff390ba63fcc7e9887286b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3b605061353f9acc4fa88b70c2eddfc2fece73a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/39] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From 428b1f5dcfb750eb40b2820bd676e119ab81af54 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/39] evolution-data-server: revbump due to openldap update
---
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 138a528beee1e007e5c5cbd83ee186ba764e3717 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 4bb0bcd9ee404343c6b628cd0f7a8be9cfd942b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 1984864783533a1191473a2ce446a1dc6b48080a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 2a4e0412281dc33a5e21318fd41e602027468646 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 3df046d884fb..0777e1b92e57 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 8848d585aa2cd0c8864205b7fc29456166721146 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 1448cd6cc5214a1b9ba853ba6e9f6d4b0a7bbe3a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/39] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From cebbae1134e34c114a0523cb0e4db2ed556cdf39 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 6f844667e5ba6303c40b017145db148b7fd077d1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 5d16bbd6892b768dbcfba1ea021c9714eb9ffe19 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 064701b0a75a516ad6dcb9707b250880d65c4608 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 de920677ad5d48247536ce05f19abfc123539a76 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 562484547a1b3faaa0e896abd7541550d0dacdbc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 46315024182249c46dc7fbc6b6a402ed4cc16105 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 60864a69e1ea476f72ed0d1f852c9c2f92f8ce2c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 00f26830b9c3b022df234f608e214c077df9bfab Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 98b17bbdf2af87c1b1e840750c790abf90416c79 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 4a7380f1620094549f45f52bbbc1e6be3a1e1d91 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 08a77e089a92495da1ecccc18a0615c8bb5ec76c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 46ee65302a53bd39a9a3d71a24c4052b84d7e1c5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 5c8322d75e02357e199ebfbe03be216fe7ec2cd3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/39] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 4b81f4c792282fa2c19e3f6c197cae4f80aabe01 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 cb889e4c7488e14193f7f8c85a6f717718a41edf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From eb0ae0229530a475cbe1b2c426e88386a4d80add Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 d016277a19c8cb51fed050338ed5b44a9a4c5658 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:16:10 +0100
Subject: [PATCH 28/39] php: revbump due to openldap update
---
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 55e6c6b4b12ac96e56883b2367cb43cfb2843442 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 29/39] php8.0: revbump due to openldap update
---
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 8615b391e18fae9a2286ebfed1e7e46743c259a4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 30/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 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 dae65d88e9eaa439e506ee5584114e6ce5142468 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 31/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 31b3dfba9cc29ae3037abce6effe4d0d1dc238ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 32/39] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From da412e4838b4ce94a36f376f3a209c3752c6c5b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 33/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 c011c9ecedb3d52028150cedd9d24d506aec757d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 34/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 5959ee9858037f1ab55b229e55b3cffb44cc6107 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 35/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 7375d45feea6790400c2a473e120b918f0f5585d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 36/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 825f8c73197fca469f14b9d37328a9cb716f126b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 37/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 b2476b937fb4ca8fa4f849cea4ff27106be61c65 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 38/39] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From 6af1183ab1b1f193862f2e4de8de859a9c99a76a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 39/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (60 preceding siblings ...)
2023-03-02 14:53 ` klarasm
@ 2023-03-05 21:05 ` klarasm
2023-03-06 19:40 ` [PR REVIEW] " paper42
` (42 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-03-05 21:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4578 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
So far it seems promising but will test more. I would appreciate if anyone else could test as well.
I have probably missed packages that need to be revbumped so please point them out in that case.
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php-ldap-7.4.33_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
[ci skip] again. This will probably take a long time to build.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- [x] dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- [x] evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- [x] evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 99886 bytes --]
From 5b820fbccf094c7304f3a7381dc770159e6aa753 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0f9c75af44bc..eead4562f504 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 b2bc638b64684fa377f0f809d008c258bc82bec6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 86ef177150abe5d8e8456e18ea52c71c2f5df634 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:26:08 +0100
Subject: [PATCH 03/38] mit-krb5: update to 1.20.1
A rebuild triggerd by update to openldap-2.6.3 had some errors in the
test suite.
Remove patch for libressl.
Follow distfiles convention.
---
srcpkgs/mit-krb5/patches/libressl.patch | 38 -------------------------
srcpkgs/mit-krb5/template | 8 +++---
2 files changed, 4 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index 6eb0dbfcaf3d..000000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200
-@@ -189,7 +189,7 @@
- (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3053,7 +3053,7 @@
- return retval;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
-@@ -3079,7 +3079,7 @@
- ASN1_SEQUENCE(DHvparams) = {
- ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
- ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
--} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-+} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
-
- ASN1_SEQUENCE(DHxparams) = {
- ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-@@ -3087,7 +3087,7 @@
- ASN1_OPT(int_dhx942_dh, q, BIGNUM),
- ASN1_OPT(int_dhx942_dh, j, BIGNUM),
- ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
--} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-+} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
- static DH *
- decode_dh_params(const uint8_t *p, unsigned int len)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a67bae19764a..36a7de46e099 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,8 +2,8 @@
# if there is a bump in .so version,
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
-version=1.18.3
-revision=2
+version=1.20.1
+revision=1
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
@@ -11,8 +11,8 @@ short_desc="MIT Kerberos 5 implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://web.mit.edu/kerberos"
-distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
+distfiles="http://web.mit.edu/kerberos/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
+checksum=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851
post_patch() {
vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in
From af8ab5a50d65501767a4bd33346c494ef3f276ca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 04/38] evolution-data-server: revbump due to openldap update
---
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 249c348d2318a2435bca58eff8f1745a9dfdc48e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 05/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 69cb34a3fd36c8b145fb8b7775d614270a8e67f7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 06/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 1bfdb17f46d3f6206b039df47e9b40e15199e0d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 07/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From b0a49dd7250e5126d17c73aad56f192146e0f515 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 08/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 3df046d884fb..0777e1b92e57 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 9dedbad66fae32e72f85560f2a21446512531d3a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 09/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From c6edbd3e13dc6fd2fd4a69ffc20da5512b936e46 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 10/38] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
---
srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
srcpkgs/apr-util/template | 8 ++++----
2 files changed, 4 insertions(+), 19 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..5e9009851ba4 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.2
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
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
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=4fe57443a7905027e13707c875c5de6f9fc6e2e5a2725d695b25a8a10c2d27e0
# fails to build tests
make_check=no
From 49287d00cdee87fc2af24bce97c6125733b947df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 11/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 8b7f0417bdcfac409cd3a4dcd33ddd8c7ff43272 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 12/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 7f9940845df289cd2fd7ce2bd3ab416871319c59 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 13/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 9e9e9330ca73e79e1bcbe2a1b103b7c5c2004266 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 14/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 aeb42b13b187cdfd73581c1db953e436c6a0e79b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 15/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From e7695181b20b5ef1775d56c434cf422fd78cf84c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 16/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 c2d194416b3797a2e31cee06d9027a59e5234cf4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 17/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 b584bbde0b2bfbe9c4157f08033d705de489116b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 18/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 e846eed0011e9d0b3cb6f5adaf6f607e7c6a7753 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 19/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From b190b95c0e6296f8db8c9cbea62d4fd74de0cd6b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 20/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 2befa0094f91ed1fcdc03a055d784b4ba6fc8aa5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 21/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 e476ffc921936f6b1aa9c390dc117eae3fd048ed Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 22/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 66f046b62a664f33262f156848bf0eb4dbeb1793 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 23/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From de4e1055cf42053b4de0ab2cd5c996588735f814 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:53:53 +0100
Subject: [PATCH 24/38] log4cxx: update to 1.0.0
- fix a linting issue
- fix subpacakge
---
.../patches/100-bugfix-LOGCXX-284.patch | 17 ----
.../patches/150-bugfix-LOGCXX-365.patch | 19 -----
srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 -------------------
.../patches/180-gcc-fix-testsuite.patch | 25 ------
.../log4cxx/patches/missing-includes.patch | 38 ---------
srcpkgs/log4cxx/template | 14 ++--
6 files changed, 7 insertions(+), 186 deletions(-)
delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch
delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch
diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
deleted file mode 100644
index fcff330f36d7..000000000000
--- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes build error on AIX with xlc_r
-
---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
-+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
-@@ -181,7 +181,7 @@
- // output the using STL
- //
- std::basic_ostringstream<logchar> buffer;
--#if defined(_USEFAC)
-+#if defined(_MSC_VER) && _MSC_VER < 1300
- _USEFAC(locale, std::time_put<logchar>)
- .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
- #else
diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
deleted file mode 100644
index 0cf96b67ae4a..000000000000
--- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fixes test suite to not expect the year to be between 2000 and 2009.
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335
-Bug: https://issues.apache.org/jira/browse/LOGCXX-365
-Forwarded: not-needed
-Applied-Upstream: commit 954335
-Last-Update: 2014-03-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334
-+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335
-@@ -31,7 +31,7 @@
- #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)"
- #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_DATE_AND_TIME_PAT \
-- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
-+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}"
- #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]"
- #define RELATIVE_TIME_PAT "^[0-9]+"
-
diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
deleted file mode 100644
index cfa0c2f5319c..000000000000
--- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix FTBFS with GCC6
- GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors.
-Author: Tobias Frost <tobi@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768
-Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482
-Applied-Upstream: yes, targeted version 0.11.0
-Last-Update: 2016-07-01 (DebCamp16)
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/main/cpp/locationinfo.cpp
-+++ b/src/main/cpp/locationinfo.cpp
-@@ -148,7 +148,7 @@
- if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) {
- os.writeNull(p);
- } else {
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
-@@ -161,7 +161,7 @@
- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
-- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
-+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p);
- char* line = p.itoa(lineNumber);
- //
- // construct Java-like fullInfo (replace "::" with ".")
---- a/src/main/cpp/loggingevent.cpp
-+++ b/src/main/cpp/loggingevent.cpp
-@@ -236,7 +236,7 @@
-
-
- void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) {
-- char classDesc[] = {
-+ unsigned char classDesc[] = {
- 0x72, 0x00, 0x21,
- 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63,
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A,
-@@ -292,7 +292,7 @@
- 0x3B, 0x78, 0x70 };
-
- os.writeProlog("org.apache.log4j.spi.LoggingEvent",
-- 8, classDesc, sizeof(classDesc), p);
-+ 8, (char *) classDesc, sizeof(classDesc), p);
- }
-
- void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const {
---- a/src/main/cpp/objectoutputstream.cpp
-+++ b/src/main/cpp/objectoutputstream.cpp
-@@ -36,8 +36,8 @@
- objectHandle(0x7E0000),
- classDescriptions(new ClassDescriptionMap())
- {
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-- ByteBuffer buf(start, sizeof(start));
-+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 };
-+ ByteBuffer buf((char*)start, sizeof(start));
- os->write(buf, p);
- }
-
-@@ -81,7 +81,7 @@
- //
- // TC_OBJECT and the classDesc for java.util.Hashtable
- //
-- char prolog[] = {
-+ unsigned char prolog[] = {
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
-@@ -90,7 +90,7 @@
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
- 0x6F, 0x6C, 0x64, 0x78, 0x70 };
-- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
-+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p);
- //
- // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
- char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
deleted file mode 100644
index 71b71467a131..000000000000
--- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix narrowing errors also for the testsuite
-Author: Tobias Frost <tobi@debian.org>
-Last-Update: 2016-10-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/test/cpp/xml/domtestcase.cpp
-+++ b/src/test/cpp/xml/domtestcase.cpp
-@@ -190,7 +190,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
- #endif
-@@ -209,7 +209,7 @@
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
- #if LOG4CXX_LOGCHAR_IS_UTF8
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
-+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 };
- #else
- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
- #endif
diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch
deleted file mode 100644
index a63bffd95c57..000000000000
--- a/srcpkgs/log4cxx/patches/missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
-+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
- * limitations under the License.
- */
-
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
-
-diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
-+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
-
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 2f4905a16092..963743f6367a 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,22 +1,22 @@
# Template file for 'log4cxx'
pkgname=log4cxx
-version=0.10.0
-revision=4
-build_style=gnu-configure
-makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel"
-short_desc="A C++ Logging Library based on Log4J"
+version=1.0.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config zip"
+makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
+short_desc="C++ Logging Library based on Log4J"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://logging.apache.org/log4cxx/"
distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz"
-checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f
log4cxx-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
From 9ce5827408effa46c733fe08a18d5d0da26a1844 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 25/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 4d52c4a0eb85099ac9b25f3a24ba2841ee5eb325 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 26/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From b0e08ddeca5074d57d82ff6bf0edbcf59ae0b6b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 27/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 34d7b74f309e9c8592d68cd966662695ec915df8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 28/38] php8.0: revbump due to openldap update
---
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 6f694bf928a1..5ade87c4ad5e 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=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 3885cb7c2887edd36c4a2a6ed751cc5aca15a0d8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 29/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 49fd265f684f..7f0ca96a7871 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=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 378351976dc096670e2c89c8e351093d69db6e0e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 30/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 42593fc12496ae6793283b90969a9ff2f21b7249 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:21:36 +0100
Subject: [PATCH 31/38] python3-ldap: update to 3.4.3
build was failing after revbump
remove unnecessary sed expression
---
srcpkgs/python3-ldap/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..41e4edb1f354 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,10 +1,10 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
_pkgname=python-ldap
-version=3.2.0
-revision=5
+version=3.4.3
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
depends="python3-pyasn1-modules"
checkdepends="openldap openldap-tools"
@@ -13,8 +13,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Python-2.0"
homepage="https://www.python-ldap.org"
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
-}
+checksum=ab26c519a0ef2a443a2a10391fa3c5cb52d7871323399db949ebfaa9f25ee2a0
From 48e9b91584f8214bbec382d58cf2024e61ceff80 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 32/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 e9eb1353e8828dace55a61dde8626ddd655d81bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 33/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 d08840bce397fa1fecdf6b1d84cbba16db169602 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 34/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 b25230771257572aadffbe5febe567264f617d3a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 35/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From b85fd8a731f6def4536e024f03addd3910ef6a98 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 36/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 872b6f3ff781c9f1d8edc3d50b70a07582419af9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:42:47 +0100
Subject: [PATCH 37/38] virtuoso: update to 7.2.8
test suite was failing on revbump
- remove patches that no longer apply
- add patch that removes git revision from graphql
- disable static libraries as we're removing them after install anyway
- add which to hostmakedepends
- add missing checkdepends
---
.../virtuoso/patches/always-ieee-floats.patch | 46 -
srcpkgs/virtuoso/patches/fix-graphql.patch | 11 +
.../virtuoso/patches/fix-utf8-bittest.patch | 15 -
srcpkgs/virtuoso/patches/musl-page_size.patch | 34 -
.../remove-openssl-version-check.patch | 48 -
.../virtuoso/patches/ssl-connect-state.patch | 15 -
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 -----------------
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 -
srcpkgs/virtuoso/patches/use-mkstemp.patch | 18 -
srcpkgs/virtuoso/template | 16 +-
10 files changed, 18 insertions(+), 1605 deletions(-)
delete mode 100644 srcpkgs/virtuoso/patches/always-ieee-floats.patch
create mode 100644 srcpkgs/virtuoso/patches/fix-graphql.patch
delete mode 100644 srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
delete mode 100644 srcpkgs/virtuoso/patches/musl-page_size.patch
delete mode 100644 srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl-connect-state.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
delete mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
delete mode 100644 srcpkgs/virtuoso/patches/use-mkstemp.patch
diff --git a/srcpkgs/virtuoso/patches/always-ieee-floats.patch b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
deleted file mode 100644
index 69b5034214f7..000000000000
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:50:46 +0100
-Subject: [PATCH 1/2] always use IEEE floats
-
-We don't build on any platforms where this is not the case.
-
-Fixes platforms for which this is not checked.
----
- libsrc/Dk/Dkmarshal.c | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
-index da15a21..b2b6c71 100644
---- a/libsrc/Dk/Dkmarshal.c
-+++ b/libsrc/Dk/Dkmarshal.c
-@@ -31,25 +31,7 @@
- # include <netinet/in.h> /* for ntohl, htonl */
- #endif
-
--#if defined (i386) || \
-- defined (_WIN64) || \
-- defined (_M_IX86) || \
-- defined (_M_ALPHA) || \
-- defined (mc68000) || \
-- defined (sparc) || \
-- defined (__x86_64) || \
-- defined (__alpha) || \
-- defined (__powerpc) || \
-- defined (mips) || \
-- defined (__OS2__) || \
-- defined (_IBMR2)
--# define _IEEE_FLOATS
--#elif defined (OPL_SOURCE)
--# include <librpc.h>
--#else
--# include <rpc/types.h>
--# include <rpc/xdr.h>
--#endif
-+#define _IEEE_FLOATS
-
- macro_char_func readtable[256];
- ses_write_func writetable[256];
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/fix-graphql.patch b/srcpkgs/virtuoso/patches/fix-graphql.patch
new file mode 100644
index 000000000000..f04b3e45c47a
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/fix-graphql.patch
@@ -0,0 +1,11 @@
+--- a/binsrc/graphql/graphql_plugin.c 2023-02-01 21:14:18.148478500 +0100
++++ b/binsrc/graphql/graphql_plugin.c 2022-10-19 14:44:14.000000000 +0200
+@@ -173,7 +173,7 @@
+
+ static unit_version_t plugin_graphql_version = {
+ "GraphQL/SPARQL Bridge", /*!< Title of unit, filled by unit */
+- GQL_BRIDGE_VER " (" GIT_HEAD_STR ")", /*!< Version number, filled by unit */
++ GQL_BRIDGE_VER, /*!< Version number, filled by unit */
+ "OpenLink Software", /*!< Plugin's developer, filled by unit */
+ "Support functions for GraphQL/SPARQL Bridge", /*!< Any additional info, filled by unit */
+ 0, /*!< Error message, filled by unit loader */
diff --git a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
deleted file mode 100644
index 85e84a67ef3c..000000000000
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: expression requires binary AND, not logical
-
---- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
-@@ -432,7 +432,7 @@
- for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
- for (c = 128; c < 256; c++)
- {
-- if ((tcode[c/8] && (1 << (c&7))) != 0)
-+ if ((tcode[c/8] & (1 << (c&7))) != 0)
- {
- int d = (c >> 6) | 0xc0; /* Set bit for this starter */
- start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
diff --git a/srcpkgs/virtuoso/patches/musl-page_size.patch b/srcpkgs/virtuoso/patches/musl-page_size.patch
deleted file mode 100644
index 73a9abdd0f39..000000000000
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 29 Jan 2020 12:54:14 +0100
-Subject: [PATCH 2/2] Use more portable page size check
-
-This fixes musl builds.
----
- libsrc/Dk/tlsf.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
-index ddce478..a9687f4 100644
---- a/libsrc/Dk/tlsf.h
-+++ b/libsrc/Dk/tlsf.h
-@@ -20,6 +20,7 @@
- #define _TLSF_H_
-
- #include <sys/types.h>
-+#include <unistd.h>
-
- extern size_t init_memory_pool(size_t, void *);
- extern size_t get_used_size(void *);
-@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
-
- #define DEFAULT_AREA_SIZE (1024*10)
-
--#define PAGE_SIZE (getpagesize())
-+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
-
- #ifndef WIN32
- #ifdef USE_PRINTF
---
-2.24.0
-
diff --git a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
deleted file mode 100644
index 3094fbb6ab64..000000000000
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Enable subdir-objects and strip openssl version check which fails for libressl
-
---- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
-+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
-@@ -58,7 +58,7 @@
- dnl AM_INIT_AUTOMAKE([1.8])
- dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
- dnl
--AM_INIT_AUTOMAKE([1.9 tar-ustar])
-+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
- AM_MAINTAINER_MODE
-
-@@ -867,32 +867,6 @@
- ;;
- esac
-
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--], [
--#if OPENSSL_VERSION_NUMBER < 0x0090801fL
--#error OpenSSL version too old
--#endif
-- ],[
-- AC_MSG_RESULT([>= 0.9.8e])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
-- ])
--
--AC_MSG_CHECKING([OpenSSL version])
--AC_TRY_COMPILE([
--#include <openssl/opensslv.h>
--],[
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
--#error OpenSSL version too new
--#endif
-- ],[
-- AC_MSG_RESULT([< 1.1.0])
-- ],[
-- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
-- ])
--
- AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
- AC_TRY_RUN([
- #include <openssl/rsa.h>
diff --git a/srcpkgs/virtuoso/patches/ssl-connect-state.patch b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
deleted file mode 100644
index 39566e3b6dfd..000000000000
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
-
---- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
-@@ -9949,7 +9949,7 @@
- cli_ssl_get_error_string (err_buf, sizeof (err_buf));
- sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
- }
-- ssl->state = SSL_ST_ACCEPT;
-+ SSL_set_accept_state (ssl);
- while (SSL_renegotiate_pending (ssl) && ctr < 1000)
- {
- timeout_t to = { 0, 1000 };
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
deleted file mode 100644
index 988749946480..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ /dev/null
@@ -1,1400 +0,0 @@
-Description: Fix FTBFS with openssl 1.1
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Bug-Debian: https://bugs.debian.org/828594
-Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
-Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
-
----
-
-From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Mon, 5 Sep 2016 10:49:54 +0000
-Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- libsrc/Dk/Dkernel.c | 6 +-
- libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
- libsrc/Wi/http.c | 2 +-
- libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
- libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
- libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
- libsrc/util/sslengine.c | 6 +-
- 7 files changed, 524 insertions(+), 254 deletions(-)
-
---- a/libsrc/Wi/bif_crypto.c
-+++ b/libsrc/Wi/bif_crypto.c
-@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
- unsigned char temp[EVP_MAX_MD_SIZE];
- unsigned int size = 0;
- caddr_t res = NULL;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- const EVP_MD *md = EVP_sha1 ();
-
- if (alg == 1)
- md = EVP_ripemd160 ();
-
-- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
-- box_hmac_1 (box, &ctx);
-- HMAC_Final (&ctx, temp, &size);
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return res;
-+
-+ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
-+ box_hmac_1 (box, ctx);
-+ HMAC_Final (ctx, temp, &size);
- if (size)
- {
- res = dk_alloc_box (size + 1, DV_SHORT_STRING);
- memcpy (res, temp, size);
- res[size] = 0;
- }
-+ HMAC_CTX_free(ctx);
- return res;
- }
-
-@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- {
- int ii;
-
-- opp = op;
-- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
-- if (ii < 0)
-+ if (len + hl < 1)
- {
- if (BIO_write (bp, "Bad boolean\n", 12))
- goto end;
- }
-- BIO_printf (bp, "%d", ii);
-+ BIO_printf (bp, "%d", p[0]);
- }
- else if (tag == V_ASN1_BMPSTRING)
- {
-@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- }
- if (os != NULL)
- {
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- os = NULL;
- }
- }
-@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
- goto end;
- }
-- M_ASN1_INTEGER_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (tag == V_ASN1_ENUMERATED)
- {
-@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
- if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
- goto end;
- }
-- M_ASN1_ENUMERATED_free (bs);
-+ ASN1_STRING_free (bs);
- }
- else if (len > 0 && dump)
- {
-@@ -515,7 +518,7 @@ end:
- if (o != NULL)
- ASN1_OBJECT_free (o);
- if (os != NULL)
-- M_ASN1_OCTET_STRING_free (os);
-+ ASN1_STRING_free (os);
- *pp = p;
- return (ret);
- }
-@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
- int len = BIO_get_mem_data (out_bio, &ptr);
- int to_read = len, readed = 0;
-
-- to_free = ((BUF_MEM *) out_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
- BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- CATCH_WRITE_FAIL (ses)
- {
-@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
- } while (to_read > 0);
- }
- END_WRITE_FAIL (ses);
-- ((BUF_MEM *) out_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
- BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
- return ses;
- }
-@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
- {
- in_bio = strses_to_bio ((dk_session_t *) msg);
-- to_free = ((BUF_MEM *) in_bio->ptr)->data;
-+ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
- BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- else
-@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
- p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
- if (to_free)
- {
-- ((BUF_MEM *) in_bio->ptr)->data = to_free;
-+ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
- BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
- }
- BIO_free (in_bio);
-@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
- }
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
-
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
- sqlr_new_error ("42000", "CR006", "No recipient certificates");
-
- certs = sk_X509_new_null ();
-- if (store && store->objs)
-+
-+ if (store && X509_STORE_get0_objects(store))
- {
-- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
-+ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
-+
-+ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
- {
-- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
-- if (obj->type == X509_LU_X509)
-- sk_X509_push (certs, X509_dup (obj->data.x509));
-+ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
-+ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
- }
- }
-+
- if (store)
- X509_STORE_free (store);
- in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
-@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
- char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
- if (!ok && opts)
- {
-- switch (ctx->error)
-+ switch (X509_STORE_CTX_get_error(ctx))
- {
- case X509_V_ERR_CERT_HAS_EXPIRED:
- if (strstr (opts, "expired"))
-@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
- if (!i)
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (csc->error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
- *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
- }
-
-@@ -1308,20 +1319,16 @@ err_ret:
- #define VIRT_CERT_EXT "2.16.840.1.1113.1"
-
- static caddr_t
--BN_box (BIGNUM * x)
-+BN_box (const BIGNUM *x)
- {
- size_t buf_len, n;
- caddr_t buf;
- buf_len = (size_t) BN_num_bytes (x);
-- if (buf_len <= BN_BYTES)
-- buf = box_num ((unsigned long) x->d[0]);
-- else
-- {
-- buf = dk_alloc_box (buf_len, DV_BIN);
-- n = BN_bn2bin (x, (unsigned char *) buf);
-- if (n != buf_len)
-- GPF_T;
-- }
-+ /* did not figure out where buf is free()ed */
-+ buf = dk_alloc_box (buf_len, DV_BIN);
-+ n = BN_bn2bin (x, (unsigned char *) buf);
-+ if (n != buf_len)
-+ GPF_T;
- return buf;
- }
-
-@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
- int i;
- char tmp[1024];
- char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
-- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
-+ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
- for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
- {
- X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
-@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
- char *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
- if (!X509V3_EXT_print (mem, ex, 0, 0))
-- M_ASN1_OCTET_STRING_print (mem, ex->value);
-+ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA *x = k->pkey.rsa;
-- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
-+
-+ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
- }
- else
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA *x = k->pkey.dsa;
-- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
-+ const BIGNUM *pub_key;
-+
-+ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
-+ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
- }
- else
- #endif
-@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
- int n, i, len;
- char *s, *data_ptr;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
- if (!strcmp (s, attr))
-@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
- break;
- }
- }
-+
- if (ne_ret)
- {
-- ASN1_STRING_print (mem, ne_ret->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
- dk_set_t set = NULL;
- caddr_t val;
- BIO *mem = BIO_new (BIO_s_mem ());
-- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
-+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
- {
- val = NULL;
-- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
-- n = OBJ_obj2nid (ne->object);
-+ ne = X509_NAME_get_entry(subj, i);
-+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
- if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
- {
-- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
-+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
- s = buffer;
- }
-- ASN1_STRING_print (mem, ne->value);
-+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
- len = BIO_get_mem_data (mem, &data_ptr);
- if (len > 0 && data_ptr)
- {
-@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
- }
- BIO_free (mem);
- ret = list_to_array (dk_set_nreverse (set));
-+
- break;
- }
- case 12:
- {
- const unsigned char *s;
- int i, n;
-- const ASN1_STRING *sig = cert->signature;
-- X509_ALGOR *sigalg = cert->sig_alg;
-+ const ASN1_STRING *sig;
-+ const X509_ALGOR *sigalg;
-+ const ASN1_OBJECT *sig_alg_algorithm;
- char buf[80];
- caddr_t val;
-
-- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
-+ X509_get0_signature(&sig, &sigalg, cert);
-+ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
-+ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
-
- n = sig->length;
- s = sig->data;
-@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
- if (k)
- {
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
- char *data_ptr;
- int len;
-- RSA *x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- b = BIO_new (BIO_s_mem());
- i2d_RSA_PUBKEY_bio (b, x);
- len = BIO_get_mem_data (b, &data_ptr);
---- a/libsrc/Wi/xmlenc.c
-+++ b/libsrc/Wi/xmlenc.c
-@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
- }
-
-
--static void
--genrsa_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- int
- __xenc_key_rsa_init (char *name)
- {
- RSA *rsa = NULL;
-- int num=1024;
-- unsigned long f4=RSA_F4;
-+ BIGNUM *bn = NULL;
- int r;
-+
- xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
-+ rsa = RSA_new();
-+ if (!rsa)
-+ goto out;
-+ bn = BN_new();
-+ if (!bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-+
-+ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
-+ goto out;
-+
- r = RSA_check_key(rsa);
-+ if (r != 1)
-+ goto out;
- pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06",
-- "RSA parameters generation error");
-- }
- pkey->xek_rsa = rsa;
- pkey->xek_private_rsa = rsa;
-+ BN_free(bn);
- return 0;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06",
-+ "RSA parameters generation error");
-+ return -1;
- }
-
-
-@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
-
- if (pkey)
- {
-- switch (EVP_PKEY_type (pkey->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = pkey->pkey.dsa;
-- private_dsa = private_key ? private_key->pkey.dsa : 0;
-+ dsa = EVP_PKEY_get0_DSA(pkey);
-+ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = pkey->pkey.rsa;
-- private_rsa = private_key ? private_key->pkey.rsa : 0;
-+ rsa = EVP_PKEY_get0_RSA(pkey);
-+ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
- break;
- default:
- goto finish;
-@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
- return k;
- }
-
--static void dh_cb(int p, int n, void *arg)
--{
--#ifdef LINT
-- p=n;
--#endif
--}
--
- static /*xenc_key_DSA_create */
- caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
- {
-@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
- dh = DH_new ();
- bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
- bn_g = BN_bin2bn (g_bin, 1, NULL);
-- dh->p = bn_p;
-- dh->g = bn_g;
-+ if (dh)
-+ DH_set0_pqg(dh, bn_p, NULL, bn_g);
-
- dk_free_box (mod_b64);
- dk_free_box (mod);
- }
- else
- {
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- }
- if (!dh)
- {
-@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- int n, len;
- caddr_t buf = NULL, ret, b64;
- DH *dh;
-- BIGNUM *num;
-+ const BIGNUM *num;
-
- mutex_enter (xenc_keys_mtx);
- key = xenc_get_key_by_name (name, 0);
-@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
- switch (param)
- {
- case 1:
-- num = dh->p;
-+ DH_get0_pqg(dh, &num, NULL, NULL);
- break;
- case 2:
-- num = dh->g;
-+ DH_get0_pqg(dh, NULL, NULL, &num);
- break;
- case 3:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- break;
- case 4:
-- num = dh->priv_key;
-+ DH_get0_key(dh, NULL, &num);
- break;
- default:
-- num = dh->pub_key;
-+ DH_get0_key(dh, &num, NULL);
- }
-
- buf_len = (size_t)BN_num_bytes(num);
-@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- xenc_key_t * k;
- caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
- int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
-- RSA *rsa = NULL;
-+ RSA *rsa;
-+ BIGNUM *bn;
-+
-+ rsa = RSA_new();
-+ bn = BN_new();
-+ if (!rsa || !bn)
-+ goto out;
-+ if (!BN_set_word(bn, RSA_F4))
-+ goto out;
-
- mutex_enter (xenc_keys_mtx);
- if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
-@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
- SQLR_NEW_KEY_EXIST_ERROR (name);
- }
-
-- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
--
-- if (rsa == NULL)
-- {
-- sqlr_new_error ("42000", "XENC06", "RSA generation error");
-- }
-+ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
-+ mutex_leave (xenc_keys_mtx);
-+ goto out;
-+ }
-+ BN_free(bn);
-
- k->xek_rsa = RSAPublicKey_dup (rsa);
- k->xek_private_rsa = rsa;
-@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
-
- mutex_leave (xenc_keys_mtx);
- return NULL;
-+out:
-+ if (bn)
-+ BN_free(bn);
-+ if (rsa)
-+ RSA_free(rsa);
-+ sqlr_new_error ("42000", "XENC06", "RSA generation error");
-+ return NULL;
- }
-
- xenc_key_t *
-@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
- SQLR_NEW_KEY_ERROR (name);
-
- RAND_poll ();
-- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
-+ dsa = DSA_new();
-+ if (dsa) {
-+ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
-+ DSA_free(dsa);
-+ dsa = NULL;
-+ }
-+ }
- if (dsa == NULL)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
- if (NULL == pkey)
- SQLR_NEW_KEY_ERROR (name);
-
-- dh = DH_generate_parameters (num, g, dh_cb, NULL);
-+ dh = DH_new();
-+ if (dh) {
-+ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
-+ DH_free(dh);
-+ dh = NULL;
-+ }
-+ }
- if (!dh)
- {
- sqlr_new_error ("42000", "XENC11",
-@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
- {
- in = BIO_new_mem_buf (key_base64, len);
- pkey = d2i_PUBKEY_bio (in, NULL);
-- if (pkey && pkey->type == EVP_PKEY_RSA)
-- p = pkey->pkey.rsa;
-+ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
-+ p = EVP_PKEY_get0_RSA(pkey);
- BIO_reset (in);
- pkkey = d2i_PrivateKey_bio (in, NULL);
-- if (pkkey && pkkey->type == EVP_PKEY_RSA)
-- r = pkkey->pkey.rsa;
-+ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
-+ r = EVP_PKEY_get0_RSA(pkkey);
- BIO_free (in);
- }
- else
-@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
-
- if (!p)
- {
-+ const BIGNUM *n, *e;
-+
-+ RSA_get0_key(r, &n, &e, NULL);
- p = RSA_new ();
-- p->n = BN_dup (r->n);
-- p->e = BN_dup (r->e);
-+ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
- }
-
- mutex_enter (xenc_keys_mtx);
-@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
- p = RSA_new ();
- n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
- e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
-- p->n = n;
-- p->e = e;
-+ RSA_set0_key(p, n, e, NULL);
- if (pexp)
- {
- pk = RSA_new ();
-- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
-- pk->n = BN_dup (n);
-- pk->e = BN_dup (e);
-+ RSA_set0_key(p, BN_dup(n),
-+ BN_dup(e),
-+ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
- }
- mutex_enter (xenc_keys_mtx);
- k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
-@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
- #endif
- }
-
--xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
-+static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
- {
- char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
- char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
-@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- caddr_t ** array;
- if (key->xek_type == DSIG_KEY_RSA)
- {
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
- xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
- xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
- xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
-
-- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
-- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
-+ xenc_tag_add_child_BN (rsamodulus, rsa_n);
-+ xenc_tag_add_child_BN (rsaexponent, rsa_e);
-
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
- xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
-@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
- xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
- xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
- DSA * dsa = key->ki.dsa.dsa_st;
-+ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
-
-+ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
-+ DSA_get0_key(dsa, &dsa_pub_key, NULL);
-
-- xenc_tag_add_child_BN (p, dsa->p);
-- xenc_tag_add_child_BN (p, dsa->q);
-- xenc_tag_add_child_BN (p, dsa->g);
-- xenc_tag_add_child_BN (p, dsa->pub_key);
-+ xenc_tag_add_child_BN (p, dsa_p);
-+ xenc_tag_add_child_BN (p, dsa_q);
-+ xenc_tag_add_child_BN (p, dsa_g);
-+ xenc_tag_add_child_BN (p, dsa_pub_key);
-
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
- xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
-@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
-
- ret = dk_alloc_box (ikeyid->length, DV_BIN);
- memcpy (ret, ikeyid->data, ikeyid->length);
-- M_ASN1_OCTET_STRING_free(ikeyid);
-+ ASN1_STRING_free(ikeyid);
- return ret;
- }
-
-@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
- sk_X509_EXTENSION_push(st_exts, ex);
- }
- X509_REQ_add_extensions(x, st_exts);
-- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
-+ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
- {
- pk = NULL; /* keep one in the xenc_key */
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
-@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
- goto err;
- }
-- switch (EVP_PKEY_type (cli_pk->type))
-+ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
- {
- case EVP_PKEY_DSA:
- sign_algoname = DSIG_DSA_SHA1_ALGO;
- enc_algoname = XENC_DSA_ALGO;
-- dsa = cli_pk->pkey.dsa;
-+ dsa = EVP_PKEY_get0_DSA(cli_pk);
- break;
- case EVP_PKEY_RSA:
- sign_algoname = DSIG_RSA_SHA1_ALGO;
- enc_algoname = XENC_RSA_ALGO;
-- rsa = cli_pk->pkey.rsa;
-+ rsa = EVP_PKEY_get0_RSA(cli_pk);
- break;
- default:
- *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
-@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
- if (export_chain)
- {
- int i;
-- X509_STORE_CTX store_ctx;
-- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
-- if (X509_verify_cert (&store_ctx) > 0)
-- chain = X509_STORE_CTX_get1_chain (&store_ctx);
-+ X509_STORE_CTX *ctx;
-+ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
-+ if (X509_verify_cert (ctx) > 0)
-+ chain = X509_STORE_CTX_get1_chain (ctx);
- else
- {
- const char *err_str;
-- err_str = X509_verify_cert_error_string (store_ctx.error);
-+ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
- *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- goto err;
- }
-- X509_STORE_CTX_cleanup (&store_ctx);
-+ X509_STORE_CTX_cleanup (ctx);
- if (chain)
- {
- certs = sk_X509_new_null ();
-@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA *x = EVP_PKEY_get0_RSA(k);
- PEM_write_bio_RSA_PUBKEY (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- PEM_write_bio_DSA_PUBKEY (b, x);
- }
- #endif
-@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- i2d_RSA_PUBKEY_bio (b, x);
- }
- #endif
- #ifdef EVP_PKEY_DSA
-- if (k->type == EVP_PKEY_DSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
- {
-- DSA * x = k->pkey.dsa;
-+ DSA * x = EVP_PKEY_get0_DSA(k);
- i2d_DSA_PUBKEY_bio (b, x);
- }
- #endif
-@@ -7245,7 +7286,7 @@ err:
- }
-
- static caddr_t
--BN2binbox (BIGNUM * x)
-+BN2binbox (const BIGNUM * x)
- {
- size_t buf_len, n;
- caddr_t buf;
-@@ -7280,8 +7321,14 @@ static caddr_t
- xenc_rsa_pub_magic (RSA * x)
- {
- caddr_t ret;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+ const BIGNUM *rsa_n, *rsa_e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- n = xenc_encode_base64_binbox (n, 1);
- e = xenc_encode_base64_binbox (e, 1);
- ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
-@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_magic (x);
- }
- #endif
-@@ -7349,10 +7396,16 @@ static caddr_t
- xenc_rsa_pub_ssh_export (RSA * x)
- {
- static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
-+ const BIGNUM *rsa_n, *rsa_e;
- caddr_t ret;
- int len, pos;
-- caddr_t n = BN2binbox (x->n); /* modulus */
-- caddr_t e = BN2binbox (x->e); /* public exponent */
-+ caddr_t n;
-+ caddr_t e;
-+
-+ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
-+ n = BN2binbox (rsa_n); /* modulus */
-+ e = BN2binbox (rsa_e); /* public exponent */
-+
- len = 11 + 8 + box_length (n) + box_length (e);
- if (n[0] & 0x80)
- len ++;
-@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
- {
- k = X509_get_pubkey (key->xek_x509);
- #ifdef EVP_PKEY_RSA
-- if (k->type == EVP_PKEY_RSA)
-+ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
- {
-- RSA * x = k->pkey.rsa;
-+ RSA * x = EVP_PKEY_get0_RSA(k);
- ret = xenc_rsa_pub_ssh_export (x);
- }
- #endif
-@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
- return NULL;
- }
- pk = NETSCAPE_SPKI_get_pubkey (spki);
-- if (!pk || pk->type != EVP_PKEY_RSA)
-+ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
- {
- NETSCAPE_SPKI_free (spki);
- *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
-@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
- sec_check_dba ((QI*)qst, me);
- in = BIO_new (BIO_s_mem ());
- mutex_enter (xenc_keys_mtx);
-- certs = CA_certs->objs;
-+ certs = X509_STORE_get0_objects(CA_certs);
- len = sk_X509_OBJECT_num (certs);
- for (i = 0; i < len; i++)
- {
- X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
-- if (obj->type == X509_LU_X509)
-+ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
- {
-- X509 *x = obj->data.x509;
-+ X509 *x = X509_OBJECT_get0_X509(obj);
- caddr_t itm;
- int blen;
- BIO_reset (in);
---- a/libsrc/Wi/xmlenc.h
-+++ b/libsrc/Wi/xmlenc.h
-@@ -38,6 +38,7 @@
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/des.h>
-+#include <openssl/hmac.h>
-
- #ifdef AES_ENC_ENABLE
- #include <openssl/aes.h>
-@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
-
- extern dk_mutex_t * xenc_keys_mtx;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline HMAC_CTX *HMAC_CTX_new(void)
-+{
-+ HMAC_CTX *p;
-+
-+ p = calloc(1, sizeof(HMAC_CTX));
-+ if (!p)
-+ return p;
-+ HMAC_CTX_init(p);
-+ return p;
-+}
-+
-+static inline void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+ HMAC_CTX_cleanup(ctx);
-+ free(ctx);
-+}
-+
-+static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
-+ const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n != NULL)
-+ *n = r->n;
-+ if (e != NULL)
-+ *e = r->e;
-+ if (d != NULL)
-+ *d = r->d;
-+}
-+
-+static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
-+ const BIGNUM **q)
-+{
-+ if (p != NULL)
-+ *p = r->p;
-+ if (q != NULL)
-+ *q = r->q;
-+}
-+
-+static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_RSA)
-+ return NULL;
-+ return pkey->pkey.rsa;
-+}
-+
-+static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+
-+static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
-+ const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = dh->p;
-+ if (q != NULL)
-+ *q = dh->q;
-+ if (g != NULL)
-+ *g = dh->g;
-+}
-+
-+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+ if (pkey->type != EVP_PKEY_DSA)
-+ return NULL;
-+ return pkey->pkey.dsa;
-+}
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free(dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free(dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free(dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits(q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+ /* If the fields n and e in r are NULL, the corresponding input
-+ * parameters MUST be non-NULL for n and e. d may be
-+ * left NULL (in case only the public key is used).
-+ */
-+ if ((r->n == NULL && n == NULL)
-+ || (r->e == NULL && e == NULL))
-+ return 0;
-+
-+ if (n != NULL) {
-+ BN_free(r->n);
-+ r->n = n;
-+ }
-+ if (e != NULL) {
-+ BN_free(r->e);
-+ r->e = e;
-+ }
-+ if (d != NULL) {
-+ BN_free(r->d);
-+ r->d = d;
-+ }
-+
-+ return 1;
-+}
-+
-+static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-+ const BIGNUM **q, const BIGNUM **g)
-+{
-+ if (p != NULL)
-+ *p = d->p;
-+ if (q != NULL)
-+ *q = d->q;
-+ if (g != NULL)
-+ *g = d->g;
-+}
-+
-+static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-+ const BIGNUM **priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = d->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = d->priv_key;
-+}
-+
-+static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
-+{
-+ return x->cert_info->extensions;
-+}
-+
-+static inline int X509_up_ref(X509 *x)
-+{
-+ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+}
-+
-+static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
-+{
-+ return v->objs;
-+}
-+
-+static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
-+{
-+ return a->type;
-+}
-+
-+static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
-+{
-+ if (a == NULL || a->type != X509_LU_X509)
-+ return NULL;
-+ return a->data.x509;
-+}
-+
-+#endif
-+
- #endif
-
---- a/libsrc/Wi/xmlenc_algos.c
-+++ b/libsrc/Wi/xmlenc_algos.c
-@@ -1149,7 +1149,7 @@ int
- dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
-@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
- default:
- return 0;
- }
--
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA256_DIGEST_LENGTH)
- GPF_T;
-@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
- int
- dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA256_DIGEST_LENGTH + 1];
-@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1586,7 +1593,7 @@ int
- dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
- {
- unsigned char * data;
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char key_data[32 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
- unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
-@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
-
- if (hmac_len != SHA_DIGEST_LENGTH)
- GPF_T;
-@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
- int
- dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
- {
-- HMAC_CTX ctx;
-+ HMAC_CTX *ctx;
- unsigned char * data;
- unsigned char key_data[3 * 8];
- unsigned char md [SHA_DIGEST_LENGTH + 1];
-@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
- return 0;
- }
-
-+ ctx = HMAC_CTX_new();
-+ if (!ctx)
-+ return 0;
-
- data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
- CATCH_READ_FAIL (ses_in)
-@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
- FAILED
- {
- dk_free_box ((box_t) data);
-+ HMAC_CTX_free(ctx);
- return 0;
- }
- END_READ_FAIL (ses_in);
-
-- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
-- HMAC_Update(&ctx, data, len);
-- HMAC_Final(&ctx, md, &hmac_len);
-- HMAC_cleanup(&ctx);
-+ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
-+ HMAC_Update(ctx, data, len);
-+ HMAC_Final(ctx, md, &hmac_len);
-+ HMAC_CTX_free(ctx);
- dk_free_box ((box_t) data);
-
- len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
-@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
- caddr_t outbuf_beg;
- int len;
- caddr_t encoded_out;
-- EVP_CIPHER_CTX ctx;
-+ EVP_CIPHER_CTX *ctx;
- unsigned char * ivec = &key->ki.aes.iv[0];
-
- CATCH_READ_FAIL (ses_in)
-@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
- END_READ_FAIL (ses_in);
-
- #if 1
-- EVP_CIPHER_CTX_init(&ctx);
-+ ctx = EVP_CIPHER_CTX_new();
- outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
- memcpy (outbuf_beg, ivec, 16);
- outbuf = outbuf_beg + 16;
-@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
- switch (key->ki.aes.bits)
- {
- case 128:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 192:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- case 256:
-- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
-+ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
- break;
- default:
- GPF_T1 ("Unsupported key size");
- }
-- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
-+ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
- {
-- EVP_CIPHER_CTX_cleanup(&ctx);
- dk_free_box (text);
- dk_free_box (outbuf_beg);
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
-@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
- xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
- } */
- /* outlen += tmplen; */
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-
- #else
- outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
-@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- int len = 0;
- int keysize;
- RSA * rsa = key->xek_private_rsa;
-+ const BIGNUM *p, *q;
-
- if (!seslen)
- {
-@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
- xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
- return 0;
- }
-+ RSA_get0_factors(rsa, &p, &q);
- if (!rsa ||
-- !rsa->p ||
-- !rsa->q)
-+ !p || !q)
- {
- if (key->xek_x509_KI)
- key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
---- a/libsrc/util/sslengine.c
-+++ b/libsrc/util/sslengine.c
-@@ -29,7 +29,11 @@
- int
- ssl_engine_startup (void)
- {
-- CRYPTO_malloc_init ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
-+ CRYPTO_malloc_init ();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
---- a/libsrc/Wi/http.c
-+++ b/libsrc/Wi/http.c
-@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
- log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
- break;
- }
-- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
-+ X509_up_ref(k->xek_x509);
- tok = strtok_r (NULL, ",", &tok_s);
- }
- dk_free_box (str);
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5280,7 +5280,11 @@ ssl_server_init ()
- }
- #endif
-
-- SSLeay_add_all_algorithms ();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+ SSLeay_add_all_algorithms();
-+#else
-+ OpenSSL_add_all_algorithms();
-+#endif
- PKCS12_PBE_add (); /* stub */
-
- #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
deleted file mode 100644
index 66e50ec127ba..000000000000
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Comment unknown definition in ssl1.1 - please review!
-Author: Andreas Tille <tille@debian.org>
-Bug-Debian: https://bugs.debian.org/828594
-Last-Update: Mo 11. Feb 13:50:17 CET 2019
-
---- a/libsrc/Dk/Dkernel.c
-+++ b/libsrc/Dk/Dkernel.c
-@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
- else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
- opt = SSL_PROTOCOL_TLSV1_2;
- #endif
-+/*
- #if defined (SSL_OP_NO_TLSv1_3)
- else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
- opt = SSL_PROTOCOL_TLSV1_3;
- #endif
-+*/
- else if (!strcasecmp (name, "ALL"))
- opt = SSL_PROTOCOL_ALL;
- else
diff --git a/srcpkgs/virtuoso/patches/use-mkstemp.patch b/srcpkgs/virtuoso/patches/use-mkstemp.patch
deleted file mode 100644
index d71b7e417bd9..000000000000
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
-
---- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
-+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
-@@ -298,8 +298,10 @@
- if (!ses2->ses_file->ses_max_blocks_in_mem)
- {
- char fname[PATH_MAX + 1];
-+ int fd;
- snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
-- mktemp (fname);
-+ fd = mkstemp (fname);
-+ close (fd);
-
- #if defined (WIN32)
- # define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 73e59023d35e..783909f0de14 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,18 +1,18 @@
# Template file for 'virtuoso'
pkgname=virtuoso
-version=7.2.5.1
-revision=3
+version=7.2.8
+revision=1
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
-configure_args="--enable-static"
-hostmakedepends="automake libtool flex gperf net-tools"
+hostmakedepends="automake libtool flex gperf net-tools which"
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+checkdepends="procps-ng unzip curl"
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
+checksum=b7a8b79943aef7de1d7f7a984027747776ab0b44cf6e160cbd66085e5bd91ed5
# cannot execute binary file: Exec format error
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
@@ -45,8 +45,6 @@ post_install() {
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
- # remove static libs.
- rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
}
virtuoso-base_package() {
@@ -62,6 +60,6 @@ virtuoso-base_package() {
${PKGDESTDIR}/usr/bin/${bin}-vt
done
# Remove static libs and libtool archives.
- rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
+ rm -f ${PKGDESTDIR}/usr/lib/*.la
}
}
From a9acd61bf2f14ded365d650dbcb7ad1ccf6bf806 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 38/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (61 preceding siblings ...)
2023-03-05 21:05 ` klarasm
@ 2023-03-06 19:40 ` paper42
2023-03-06 21:54 ` klarasm
` (41 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: paper42 @ 2023-03-06 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1126940271
Comment:
let's remove this variable and replace it with it's value in $distfiles
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR REVIEW] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (62 preceding siblings ...)
2023-03-06 19:40 ` [PR REVIEW] " paper42
@ 2023-03-06 21:54 ` klarasm
2023-03-08 18:49 ` [PR PATCH] [Updated] " klarasm
` (40 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-03-06 21:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#discussion_r1127074380
Comment:
Will do.
Some of the packages have new updates and no longer build or test cleanly so will have to fix that as well.
- apr-util: some cross-compilation issues new in 1.6.3
- virtuoso: test suite fails again in 7.2.9
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (63 preceding siblings ...)
2023-03-06 21:54 ` klarasm
@ 2023-03-08 18:49 ` klarasm
2023-03-08 19:29 ` klarasm
` (39 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-03-08 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4513 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [ ] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [ ] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 crossbuilds still failing
- [ ] virtuoso-7.2.9 (no PR yet)
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31045 bytes --]
From 495d99cee38b107a5c3e3b8e66032a294c0de807 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..e0b216187e7b 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 7f9c7fb10ed66b503749e4e9db4a70e2993bb354 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 e202b4fc883b8da1b39fdc7faab35fba9d140ef5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/38] evolution-data-server: revbump due to openldap update
---
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 9cb11111c0a8eceed128c5ea6f4b0590798fde9b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 ee27a0c838030ced4ec328510fb48ee953c2ba46 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 eeaa99ec25705db7c389bf62d0dd88382fbdcbb2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From ceb6b0b09571f6a0422e118253b144182701deb9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 3df046d884fb..0777e1b92e57 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 2814cdcb02df6dbcc5decf82a9ffcd7411000cda Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 097b74cb520b342cb87afe4e547ce6aea6a1abbb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 6e6b1bfc553fab8e9d771bfb93adf61411788893 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 24a645236d6c27b85daa5d7feec0af4141c7d12d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 beae08e0f430949ed48a09fbba45ffc9fdac27c4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 b6004d58a79c5f8cefad281c37cc7575eff13cb8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5c09d31787868bc46289ad8b6f4eabacf5f7c49f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 ed1a63c03d8b0030eaab441f8a186ddfd821490e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 bcd16682b6a0d969cc5426c0c27102bc99d58c8b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 ec484e1bb87efceee59e4cdb65edc76ba2702bf3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 84a792be5a74021cf52305fa53e22a2205aa4c78 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 82587f2274777c57b03fcaedc5d071bc1c53969f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 19/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 e606cfd5da9923649a36d135fceb71b5496c39de Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 20/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 991bb08abd5bec911030829f21b9bd4e30969fb9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 21/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From dc63e90b7e038f847dba168b523e29337419e2ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 22/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 6d830143dd78b650e6fc18b5cbcc7a3dc7f490e5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 23/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From f2d6f1b1dd51f2dabb63aad02639d63538c60479 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 24/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 41aadc4f7e44a113d2a97607bf30c314e86238f3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 25/38] php8.0: revbump due to openldap update
---
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 1832c402db73..be2dec51141e 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.28
-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 15fd0334d8ecef0b396aa75a6d2bd7644386ad4d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 26/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 1019105be246..0403f358ffbe 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.16
-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 ee513212d32c9937cb2bbbd639cf896d406d031b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 27/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 628beac1c409ce0512505d09958bfad1492ee766 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 28/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 86fb44074c2fbe1158469b892e7695d5dbd3686d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 29/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 7e6414edcdce613b299f8ec4a7741aa03a064a08 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 30/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 32349de7ed4b010c2e128d6ff5378b236d95cf18 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 31/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From d9ffdc3f441f1db00d3b25068a08cc6e83ab7bf3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 32/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 9eab0757a93f5aa364748d710cd201858bb84793 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 33/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 a3e42b833922b9dd0128e4363f597f83def030e1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 34/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 cab01c87070697a749baff54a91c4ac23115b58d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 35/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 624bce43aff77a89012b391037086412bbeb56a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 36/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 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 c24132c005c82cd62cf1d34ef8949bfa42b18ed6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 37/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 d568984f2c127fb8925dbeab09fe2392bfad4e3c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 38/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (64 preceding siblings ...)
2023-03-08 18:49 ` [PR PATCH] [Updated] " klarasm
@ 2023-03-08 19:29 ` klarasm
2023-04-01 11:28 ` klarasm
` (38 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-03-08 19:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4513 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [ ] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [ ] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 crossbuilds still failing
- [ ] virtuoso-7.2.9 (no PR yet)
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31031 bytes --]
From d0b7d05f209ef289b9a091fd03f8afb2ce5f842f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..e0b216187e7b 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 1a42eebef35d691d0f47df757cb990b2645d828e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 cd901ad24e2e8cb8d07e439b3ced907a0a250f38 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/38] evolution-data-server: revbump due to openldap update
---
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 1902ca1bb61c6a0db40c23dadec3d1ea63863b39 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 5e8ed75655bbf212462c68c463755e998e0c0fd9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 30f3099147a8724f6687fd1090e31c94fd8e3001 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 30089674ceca77a25bd68c8d81e68ebc77ba2b4a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 3df046d884fb..0777e1b92e57 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 0570b101713bf2e6ac755534a39693efbe12e98f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From a9dfe8776ab427575b2cf99840ea13e39de56483 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 075809d5152fdd61acf1089167f69e73b020afd1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 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 436656859e2484bed75ec475ee3781dcf79aaae8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 d6db482ff8efac5fcf8ce17504b2282981116e92 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 be18cf032962e86cfe1e3b8387cb187b8a97997b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From c1b43d0b9cbe03305e8bef2ce016e53fb9a6668e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 1b5c5ca350d77181afc0dcf19299191aeadef126 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 bb442b5394d86860a6e99830f1866c7b3f298096 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 2157eb00b2f97a85fc1a5c26f318a1ab1a44fcbc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From cdb6b7ab7f4b6f6786b4b1034a7746503265b6e5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 9fac1d13e0cb569b18e7981906d084fc55cc998f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 19/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 1449eb01687873a099bb5d7df5b82f4252bb5899 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 20/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 4ebe880edd8b72d264e18342fd8feecbe9b6419c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 21/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 67932b64f15f4b64fd9bd8713f424520964c5cd1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 22/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 af890c0e5d80c7cf69ae2a37951a6dbdc0d848c0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 23/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 5d96929d0fecab21635e038d4041287799de743e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 24/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 35658f70cccc5731c6916049351ad0f84e17d4ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 25/38] php8.0: revbump due to openldap update
---
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 1832c402db73..be2dec51141e 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.28
-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 d1ed4c3cb35c32753f5b3b32ddafbbdb73824b2d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 26/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 1019105be246..0403f358ffbe 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.16
-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 bbfb23b6bb91709653ab202c6b9c37e5c1a4ef2b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 27/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 c1e20b7df99097c7d36d60aac9d9ff9fe7cc5b7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 28/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 b3fce14cc6c07a64e00788a20b9494f02910bc4a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 29/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 13bdf43463a29c2c0ca8c16a7afff001d338b4ba Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 30/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 fbbd1bb0521afa7d87d644a2487670b74cd90b5a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 31/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 7e4c6cfc36d4671eb4ab34b122f556ac45235d84 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 32/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 9198b476f31a42d1340b26255900aa5dce1bfc38 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 33/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 460dfe35a580264133bd0c931691d4364780479a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 34/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 0d739395bcf4807c1ad224118b91e7f259d5c97b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 35/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 4ab521dfa3c930893ece1045e5425d1e51b10b30 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 36/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 5ceaeee181e557febd943516e2cf688a41da7f8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 37/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 1e899c6ee90c1c02226b056ee183f1ae654c29f5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 38/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (65 preceding siblings ...)
2023-03-08 19:29 ` klarasm
@ 2023-04-01 11:28 ` klarasm
2023-04-06 21:19 ` klarasm
` (37 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-04-01 11:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4482 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [ ] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31031 bytes --]
From ec3e0a5e558d1f7b917dd161225e3ce9cf960e03 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..cba118c94704 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 5cc6c97d3a104b2b46a6b47e6121ef43c11494ad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 d83dbbbc12fb14f415b63a3e600b7686e533377e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/38] evolution-data-server: revbump due to openldap update
---
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 bb0f78a7bb53c9f5d94f219f5ddf30bd00cc47a1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 8b44c92d62a5f627e94882eadf37fdd1a5d0b847 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 6d70470811a2c0062750d5732c4335cbaedbba14 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 22ce6f74b960ddb521bdecf6e385bdf1f58ab21b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 8e5d4259f37d33fa0aeb84f14c84e9da79305b43 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From a4702f3dd404ba64e0eef23998a1d1926d680603 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 597da48742fc2c0f164db379b210457dbc71b9a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 db1f7c7420170ad03505ad3233f4198a8a556964 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 a12bf0310d5d644c1c0988475e69913ff9d356c8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 75fa5426e358fa0789188186dd4fb14d482d179c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 2753c81a7462266c4a8bdc98f49ed159905de9d4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 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 533a3148cf4089944e5fb7ba9f0834cb5e69bb18 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 3dcbcdbd30f0eaf32c35050365073260162bfbb1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 37bd49c4b1e91afd02087d8671f7f1137e0816c8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 08605fd248cca2cea01f2b5211ee76acccc6f63d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 e0ccdd5a65e932d2c3dd9e75114be779d7fa843c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 19/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 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 e653b0540e06c1a6faa9270c2447674e0cb5764a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 20/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 5893e2690e0d28277fd1e373fa78979bacff5b77 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 21/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From e4b1c7d6973e8dd2f6d3ebc15218fd2789e4522b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 22/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 0ba910584f24d08f0f1412ffb0266a8a98c56cb0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 23/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 49106292ea33194fc8342047fcdfd8054aa41712 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 24/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 314ddbccb0cee9bd623d00133a7c72c2890499cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:17:09 +0100
Subject: [PATCH 25/38] php8.0: revbump due to openldap update
---
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 1832c402db73..be2dec51141e 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.28
-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 b7835871f598a29208861511ae10c9ea90d46190 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:19:16 +0100
Subject: [PATCH 26/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 8888ea07a961..c4bacceefb89 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.17
-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 7dd2457541f30ed2cc003489d10fd9cae6a73f52 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:20:09 +0100
Subject: [PATCH 27/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 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 9f94c94c1c0b108bdc57757189329c09ecc7778e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 28/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 c2189ba50e2aaf2076ef771f059a864f735be4d3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 29/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 e8ed78ed72f7e83772bc0a419febb21f8d275134 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 30/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 576ed899640eea61d28c98ef588dcae080999eb3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 31/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 2a7373278d4107d36bef2e8dfcbcb3798c38327b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 32/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 bdb66ea037f0f51fe418f2ff53c1173449b9425b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 33/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 b897caeb05711d8ffcd3f07014630ecde3ddd483 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 34/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 192b7cfe6bc0e1d5385dff1d15f7914090015131 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 35/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 994ee3d00c98bbb9a5d4d0c7f16cb492b6eb322f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 36/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From ac81edcbc4e059d63fe47528373b26ec310ae3cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 37/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 74f788442c44336b5244c94509d133bc35d773c4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 38/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (66 preceding siblings ...)
2023-04-01 11:28 ` klarasm
@ 2023-04-06 21:19 ` klarasm
2023-04-15 18:01 ` klarasm
` (36 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-04-06 21:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4482 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [ ] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31742 bytes --]
From e6f87838f44170299187abd37010eb996340773d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 45ab7fa8c512..fa28625e80dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -701,9 +701,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 4386aca994d2b60380e22eeda4f5274a340c70be Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 2c99eb16b83eb28b7cec99058d9d0c094fc2d1f9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 0e68c85cc7d9852b5b2326b0e2c590b6400716a0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 35c4f54a1e26f9d7aebf1e280937728cdda14e19 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 62fbe8b6b48ae20a382d6b583529461286c70981 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From b26d324d80d8b9b1dcb6b14f0902a5dab46c0544 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 b735640f09d5fbaa8f16fe1245a334f79fadd105 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 2f0614dcd420d17a95ac651cd2f58efa8c558b2e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 adf7f47e5d4e5eadd4ed7398763d6ea9788c57b4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 77903e3f099c965e552f777c2a5ea2095a2d04f0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 4c15290a2496044b897a09972b83f0a9ad7ceb37 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 95ffe5a103410652182011f30ede2e1d1fab4714 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 67b6438370ad736bda85b3228e9459879b8ca58c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index f271618e8976..684ff26067fb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 7892222d3eba301bc6899773c6aec38cf7ee85a8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 ec52d0f7218750353901f760be3f0d53df087944 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 5f93fe84119f9cdabf5dd2be82840ff4d93b355c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From e7b37bc7f6400c6a7dfd27f69da9c04407041b7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 2d0fda2c1214c015894b13db76fa7e9cce33e3fe Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 19/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6c4665eed6c9..496d0f76d0c2 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.1.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 7ed96afa8746b1f336812713acecb70132716f34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 20/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 a2ac8eb806a6b80ff5dae8af18595a15585e3796 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 21/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From fb0b5e032c6d0731850cbf0f93ff63479d425634 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 22/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 a24940c352245e4ad31f9571464adf6fa2e95766 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 23/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 879adf4ad302ab258c3a53ee638240277553e0b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 24/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 9aed6efcb19346d7c4aaffd86f3034ba7f38f7bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 25/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 3aabb3b9340d4dd63bd1e9f11a955db68d0962cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 26/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 3ccbcfddcdb8f2c8b9d18848bdc09b1c8d65ae37 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 27/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 5d000a664a7e324f3de4d5cc188035236c15d120 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 28/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 08962dbbad730d7197005e81f78233d51bb73ca0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 29/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 71454e753c8294206d5726a339fd83d16a51fe4e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 30/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 d16c39275d2a711a0b40498e91c4dab282b25503 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 31/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 da98211deebedd5e701c655bc37908fc0e2e4d6e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 32/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index cff7df055e78..c79afd817547 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"
From 7ba16634ca09c17369faf97d60e2a90e59046b78 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 33/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 4459f3594cd792c1809202612305e8d124836647 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 34/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 4ca18ab7511a313a59074e4a18152738d54cdfe7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 35/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 5ccb8541fd18c347f50f02f49eaea4e581fa3cd3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 36/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 997a242b9191..7cfdd3055cf3 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 2d67500e92fa27146f4250a90e12797347d8d80f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 37/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From c25d0be151c1aa667eabd81d56bb0d3d9382b3ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 38/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From a8d87216c4c31105b41f15d747c214b0ebb04d7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 39/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (67 preceding siblings ...)
2023-04-06 21:19 ` klarasm
@ 2023-04-15 18:01 ` klarasm
2023-04-25 7:05 ` klarasm
` (35 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-04-15 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4482 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31787 bytes --]
From 266e5b3a286e9f2b14fd2230ff3ea2af7848fcb5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index df30e9a925c0..f5deb9248f20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -701,9 +701,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 281fa05a849398527c6cb40f2a01d573b35630ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From c976ce3591523601f65450eb54ef9302fce2988e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 75220aa59290b8a3295dda85a1f6f46768a08f3a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 eae8e59e132e18f66e264f2d2b5b4691f725f07e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 40f07cd48079456f247eca2b46bc82da7aab1ba7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 1f3439ca63d03d34d9fd5a0431f71e08daa416cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 efd584cbb6727c0fa3303506f1ac9309088cd2cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 4a71dcdf6f8960c69a35962476c059d8b53a25df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 df8ef9add011bff7cedbf40f66c8c57b50b7a4cb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 12d68141849d898430f2312f29f63f077db5a94c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 cba30f4ddc89093b1c532c99a61e9dcf42878579 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 04f0e1cec79eaf919ccca15f2e235068de56265a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 22a8db4367f8bbdf82a6a25fc592b4301d5e0b53 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From fce9e0dee1cb2d850c54bf2e5f736034103fc6db Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 92283ca29d73cd96f6f82145b9bc0d0f7458b13b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 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 9890474906ef36506f212433e011a7752e7e3aad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From c4208851cdf362ca75b552ab6c6d6701230bfc91 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 54e26fc8e832b4412598e4608510ccc438386a46 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:41:31 +0100
Subject: [PATCH 19/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6c4665eed6c9..496d0f76d0c2 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.1.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From dbccbb3038249ebbb6de0034a68fdd406bd922bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 20/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 c84decaf227524cc4e5bacb182c39480435bc8ed Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 21/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 3efe30c26e1f6ce7433f3ea3d25700cb5d13af95 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 22/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 522c439138f173421b3b984c0a9e41a6e775ebcb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 23/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 9437945286e3e9c0eaf52ffb6433bce27ce798fc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 24/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 9f25643f58c51d7b33e27af2b8c75260525c61ef Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 25/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 1fbaea9e49cd08086f7648fd9c79cf9ebb80746c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 26/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 695712dc6e78666c0afa3e744ed65c1c0fa99ae9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 27/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 3866ee11be3a2868abc5d81ae3a1e66f3ef7cfb6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 28/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 80bc28c9e0f0a337ebe4bdf7ee2da0b10d93bc8e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 29/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 9e4cb7d4147c74c9ebc6913b8150464c36938294 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 30/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 697e2179bb489085a9053017419cb863c74b495f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 31/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 ce38fd52ffc0f08d324f66922d2af4c0512e9e69 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 32/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From d65fe48d1bbc0d04eb7e25ccdd98ecc31dc2b2f5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 33/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From b111d3eae8d041b300f264e6968691b0dbfe711e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 34/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 fec1cec0934e40318f8c223d71ff142f1e42a698 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 35/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 95ed6a9edb689f6247603ad6d6bba54629f6dbd8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 36/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 997a242b9191..7cfdd3055cf3 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 6707bad89c83aa5d277d5731ce706735e849b0c1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 37/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 6f6df63ffcd21ef586a991b189233abdf0c41080 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 38/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From eb50c943f269c067f376a709a99f3e57dee92130 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 39/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (68 preceding siblings ...)
2023-04-15 18:01 ` klarasm
@ 2023-04-25 7:05 ` klarasm
2023-05-03 15:05 ` Emru1
` (34 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-04-25 7:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4482 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31788 bytes --]
From a277553ada35f83309c74be16bd3df3c86c13ce0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7f91aa2dfccc..ad8aa20f19d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -701,9 +701,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 098234d51c9da404e51d76d57331e9a1b1591bcf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 2f4dcd9bf0a6aca0837f9e9b6704ae2efc9a816b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 07a7ef6e2a54df0dea5423eb5159590b77bdb8f3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 e7b4ee9a5e530f344df3bce1520dce4d70640f42 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 77391872828c95604fa7155875237f19b3531154 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 819386e1739c7947a502ac8eca7f7045ce5c98d1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 4d04ba0573f450fcc2454d82d8c45db25c7d7ad1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 2136176523d7a1c7f5e5d59c8bc6c733dcd4b869 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 5de2325d8170099c79c77d95f866525a1bd53b76 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 7920da0ecced5ad7f1eee01c5856a0699195c362 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 31e7bb40f559b067548ecb34bc5b1e85a5447ffa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 3d67cf6a5b492452f048508dac632d60545aef05 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 74f600df24edb77358a95498c6f8b20f985e799f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 41fa8b9401d9d42ab125691aba5370b1f14fb830 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 b0275176e41034edd9f0f3ee4fb2f71e6302eaf9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 2753f64c2e68656ad6b69492deb0c17c7858cfc8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 6a0a8a88713b7ea2c56ffcbde5e5d8a0eea7a0a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 8e5026181b3ffde62d2acc0d568265ad0068e952 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 db1a3fe6c0b528e1265ee3774535c10046e4d20f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 3b71a9ee2814f0580fdeb353a06e0d3ba86b58ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 e7c52c6ffb06a70f270d25c4ef2762a5ada17a6b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 7bb46ff4077b43b0a6eb407daa9574d72d4208c2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 d338ab9203e230c98da5e3a67c828d3f60ee669d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 73c3d6b4f938c8fff3b6f1a056ed09b67e5cd09f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 166a0443a86870c341fc04141ca167c5e28ab3b8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 eddc338b1f2d38297469d33f9452b31c43f4de4c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 1952338410cc97a26158f8bd6abe9cab8cfb6448 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 6dbe78619c791907ef23514c3b6268e3501d4bce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 323e9bdc63cd84b065a4ec9fc17570ef2723b0b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 4c2c33b1812abfcd71ead41fc93f75fceb8ca621 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 011ebc2b46fe96d354050f571b3b51d43a07d634 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 41e9dc6500a9a4a6536b3513d582d1fc2fd13b5e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 20f901381ffc6e768be36d499b408a87a2dcbc41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 2a213bbfbfa615005b0218bb91e9085f4ad72005 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 997a242b9191..7cfdd3055cf3 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From d1549f43efb67cf1d1674d8ce2a6fe8223963fa4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 92182b9f05cf37eb05c36fbac50da06bba3c1805 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From d25a7faf74adda344d46e666941fadd9fa6ac6ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 1c6fa50e00b8a1108abf7f060944f3bfa851daa8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 496d0f76d0c2..1833de5b609b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.1.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (69 preceding siblings ...)
2023-04-25 7:05 ` klarasm
@ 2023-05-03 15:05 ` Emru1
2023-05-03 16:08 ` klarasm
` (33 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: Emru1 @ 2023-05-03 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533207426
Comment:
How is it going? Can we expect it any time soon? It's quite massive with all those dependents
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (70 preceding siblings ...)
2023-05-03 15:05 ` Emru1
@ 2023-05-03 16:08 ` klarasm
2023-05-03 19:23 ` [PR PATCH] [Updated] " klarasm
` (32 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-03 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533318144
Comment:
The biggest holdup now is apr-util, a change in the libtool package broke cross-compilation for it and that was not fixed initially. As this PR revbumps apr-util cross-compilation of it would fail without the update (quite a few packages also depend on it).
The virtuoso update is not as critical (the test suite was already failing before).
Otherwise more testing would probably help. I'll rebase this again and rerun tests when I have time.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (71 preceding siblings ...)
2023-05-03 16:08 ` klarasm
@ 2023-05-03 19:23 ` klarasm
2023-05-03 19:28 ` klarasm
` (31 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-03 19:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4482 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31788 bytes --]
From 4ba448f0a677ee799c828971af221783f733d9b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8c47e79b8c43..f451bba462df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -702,9 +702,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..56b589c6d813 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -38,7 +38,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 d48836a6d4213512f48463ed423f86107b86123b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 2a45c6b0ca609088b85544dec5b2ea57d27ad57a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 3f9a3c81739199b43e7bf73805a3800353ee65a0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 cf8e7e18bca3386423d600961c7ed1e9a672d971 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 b78bc55cd726f6aa2c89343dd523ff52aad0d574 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 5ac53a509d18810cb46cf0a63772799d4fc68acc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 a2f72e0dc1be4487da87a53f8c0da536107144d1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From f4651c409c84109b437023fcb1586973eb9955a4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 674ea9d6882de377551d863a7d424f4c3f84aa4f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 05c330440c85b8a2532c4dd53644288be27e5695 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 7bb28c45f2d231a0b9edadf6516d050be72359cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 035ea37ef389ead0a67b5f077baa1cc4b3db2436 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From b0c254557a5cd104664bba901fab9cd26ff80711 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From ac1ebc5792ee73d3bc32112538a87e48978236a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 fed0c1a8112dbed9fa637fdffbd406fe6a990f78 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 49c6151889927f05e45fb032496af029f1d55170 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 24e5bdd4f3f13e8909c05a192d2ef4dc69d960e3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 7da13afb4d9a0c73be12bdb4b838412ac8d39552 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 81f22f6333c5113cba298497a11b78537dd05408 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 73acbffac0b59c6515bde5d23075a6babdd0a3b3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 75167bd19263e519aa5c6b3720e5a9aa40bc9565 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 2ca7f51378425456a0fac80f02c1c9303eb61757 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 7596b9ff94e75430735b6af3279f726bed7203aa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 873002c1271c95c048a228611d5863a7a64981a1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 84d846c78661ea532e10ab47cf1fb1568724d979 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 80994824961c286ca097c9005799bd0342aa0a26 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 4607dacb40e6f52d92d6fff22184e1d582c15409 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 27605e6f57e0d7dcadb3b6a37dadfa758a06e295 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 7773038484e0f3d7abcea732fc11a0a8d8089c60 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 135f20bab97d4b7388d6b053d0841baf4c8e516d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 2a7cb9c095be67405a1ce9fc82e5011a582be68a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From d2e8bbd3e0d578ee887b49531340d9273aa1ee66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 5fec62eb7d77dd942fbbb046bbccf8b389068369 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 145dcb06d2d24b7a28b1b8116904214516eeedde Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 2c164b2ffc2f9ff9bf1d6b30f921bb24470d1003 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 980835091bd1696fe0bbbbd6073ceaf79c8fe947 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From fbe23dd18b4066e19884e4abdcb8639f5fbfbfa8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 05d429537a4df10538191a985b334eeff383a0b9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 496d0f76d0c2..1833de5b609b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.1.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (72 preceding siblings ...)
2023-05-03 19:23 ` [PR PATCH] [Updated] " klarasm
@ 2023-05-03 19:28 ` klarasm
2023-05-05 17:19 ` klarasm
` (30 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-03 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533585853
Comment:
For local build testing (x86_64-glibc) , distfiles for apache are not available so it and packages that depend on it fail. Additionally one test of anjuta fails.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (73 preceding siblings ...)
2023-05-03 19:28 ` klarasm
@ 2023-05-05 17:19 ` klarasm
2023-05-05 17:37 ` klarasm
` (29 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-05 17:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533585853
Comment:
For local build testing (x86_64-glibc) , distfiles for apache are not available so it and packages that depend on it fail. Additionally one test of anjuta fails.
There also seems to be some cross-compilation issue. For example, the syncprov module is not detected properly on the crossbuilt version (tested x86_64-glibc host to x86_64-musl). The native version is ok.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (74 preceding siblings ...)
2023-05-05 17:19 ` klarasm
@ 2023-05-05 17:37 ` klarasm
2023-05-05 17:39 ` klarasm
` (28 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-05 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533585853
Comment:
For local build testing (x86_64-glibc) , distfiles for apache are not available so it and packages that depend on it fail. Additionally one test of anjuta fails.
There also seems to be a new some cross-compilation issue. For example, the syncprov module is not detected properly on the crossbuilt version (tested x86_64-glibc host to x86_64-musl). The native version is ok.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (75 preceding siblings ...)
2023-05-05 17:37 ` klarasm
@ 2023-05-05 17:39 ` klarasm
2023-05-09 8:20 ` klarasm
` (27 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-05 17:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533585853
Comment:
For local build testing (x86_64-glibc) , distfiles for apache are not available so it and packages that depend on it fail. Additionally one test of anjuta fails.
There also seems to be a new cross-compilation issue. For example, the syncprov module is not detected properly on the crossbuilt version (tested x86_64-glibc host to x86_64-musl). The native version is ok.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (76 preceding siblings ...)
2023-05-05 17:39 ` klarasm
@ 2023-05-09 8:20 ` klarasm
2023-05-09 8:44 ` klarasm
` (26 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-09 8:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1776 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533585853
Comment:
For local build testing (x86_64-glibc) , distfiles for apache are not available so it and packages that depend on it fail. Additionally one test of anjuta fails.
There also seems to be a new cross-compilation issue. For example, the syncprov module is not detected properly on the crossbuilt version (tested x86_64-glibc host to x86_64-musl). The native version is ok.
The crossbuilt version fails with:
```
2023-05-05T16:30:02.24463 local4.debug: May 5 16:30:02 slapd[728]: @(#) $OpenLDAP: slapd 2.6.4 (May 5 2023 16:13:43) $
2023-05-05T16:30:02.25438 local4.debug: May 5 16:30:02 slapd[728]: PROXIED attributeDescription "DC" inserted.
2023-05-05T16:30:02.25492 local4.debug: May 5 16:30:02 slapd[728]: lt_dlopenext failed: (syncprov) file not found
2023-05-05T16:30:02.25507 local4.debug: May 5 16:30:02 slapd[728]: olcModuleLoad: value #0: <olcModuleLoad> handler exited with 1!
2023-05-05T16:30:02.25518 local4.debug: May 5 16:30:02 slapd[728]: config error processing cn=module{0},cn=config: <olcModuleLoad> handler exited with 1
2023-05-05T16:30:02.25536 auth.debug: slapd[728]: DIGEST-MD5 common mech free
2023-05-05T16:30:02.25586 auth.debug: slapd[728]: DIGEST-MD5 common mech free
2023-05-05T16:30:02.25608 local4.debug: May 5 16:30:02 slapd[728]: slapd stopped.
2023-05-05T16:30:02.25623 local4.debug: May 5 16:30:02 slapd[728]: connections_destroy: nothing to destroy.
```
Looking at the function `lt_dlopenext`, libtool may be the issue this time as well as it was with apr-util. Will have to look closer though. I also tried crossbuilding openldap with syncprov built in which works as expected.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (77 preceding siblings ...)
2023-05-09 8:20 ` klarasm
@ 2023-05-09 8:44 ` klarasm
2023-05-09 12:59 ` [PR PATCH] [Updated] " klarasm
` (25 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-09 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1816 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1533585853
Comment:
For local build testing (x86_64-glibc) , distfiles for apache are not available so it and packages that depend on it fail. Additionally one test of anjuta fails.
There also seems to be a new cross-compilation issue. For example, the syncprov module is not detected properly on the crossbuilt version (tested x86_64-glibc host to x86_64-musl). The native version is ok.
The crossbuilt version fails with:
```
2023-05-05T16:30:02.24463 local4.debug: May 5 16:30:02 slapd[728]: @(#) $OpenLDAP: slapd 2.6.4 (May 5 2023 16:13:43) $
2023-05-05T16:30:02.25438 local4.debug: May 5 16:30:02 slapd[728]: PROXIED attributeDescription "DC" inserted.
2023-05-05T16:30:02.25492 local4.debug: May 5 16:30:02 slapd[728]: lt_dlopenext failed: (syncprov) file not found
2023-05-05T16:30:02.25507 local4.debug: May 5 16:30:02 slapd[728]: olcModuleLoad: value #0: <olcModuleLoad> handler exited with 1!
2023-05-05T16:30:02.25518 local4.debug: May 5 16:30:02 slapd[728]: config error processing cn=module{0},cn=config: <olcModuleLoad> handler exited with 1
2023-05-05T16:30:02.25536 auth.debug: slapd[728]: DIGEST-MD5 common mech free
2023-05-05T16:30:02.25586 auth.debug: slapd[728]: DIGEST-MD5 common mech free
2023-05-05T16:30:02.25608 local4.debug: May 5 16:30:02 slapd[728]: slapd stopped.
2023-05-05T16:30:02.25623 local4.debug: May 5 16:30:02 slapd[728]: connections_destroy: nothing to destroy.
```
Looking at the function `lt_dlopenext`, libtool may be the issue this time as well, though openldap seems to be using its own version of libtool. Will have to look closer though. I also tried crossbuilding openldap with syncprov built in which works as expected.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (78 preceding siblings ...)
2023-05-09 8:44 ` klarasm
@ 2023-05-09 12:59 ` klarasm
2023-05-09 13:31 ` klarasm
` (24 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-09 12:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
See latest comment.
<!--
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32239 bytes --]
From df6d6fccbbe06afb68431bd5081125c9f5d5b5b6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 89f7e53081f8..5f6c22d2d631 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -702,9 +702,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..694722fc78ce 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=mod --enable-meta=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From 50cf84d8d2024df95b8ab12deb9e6f6f5201a39b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 9d735dbe99aec0c203045c03248a5bd8d924f29c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 0e1dba1f6bdf2e663673543f6c1ae50bf3e7d6a1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 79f656027763d3ade792978f59afb5410ad0e929 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 20553b623a88a11f629a5812de2f5797d63ca911 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 4d8b2f57ef1be8998a5a81bfb478d19b73519dfa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 ead4750e4fc1f903597bd26b9cdd0314e38b3de5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 4b7e9e00685ac14ef345c33e23125a29f8b4a3b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 b3f167de956f77835ba4259bc23aef0504bae199 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 02d80c148dd8a52c92b1811c1917974641c9ffd9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 3cc0bb005a6d48d79ab482850395edbff146739b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 2153bcaaf77f62b54678caec756f6a4018914c27 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 0d113f768cd344766b2ed423c45a4807dd063f8d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 062532cc7a8418bab881f5a1afcdc6e6aea43082 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 ee8d81db9c3295841ed426cbad53f4e45161a2bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 07f57638807989c590c124146fd8e02f11f1a5ef Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 632eca4b885e4ac1cb80b84fb43a72c13a2f34d4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 da650516f18ef5e9721ea5e564760b8657d7fcdd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 184c2633404f8c525bff9ccc96291a73dfae2231 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From f6bf76a5535e6ba9e5024c7931a349a0ad7dc3fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 47ce5842364e603a44ae22e2433285d063798ac2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 6542b4c822765197f053af2e46964c30237003c3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 6a314aaeb2e1bb799ceecb833cbf5038fdb88008 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 6d84a3c561bf348860bc8de19b46dd033ef2ad71 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 b6b66e1642ae95e0fa294d7da3072a9490aa67b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 f18340f336c33a5a2008ee57db952f1a2361611f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 827bfcdd747dcc70d58d8f9c769cdca1e380e232 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 8a004fb23beabe6e78c78566cdf3a055a34b85bb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 2c71a290815e109d1df064095f665b8a2d744591 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 469d7a21cf27c817b2ba5d91fda2f7ed18b5417f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From f9f2b890455fbe4da20ea315b981c5370703db7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 5bbfde8bcf20ed3cfbd4a7734b6fa5d7d595d4ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 a060ec22ee3c814b4321e94436e632dd5c7cdcfb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 91c90a72593f4c6056dbe1d9cd0b94257962bd15 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From f004030e877088bf0eed8e4ac2d856ee71884959 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 1dc85f940a7589134c5ad3f29e988dd0fa2b2e5d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From b8bbe3d748906bc192587b08d7a7437748607aac Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From a6227463833fe50549d0d0bb15b8b844c11f8a6b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 496d0f76d0c2..1833de5b609b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.1.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (79 preceding siblings ...)
2023-05-09 12:59 ` [PR PATCH] [Updated] " klarasm
@ 2023-05-09 13:31 ` klarasm
2023-05-09 13:32 ` klarasm
` (23 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-09 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
See latest comment.
<!--
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32325 bytes --]
From 63dca08368a186ba555e2290106a973aaf1f2c84 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 89f7e53081f8..5f6c22d2d631 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -702,9 +702,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From 8eaddfd7884966d4d83cb5bba8a63e68e51777da Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From fc90dcc43e2afd6bc5c6ec1eb2f3d47576d9b98e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From ff2abd443666b4c1b1185f4a5b274ef3dfe975c9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 4cc59415aa95e42b4127b427e4a45683d7098ee1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 df2ee65d2dec038c4acece58fde128606fadd28f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From ff3ad9969f9e57524aaac3be772f363610785e0b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 7023db696e0a4332fdf92fa71347667d9072ab5b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 120d69278378412efcfa59616d6f16d5a45f77a0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 0002095acce87743de04aae7da1b5498d5f276ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 3e634fbc73127454ac4a90ade01a7689939638d8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 22e1f2c3cc7dbb551a2f299a4d60e333c245c74c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 b7f265f2b89da88c8aa083673f89d6a9fbfea38b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 28989a04163e09b625b8d6305fc0369da0dc7642 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From bbfa69e58b478d90de89fa6f98466685c89fe2df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 024aa468b2478ec60b4c3745f327865ee1631b55 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 4858897b3e652bf4f71ec379afa9d8c0ebb8f95c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From a1b3da3320e51ce14a64081ac958831cbf5028f0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 07e698c6e5035e695a1477e47da356d046424797 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 31220e7df5d8df703e170e1e461a56d2d320b731 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From a5ef6cb2ec46a840086362cf75bfd4b7adedbf6a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 6b4c7b0873912202664606714859cf6582d1cc6d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 779375b9691c466b3cb18eb716ea746c4cedf2fa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 dbb34914cf9e9164447dfb568fba8cfa0c7317f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 6afdd4417f59298e1916f106b90b46ef9c458d2d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 0bbfdc1eadeb824280c716d55a3a9159532038d3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 cf52730bd6d9bc9b024e93f8eb2fdd9bde85b8ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 4f41bebd001c287fa2c851d2d5a410028fcacd32 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 7c7b70556fcf87f403dd65e58a3234d1fe00013e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 3963e1dd9fb3fc30fb46b1bd7fa041e91998f456 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 369968c69e45da0f51fea862e380e38e1b1a572f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From f66bbcb8abcf53dc6e5a059f2a6f3b1763ace2a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From f898e78c1eca3987c011aa3f1bacf13851ee635a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 d259ccbb8d00fb68891322ad631b6f1e798b04e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From c0f2c5539e691fca7bc1cc9c789ee35f4e076a60 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 3f6767fb0b26abf07221957f3574b6762e4addda Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 29f8b23260b2da6175381aac4700233e05a46933 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From bf4e82bef2e18854c470aa3953b7226f3d39a3d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From bee71b4d44a83d099f7cd0879be58e06e5c6266f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 496d0f76d0c2..1833de5b609b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.1.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (80 preceding siblings ...)
2023-05-09 13:31 ` klarasm
@ 2023-05-09 13:32 ` klarasm
2023-05-12 18:49 ` [PR PATCH] [Updated] " klarasm
` (22 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-09 13:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1540134299
Comment:
Modules were broken while crossbuilding (x86_64-glibc to x86_64-musl at least) on the master branch as well. If anyone has any suggestion for how to make it work, feel free to comment.
Otherwise I'll build the overlays directly into slapd as that works.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (81 preceding siblings ...)
2023-05-09 13:32 ` klarasm
@ 2023-05-12 18:49 ` klarasm
2023-05-14 10:16 ` klarasm
` (21 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-12 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
See latest comment.
<!--
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32325 bytes --]
From d9e6f874a35e60af263c0a36b8e1694c50a774b9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7b09f9d234c9..eb69ff7c34f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -703,9 +703,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From cd27738233358ddfaa19e9a6c1944f30da122f70 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 9460c8ae8e4e90aacada1b49af4cd89fed9eb9af Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 301354a0e0ce0f10eb9244d6d87c24d75588849e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 e06877a57f3f52502d95b2ef7c5ce6804482972a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 fd843a4df414131eeb011854c4c5d5e9f99dea19 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 004d5c7373715e585b76097efcbb0571d4fbfa44 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 467d35b443107eeb638046b200b9d8167cd5ddd2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 5a27e6f46fa2692e97f7d75f460bfe6d41bade59 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 04bc56af19b89ac8f0f86b7a44f7048f55082a31 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 191de19bc11d950dc303a833f3d3aa1858bbe233 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 4837d3cf1c8af99c8803f58aa2a144c44469cfd4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 a7adf2885f673928640d2ed1fa975781c19b1c9e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From ecc231121cd7bddc7e532ab63f005854b8db8007 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 3580cdfe92e44f3dd8e764789b2345520dcc8ac4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 90a38794e22b6e1be566c22c9f9fd2c500f38e23 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From ce085622ceb5cfab69f44e169fe14968fc4bfd69 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 88de1adbbfabf7a62326d290da0a3e076e067ed4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 cb24fd701608f1823bd177fb52b74db9489779ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 eec283c1cc210fec1c31b9bfc7ad0975156bb1d7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index f99037514ae2..0153b4a8220f 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.69
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From c99bcdc8915e9a040e05f9751e17297803e1d925 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 8a04ce7cfec78fd7db37a46f81dad02e39767651 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 9a6151b30f021aaea393b46f9efb6cecbc5cc973 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 b42788201219328b85c7e61c9946b613d8fc264b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 8c6cadef17a2300229d0286630c3d68888f7d16e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 c17257a83bb1596eccb6a4431c4554f3fa1a7f8e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 cab5223f1ac81dcc89b17297e308022701407c46 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From b290ffa1bf5e10960910780372c56b5fd7b66d75 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 67dcda35fd86396e0b268eeea8226f03b4b4b016 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 222de132ead385b8d2f3688474b6d1e985cefa7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 ce686270920a976dd790b42ef4d58dd5f6de462e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From e740e3efb6b58e3683f9ef33901ee8eb1283ed3f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 41e285287f39b79ace50410d17a49c7547ce0cec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 ba9c16b6b5626a5081eaf5197a73cb8d1a2be5d4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From cab4d09ab57d9e824112e5dcb1ad6c087ff5b10c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 229e2bdb6a697606c7e3eed070ab56e1919e16d4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 96b209edd6c903c8d70e876f7d6300761626c170 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From ba8b4a5eb5ed4d69afa67adb5a47ff10102a5db8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 59131fea4dbea5a2111ed481622ccf334b9fb137 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (82 preceding siblings ...)
2023-05-12 18:49 ` [PR PATCH] [Updated] " klarasm
@ 2023-05-14 10:16 ` klarasm
2023-05-17 16:01 ` klarasm
` (20 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-14 10:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636
- [ ] virtuoso-7.2.9 #42666
[ci skip] again.
#### Local build testing
See latest comment.
<!--
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32325 bytes --]
From bc8f96b00ab791fc09a47c02396f6c41640026f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7b09f9d234c9..eb69ff7c34f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -703,9 +703,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From 913f33f58c6bccba80bfa5f25956e3bcd7d1f209 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From d65b7898e79c569e27b72e7d24d80fdc208964c1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 8e792b8ac4fe1c33597be43c59c8016ee71bcc66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 8c4c0e9fde817510b6adddd47b805c0acabb5b67 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 9fbda48ac4c2d5c31c53bb1402b9e091e66e59c3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 1d3f329dbae81c8626b9f8c3117255055a6e6fb1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 3ffe9b297ae38253effbe5ec87e122c6e48d13eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 130b35d85f5d3f20d4d18fbc16611307098cc67e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 72fad08b8571bd940893536737ead80f5b1fc756 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 d69e7596f3e45552b310a333905852b895947f72 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 ecfd45aa02a646e90ad4bdc9d4f7a63fe2b723a9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 51cdb89454e189abd30fbdb480a7e481869efa91 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 6fcd22462abf7f36f0f1b66ca484544790bf2db6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From cc4df308217c9a7d1bf8c4237ee9c97e3393112f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 a6d8e9709c520d6413af604371a659031b1b867b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 078b1dbe0bf3c6da94b07cde336b71f3f8baa7ee Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 17fdeafb99d6c4227f56a2b887a6f10dbc045175 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 21b545ba7d14d98a368cf633b78019f5de176bd6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 665b1d693ff57ce546740bcf10762bc9b00b63b5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 3b7158c1fbe4..03feb3d2c9ad 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.70
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 05fdf38ae150d74f3faddac0e3015f80cc6493ad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 df891ac9f51dada474f053ee90ea04cbc85e19b6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From cf9118b5f2827cf6ce867fab879b66df902988ee Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 48ffa1f304fd5d80196bac2f80ad5669fafc47a5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 fe3da2031a7dc61343419ffa4379f89e1da51b58 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 dc968c8d5e5a33b1914624d3451ab9d764970310 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 2768eb67d16758200a05f0de446157ca56f407a8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From c4bbc26fd96456c557cda934e3e6f0ffbc6a9bab Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 9f251599e3d10f9a236e3d7599d3c467e50b361f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 00053d0848b5a32208714efde3bd709689855093 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 4310e3ba95fd2cb7d68f5ebfc59c702e0b539fc8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 7bbf90ebe47d5bce1015de83d10461b5a3113b51 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From ec1ebc3f270cdf118258f17d4eb463a4b8f779b6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 3fc60affc5d0433f62f4c8d8b6369b2e566ba0a8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 28858e0d57efff2bfa91f46a802a760a420598a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 42effa8503734f88adb734346d25aa5d764b1887 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 97fce85cceb472a9bd4dd2e06dfb39a3f8d4f40e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 3308c42d75910a79d99cbd000ad2729ffcf13c73 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From f5ac76700e34b3686cf679522215474995d6ef7c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (83 preceding siblings ...)
2023-05-14 10:16 ` klarasm
@ 2023-05-17 16:01 ` klarasm
2023-05-30 14:04 ` klarasm
` (19 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-17 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4698 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
<!--
Packages that depend on libldap:
- [x] FreeRADIUS-3.0.26_1 (out of date, newest version is 3.2.1)
- [x] alpine-2.26_1
- [x] anjuta-3.34.0_4 (fix faulty detection of webkit2gtk)
- [x] apache-2.4.54_2 (out of date, newest version is 2.4.55)
- [x] apr-util-ldap-1.6.1_13 (update to 1.6.2)
- [x] audit-3.0.3_4 (out of date, newest version is 3.0.9)
- [x] autofs-5.1.8_2 (out of date, newest version is 5.1.9)
- [x] claws-mail-4.1.1_1
- [x] cyrus-sasl-2.1.27_9 (out of date, newest version is 2.1.28)
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] evolution-3.46.2_1
- [x] evolution-data-server-3.46.2_1
- [x] gnupg-2.3.8_1
- [x] gnupg1-1.4.23_1
- [x] kldap-22.08.2_1
- [x] ldapvi-1.7_11
- [x] libnfsidmap-2.5.4_2
- [x] libreoffice-common-7.4.3.2_1
- [x] lighttpd-1.4.68_1
- [x] log4cxx-0.10.0_4 (update to 1.0.0)
- [x] lua54-lualdap-1.2.5_3 (out of date, newest version is 1.3.0)
- [x] mit-krb5-libs-1.18.3_2 (update to 1.20.1)
- [x] monitoring-plugins-2.3.2_1 (out of date, newest version is 2.3.3)
- [x] nss-pam-ldapd-0.9.12_1
- [x] php8.0-ldap-8.0.25_1 (out of date, newest version is 8.0.27)
- [x] php8.1-ldap-8.1.12_1 (out of date, newest version in branch is 8.1.14. 8.2.1 is also available)
- [x] postfix-3.7.3_1
- [x] python3-ldap-3.2.0_5 (update to 3.4.3)
- [x] quota-4.09_1
- [x] samba-4.14.12_2 (out of date, newest version is 4.17.5)
- [x] seahorse-43.0_1
- [x] squid-5.7_1
- [x] sssd-2.4.0_5 (out of date, latest version is 2.8.2)
- [x] sylpheed-3.7.0_8
- [x] virtuoso-base-7.2.5.1_3 (update to 7.2.8)
- [x] x2goclient-4.1.2.2_2
-->
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [ ] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [ ] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
See latest comment.
<!--
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl). Build issues:
- audit-3.0.3_4 (out of date, newest version is 3.0.9) already failing on master branch
- dovecot-plugin-ldap-2.3.20_1 already failing on master branch
- dovecot-plugin-pigeonhole-ldap-0.5.20_1 test suite passes if dovecot is built without checks first
- evolution-3.46.2_1 tests are not found on master branch and thus passes without running them
- evolution-data-server-3.46.2_1 already failing on master branch
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv6l-musl (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- armv7l (x2go-client, virtuoso, sssd, squid, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
- i686 (apr-util seems to require x86_64 and complains that selected cpu does not support that. This makes other package that depend on apr-util fail as well: anjuta, apache, php, php8.0 and log4cxx. virtuoso, sssd, libreoffice, FreeRADIUS, squid and gnupg1 probably fails due to cross-compilation)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32325 bytes --]
From 4354ab3b597bf120faaa9e384499be909daf2147 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 512268d5030f..221158d8d80e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -703,9 +703,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From 5603405428147b6beb48231fd042609f47aa7102 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 77154ec900337f8a3a0ef4cabd581784a3a8f9ab Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From a1308ddcf7d1967ea7151e463f343749cb751285 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 946ce43dff056b7aeb086f310270eb712a7f9c0d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 028c09714c28d5cfbe18d9682f48714765377593 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 59cdd0ba129a2f62557d767735a846303ca7dc8f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 5f068b1baa54b247664ecdf8dff84c0c913f97e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From cb8c177d8e2a0ce9c1861a368afe6ba430f17903 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 af1ce00401e346a91471335334e8994d0d820f4d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 ae325d30f9e538231b789c0acb1326b60214d8ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 6f66591a5ec8d70351de18d9137cf29a8e875c03 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 8ea040b9135c9b4d31d977c2fafc9dd57ee4755b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 1b24fd0d468123922c78398e6c84893d3c09ec22 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 596fb86221582cbf6ad48ca44731e41fa6e3f607 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 3b5d79974374600a2d401eef70bb8ef3e6aecd50 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From b4895e341cc206102dcd7efafda017d609012636 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From f68972533a18133a135b0d2a18314fe51a5594a3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 f81521596b56761f73b02d5aceb03d67bb0ce531 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 841c52570e4220056d62d92e41742cf91f1ddab6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 3b7158c1fbe4..03feb3d2c9ad 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.70
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 351e1ba6d2ce4f6fa6035a3ec4c78802f441a0a1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 3fc6712ad25ea0664c9717bcade26dcc852b6c84 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From c097254190d58138a40e1fbf17470fae651e344f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 5fa0d13a5835a089856e88f40743e5ef452882c2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 eb2005e6bdb48394f754c1239f528ba534770f43 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 4abbb01bc1cdde8be581a6de59734b7e32b08bc1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 49e1c7a161d06116bc57b00098b4b5b00e1eda48 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 34259d3b298e76094fa1520e1924bb2e5ae77ef2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 528addc7ee420ac6fe69bcebe1ac247242f012f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 9d8df539ccd1ccd1d8f723d679a8a116fc06f64a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 54059479419121df44d155af7bb84aa6dd63d003 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 85072fdd4b860b67d981582ab9b38b162ebddb20 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From b8394811367c792a573c01b765dcfbd0df5d94cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 caad585ffc826734a16a55015aa5795b28bff1ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From f098eec9fb05e749496afbd1d9a4450dc4c14a41 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 05ceb581df2c52de4bd6a1dbc11b0e080fbbdfc7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 97d519d0377801c3f5761ff24c1af03c29333ed3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 31155d632875bc1602b3b8a6bbf987332232550e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 5b5e320cc24b5bd1ac44ef8ae98e1cedece1e503 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (84 preceding siblings ...)
2023-05-17 16:01 ` klarasm
@ 2023-05-30 14:04 ` klarasm
2023-05-30 14:33 ` klarasm
` (18 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-30 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [ ] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [ ] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-05-17, pulled in relevant PRs in testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32325 bytes --]
From 2eda9a844bdee1b98a451f29dda8920d96c1abbe Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f1e825819fb4..cc4ceb984a54 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -703,9 +703,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From da0eeaf9726c3c564b401850c47ce64a87ebaca3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 6893017d60142f81191855b1a3ec9c5118ae679a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 6240a3c20c4120a351aa175cb0f5ffa96c131600 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 be693377a1b986a92742a0f575f4724a0412b18b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 1e2fe5a3cffae4b808df2d88e3a1df7adba7e25c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 8fa325b3e070e4d0bdf4de1107bb73e42d510059 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 00766092498e9818a0860fd42c960c57be242ed3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 55136bcee4990241de10341c72203af7685aa1f0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 147deca2063efc39c173f1f7acc4f46c834142ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 1b2bb00f975fe04e086212b46afa8ef711c91516 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 a5fe52a71a1238901efd9e8e88dc650a2693c3fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 24d8213cc5594cc58445102c048d0194b5f70655 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5b30b1c726ec96be10afa68c1a6710f9f105ebc4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From f29c2103faf84d88e57a9b18e22c730828181065 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 720ae9c3067b7bdc82fca228d3d80411aa5f6bae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 3e71dc1d50bc9c0e6c1b8c910b818780a6ffb927 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 6c29f23d7a492e9eeb04007fe760a1eb33bc893a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 8d36709fdda8296dfe983b545aeae3533e4b1dec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 3a60ad863f4b583c819125264f8038bb4e204e7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f..310e0c9674ae 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From e792d0234383c00b1fe8107774f97b0df1c8aebd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 3f9ce930a044725d9f1d8ef5d5fa6aa46139be49 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From af563197f31c3792012403dcc57678ce97531130 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 08e61d1aa80d4462880d2cc70ef686e02a7d0c57 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 fc7d412b48debd073f439c1de1653d844ddc059c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 8cce18cb7112238384ad6e38232b76ea705b47eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 d6573124e9a880a71c291b2c05485c29be4689a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From b89b9af836134ca76ea4991368c37b89cdd38550 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 08ea62bf98e298d4f27e9fe93d26e711c97f7206 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 981d2adb580681f494f542e085a260b5943cfcbe Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 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 71980837f1934d496f463ffa90372d6892950c2f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From a78376fa2699191b9db3763d0a8ae1f677650d79 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From f2b87ca5c4740622b551a2373ea42f5060cc2519 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 7e41dfa653677dd4679adcf206bfbc4bc135af17 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From f9d99480a8bee7142e7f5feeae1ed08a9c2e672a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From d50a0ae3272ad7a0cc6c1de0979f1f6b410676a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 5a484653341796facb43ea229fb7208c5ae806ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From aa6235e5341195a5ee8f580fe440480d2460a173 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From f6c6724eaa42b8d40c3ebca44d22937ea285419f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (85 preceding siblings ...)
2023-05-30 14:04 ` klarasm
@ 2023-05-30 14:33 ` klarasm
2023-06-11 17:02 ` klarasm
` (17 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-05-30 14:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [ ] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [ ] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-05-17, pulled in relevant PRs in testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32881 bytes --]
From 2eda9a844bdee1b98a451f29dda8920d96c1abbe Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f1e825819fb4..cc4ceb984a54 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -703,9 +703,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From da0eeaf9726c3c564b401850c47ce64a87ebaca3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 6893017d60142f81191855b1a3ec9c5118ae679a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 6240a3c20c4120a351aa175cb0f5ffa96c131600 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 be693377a1b986a92742a0f575f4724a0412b18b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 1e2fe5a3cffae4b808df2d88e3a1df7adba7e25c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 8fa325b3e070e4d0bdf4de1107bb73e42d510059 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 00766092498e9818a0860fd42c960c57be242ed3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 55136bcee4990241de10341c72203af7685aa1f0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 147deca2063efc39c173f1f7acc4f46c834142ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 1b2bb00f975fe04e086212b46afa8ef711c91516 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 a5fe52a71a1238901efd9e8e88dc650a2693c3fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 24d8213cc5594cc58445102c048d0194b5f70655 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5b30b1c726ec96be10afa68c1a6710f9f105ebc4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From f29c2103faf84d88e57a9b18e22c730828181065 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 720ae9c3067b7bdc82fca228d3d80411aa5f6bae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a4b0b07501bc..d46a8db04933 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 3e71dc1d50bc9c0e6c1b8c910b818780a6ffb927 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 6c29f23d7a492e9eeb04007fe760a1eb33bc893a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 8d36709fdda8296dfe983b545aeae3533e4b1dec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 3a60ad863f4b583c819125264f8038bb4e204e7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f..310e0c9674ae 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From e792d0234383c00b1fe8107774f97b0df1c8aebd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 3f9ce930a044725d9f1d8ef5d5fa6aa46139be49 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From af563197f31c3792012403dcc57678ce97531130 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 08e61d1aa80d4462880d2cc70ef686e02a7d0c57 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 fc7d412b48debd073f439c1de1653d844ddc059c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 8cce18cb7112238384ad6e38232b76ea705b47eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 d6573124e9a880a71c291b2c05485c29be4689a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From b89b9af836134ca76ea4991368c37b89cdd38550 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 08ea62bf98e298d4f27e9fe93d26e711c97f7206 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 aa6e3a94fd34572b1cdf283a810d91e3489032f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
- also fix a linting issue
---
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 20c5b476a5f95b4a3a7cb2f0c945951e4fbc5a7e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From d158cbb1a7404563a100a54ce05c988f8318639e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 62df9515c460c3f373222214642c2c5937bea7ac Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 4d7ee7a782b597400c626f8c12a01204d1198087 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 85937119feae00b3dd8c062d043d894e25c33c02 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 3b34e7269ae6..94b990f36653 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.0
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 662290fce40b6ae657e6248f219b7d7e72558b74 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 08aaa5c95ec5754e0d8ac406c0709acb0c6632fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 972f33b4048366819144d276a04d7b27aabef429 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From b4e0aa77aa47818bd1f1e2189fa7dbc5e83044e2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (86 preceding siblings ...)
2023-05-30 14:33 ` klarasm
@ 2023-06-11 17:02 ` klarasm
2023-06-19 20:22 ` klarasm
` (16 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-06-11 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [ ] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [ ] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-05-17, pulled in relevant PRs in testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32881 bytes --]
From 365fb224a6b34ba55624da7257bd48ab8fad0a63 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 005700403d0d..452296fc87b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -703,9 +703,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From ea450cd538c4811098c12df76bdacec9cfdbadcc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 4293b685090356936152a1d6ca2e5d5fd61c0cd8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From fe99f7f168755e056647a24128e10d3d149dec35 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 8d9758066adf96e39724dc86dbdffcb9f3b84577 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 a4d7e4a08ada4e1578b0089ee74158f9d8cfe590 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From df4f43bb75c7649332088587f94574569b6a1e7e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 2fefaf87d242e916a026ccf415e5dd75d9f1755f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 3779a4092f864933294220bf796e8657c1e137e9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 268a7984264ddb23cae8d1169c7b4d384e2c7578 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 1cabb7921c35eb8cbd387b6e482c500e3b321464 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 2a64927fe5d6975fe48813b453a8dc9dfa7389f5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 6586952cefc72866fd328d5306fe2d2358844f5b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From a978194a399c89912904a84ccab7a14c93021c6a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From a8fc7aef1cc36cf2003154a81068b7fdbaa1bea9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 46a57006c5ac18a6f16cd7060b917fa9439c8301 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c..836965e3524d 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 81f46cf575abe7285f11c0db57d8301662cbee34 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From edb17a2e10bfbb0ab5e4d7e2afb7a7cb78ffa324 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 cbaa0f4e37c5eae5afa6912ff31bd1bf8446617e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 affda7b1d5cee2ad6ff3bfc1e763609f42271ed8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f..310e0c9674ae 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 3526eb6b63c413c378a106a7be0bf8fa98a8922c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 1872cb0693c2757f2920717d65e727e19788b2b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 1c392253dc3bc8459b3c000504830f0edaeb044c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 2a1425e90710713b7be01c83b282e19ad5c63b81 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 a19a250fff201a4aeafb920e80d48a8e4c750ade Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 446235abc377f2e26bc661d8f8463f61c3539652 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 ef9db0ec15385d426269162c9eff76856c4333b9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From fca65d5feb25fda1b79c51c32da44fbc5b2e2b7d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 eed3e19d0080409f8c9740d5b9fa538bfc411fca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 3f46c8ee2019146e726126cf0245c0a6d4bb2c61 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
- also fix a linting issue
---
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 f7f9fdbb44a7883d77ad7cbc398de336203d4578 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 3c464ca00d09c47f16f3d2b08250aa071edbea70 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From e0c0d07b1425e5dad307f4a3812971e96fefe654 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 d30cc01d7fd6975883c7c21ec307175edbbd9f28 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 5a0a54ee7b01070adc787fae6d696c340222fdf9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 1a5fb172288c..fb603162173f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 2927f85fc7a80498faba13e0ae21dcbc6c76c8cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 1ee3c7725ad33f026a9e59aa5da5b15b80e77c16 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index c4bacceefb89..1d46497b797c 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.17
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From b9d875da862b699f1035289272b4fb1988c8187e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 956403ea22f4..423b5b79cd78 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.4
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 00e2ced0b691d4163f2e0c8fa33d3af951073872 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (87 preceding siblings ...)
2023-06-11 17:02 ` klarasm
@ 2023-06-19 20:22 ` klarasm
2023-06-25 21:05 ` klarasm
` (15 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-06-19 20:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [ ] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [ ] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-05-17, pulled in relevant PRs in testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32881 bytes --]
From 4cf552101cf1a5166bda21393e4b82d7620b7242 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 17 +++++++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c293ac460c08..b9032d4e3c31 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..84eb21a9b3de 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
From 65e36e18ca9b958e0271ad85defe1a8c89765236 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 8001f05722167be743cbf1fb51bb5d671d6c96cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From dc2a61139a241da48e9134338d661d756d71b7c7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 dd23edb7d128f6c3ddf0fbc137aa789fcea8beff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 f5edc47dbd284526287d6593fe89be03e614e32b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 302feed4113d3c863a0463a4dab331a648554732 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 9917695ca10f9e45501219f1a639e7cb378b28dd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..a661bf71d5c1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.54
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 4268b8d928f92625bcc012dbae12af4c0a899ad0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 86b9b99066ca1af7596edd826552f3e999c8da07 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 d2a345d9f6dd230cebbe7ff06d70abf378d95628 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 8d951f2ea421d0143c0900f7304f5cdefdde5432 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 d910ff827b027400630ba3462b57fc46ba1cf55a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From b415ba618f1b74dae6090ce1a5607d320e8d88da Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From e03902939f16590c2a080947a5844b9a3b6d2522 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 20e628bfead459ceef91621e2862ff9f0e264b2a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c..836965e3524d 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 89312f1fb94193bc22169fafcc81d72dfded2d12 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From eb08ab0a765291be4b3446ee0ac54c4174384327 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 fde13e7289ca1fcb821dc40cb755ea9f2b7d18f2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 c2aaa1bf63ef5044d23bba68de49568ab7735eaf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f..310e0c9674ae 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From a576f7266b15c023dbc2edb6076f7f7acaaadb49 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 41e8535565a17015268c8b58d4661979b481d085 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From 9a6a08dd90b64190f3ffda0f53cd21a29324106b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 2ee35f3490aabcf82d792cb216f7b22f62031817 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 c038abdb2b489aa8573a1cd9d5b112c0e3b8d9d6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 9b1408ffe7e7efb2b59b68c23462f9260974dfd3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 98fe2f194630c253f7f2cdf7c0cad541d302ad97 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From a1d5eb2c02526dc3ebe0b91d046e73da82d4ae67 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 e5b80f4eb4cb6ab4e887ae9860171dcede006848 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 2252bd94d18281be70eb5d453aae5a85dc65064d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
- also fix a linting issue
---
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 addb8fe2512397785663c841aafeef0b85dbd6da Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 6d2bf08e9345c0f23ed724ab1a331371910297d6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 5304262c5d447907168debeab2bddc42db2a7a6f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 6b12fc5388f542534d2283d3017a449e575bfc38 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 960485ced0aed1971a511d9a00a25423ad7f94c0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 1a5fb172288c..fb603162173f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 0de3584047062a97127e81b896a59b8e2aadfaba Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 7a3f7106be41a49e383ab1ad53fc6c29ea2a7ec0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 90be03c44a5d..d41eb4784b48 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.19
-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 63d8732452375f602ca3b892bee2a3aced7e5f43 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index c73b5f8c010c..05275b9bfb1c 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.6
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 8d76462cf86fc76f608694a28ce2bc51a66be309 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (88 preceding siblings ...)
2023-06-19 20:22 ` klarasm
@ 2023-06-25 21:05 ` klarasm
2023-07-12 15:58 ` klarasm
` (14 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-06-25 21:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-05-17, pulled in relevant PRs in testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32887 bytes --]
From 0ad6b23c0997272fbce3b19dea51da57c24d07bc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/39] openldap: update to 2.6.4
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1cc1b6815e7f..f9d52e77eb05 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..fbc91353f511 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.4
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 8a1841353b1eb7d5492a64d19a40b5ac11141fd3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/39] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From fa982ba17833832239a306c817a8bf5d4facb1f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:19:33 +0100
Subject: [PATCH 03/39] evolution-data-server: revbump due to openldap update
---
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 652f8911aef0..dc161e0aa313 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.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 9cecce2e8a0d9758d954af112760a9758b24fd10 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 04/39] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 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 2e88af542532fedcbd3d5260a983c23a093dcf3a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 05/39] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 71d6f36775493b975f2f6612d884b5f46595af0b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 06/39] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From a0ba6aec50629205ceca4931e460a2b365f41de6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 07/39] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 0e06575f62beff9cc64db0bcfa806e01228c0137 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 08/39] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aa..5c8cc6b43554 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 7efc7da5a28f2f627694416b03483b9e5504490c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 09/39] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 7da20779ecb9ba0055b57f1d9711e4a8c0726e7b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 10/39] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 516c8db7600730731d962709b919034d295aa2d2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 11/39] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 543ad4b43064982defd536e19739525862e29834 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 12/39] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 439baed8234f7d4d85fd013a3728aeddda9e2a07 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 13/39] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From d0244480826b40651cae1d83ea8d61ced4a777ad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 14/39] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 14448bf4f0e83abd9b28d6164fe408e9829321ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 15/39] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 f586b6a61cc259fd44c950a5b06135c0f2246a6c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 16/39] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c..836965e3524d 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 49b3c9566356648554619227cd7be929ba1ca980 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 17/39] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 17c6e22edc9f98a6292189fd37745b33df109745 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 18/39] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 cc7379f4170c1749f7e56b6be01faf6a6bfe6b8b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 19/39] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 446ab8d6ea4f66d094a7dbe34c83b8f4ebd2e425 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 20/39] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f..310e0c9674ae 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 5a3492ca80c502aa6bb8e734ac67264c41bb4e0b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 21/39] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 b7de0323d8ac7fef32fefd86052e2b406a38ba04 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 22/39] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From a56dc33154acfb87cae638afee31e4bb1fe01b39 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 23/39] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 12455ebd9a3ca75a3931f4b690b27e7ed602b033 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 24/39] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 19610a10f52597cac85e90736371a15e4155d23d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 25/39] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 33dbba389741a204d7ea2f3365b1a9791c9fb0a1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 26/39] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 74b385eaae21a4fd29c2e2f7c645ea152cc83fc6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 27/39] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 6c87c2274bf1ee1b851b6115391a68132385b179 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 28/39] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 a75223ba6dcc9fc5aaa6fb89dfb36e1935688f19 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 29/39] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 70206995c076c88ccfacc154340bb040170845f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 30/39] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df..7ee867bda0db 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 1e865e9bd11eefd2ab2a60bc10414591569c794e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 31/39] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 157358e4af0446ed9b65a58f9a430b570f141420 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 32/39] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 08b69094202fca5d2981170e91ce8e597544f6bb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 33/39] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 d4abf1eb480791da8603793a0028d85ea70f6d80 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 34/39] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 110a989a7b465573d3766f342bad77a6b9b797a6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:15:59 +0200
Subject: [PATCH 35/39] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 1a5fb172288c..fb603162173f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From ef725ccc26d001cc05cbe145ecb1f286e7159c0b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:28 +0200
Subject: [PATCH 36/39] php8.0: revbump due to openldap update
---
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 be2dec51141e..520bc839f11c 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.28
-revision=2
+revision=3
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 40550ebd938b2fcabb763f03d6a0f0cb44def7b6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:16:58 +0200
Subject: [PATCH 37/39] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 90be03c44a5d..d41eb4784b48 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.19
-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 3d7535363261401d7bd66a3aa5fde9e48fc2b213 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 6 Apr 2023 23:17:57 +0200
Subject: [PATCH 38/39] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index c73b5f8c010c..05275b9bfb1c 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.6
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From f9c73af71f6a2ff6c0ae5b1f18754a91dc728b88 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 23 Apr 2023 18:11:06 +0200
Subject: [PATCH 39/39] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..bf5d7af39190 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (89 preceding siblings ...)
2023-06-25 21:05 ` klarasm
@ 2023-07-12 15:58 ` klarasm
2023-07-12 16:54 ` [PR PATCH] [Updated] " klarasm
` (13 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-07-12 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1632803786
Comment:
2.6.5 has been released. Will redo build/check testing for dependents.
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.4
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (90 preceding siblings ...)
2023-07-12 15:58 ` klarasm
@ 2023-07-12 16:54 ` klarasm
2023-07-21 16:55 ` [PR PATCH] [Updated] openldap: update to 2.6.5 klarasm
` (12 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-07-12 16:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.4
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-05-17, pulled in relevant PRs in testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32168 bytes --]
From c03dd7e30ef82a97833f4f849e578cbb163c1f57 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.5
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4b2122d1b199..ad122ff1278d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -705,9 +705,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3..4fa2253b1825 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e..09f5b47756c6 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.5
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=2e27a8d4f4c2af8fe840b573271c20aa163e24987f9765214644290f5beb38d9
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 19b1332af2966ea7f0d7df8097b14d4f8573a224 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb1178..f9e745e93e11 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From a53c166f9d77fd1c1c9f66d233dc9c99adac9bb3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08f..d18025c9de2b 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 539e8f8d838857c25c2d339182ec502ffc046c8d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 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 80958fc6802cd9839f4cb01357f9080e087e970d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..9789e303fc8a 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From c380402d6f4ff309c589b944d476f691c6576739 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee9197..8a43a3267395 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 76ac495bc813648dc17b1ba67d9fbf05cf43e997 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aa..5c8cc6b43554 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 16c7de074da7d21d0f0961e0c04ea95278b42525 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 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 93f7c4ca165837e07f94f2c98f94879a38345762 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46f..f48c92ccf91b 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 4801d0b21589431cc4d85c1ca09f15e14ece39e6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 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 cdb4befc802fe628a3b32fced860661fe420ae58 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8..697788e5c266 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=2
+revision=3
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 8163f39b9722a5d4d104e2eab1c7b090129a83fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f78..8ad37ccf8fda 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 73c1f07b17b0346777ecc62568805da8231b859e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b306b79e349d..9c9c92b38e49 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.0
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From a4c5c53e7d127c797206e10b5405598fac58781d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index 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 37955392b16e128c09252887d8981f7b387ea095 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c..836965e3524d 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From c850a1cc276342db3788076dd2669cf1f897601a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e8..88401b722197 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 656a8995547c5aa16712c68b8486bc6b835b67e7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 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 f23477f76685d891c20892672cd40135765bf93b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 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 6575f2faed24fca7a6dbacad246a640c12c8425a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f..310e0c9674ae 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 4fe25c2f26ac31273fdae21f937d859ae5cb2b05 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 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 d5aed59b623ea15d74f5122136709e99b52919d2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 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"
From d636f11a3ad80f5b6375acf878e5a68c5ec827db Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 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 085ec53851aa482107fb465b7150e49caf0e5e64 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 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 a3b95c0b6d68da3cafd1cf832456dd6e1208f02d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 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 aa4df41eef0de7744fa47f0514b50dd4b83c6be1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 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 9250b40bc820d9e358cc6c9d7a3f65d4f003886d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 4986c89039a765a3adf33a13f78fc1c7029bea9e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 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 6ce642ba2b47058bb663d0662a2e47b40e15da7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 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 74b5d23a4e1af0e107d8750135ad3a0e71640b0a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df..7ee867bda0db 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From d85e46228e2e4cbbb62f7bd585ce4380b1e049d4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4..c035192e6f52 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 23933fb54f38d1559f1b02c2968a44fab7fc241c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797..f0b153c55944 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From efc897201ee9ced2118c5576b86ecf93d083ee16 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 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 76746c26b137b9c10246c730c49c7a6af01344db Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e099..b0bc21dd7641 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 2d2abd4afb78a83dcf8f3c6e9c67f65b11592a02 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f..ef8d4e52fad2 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 49d9009bf037f9844a532147d80e77d719b3f007 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update
---
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 520bc839f11c..e6fa49926eaa 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.28
-revision=3
+revision=4
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 13d81d242462056b95aef6c1fc7410d1f21b039f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index d41eb4784b48..7b507928a281 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.19
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From acb769670421d3a06d635b578576df92250cb9fa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 05275b9bfb1c..aab81c4fa1d7 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.6
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 493aa88cf462a1a06444abcad08ff3a4d76d72ba Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index bf5d7af39190..93cf33e455d2 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.5
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (91 preceding siblings ...)
2023-07-12 16:54 ` [PR PATCH] [Updated] " klarasm
@ 2023-07-21 16:55 ` klarasm
2023-07-29 22:58 ` klarasm
` (11 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-07-21 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.5
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-07-13, relevant PRs pulled in for testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32248 bytes --]
From f828e45e38341d576024c9b329f7f1bd2f018dc2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.5
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dc2e91141d95c..93654df3a8874 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -705,9 +705,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..09f5b47756c67 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.5
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=2e27a8d4f4c2af8fe840b573271c20aa163e24987f9765214644290f5beb38d9
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 17636a950c78aecfa94b840192399e6a26330ac3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb11780..f9e745e93e11a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 5aac71bf226520cc64644d85b414218ed248c476 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 38454cf6895a9b3c9716116a12df63b3d1ddb0fd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index ee2059a373b46..5b2d6fcb74f34 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 46c0c327fdf632e536283d38a09e472f95b490c0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515cc..9789e303fc8af 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 4839a139fa8b7e28370ca57386c66c8014309354 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 037c1fc5e26be37f3edc10a474e30d8e1566774b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..5c8cc6b43554d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 4547b6cd5d8736d5d0506dce77361fc765650e9d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From f73d9de9c7815a56a810c8eb7fc984634b08e741 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From d9cf87c76859d9458712cd24ccefa521b509ff15 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From d327b196b583697d20ddc8b81d7d4bd9db96ea3c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8d..697788e5c2662 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=2
+revision=3
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 bfd72af99b4eadbefda42cacb1164a5402dcecf6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 79018373d71b867bae4850c6b8bb53f7475355df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 93b688ddb199e196d71e16e20b0bca468e9d571e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 6aa20e3493958b3056c043e76541d2324c957b42 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 0d284e47b36ffdc6696981efea2647754993f063 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e83..88401b722197a 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 486d5c0bff7d265ab14c3167a5e0bcd0beffa4be Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From dcc91760517eb8deb8c4b8175c52d8d18400a3cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From ff138f69be162696db38eafbc1dc3479aa5d381b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f5..310e0c9674ae7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From d8fecd2a70a781a775cd1f8e1f52f5bbcc13c969 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 921d472d808d37fb87674f443b9ade604afb7e7a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 9fec5562a9cc3..20fbd13a50203 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"
From 2a663a1392539c8759bd18535932d164b4ebdc04 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 05aeed1316e13e50e98014daf3dac375c78f0610 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 5fda6d61e9200e59d30ac6b06d7bd61ccd4596c0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 279b97e4ec54bd5753eb5443b6feb0f95d11cfdf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 49b9eb9d7b916..2238d1c7df529 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 110e816cd70865798a9a302000904c7ee74c4976 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 11c821fdf826d..4ba13475b3330 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 0d13805e412bd37296f6c1f421ea7f691903dbf0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 7fbf25276fbc5..25aa753e6d4db 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 b09f3387bf15eb7c588b66f23186297b38e1f37c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From bb4530a218d88a8c1f8d555b7ba39b1030fe7adf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df3..7ee867bda0db9 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 5187be9c5c468b6901b8f30a3f6b350b6716461a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 2af9ab281845279c190b3c49d0359135f6833005 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 01f5284aadf828c51e23dc7bf3314f52ba8f63cb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a8..ee50b73c6ed03 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 2991b6a084a3595306de13c945ff3f09d9812b54 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 36a7de46e0991..b0bc21dd76417 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.20.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
makedepends="e2fsprogs-devel libldap-devel"
From 8dbf67dd350b129c6bd972aa8177a847e5702c64 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f3..ef8d4e52fad2b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From aee56d625c2d3a4ff017ce747a7c69173313f3ad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update
---
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 c8c0045252290..96652cfb52ad8 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.29
-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 583ea7477a5b0720d9ec4ef358aa2719a6c0223d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..6e371545bef70 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=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 d2646c9b8572aca7d606d4f7d90cc2d7b0a12976 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..3706daecb8659 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 65b45518960bb7d5a919a4cec30d128c530e11ad Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index bf5d7af39190a..93cf33e455d2e 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.5
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (92 preceding siblings ...)
2023-07-21 16:55 ` [PR PATCH] [Updated] openldap: update to 2.6.5 klarasm
@ 2023-07-29 22:58 ` klarasm
2023-08-04 16:24 ` klarasm
` (10 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-07-29 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.5
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-07-13, relevant PRs pulled in for testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32258 bytes --]
From 29e64a787ef7d38d6dbc8245b5e648a52db84105 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.5
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c71817b11b51f..554f382a6c9c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -706,9 +706,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..09f5b47756c67 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.5
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=2e27a8d4f4c2af8fe840b573271c20aa163e24987f9765214644290f5beb38d9
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 2afd9e3e61dfce7e6f9f39da2176a5e6d86a9547 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb11780..f9e745e93e11a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From f57beaee33f0a2a99882f9a6c781d23958175846 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From d055f466fd62bc194c712b90feb96971f5204c9d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 13d2ef286e22c..19af6a6066df8 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 98e52d8bbf2d54ffe0748fc8460a8ab8c7078617 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515cc..9789e303fc8af 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 20dcf67082eefddda4e1c362f8aff597585eeeae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 3c61181710c106b78244a273c81944d260bc0e22 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..5c8cc6b43554d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 51e355a6a8e6f152e6037682253a00e6c1ef27c0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From b7961ce56915cafdb8d0f2baba306a51efbfed58 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From f4191a667966a9ea5891fcdb4a08832f576a1588 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From ee295780c41dc2ad5de21fe9aebb6805b2b0a768 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8d..697788e5c2662 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=2
+revision=3
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 2fcc80d71dc33743c40e5bd8c962bdc5dd42bef5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 86031ba4faf001e210dac62568128817537d2a3d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 2b8a16eb898cc81ad25829c99dc5017a795088eb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 620cbacee676504356be1482ba2a0cd58d1f1666 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From e1adece50420269701fe1b4f4bef4f4b3354353f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e83..88401b722197a 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From ce751a54ace8aab31c3cda050e27b677791d4e6e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 8dc3f3fd912f0726d32d78433fe32ab18f56d22e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From ca4d1514c11adef85503d9fe67fd6cc329de25d8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f5..310e0c9674ae7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 79d0abda8de961d01ba07a5ac67f5186df8ade74 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 33c66f7d8c03e8a7bc4a271bcdf0802853e8190e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 9fec5562a9cc3..20fbd13a50203 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"
From 1d226f282f98f4d77f5d7e780678461c4f25cc77 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 15f561ca3b2e683a19e679ebf37ff9a1296ca003 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 63e36cd436de5eaa33ac7c7fd5d9d3356f907c93 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From b5e611b79c1542f208ec5228c91735de39050fd2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index ca758380e900d..7bbe58e719c0f 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 bde165fddaa39ca2499798ccab6f681ca901173f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 11c821fdf826d..4ba13475b3330 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 7c256fa716dd759eb271baf09d0241be43b9da03 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 7fbf25276fbc5..25aa753e6d4db 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 fa5286a110a5734b20e73bcb55dcb599f94fd4cc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From b3c25ac22707e33cb6d7582900c2f4ecdfd9e99d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df3..7ee867bda0db9 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 5b1302d6b7811961daee01592d0a6add11d956ae Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From f5fb408033dc4e2c990d31407d52a55d6a9a4acf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 6f5bdf07b226eee15b4db56b00e6e616bd3c44fc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..55f6ea38850fb 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 83555b249dea80e47f62d0a7c4ab28f43c64dd64 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 683c7e8d32a03..0d181cdf62c06 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.1
-revision=1
+revision=2
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From 7ce7d9b73f88d9e87fa16238b72f9c67b6fcf6d9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f3..ef8d4e52fad2b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 49499dc7de2d268117f71bb667b6e6501a5e8985 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update
---
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 c8c0045252290..96652cfb52ad8 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.29
-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 ff181850a73ef6ea05415d773c84ff046ec21206 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..6e371545bef70 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=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 888b5e6f8d81e911b6e40b561c5e433c68dc6d8b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..3706daecb8659 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 4b070ad3cbd6e86f0d782a98e35c0b93827f3ca0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 35c83414acaf1..be8ed0d574618 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.5
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (93 preceding siblings ...)
2023-07-29 22:58 ` klarasm
@ 2023-08-04 16:24 ` klarasm
2023-08-08 22:59 ` [PR PATCH] [Updated] openldap: update to 2.6.6 klarasm
` (9 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-08-04 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.5
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-07-13, relevant PRs pulled in for testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32258 bytes --]
From 02279bd8c439fc88153ee1293f81d3657b596f2d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9f4553e6ccc2b..7c4150c148750 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -706,9 +706,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..d10daef834a75 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.6
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From f297629266127b868b2b8e22e5babf34e73450de Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb11780..f9e745e93e11a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 173911f9133535af350a4c07df5614f8022ad494 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From b0c333f52018d8c20a46d8eb895d59b1b7c4c880 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 13d2ef286e22c..19af6a6066df8 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 50de1d158ebf87c51503ecfbaeb7e683e7378d13 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515cc..9789e303fc8af 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 069976aaa833b25dfa62cbc26ed4efbd8d804781 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From fada6cec42390d826b4cb307c11d5a76f17908e6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..5c8cc6b43554d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 649019be45184dd4ad83f60c2520cb2afa761eb2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From 07673e30167ed2800e8389b25458b430743f0063 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From 674bac3ced22e00902c85a94a3c98cc94d80423e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From fb4d7c06f87f4dd6a97f232ec6aa56385308db9a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8d..697788e5c2662 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=2
+revision=3
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 b69bca74ef122da13290002629fae4d320679e3c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From daf1c7b7d7eacaa26454e51d5a52d7caea8469b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 307c72dc3ec0caa57a210829a388fb1690bc9b2f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 47109b7df604853e8c300fd3446b62bffb01e044 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 97032727d5416031d897510c015da1a74236bc5f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e83..88401b722197a 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 2c5d20054268c90fbc2642b0c366bb88a488a511 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 85157ae8251f3ddfa314557006bfa8623dba5ba8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From 7073a818298f4ade34e68610decbec3a49a871b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f5..310e0c9674ae7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 21d6c750b05196dbb88ec53531db3ddbe3c0e793 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 03bf2f763ccca464c41a73dc567c87a9f7e1a8f8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 9fec5562a9cc3..20fbd13a50203 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"
From 454ccd33c71d9abd6d0bb537dc69a6a8f34787ca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From cae308adb3e68bbce9887a1fece8086b61fe6e85 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From b474998ff2e900084c5645766e45f2aedb075afc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 26f600029e3e33d67397bc32d32b9821acb7e57d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index ca758380e900d..7bbe58e719c0f 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 1630ce9dd348672d918d39a225b5d7fed0ad743c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 11c821fdf826d..4ba13475b3330 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 665e1fab9fe1f3fc8d0bfcdc84fd495f9262a943 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 7fbf25276fbc5..25aa753e6d4db 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 e91c8916a70766a9f03fa98531ae57e5aa984c14 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From ed587132aeccba4c66fe10b53e83c0a181894b5b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df3..7ee867bda0db9 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From f9f1d467b0561244b4367cb22f5d306f773a3fa6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 0536f447c09fd08447216a8bdfbc3370714518a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 5f62791e7801b7c2950e794c41df35fc8151d42d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..55f6ea38850fb 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 7dc1435f3521ff29ff9ec48163ec16974b1d38f3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 683c7e8d32a03..0d181cdf62c06 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.1
-revision=1
+revision=2
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From 0919babb11d8c1482b40306244381a749add9e22 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f3..ef8d4e52fad2b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From c36bdc6d7dd8e377c57dfa7f84c6e53a34975a83 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update
---
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 c8c0045252290..96652cfb52ad8 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.29
-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 58752c2b4bd243c15259cdf7f15bea47b6cb943d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..6e371545bef70 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=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 171c5c961da9ad168de1db6c8cbd18fbc4034f69 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..3706daecb8659 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From f64508c60f95a374a01dc222d346579f7d57deec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 35c83414acaf1..be8ed0d574618 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.3.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (94 preceding siblings ...)
2023-08-04 16:24 ` klarasm
@ 2023-08-08 22:59 ` klarasm
2023-08-22 21:20 ` klarasm
` (8 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-08-08 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [ ] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-07-13, relevant PRs pulled in for testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32293 bytes --]
From 85b7d8bfad654ea23604f6aa8c0dc6e56aa53093 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3c3defa53d1b2..bd1483d5e6703 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -706,9 +706,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..d10daef834a75 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.6
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 9633e9da4dbf77f5e6e26dfbf65bceb784918b54 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb11780..f9e745e93e11a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From 00759260ecfad636104181cff23ea8f7b2874e0c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 1e64f410a4dabfeb2a8714912c640837f628cd4b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 13d2ef286e22c..19af6a6066df8 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 8af3bf489c929bf34fc3f998775c2d530bb43090 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515cc..9789e303fc8af 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 4475be83420786af5b352d68b36a8e8e1d05babf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 38a47c4ee6c188eca362554dc65405287f170cc8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..5c8cc6b43554d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 252e118bcc8393f1dba7683c2a51502129c03605 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From 99c294d1bf5cbe86e590f23e88e50cc62aa59307 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From 3c41515e5d8e6d3ca113af1318a22cb209d71cca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From bd977b82d9fe1c4231769cb8caa2e0971aa751b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8d..697788e5c2662 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=2
+revision=3
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 dbe8e47f676bd84d6f849118915df4e80571a5e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 7cf493d67ac2d1df5f1c27cf72976de2359cf9b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From aec6c68b7f1442c60c277df641997ed9e98cac89 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 4a14e0c18d8e6f725b0e03163f3b9c70c69671df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From d9694cab15d52e8cad3525c5d2eea770c5ab3b1f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e83..88401b722197a 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From e66a35920d96dc11685cf097bec8072a3488c4f8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 991e4f84c121411dbdfada98e15f5d3c6f44b929 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From 59dc31edf6aeb006c72d835ab1fc272982aba15f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f5..310e0c9674ae7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 1d7ea31d906579174fc8d3e19635e2a35cedb6f4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From eeed3679b1ba021951f211f12d640173719b6717 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 9fec5562a9cc3..20fbd13a50203 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"
From a3027712c99afa63f95daecb7d9384bc15dfc724 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 786eaea34507b6c742da8fd3665845b838891c36 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 227a8cf79839c81449099b60648412178ed34ff3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 98e8e8e0e81207f7493b1354f4f4c164af03e74e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index ca758380e900d..7bbe58e719c0f 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 44ebbbcce98f4f81683b24f5755696b48fc36eef Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 11c821fdf826d..4ba13475b3330 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 2c5128e9d7a892d71da682a6f436e881116ccdfc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 7fbf25276fbc5..25aa753e6d4db 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 406c1120ab4c10b7de8f438b631bebc2e1bf3a7e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From d9503a2086ff27089775c49eaf485db0a2a2cf3c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df3..7ee867bda0db9 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From e944c315b73b6c58fec1c169b9d7af1a8fca35dc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 1e6bf96974c1637fff2e71d2bb90d8595dc19f2f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 7e14868424eba562b9545a8dbd93f3ff53fb9784 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..55f6ea38850fb 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 5454a1cf9457c3772d0631f25f90c63efb3fa04f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 683c7e8d32a03..0d181cdf62c06 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.1
-revision=1
+revision=2
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From fc33972838ba3506cdd173385ae0deef27f73fa0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f3..ef8d4e52fad2b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 8bd115c6e4a6718f7a12504cfba2799a4fbb2dcd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update
---
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 c8c0045252290..96652cfb52ad8 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.29
-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 08efa6cbb53c5125fcc9f73e6a808b6d497a4b6d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..6e371545bef70 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=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 d7744782503090a889f54ad1c50f0aa3126e93cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..3706daecb8659 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From e0bef8978946dc4bff81e1fc836de36e812ed208 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index a5ade73cc1969..520308cbc58f7 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.5.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (95 preceding siblings ...)
2023-08-08 22:59 ` [PR PATCH] [Updated] openldap: update to 2.6.6 klarasm
@ 2023-08-22 21:20 ` klarasm
2023-08-22 21:26 ` klarasm
` (7 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-08-22 21:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-07-13, relevant PRs pulled in for testing)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 32325 bytes --]
From d272440d819ff7801ed6827257e66ade05afe2de Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/38] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 19 +++++++++++++------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f1ca9ce4870d1..407d7e7f49bff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -706,9 +706,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 85fe79d77d1e1..d10daef834a75 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.6
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
@@ -8,21 +8,21 @@ configure_args="--prefix=/usr
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 001de4c304ca85eb040f9baf12bb9b6ae1d5f840 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 00:25:36 +0100
Subject: [PATCH 02/38] cyrus-sasl: revbump due to openldap update
---
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 3ee25aeb11780..f9e745e93e11a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -2,7 +2,7 @@
# keep in sync with libsasl
pkgname=cyrus-sasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
From a5dad5959f501140ecf2079268345e595255aa2e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 03/38] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From a73370c9a39645f247b47a427a4f4f140afb8e2b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:13:25 +0100
Subject: [PATCH 04/38] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 13d2ef286e22c..19af6a6066df8 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 66e2d1ec2de93e5c4826b1870c314be3939793cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 05/38] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515cc..9789e303fc8af 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"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 515c8e14d007e4619f2cda2cc45b8bd1c921deb4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 06/38] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 4ede44831fd36eda52246f6570b203f60c26e1c8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:19:45 +0100
Subject: [PATCH 07/38] apache: revbump due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 72c09ee934aac..5c8cc6b43554d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-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 794a70e10c9508a48bd03c9c3f02eca5598d20e2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 08/38] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From db813336e72fd42199b1ffd99b744e2266009cc6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 09/38] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From 3ed8461a18d084681790160c3fc5c111f513ace9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 10/38] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From 8863e78e405c76c4b46541db204bd90a61996b2e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:31:16 +0100
Subject: [PATCH 11/38] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 787b29b6eab8d..697788e5c2662 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=2
+revision=3
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 0dc003bf8db97c432397ed37fffecb4a27c91ee6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 12/38] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 207a280bf5bb3776eef0e13b4532f1a4fa34ea60 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 13/38] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 8d01c75c80bff5aac0023242b0b6df7002c9a4ab Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 14/38] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From b7dbca0a41a9c86c647d6848a934af8c8802eca9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 15/38] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From c0da7dfdc17e747bc153b7f61d688329653000b9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 16/38] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 1dda3c2ae6e83..88401b722197a 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-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 250356997031f3972c8e6541cd4cbfd83fb52e10 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 17/38] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 509741dab3ec1aef05b0733827d09c1ef237331f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 18/38] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From fce487f9882187c028bd254879aa4a1a54a597ab Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:51:24 +0100
Subject: [PATCH 19/38] lighttp: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 04e11bd2209f5..310e0c9674ae7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 7480061c1d7beb17124d7927bf2c18a5580be3fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 20/38] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 042e572c71a69ebc14b4e4ef0b18f389effcccaa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:56:22 +0100
Subject: [PATCH 21/38] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 9fec5562a9cc3..20fbd13a50203 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"
From 5ad2b5f84a6aee44f7e47220d1d5b47bbd716959 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 22/38] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From f09d7d27ce882a17407a9a669ff5d5d6b56b8e13 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 23/38] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 474af5296cd42c73ed89ee57536daf1fa8386b8b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 24/38] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 0a17911965155ef747aea999a8e62d6d8cacb4f3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:38:35 +0100
Subject: [PATCH 25/38] squid: revbump due to openldap update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index ca758380e900d..7bbe58e719c0f 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 3b16feb5f46072b9d7c819c7805c569240335246 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:39:30 +0100
Subject: [PATCH 26/38] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 11c821fdf826d..4ba13475b3330 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=1
+revision=2
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From d9645631d381865873ca3d6e578fcb406d5c50ed Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:41:30 +0100
Subject: [PATCH 27/38] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 7fbf25276fbc5..25aa753e6d4db 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 71c3541e3b56f92051f3e8c813b00cd66735c420 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 28/38] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From 0f8f59e9505120c924a23cff21291a5e5b9076e2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:50:42 +0100
Subject: [PATCH 29/38] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 263ce542d8df3..7ee867bda0db9 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=1
+revision=2
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From c2448d1244125146e9e4823e948e518a431f10e8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 30/38] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 3b9c66a0b53db31e6236a28f038ff2bb83d2a25a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 31/38] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 28b14d0b7d82899eceb32cfbc55a5ee371c97ecd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:57:15 +0100
Subject: [PATCH 32/38] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 496fb7d692fcc..56804533e1dd3 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
From c19a1322b42be3296327ee3010055332c18cf343 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:59:05 +0100
Subject: [PATCH 33/38] mit-krb5: revbump due to openldap update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a6fc8e395243a..a1b85efd468c9 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.2
-revision=1
+revision=2
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From 7f7f6694f3491ea92a39cc5740059db3e6c120a2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:48:44 +0200
Subject: [PATCH 34/38] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index fb603162173f3..ef8d4e52fad2b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From c96ccc34ca73d0bbcdd5b6c30460b8150801a3ea Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:10 +0200
Subject: [PATCH 35/38] php8.0: revbump due to openldap update
---
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 c8c0045252290..96652cfb52ad8 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.29
-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 1091dff6429ef6be966c535781325f3099716191 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:38 +0200
Subject: [PATCH 36/38] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..6e371545bef70 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=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 27264223d2a55ff3b891fbd7ebbfd4744d3c0118 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:49:59 +0200
Subject: [PATCH 37/38] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..3706daecb8659 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 46d115fff133a590ae0686b1307f6421d2dcebd1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 38/38] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index a5ade73cc1969..520308cbc58f7 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.5.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (96 preceding siblings ...)
2023-08-22 21:20 ` klarasm
@ 2023-08-22 21:26 ` klarasm
2023-08-28 12:26 ` [PR PATCH] [Updated] " klarasm
` (6 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-08-22 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1688953994
Comment:
Now that apr-util is updated there should probably be nothing major blocking this PR. I'll redo build testing though I don't think much will change (very few changes from 2.6.5 to 2.6.6).
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (97 preceding siblings ...)
2023-08-22 21:26 ` klarasm
@ 2023-08-28 12:26 ` klarasm
2023-08-30 17:15 ` klarasm
` (5 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-08-28 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4091 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-08-23)
##### I built this PR locally for my native architecture, (x86_64-glibc):
- Build failures:
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
##### I built this PR locally for my native architecture, (x86_64-musl):
- Build failures:
- sssd (does not support musl)
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- nss-pam-ldapd (musl does not support nsswitch)
##### Crossbuilds
- aarch64-musl, build failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv7l, build failures:
- alpine (already failing on master branch)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv6l-musl, build-failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
<!--
(old builds from 2023-07-13)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31348 bytes --]
From 0cf02cb94cc30e0bba133e346700fd0dab976d52 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/37] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 21 ++++++++++++++-------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 82107af453333..b5ca5599725f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -706,9 +706,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 2118b54421006..d10daef834a75 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,28 +1,28 @@
# Template file for 'openldap'
pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
--libexecdir=/usr/libexec
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From 33ee7139e9a6a2fa1833e0ad0772275990320d00 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 02/37] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 7e2129261dfdbadc91b50db7e5f17d08f50d7940 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 03/37] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 0a73307c23650..c383fedbc9e4f 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -13,7 +13,7 @@ hostmakedepends="hunspell"
makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
+license="Apache-2.0, BSD-4-Clause"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From 5f8d4a709a3d3d03ff0a42a7b3b1a8b166996e6c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 04/37] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From e318fb3408c7a851a40e652696dbbfa5658a2f8c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 05/37] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From 52e77b69eb9c889f9d0d87ec1a41a992eb34c356 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 06/37] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From 316499576374a4c1deb6869ac944a83f7a54c046 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 07/37] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From 6e0ebc9d4eaec4a2b5e420e2433555c6cff5932e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 08/37] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 2b6182769f42e79d13ed9eba3a297d60e02d430e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 09/37] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 39ed72c6d91e0c5a8942befbe6282f84556f6525 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 10/37] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 86d1fb101ddfa6db088893fbec19f47a3d70166a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 11/37] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 50dfc24eed8af4af5fac559080bf145824f1a910 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 12/37] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 89275388ff4b0..88401b722197a 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -4,12 +4,12 @@ version=1.7
revision=12
build_style=gnu-configure
configure_args="--with-sha"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
hostmakedepends="pkg-config"
makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
-license="GPL-2"
+short_desc="Interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 90649ee3f0b5fb85f1a07e09e8b8ff1b6ed9804f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 13/37] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 210e5f5bd0ebd91f582a970842d5996fae4d83f1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 14/37] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From 61c64f795d5de8c80e938de3acbae9e1dcba8be1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 15/37] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From ca3df077e66348d85c394c74b358fe29a9a2e444 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 16/37] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 0365ac0caa1b20371f6e9e19d817508e141e5806 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 17/37] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 9f0adcbdcc609fb07e3831257fd9f8b4a6c03438 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 18/37] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 8d31510079aaea1371fed18df475db5b49ef6e27 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 19/37] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From 787d17eeb678f22bcb7f9de54715edec9f762685 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 20/37] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 0fbc36c8a7915c8e9b349068dce1745e3cecab2c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 21/37] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From f80b73c4ce2a9981bee728087ab3bac74366c919 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 22/37] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index a5ade73cc1969..520308cbc58f7 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.5.5.2
-revision=2
+revision=3
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
From 794555c685d8d6dbe766a4edd2ab135cc2c560b0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:25 +0200
Subject: [PATCH 23/37] cyrus-sasl: revbump due to openldap update
---
srcpkgs/libsasl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 79afba2f332dd..76d1811f128af 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -2,7 +2,7 @@
# keep in sync with cyrus-sasl
pkgname=libsasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
From a046d77f01b67e5795c03b2800e08c5fe370d51d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:52 +0200
Subject: [PATCH 24/37] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 19af6a6066df8..90a4c662bc994 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-revision=2
+revision=3
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
From dbf2d11db51e4385b4fc5e75ea32d9e767aee34a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:12 +0200
Subject: [PATCH 25/37] apache: revbumpe due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 5c8cc6b43554d..ad9b3e23a722c 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 1c9db7078759875ab658eebf35b75c6f3ee2cd6e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:50 +0200
Subject: [PATCH 26/37] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 697788e5c2662..c859f0846a959 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 22b3b3813094f477cf43b2cc4782106f0bc4b869 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:15:56 +0200
Subject: [PATCH 27/37] lighttpd: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 310e0c9674ae7..07875c1099eca 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=2
+revision=3
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From b382d8c51fd175565e6fa981b9ec18642939dc31 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:16:30 +0200
Subject: [PATCH 28/37] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 20fbd13a50203..1d917e5eabafc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
version=2.3.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"
From 16c790565cb497a8de33af9c37ecd69dab8d715f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:03 +0200
Subject: [PATCH 29/37] squid: revbump due to openldap:update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 7bbe58e719c0f..51059a075c3b8 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
From 1fe76b87b491c2f003a8a7f6d4a15b52a8f84cbc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:26 +0200
Subject: [PATCH 30/37] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 4ba13475b3330..a8fcc51d14b24 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=2
+revision=3
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From b0ab3eb5be2ba1befc9ce50221a6ccbcbf420e2d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:48 +0200
Subject: [PATCH 31/37] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 25aa753e6d4db..a2ee05c6f3517 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
From d2f8cbea55b592c8db704c9eb099ce51c8167a47 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:18:16 +0200
Subject: [PATCH 32/37] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7ee867bda0db9..ca05654788844 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 808e8e3fb7eabe6c2a775616115c77d51d6e45bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:19:50 +0200
Subject: [PATCH 33/37] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 56804533e1dd3..ca4f6bbe24951 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
From 631887ce36458bb1138a814a9320e796e01ada64 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:15 +0200
Subject: [PATCH 34/37] mit-krb5: revbump due to openldap-update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a1b85efd468c9..1d7f004a53986 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.2
-revision=2
+revision=3
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From de24a6e84cbaaeb1586e5565b8f781697aba1231 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:36 +0200
Subject: [PATCH 35/37] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ef8d4e52fad2b..c8abbe9791f5b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=3
+revision=4
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From b0ae571bed9d04c0de25cb95a56e145f0dfe87df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:06 +0200
Subject: [PATCH 36/37] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 6e371545bef70..9e4cbfef1d4b9 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 0ffd44a31bda2dd28fffb47a22992de659fce348 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:27 +0200
Subject: [PATCH 37/37] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 3706daecb8659..add04b4d3d562 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (98 preceding siblings ...)
2023-08-28 12:26 ` [PR PATCH] [Updated] " klarasm
@ 2023-08-30 17:15 ` klarasm
2023-09-09 12:14 ` klarasm
` (4 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-08-30 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4091 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-08-23)
##### I built this PR locally for my native architecture, (x86_64-glibc):
- Build failures:
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
##### I built this PR locally for my native architecture, (x86_64-musl):
- Build failures:
- sssd (does not support musl)
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- nss-pam-ldapd (musl does not support nsswitch)
##### Crossbuilds
- aarch64-musl, build failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv7l, build failures:
- alpine (already failing on master branch)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv6l-musl, build-failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
<!--
(old builds from 2023-07-13)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31348 bytes --]
From bf152b367d785fd37ef2cd7f404e967eccaad638 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/37] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 21 ++++++++++++++-------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 616785bdb4778..3d0e26c99a8fd 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 2118b54421006..d10daef834a75 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,28 +1,28 @@
# Template file for 'openldap'
pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
--libexecdir=/usr/libexec
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From ad12b7a5e9084c5b26d311b23219967cbc850b05 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 02/37] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 395c7f5d5ddeaac9a5ab76d1915f118279cbcdd7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 03/37] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 0a73307c23650..c383fedbc9e4f 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -13,7 +13,7 @@ hostmakedepends="hunspell"
makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
+license="Apache-2.0, BSD-4-Clause"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From fbc954c2344e8eb027bcd2b8e47337895481ebde Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 04/37] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 6c9b2ba81f70c02af66e090cf787e346c933c0cc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 05/37] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From 016e1ce2d0187366c0bcb34b2af9731aa3a0ffa9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 06/37] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From 1ad885e8a44b0726ccf0a371f207c4d4b4253cc2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 07/37] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From e8b05a429ec8fde702f923167423c41144beed04 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 08/37] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 87fc37076d52fa890a44045e5e6394fbc9121d73 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 09/37] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 84c97a3309840db9728e4183e52fe1ae74853033 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 10/37] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 358f37ffbaa61118138fc3ece3fb787ade7e4a36 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 11/37] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 8539a5e54acb2145e7c5faf4bf9d2724c073a41f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 12/37] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 89275388ff4b0..88401b722197a 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -4,12 +4,12 @@ version=1.7
revision=12
build_style=gnu-configure
configure_args="--with-sha"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
hostmakedepends="pkg-config"
makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
-license="GPL-2"
+short_desc="Interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From c632098e16596f54e8dcdc6dab48288ca63376ed Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 13/37] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From b7ac3de607e10e6bb3d3d2c6f7ab4cdcf79b062f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 14/37] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From c3b63cee5b3a0bef2114af7bb64c49eba19db376 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 15/37] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 7e50f442b0a3d62ca4e37266a8d99885aec2c1bc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 16/37] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 3e65c86d7cedca4d83bfffe136693c7387614bcb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 17/37] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From df01bb4e553530b490d298a505c13244073266f0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 18/37] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 44863a71effbb2d57a99cf4dc1a0b65f39e2d942 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 19/37] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From ff345c135061b2033ae78a6b12bff9f556acd0b8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 20/37] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 2e89e529be8919d6aa7f7729a432747b819b54c8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 21/37] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 9f81b3924519943d6733d4e2b5bb2da226dcba1a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 22/37] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6dbe8c8730943..6672dd787a0a9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.6.0.3
-revision=1
+revision=2
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
From e48faafcf0f3d2e2d1c06f5cba0427bd1bd54d87 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:25 +0200
Subject: [PATCH 23/37] cyrus-sasl: revbump due to openldap update
---
srcpkgs/libsasl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 79afba2f332dd..76d1811f128af 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -2,7 +2,7 @@
# keep in sync with cyrus-sasl
pkgname=libsasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
From 6e71663e40c08817b1f739db4a4b6af544673cd4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:52 +0200
Subject: [PATCH 24/37] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 19af6a6066df8..90a4c662bc994 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-revision=2
+revision=3
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
From 20ec33a46600fa1fd42022728b50c07271fbe996 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:12 +0200
Subject: [PATCH 25/37] apache: revbumpe due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 5c8cc6b43554d..ad9b3e23a722c 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 776137ad505daa1682496e90c8fcffb960905ee0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:50 +0200
Subject: [PATCH 26/37] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 697788e5c2662..c859f0846a959 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From bcf27d53c4bd453c445cffe2ee36937413d8d72b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:15:56 +0200
Subject: [PATCH 27/37] lighttpd: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 310e0c9674ae7..07875c1099eca 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=2
+revision=3
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From ffa5de21ae02cfed6acc44d394a9c9e06e27d135 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:16:30 +0200
Subject: [PATCH 28/37] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 20fbd13a50203..1d917e5eabafc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
version=2.3.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"
From dda9e3025c7a6fdc846a2b9929f1669ef141dc7a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:03 +0200
Subject: [PATCH 29/37] squid: revbump due to openldap:update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 7bbe58e719c0f..51059a075c3b8 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
From 9219b669196348fdb915b54ff5a3d91721d159ce Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:26 +0200
Subject: [PATCH 30/37] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 4ba13475b3330..a8fcc51d14b24 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=2
+revision=3
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 37440e3d60b2faf434c8040fef363e2fbccb6d66 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:48 +0200
Subject: [PATCH 31/37] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 25aa753e6d4db..a2ee05c6f3517 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
From de62488f0cfe846bc87423a2e3ae68a39e78acc7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:18:16 +0200
Subject: [PATCH 32/37] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7ee867bda0db9..ca05654788844 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 93d70e8279a8c2d2ba762792452f79c6cad4dfa0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:19:50 +0200
Subject: [PATCH 33/37] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 56804533e1dd3..ca4f6bbe24951 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
From 0ac128d57f5e0f2f7bffab9aef2c68acbf79d000 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:15 +0200
Subject: [PATCH 34/37] mit-krb5: revbump due to openldap-update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a1b85efd468c9..1d7f004a53986 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.2
-revision=2
+revision=3
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From d35775862c9f907af36a38d92b93e076a3345eda Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:36 +0200
Subject: [PATCH 35/37] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ef8d4e52fad2b..c8abbe9791f5b 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.1
-revision=3
+revision=4
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 7efdda336b3630e14bdca21fd19d65ee76f689cc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:06 +0200
Subject: [PATCH 36/37] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 6e371545bef70..9e4cbfef1d4b9 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From ecf5b827a5bcd06bf3ba738eff1a5055e7fa0ed2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:27 +0200
Subject: [PATCH 37/37] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 3706daecb8659..add04b4d3d562 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (99 preceding siblings ...)
2023-08-30 17:15 ` klarasm
@ 2023-09-09 12:14 ` klarasm
2023-09-14 12:24 ` klarasm
` (3 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-09-09 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4091 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-08-23)
##### I built this PR locally for my native architecture, (x86_64-glibc):
- Build failures:
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
##### I built this PR locally for my native architecture, (x86_64-musl):
- Build failures:
- sssd (does not support musl)
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- nss-pam-ldapd (musl does not support nsswitch)
##### Crossbuilds
- aarch64-musl, build failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv7l, build failures:
- alpine (already failing on master branch)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv6l-musl, build-failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
<!--
(old builds from 2023-07-13)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31348 bytes --]
From 845768f0cf604929caf78ab74a51a7d3efaa82ef Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/37] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 21 ++++++++++++++-------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 531b3345e230f..5a7b718e09b05 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/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 2118b54421006..d10daef834a75 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,28 +1,28 @@
# Template file for 'openldap'
pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
--libexecdir=/usr/libexec
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From d6bd9eb3f35e45af1709ad93205549a6fc4e5bfa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 02/37] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 2c8de13f41a65a77ed676712a46f6e320b1cb5ff Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 03/37] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 0a73307c23650..c383fedbc9e4f 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -13,7 +13,7 @@ hostmakedepends="hunspell"
makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
+license="Apache-2.0, BSD-4-Clause"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From e6fd35ad8b78ffabaf0a01e45e2426449746c069 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 04/37] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From d87e3a1ec6a86aecaafad14f9b449d4b0b59b333 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 05/37] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From b045cd74b82189f355e447fc69ea90820fb2f37a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 06/37] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From f09899e4ee2ff8ee1260d12a9a71a7a3dd4de13b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 07/37] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From e4f310cf49cbe4af708e2a80b5cdb77a2ee326bb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 08/37] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 481306f63429e755eb8a6634e29bb2e59a51485b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 09/37] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From e365af30cd805cf77b9b888e938b40c05726e22a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 10/37] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 5774ec28b11065abfb5b7ebd3ce8ae67d35fe727 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 11/37] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 56ce6bc70d7c9..836965e3524d5 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.04.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 8ae4139a0563aa82049e5a8555925e580280c1b2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 12/37] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 89275388ff4b0..88401b722197a 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -4,12 +4,12 @@ version=1.7
revision=12
build_style=gnu-configure
configure_args="--with-sha"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
hostmakedepends="pkg-config"
makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
-license="GPL-2"
+short_desc="Interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 5d6fa0833b9c73b2b6654bf46f5d1c95a4586725 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 13/37] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 3ce32704e4010edb37ff847304ec89ccf3223289 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 14/37] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From 9ef4e5550e65e20b4b48a94d586987b141c8cbf9 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 15/37] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 2b6906b0798c5336a6b27e4e9c1124a6f2f4cff1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 16/37] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 608fdcd16791cf0daa810f7a6a886370d5046896 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 17/37] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From ae5d40c378f29b647bcde75565729fb5fcb32070 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 18/37] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 2dd8780e1db01098c7f2fad2d0ad50f8284b5057 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 19/37] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From 60f35a3d4824130b36871e2d4fed619a2fc6f833 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 20/37] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 36154498eada743281fad3b63797542fed5112fc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 21/37] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From af4dc0d9c0db209350096da71e397d1f9ac927ed Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 22/37] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6dbe8c8730943..6672dd787a0a9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.6.0.3
-revision=1
+revision=2
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
From 2eb848bf65ad94bd6500b550f2ad71c6731325e3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:25 +0200
Subject: [PATCH 23/37] cyrus-sasl: revbump due to openldap update
---
srcpkgs/libsasl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 79afba2f332dd..76d1811f128af 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -2,7 +2,7 @@
# keep in sync with cyrus-sasl
pkgname=libsasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
From 4f7446863adfaf027fdf278bafd4db63296bd50b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:52 +0200
Subject: [PATCH 24/37] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 19af6a6066df8..90a4c662bc994 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-revision=2
+revision=3
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
From df85d2bc92b59454c0e627bb79149e69539e5c7d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:12 +0200
Subject: [PATCH 25/37] apache: revbumpe due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 5c8cc6b43554d..ad9b3e23a722c 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 30f3fb83d0c3a49c1c3c9ec6113465450a9f18a8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:50 +0200
Subject: [PATCH 26/37] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 697788e5c2662..c859f0846a959 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From d33d21c4c81a6cbcb451c8eb8fa3fb9064a95a20 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:15:56 +0200
Subject: [PATCH 27/37] lighttpd: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 310e0c9674ae7..07875c1099eca 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=2
+revision=3
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From c114a89444ae65b5a12cc0e066a9588b51e63497 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:16:30 +0200
Subject: [PATCH 28/37] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 20fbd13a50203..1d917e5eabafc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
version=2.3.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"
From e4eae1c2bfc222f9bf0b48214265ded8432918d0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:03 +0200
Subject: [PATCH 29/37] squid: revbump due to openldap:update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 7bbe58e719c0f..51059a075c3b8 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
From 6c8854f8f5e1675df4d0ff3ce1de2f1a1a43a73f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:26 +0200
Subject: [PATCH 30/37] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 4ba13475b3330..a8fcc51d14b24 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=2
+revision=3
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 8e5c51ecc841651f6c4ac39df449d2b7dbd96278 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:48 +0200
Subject: [PATCH 31/37] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 25aa753e6d4db..a2ee05c6f3517 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
From 7b29fcc857c8e8a6c39709b02390b318f1252f6f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:18:16 +0200
Subject: [PATCH 32/37] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7ee867bda0db9..ca05654788844 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 4cd646a14565909906cfbe50d7e6206f88a26efa Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:19:50 +0200
Subject: [PATCH 33/37] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 56804533e1dd3..ca4f6bbe24951 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
From cf5656b90678c88ee0aa53ae80ae3cdca6ebbdcb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:15 +0200
Subject: [PATCH 34/37] mit-krb5: revbump due to openldap-update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a1b85efd468c9..1d7f004a53986 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.2
-revision=2
+revision=3
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From 916f44f0f67232726a4e295ed41976402226248a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:36 +0200
Subject: [PATCH 35/37] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index e00ad3e979ce1..401571fb1b5b7 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.2
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 8c00b7c22a7950df3a63c04c35d2950dec7d4b9c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:06 +0200
Subject: [PATCH 36/37] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 6e371545bef70..9e4cbfef1d4b9 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From ad4d1dc46d23e1cd6dcc8037e038d4081cb32c86 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:27 +0200
Subject: [PATCH 37/37] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 3706daecb8659..add04b4d3d562 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (100 preceding siblings ...)
2023-09-09 12:14 ` klarasm
@ 2023-09-14 12:24 ` klarasm
2023-09-17 18:44 ` klarasm
` (2 subsequent siblings)
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-09-14 12:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4091 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-08-23)
##### I built this PR locally for my native architecture, (x86_64-glibc):
- Build failures:
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
##### I built this PR locally for my native architecture, (x86_64-musl):
- Build failures:
- sssd (does not support musl)
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- nss-pam-ldapd (musl does not support nsswitch)
##### Crossbuilds
- aarch64-musl, build failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv7l, build failures:
- alpine (already failing on master branch)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv6l-musl, build-failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
<!--
(old builds from 2023-07-13)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31348 bytes --]
From 2a4714988c62fd5a3e0b5df8a69fc5f630420f77 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/37] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 21 ++++++++++++++-------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9a57cda25562b..b354ac8855fb6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -698,9 +698,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 2118b54421006..d10daef834a75 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,28 +1,28 @@
# Template file for 'openldap'
pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
--libexecdir=/usr/libexec
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From f46e119a3ea478792d4398679a768079ba309165 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 02/37] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From 738e3284c4c5eaecd4dfbf79a11741d4cf6667b1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 03/37] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 0a73307c23650..c383fedbc9e4f 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -13,7 +13,7 @@ hostmakedepends="hunspell"
makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
+license="Apache-2.0, BSD-4-Clause"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From bae6ba7476e7d07e75aa64c018a61dbb245cb6a7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 04/37] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 7b53336d6f129c2dd05ff3b4bc61ce4a92e1537f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 05/37] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From d206e7dc38c00cc912dc7b7b72ea1bc707dfef11 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 06/37] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From 82818539c9e0d0c4dfe85c2c003ab9b8da209934 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 07/37] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From c83f30fb31ce1ea4c00824f95789ed5317c60677 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 08/37] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index e4d168cc4f785..8ad37ccf8fda0 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From f5f0019fc6d60b8238f30271d56b3f669e10850a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 09/37] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From acbb9afc6163f4080ee26c99c4acc7ffbebcb5cd Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 10/37] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 2fb30c823aa51af6b3d7c88059411994d84498c7 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 11/37] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a353239f45264..fb3fa84b73c1c 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.08.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 4dcacafcb3bd4148d5503199d2f7ff82440a85a1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 12/37] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 89275388ff4b0..88401b722197a 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -4,12 +4,12 @@ version=1.7
revision=12
build_style=gnu-configure
configure_args="--with-sha"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
hostmakedepends="pkg-config"
makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
-license="GPL-2"
+short_desc="Interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From 425ea8fab8fbbb39b6f86e8c0b5ccd038efd90a4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 13/37] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 11be64f8b366ebf0a00f66835edf1101b9e8d24c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 14/37] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From 2d3c9226bfa7cddd6cedcef4e3d309ab13c93a59 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 15/37] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 18b741f2779456edc21cc1281d4ea705c28350e0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 16/37] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From 10742b970f6750787d6d022228ebbaafc41cb512 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 17/37] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 5e1149f312a935e18a4a0306167c2449ff5741d5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 18/37] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From ff047c5a0f26f7f6e1111fc628d0e2a1bb6b2086 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 19/37] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From 3a07503ba81ee23ac04f19848dc2e1159681e6ca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 20/37] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 3ed1ae5eaf096556c3156ec1765e2afeb3a4204e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 21/37] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 79e54553f326a20aa77e7934e0fc18fa686971d3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 22/37] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6dbe8c8730943..6672dd787a0a9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.6.0.3
-revision=1
+revision=2
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
From 38eb1aad9163e204079324fcf1308b59126b065c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:25 +0200
Subject: [PATCH 23/37] cyrus-sasl: revbump due to openldap update
---
srcpkgs/libsasl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 79afba2f332dd..76d1811f128af 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -2,7 +2,7 @@
# keep in sync with cyrus-sasl
pkgname=libsasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
From 9580d903cb2ae3ebbabaf3e28ba192489dfc2ed3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:52 +0200
Subject: [PATCH 24/37] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 19af6a6066df8..90a4c662bc994 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-revision=2
+revision=3
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
From 3cd817379e48a6925347b5f82ee6f0dec4816123 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:12 +0200
Subject: [PATCH 25/37] apache: revbumpe due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 5c8cc6b43554d..ad9b3e23a722c 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 2e61ea1cf8d522ec0e882f26867d02b4372ed791 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:50 +0200
Subject: [PATCH 26/37] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 697788e5c2662..c859f0846a959 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 111e5f13523b08dbe0ff259c4f34f2074a2af291 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:15:56 +0200
Subject: [PATCH 27/37] lighttpd: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 310e0c9674ae7..07875c1099eca 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=2
+revision=3
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 4180cadbf804564f711edaabd6a60e4552ab0427 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:16:30 +0200
Subject: [PATCH 28/37] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 20fbd13a50203..1d917e5eabafc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
version=2.3.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"
From e284cd7ac3b22994b946adbf282c307f94318ef3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:03 +0200
Subject: [PATCH 29/37] squid: revbump due to openldap:update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 754a5d9e9b0d1..58ef243c8c5f8 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
From 0bd7d944b15e37c911f8b2e1580dc97a29257b1a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:26 +0200
Subject: [PATCH 30/37] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 4ba13475b3330..a8fcc51d14b24 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=2
+revision=3
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 43bf76590a90a6cf1770216b14545322a9fe6052 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:48 +0200
Subject: [PATCH 31/37] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 25aa753e6d4db..a2ee05c6f3517 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
From da715d00daebf7ab0ad16053afb9abd4280abca2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:18:16 +0200
Subject: [PATCH 32/37] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7ee867bda0db9..ca05654788844 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From eeacab2fa302d02b25fd34fa333af04166b4e9a0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:19:50 +0200
Subject: [PATCH 33/37] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index cd82a74d087ca..bc216965d6f63 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
From f36604c6f0c06ef012fe0e61625a19d6dea6e883 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:15 +0200
Subject: [PATCH 34/37] mit-krb5: revbump due to openldap-update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a1b85efd468c9..1d7f004a53986 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.2
-revision=2
+revision=3
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From 650b8ae21e5d759f281a9f2cbf12adb504109d73 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:36 +0200
Subject: [PATCH 35/37] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index e00ad3e979ce1..401571fb1b5b7 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.2
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From e616d9ee3fe894ae5eaba924aa3638da0e7b900e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:06 +0200
Subject: [PATCH 36/37] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 6e371545bef70..9e4cbfef1d4b9 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 8ff3a31af54eaaa49b9d004a3216a67bbe779e84 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:27 +0200
Subject: [PATCH 37/37] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 3706daecb8659..add04b4d3d562 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Updated] openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (101 preceding siblings ...)
2023-09-14 12:24 ` klarasm
@ 2023-09-17 18:44 ` klarasm
2023-09-17 18:57 ` [PR PATCH] [Merged]: " the-maldridge
2023-09-17 19:57 ` klarasm
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-09-17 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4091 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages openldap-2.6
https://github.com/void-linux/void-packages/pull/41948
openldap: update to 2.6.6
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-08-23)
##### I built this PR locally for my native architecture, (x86_64-glibc):
- Build failures:
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
##### I built this PR locally for my native architecture, (x86_64-musl):
- Build failures:
- sssd (does not support musl)
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- nss-pam-ldapd (musl does not support nsswitch)
##### Crossbuilds
- aarch64-musl, build failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv7l, build failures:
- alpine (already failing on master branch)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv6l-musl, build-failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
<!--
(old builds from 2023-07-13)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
-->
A patch file from https://github.com/void-linux/void-packages/pull/41948.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openldap-2.6-41948.patch --]
[-- Type: text/x-diff, Size: 31348 bytes --]
From 937a24c09297bcf5bfc1361dbb718b4760e7ba29 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 2 Nov 2022 21:04:46 +0100
Subject: [PATCH 01/37] openldap: update to 2.6.6
- update common/shlibs
- add slapd.ldif to conf_files
- add more options to runit service
- remove unregognized configure opts
- run make depend separately as suggested in
https://www.openldap.org/doc/admin26/install.html
- build modules into slapd directly (dynamic modules are broken on
cross-compiling)
- move ldapvc too openldap-tools
---
common/shlibs | 5 ++---
srcpkgs/openldap/files/slapd/run | 2 +-
srcpkgs/openldap/template | 21 ++++++++++++++-------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d2791c238eada..c9d59ef3b97ca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -698,9 +698,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
libevent-2.1.so.7 libevent-2.1.11_1
libevent_core-2.1.so.7 libevent-2.1.11_1
libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea3e..4fa2253b1825d 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
chown $LDAPUSER:$LDAPGROUP /run/openldap
fi
exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 2118b54421006..d10daef834a75 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,28 +1,28 @@
# Template file for 'openldap'
pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
build_style=gnu-configure
configure_args="--prefix=/usr
--libexecdir=/usr/libexec
--sysconfdir=/etc
--localstatedir=/var/lib/openldap
--sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
--enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="OLDAP-2.0"
homepage="http://www.openldap.org"
distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
system_accounts="ldap"
ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
}
+
+pre_build() {
+ make ${makejobs} ${make_build_args} depend
+}
+
post_install() {
ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
vsv slapd
vlicense LICENSE
chmod 755 ${DESTDIR}/usr/lib/*.so.*
vmkdir usr/share/examples/openldap
- mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+ mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
}
@@ -72,6 +77,7 @@ openldap-tools_package() {
vmove usr/bin/ldapwhoami
vmove usr/bin/ldapdelete
vmove usr/bin/ldapadd
+ vmove usr/bin/ldapvc
vmove usr/share/man/man1/ldapmodrdn.1
vmove usr/share/man/man1/ldapsearch.1
vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
vmove usr/share/man/man1/ldapwhoami.1
vmove usr/share/man/man1/ldapdelete.1
vmove usr/share/man/man1/ldapadd.1
+ vmove usr/share/man/man1/ldapvc.1
}
}
From bd8eb596e37b0c40f77c21cf8dc0068eedde46cf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 02:20:19 +0100
Subject: [PATCH 02/37] gnupg: revbump due to openldap update
---
srcpkgs/gnupg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index f769b5b3f08fe..d18025c9de2bb 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
# minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
pkgname=gnupg
version=2.4.3
-revision=1
+revision=2
# We're building outside of the source tree, because upstream told us to:
# https://dev.gnupg.org/T6313#166339
build_wrksrc=build
From e4371c85293d4b00f63da4eb3185a5e212bbe1a4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:14:31 +0100
Subject: [PATCH 03/37] alpine: revbump due to openldap udpate
also add BSD-4-Clause to licenses
---
srcpkgs/alpine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 0a73307c23650..c383fedbc9e4f 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -13,7 +13,7 @@ hostmakedepends="hunspell"
makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
+license="Apache-2.0, BSD-4-Clause"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
From ac8468256017780842bd953035ad29006081c8d5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:18:27 +0100
Subject: [PATCH 04/37] anjuta: revbump due to openldap update
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index cde101ee91971..8a43a32673951 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 2a155af91f96e3a669beb27fb91e94c3380cab1c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:26:54 +0100
Subject: [PATCH 05/37] audit: revbump due to openldap update
---
srcpkgs/audit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 7e1e4dab2f450..334d567f37811 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
# Template file for 'audit'
pkgname=audit
version=3.0.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
--with-apparmor --with-libcap-ng --with-python3"
From 1de421273c73a975c91f96d07ba408b176f9c91b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:28:15 +0100
Subject: [PATCH 06/37] autofs: revbump due to openldap update
---
srcpkgs/autofs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 9a787e37b46ff..f48c92ccf91b6 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
version=5.1.8
-revision=2
+revision=3
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
From db016339f1988de59d185bab28c07f6d60cac15d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:29:04 +0100
Subject: [PATCH 07/37] claws-mail: revbump due to openldap update
---
srcpkgs/claws-mail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 0fd87df7803ec..b989ebf1d8e43 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
From ed9d7e514839c8ca6ac8ec1bfe47eddb8922aff3 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:32:32 +0100
Subject: [PATCH 08/37] dovecot-plugin-pigeonhole: revbump due to openldap
update
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 2dc49fbabc4ef..7a74fac96ec97 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.21
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From de775f0512125ed79b02c8860aa534ea60ab80ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:33:45 +0100
Subject: [PATCH 09/37] evolution: revbump due to openldap update
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ab3dd6caa164d..6c4e7918faa6e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.48.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 1769a412143b319e9dac96aad04717165c681ef5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:35:27 +0100
Subject: [PATCH 10/37] gnupg1: revbump due to openldap update
---
srcpkgs/gnupg1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnupg1/template b/srcpkgs/gnupg1/template
index c0c8374779399..e86147006aa16 100644
--- a/srcpkgs/gnupg1/template
+++ b/srcpkgs/gnupg1/template
@@ -1,7 +1,7 @@
# Template file for 'gnupg1'
pkgname=gnupg1
version=1.4.23
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-threads=posix --enable-noexecstack
gnupg_cv_regex_broken=no"
From 3bc2f7f3a0a87b2676e92211807f9637bd3185fb Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:36:50 +0100
Subject: [PATCH 11/37] kldap: revbump due to openldap update
---
srcpkgs/kldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index a353239f45264..fb3fa84b73c1c 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,7 +1,7 @@
# Template file for 'kldap'
pkgname=kldap
version=23.08.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
gettext kcoreaddons kdoctools"
From 9725bf63e2dcafc6b7dc4ab712c2e350597f602b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:37:27 +0100
Subject: [PATCH 12/37] ldapvi: revbump due to openldap update
also fix some linting problems
---
srcpkgs/ldapvi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 89275388ff4b0..88401b722197a 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -4,12 +4,12 @@ version=1.7
revision=12
build_style=gnu-configure
configure_args="--with-sha"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
hostmakedepends="pkg-config"
makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
-license="GPL-2"
+short_desc="Interactive LDAP client for Unix terminals"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
homepage="http://www.lichteblau.com/ldapvi/"
-short_desc="An interactive LDAP client for Unix terminals"
distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz"
checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
From c121252dfbc55e9f09375130a73a274484d16922 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:40:34 +0100
Subject: [PATCH 13/37] nfs-utils: revbump due to openldap update
---
srcpkgs/nfs-utils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 252a7355b6836..1ea23781caffa 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=2.6.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
From 7289ca30d9ed936fc2dbe8d3d5099fa7ba496726 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:45:51 +0100
Subject: [PATCH 14/37] samba: revbump due to openldap update
---
srcpkgs/samba/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ba93268973d3..3e1199b70c5e2 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.14.12
-revision=2
+revision=3
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
From 859bff68aaac186da9a9756e45e727a7c7b30a57 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:55:25 +0100
Subject: [PATCH 15/37] lua54-lualdap: revbump due to openldap update
---
srcpkgs/lua54-lualdap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 4492dbeab650f..8c03eef7ef4d0 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -1,7 +1,7 @@
# Template file for 'lua54-lualdap'
pkgname=lua54-lualdap
version=1.2.5
-revision=3
+revision=4
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
From 1f7c95e0cea57fe773fa5b687d2a751e938ba297 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:57:12 +0100
Subject: [PATCH 16/37] nss-pam-ldapd: revbump due to openldap update
---
srcpkgs/nss-pam-ldapd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index 92cbd75417b41..2b3a35ae85a33 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -1,7 +1,7 @@
# Template file for 'nss-pam-ldapd'
pkgname=nss-pam-ldapd
version=0.9.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sasl --enable-kerberos --with-pam-seclib-dir=/usr/lib/security/"
conf_files="/etc/nslcd.conf"
From b6aa7b739d071787d3dfcf3a12edadda0c22a917 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:23:39 +0100
Subject: [PATCH 17/37] quota: revbump due to openldap update
---
srcpkgs/quota/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index a5dc7bbdb5f47..559efaee2994f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -1,7 +1,7 @@
# Template file for 'quota'
pkgname=quota
version=4.09
-revision=1
+revision=2
build_style=gnu-configure
make_build_args="V=1"
conf_files="/etc/quotagrpadmins /etc/quotatab /etc/warnquota.conf"
From 22421db89b6ec66c77e4b6bfc8eec9da34fc2883 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 18/37] seahorse: revbump due to openldap update
---
srcpkgs/seahorse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8a..da92234d8216e 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse'
pkgname=seahorse
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
From 0b84508019edff1ebcef7de90c0644f148bf6a33 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:43:58 +0100
Subject: [PATCH 19/37] x2goclient: revbump due to openldap update
---
srcpkgs/x2goclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index ba2d57781c4d3..70c9faec4d4e4 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
# Template file for 'x2goclient'
pkgname=x2goclient
version=4.1.2.2
-revision=2
+revision=3
build_style=gnu-makefile
build_helper=qmake
make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
From 79ed611b735b2170412be79f3092742ee1cebc0b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:52:58 +0100
Subject: [PATCH 20/37] python3-ldap: revbump due to openldap update
---
srcpkgs/python3-ldap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 8d4cbcf835f4c..c035192e6f529 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ldap'
pkgname=python3-ldap
version=3.4.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules"
makedepends="python3-devel libldap-devel"
From 1061eb97fd4e2b46842f416620f643689187f89c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 6 Mar 2023 20:55:47 +0100
Subject: [PATCH 21/37] log4cxx: revbump due to openldap update
---
srcpkgs/log4cxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template
index 956333fed797a..f0b153c559443 100644
--- a/srcpkgs/log4cxx/template
+++ b/srcpkgs/log4cxx/template
@@ -1,7 +1,7 @@
# Template file for 'log4cxx'
pkgname=log4cxx
version=1.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config zip"
makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel"
From 852b05ffd73c0d6d74a5fb9c96f67f09adc14c53 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 12 Jul 2023 17:50:27 +0200
Subject: [PATCH 22/37] libreoffice: revbump due to openldap update
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6dbe8c8730943..6672dd787a0a9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.6.0.3
-revision=1
+revision=2
build_style=meta
make_build_target="build"
hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
From 27df6a3128d4fdead4877b9eb23c216cd70a6591 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:25 +0200
Subject: [PATCH 23/37] cyrus-sasl: revbump due to openldap update
---
srcpkgs/libsasl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 79afba2f332dd..76d1811f128af 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -2,7 +2,7 @@
# keep in sync with cyrus-sasl
pkgname=libsasl
version=2.1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
From 6929ec97ad371c3bdf387257ceca84016b845e6f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:13:52 +0200
Subject: [PATCH 24/37] FreeRADIUS: revbump due to openldap update
---
srcpkgs/FreeRADIUS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 19af6a6066df8..90a4c662bc994 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.26
-revision=2
+revision=3
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
From 942af88a237ee1e1fa117ed421f9fc77e90388df Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:12 +0200
Subject: [PATCH 25/37] apache: revbumpe due to openldap update
---
srcpkgs/apache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 5c8cc6b43554d..ad9b3e23a722c 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.56
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
From 3db6fa24ea9be33062d00e90ad4092442e17cb12 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:14:50 +0200
Subject: [PATCH 26/37] dovecot: revbump due to openldap update
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9fcb7aaadf104..0b8f470c1723a 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.21
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From d396edf2323c471d44c4b053e5db53ccf0941f27 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:15:56 +0200
Subject: [PATCH 27/37] lighttpd: revbump due to openldap update
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 310e0c9674ae7..07875c1099eca 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.71
-revision=2
+revision=3
build_style=meson
configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_krb5=enabled -Dwith_ldap=enabled
From 623bd0e59cafd9f9b1c6b5e9fb3e7ab3055b010b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:16:30 +0200
Subject: [PATCH 28/37] monitoring-plugins: revbump due to openldap update
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 20fbd13a50203..1d917e5eabafc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
version=2.3.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
hostmakedepends="fping openssh postfix procps-ng smbclient net-snmp bind-utils sudo"
From 4a6aca90681e8a18c77b03f18ce2676c7c53b03d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:03 +0200
Subject: [PATCH 29/37] squid: revbump due to openldap:update
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 754a5d9e9b0d1..58ef243c8c5f8 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=5.7
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--sysconfdir=/etc/squid
From d709e3b3193165f9c54c3e9fea5a285e455cf7d2 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:26 +0200
Subject: [PATCH 30/37] sssd: revbump due to openldap update
---
srcpkgs/sssd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 4ba13475b3330..a8fcc51d14b24 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.8.2
-revision=2
+revision=3
# upstream explicitly hardcodes to use glibc:
# https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
archs="~*-musl"
From 21876bd550700b47f6167015b7b498661d9224d0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:17:48 +0200
Subject: [PATCH 31/37] sylpheed: revbump due to openldap update
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 25aa753e6d4db..a2ee05c6f3517 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,7 +1,7 @@
# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
From f8b70fcbac8a077028f77b33b6b91225c1bc52bf Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:18:16 +0200
Subject: [PATCH 32/37] virtuoso: revbump due to openldap update
---
srcpkgs/virtuoso/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7ee867bda0db9..ca05654788844 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,7 +1,7 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.10
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
build_style=gnu-configure
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
From 1a067f654c0c4d49ae68fd259340474062702ec8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:19:50 +0200
Subject: [PATCH 33/37] apr-util: revbump due to openldap update
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index cd82a74d087ca..bc216965d6f63 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
From e632a4ff4c46cec6ac1fd2d25e6e2fe57678518b Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:15 +0200
Subject: [PATCH 34/37] mit-krb5: revbump due to openldap-update
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a1b85efd468c9..1d7f004a53986 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.21.2
-revision=2
+revision=3
_distver=$(echo $version | cut -d. -f-2)
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --disable-rpath --with-system-et
From ccd09bbfac9fdcd8bce18951533ce9160842f4dc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:20:36 +0200
Subject: [PATCH 35/37] postfix: revbump due to openldap update
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index e00ad3e979ce1..401571fb1b5b7 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.8.2
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 6fa24f5020400dba14c7017ee250fbe3b9068265 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:06 +0200
Subject: [PATCH 36/37] php8.1: revbump due to openldap update
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 6e371545bef70..9e4cbfef1d4b9 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.21
-revision=2
+revision=3
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From bbfc8b4575159aaadc9f162cc8ace38f3b48ae02 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 28 Aug 2023 14:21:27 +0200
Subject: [PATCH 37/37] php8.2: revbump due to openldap update
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 3706daecb8659..add04b4d3d562 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=2
+revision=3
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: [PR PATCH] [Merged]: openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (102 preceding siblings ...)
2023-09-17 18:44 ` klarasm
@ 2023-09-17 18:57 ` the-maldridge
2023-09-17 19:57 ` klarasm
104 siblings, 0 replies; 111+ messages in thread
From: the-maldridge @ 2023-09-17 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3930 bytes --]
There's a merged pull request on the void-packages repository
openldap: update to 2.6.6
https://github.com/void-linux/void-packages/pull/41948
Description:
The 2.4 branch is not maintained anymore and I don't know if there's much advantage to going to 2.5 instead of 2.6
Some shared libraries have changed name so this updates common/shlibs.
As this is a major update the ldap database should be backed up and recreated as per https://www.openldap.org/doc/admin26/maintenance.html
#### Testing the changes
- I tested the changes in this PR: **YES** (mainly openldap, mit-krb5 and cyrus-sasl)
- I haven't tested the revbumped packages that much, other than building with their test suite
I have upgraded my ldap setup to this version. It's not very complicated so may not be great for coverage.
Basically:
- two nodes, with normal syncrepl and gssapi/kerberos for authentication
- the ldap directory is used as database backend for my kerberos setup
- I have a few machines setup with kerberos for authentication and ldap as id provider (some with sssd and some with nslcd)
This PR should not be merged before:
- [x] log4cxx-1.0.0 #42632
- [x] mit-krb5 1.20.1 #42633
- [x] python3-ldap-3.4.3 #42634
- [x] apr-util-1.6.3 #42636 (change in libtool resulted in cross-compilation failure)
- [x] virtuoso-7.2.9 #42666 (probably not critical, tests are already failing on master branch)
- [x] apache-2.4.56 #43108 (same failure as in apr-util)
[ci skip] again.
#### Local build testing
(updated 2023-08-23)
##### I built this PR locally for my native architecture, (x86_64-glibc):
- Build failures:
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
##### I built this PR locally for my native architecture, (x86_64-musl):
- Build failures:
- sssd (does not support musl)
- alpine (already failing on master branch)
- Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- nss-pam-ldapd (musl does not support nsswitch)
##### Crossbuilds
- aarch64-musl, build failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv7l, build failures:
- alpine (already failing on master branch)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
- armv6l-musl, build-failures:
- alpine (already failing on master branch)
- sssd (does not support musl)
- packages not supporting cross-compilation:
- FreeRADIUS
- libreoffice
- virtuoso
- x2goclient
<!--
(old builds from 2023-07-13)
- I built this PR locally for my native architecture, (x86_64-glibc). All packages build. Test suite errors:
- anjuta (already failing on master branch)
- I built this PR locally for my native architecture, (x86_64-musl). Except sssd (which does not support musl), all packages build. Test suite errors:
- anjuta (already failing on master branch)
- audit (already failing on master branch)
- dovecot (already failing on master branch)
- evolution-data-server (already failing on master branch)
- nss-pam-ldapd (already failing on master, expected as musl does not support nsswitch)
- I built this PR locally for these architectures:
- aarch64-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv6l-musl (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, sssd does not support musl, all other complete)
- armv7l (x2go-client, virtuoso, libreoffice and FreeRADIUS fail due to cross-compilation, all other complete)
-->
^ permalink raw reply [flat|nested] 111+ messages in thread* Re: openldap: update to 2.6.6
2023-01-29 23:49 [PR PATCH] openldap: update to 2.6.3 klarasm
` (103 preceding siblings ...)
2023-09-17 18:57 ` [PR PATCH] [Merged]: " the-maldridge
@ 2023-09-17 19:57 ` klarasm
104 siblings, 0 replies; 111+ messages in thread
From: klarasm @ 2023-09-17 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/41948#issuecomment-1722555096
Comment:
Seems I somehow dropped evolution-data-server when rebasing, sorry about that.
^ permalink raw reply [flat|nested] 111+ messages in thread