From 23396add51566d222b33792d04e9e3f37719a3b4 Mon Sep 17 00:00:00 2001 From: Klara Modin 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 " 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 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 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 " 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 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 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 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 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 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 " From 30ee398b16d5959bdb37c7bed2e2ad4ed552764d Mon Sep 17 00:00:00 2001 From: Klara Modin 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 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 " 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 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 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 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 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 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 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 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 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 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 " hostmakedepends="pkg-config" makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel" -license="GPL-2" +short_desc="Interactive LDAP client for Unix terminals" +maintainer="Leah Neukirchen " +license="GPL-2.0-or-later" homepage="http://www.lichteblau.com/ldapvi/" -short_desc="An interactive LDAP client for Unix terminals" distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz" checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153 From 62e5d5be24238b3e4030a825705a35df4d4a6d08 Mon Sep 17 00:00:00 2001 From: Klara Modin 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 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 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 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 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 -## -## 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 buffer; --#if defined(_USEFAC) -+#if defined(_MSC_VER) && _MSC_VER < 1300 - _USEFAC(locale, std::time_put) - .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 -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 -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 -+#include -+#include -+#include -+#include - #include - #include - #include -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 - #include - -+#include -+ - 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 - #include - -+#include -+ - 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 " 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 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 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 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 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 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 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 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 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 " 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 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 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 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 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 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 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 " -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 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"