From f3fa80e4989eccf411ce4f802436bd257e3078a4 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Mon, 18 Sep 2023 19:14:09 +0000
Subject: [PATCH] apr: update to 1.7.4

Add pgp key to validate source tarball
---
 mingw-w64-apr/0001-apr-fix-linking-error.patch | 11 +++++++++++
 mingw-w64-apr/PKGBUILD                         | 17 +++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 mingw-w64-apr/0001-apr-fix-linking-error.patch

diff --git a/mingw-w64-apr/0001-apr-fix-linking-error.patch b/mingw-w64-apr/0001-apr-fix-linking-error.patch
new file mode 100644
index 0000000000..2ba0ab1114
--- /dev/null
+++ b/mingw-w64-apr/0001-apr-fix-linking-error.patch
@@ -0,0 +1,11 @@
+--- a/atomic/win32/apr_atomic.c
++++ b/atomic/win32/apr_atomic.c
+@@ -18,7 +18,7 @@
+ 
+ APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+ {
+-#if defined (NEED_ATOMICS_GENERIC64)
++#if defined (NEED_ATOMICS_GENERIC64) && !defined(_WIN32)
+     return apr__atomic_generic64_init(p);
+ #else
+     return APR_SUCCESS;
diff --git a/mingw-w64-apr/PKGBUILD b/mingw-w64-apr/PKGBUILD
index f42711203e..354df7d374 100644
--- a/mingw-w64-apr/PKGBUILD
+++ b/mingw-w64-apr/PKGBUILD
@@ -3,27 +3,32 @@
 _realname=apr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.6.5
-pkgrel=5
+pkgver=1.7.4
+pkgrel=1
 pkgdesc="The Apache Portable Runtime (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://apr.apache.org/"
-license=('APACHE')
-validpgpkeys=('B1B96F45DFBDCCF974019235193F180AB55D9977')
+license=('spdx:Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-python")
-source=(https://www.apache.org/dist/apr/${_realname}-${pkgver}.tar.bz2
+source=(https://downloads.apache.org/apr/${_realname}-${pkgver}.tar.bz2{,.asc}
+        0001-apr-fix-linking-error.patch
         'apr_ssize_t.patch'
         'apr_wtypes.patch')
-sha256sums=('a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105'
+sha256sums=('fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577'
+            'SKIP'
+            'c5207578313c2c2605a4dc8a498055f847f158e126325918194c059f356c484f'
             'ba7d6de7e7930801df483d444b97c159af4ff11b4ce27e1337aea5e0417e6066'
             'b82dd98ec8cff2273fb071dc9f1d2ee7466905c9b82a12d3d83ce1cb5920a5d6')
+# pgp keys are listed here https://people.apache.org/keys/committer/
+validpgpkeys=('65B2D44FE74BD5E3DE3AC3F082781DE46D5954FA') # Eric Covener <covener@apache.org>
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
+  patch -p1 -i "${srcdir}/0001-apr-fix-linking-error.patch"
   patch -p0 -i ${srcdir}/apr_ssize_t.patch
   patch -p0 -i ${srcdir}/apr_wtypes.patch