From 4a5baef6190d5b382400c545c211ea1bf6f63f23 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 23 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..7b91c9f32d5c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,14 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-ldap-lib=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
- --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
+ --with-dbm=db53 --with-crypto --with-openssl=${XBPS_CROSS_BASE}/usr
+ --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
@@ -17,10 +18,13 @@ 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
-# fails to build tests
-make_check=no
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# disable tests on musl (testxlate fails)
+	make_check=no
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"