From 0bc52a522048b46cd2d81fd5206a5eb97d7be16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Wed, 12 Apr 2023 00:57:37 +0200
Subject: [PATCH 01/19] new version 1.7.3

---
 .gitignore               |  1 +
 apr-1.7.2-r1907541.patch | 29 -----------------------------
 apr.spec                 |  9 +++++----
 sources                  |  2 +-
 4 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 apr-1.7.2-r1907541.patch

diff --git a/.gitignore b/.gitignore
index f7457a3..ec6cad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ apr-1.3.9.tar.bz2
 /apr-1.7.0.tar.bz2
 /apr-1.7.1.tar.bz2
 /apr-1.7.2.tar.bz2
+/apr-1.7.3.tar.bz2
diff --git a/apr-1.7.2-r1907541.patch b/apr-1.7.2-r1907541.patch
deleted file mode 100644
index b586260..0000000
--- a/apr-1.7.2-r1907541.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/atomic/unix/mutex64.c	2023/02/09 12:45:02	1907540
-+++ b/atomic/unix/mutex64.c	2023/02/09 13:36:18	1907541
-@@ -96,7 +96,26 @@
- 
- APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem)
- {
-+    /* On 32bit CPUs this loads with two instructions (tearing),
-+     * so a lock is needed to ensure atomicity.
-+     *
-+     * APR_SIZEOF_VOIDP is probably not the right check for 32 vs 64 bits CPUs
-+     * but it spares an (hardly-)exhaustive list of supported CPUs (and using
-+     * assembly). If APR_SIZEOF_VOIDP==4 means that the compiler generates
-+     * 32bit instructions (-m32 or whatever) then it's the right check though.
-+     */
-+#if APR_SIZEOF_VOIDP >= 8
-     return *mem;
-+#else
-+    apr_uint64_t cur_value;
-+    DECLARE_MUTEX_LOCKED(mutex, mem);
-+
-+    cur_value = *mem;
-+
-+    MUTEX_UNLOCK(mutex);
-+
-+    return cur_value;
-+#endif
- }
- 
- APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val)
diff --git a/apr.spec b/apr.spec
index 305a41e..0ed0b12 100644
--- a/apr.spec
+++ b/apr.spec
@@ -11,8 +11,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.7.2
-Release: 2%{?dist}
+Version: 1.7.3
+Release: 1%{?dist}
 # ASL 2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -27,7 +27,6 @@ Patch1: apr-1.7.2-libdir.patch
 Patch2: apr-1.2.7-pkgconf.patch
 Patch3: apr-1.7.0-deepbind.patch
 Patch4: apr-1.7.2-autoconf.patch
-Patch5: apr-1.7.2-r1907541.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
 BuildRequires: make
 
@@ -54,7 +53,6 @@ C data structures and routines.
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .deepbind
 %patch4 -p1 -b .autoconf-2-71
-%patch5 -p1 -b .r1907541
 
 %build
 # regenerate configure script etc.
@@ -144,6 +142,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Apr 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-1
+- new version 1.7.3
+
 * Fri Feb 10 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.2-2
 - enable apr_atomic test again
 
diff --git a/sources b/sources
index 8d4c71a..c341b14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apr-1.7.2.tar.bz2) = 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
+SHA512 (apr-1.7.3.tar.bz2) = d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124

From 9c43a3711e8404467a87c899456a78031ddca728 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 13:36:34 +0000
Subject: [PATCH 02/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index 0ed0b12..f696135 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 # ASL 2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -142,6 +142,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Apr 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-1
 - new version 1.7.3
 

From 6f8da4abb79b94451bb8d7c9b8fd147136eb8837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Fri, 6 Oct 2023 16:12:51 +0200
Subject: [PATCH 03/19] SPDX migration

---
 apr.spec | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apr.spec b/apr.spec
index f696135..e2af453 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,14 +12,17 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 2%{?dist}
-# ASL 2.0: everything
+Release: 3%{?dist}
+# Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
-# BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c,
+# BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
 #                   include/apr_fnmatch.h, misc/unix/getopt.c,
 #                   file_io/unix/mktemp.c, strings/apr_strings.c
-# BSD (3-clause): strings/apr_strnatcmp.c, include/apr_strings.h
-License: ASL 2.0 and BSD with advertising and ISC and BSD
+# Zlib: strings/apr_strnatcmp.c, include/apr_strings.h
+# Caldera: strings/apr_snprintf.c
+License: Apache-2.0 AND (BSD-4-Clause-UC AND ISC AND Zlib AND Caldera)
+
+
 URL: https://apr.apache.org/
 Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Source1: apr-wrapper.h
@@ -142,6 +145,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Sep 29 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-3
+- SPDX migration
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 58946e5305ffbf3fb5298074039d1514ba92ce46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Tue, 16 Jan 2024 18:11:49 +0100
Subject: [PATCH 04/19] Use Caldera-no-preamble instead of Caldera identifier

https://github.com/spdx/license-list-XML/issues/2195
https://gitlab.com/fedora/legal/fedora-license-data/-/issues/366
---
 apr.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apr.spec b/apr.spec
index e2af453..aaac1fd 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,15 +12,15 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
 #                   include/apr_fnmatch.h, misc/unix/getopt.c,
 #                   file_io/unix/mktemp.c, strings/apr_strings.c
 # Zlib: strings/apr_strnatcmp.c, include/apr_strings.h
-# Caldera: strings/apr_snprintf.c
-License: Apache-2.0 AND (BSD-4-Clause-UC AND ISC AND Zlib AND Caldera)
+# Caldera-no-preamble: strings/apr_snprintf.c
+License: Apache-2.0 AND (BSD-4-Clause-UC AND ISC AND Zlib AND Caldera-no-preamble)
 
 
 URL: https://apr.apache.org/
@@ -30,6 +30,7 @@ Patch1: apr-1.7.2-libdir.patch
 Patch2: apr-1.2.7-pkgconf.patch
 Patch3: apr-1.7.0-deepbind.patch
 Patch4: apr-1.7.2-autoconf.patch
+Patch5: apr-1.7.3-lmdb-support.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
 BuildRequires: make
 
@@ -56,6 +57,7 @@ C data structures and routines.
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .deepbind
 %patch4 -p1 -b .autoconf-2-71
+%patch5 -p1 -b .lmdb-support
 
 %build
 # regenerate configure script etc.
@@ -73,6 +75,7 @@ export apr_cv_sctp=no
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
         --with-devrandom=/dev/urandom \
         --disable-static
+        --enable-maintainer-mode --with-lmdb --with-dbm=lmdb
 %{make_build}
 
 %install
@@ -145,6 +148,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Oct 24 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-4
+- rebuilt
+
 * Fri Sep 29 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-3
 - SPDX migration
 

From 040019a8f6de2c7e17964b3b4abe8ddf23bff0dc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 13:24:03 +0000
Subject: [PATCH 05/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index aaac1fd..fb6ede3 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -148,6 +148,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Oct 24 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-4
 - rebuilt
 

From 6010e7d5c19cec9766224b739c8d6a2c055c129b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 23:19:33 +0000
Subject: [PATCH 06/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index fb6ede3..e6fe463 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -148,6 +148,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 346168b027a00a85facaacabd5b6678debee3c3a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 29 Jan 2024 10:46:53 +0000
Subject: [PATCH 07/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index e6fe463..fffbc7e 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -148,6 +148,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 936a9698227f2b1bd40d5a5fd68f0017acd53e0b Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 7 Feb 2024 11:45:47 -0500
Subject: [PATCH 08/19] Revert incomplete lmdb changes

This is preventing apr from even completing buildSRPMFromSCM,
much less an actual build attempt.
---
 apr.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apr.spec b/apr.spec
index fffbc7e..6d2630c 100644
--- a/apr.spec
+++ b/apr.spec
@@ -30,7 +30,6 @@ Patch1: apr-1.7.2-libdir.patch
 Patch2: apr-1.2.7-pkgconf.patch
 Patch3: apr-1.7.0-deepbind.patch
 Patch4: apr-1.7.2-autoconf.patch
-Patch5: apr-1.7.3-lmdb-support.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
 BuildRequires: make
 
@@ -57,7 +56,6 @@ C data structures and routines.
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .deepbind
 %patch4 -p1 -b .autoconf-2-71
-%patch5 -p1 -b .lmdb-support
 
 %build
 # regenerate configure script etc.
@@ -75,7 +73,6 @@ export apr_cv_sctp=no
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
         --with-devrandom=/dev/urandom \
         --disable-static
-        --enable-maintainer-mode --with-lmdb --with-dbm=lmdb
 %{make_build}
 
 %install

From 2a48b9dd5bc770d0c8429274961475ee614a8399 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 8 Feb 2024 08:21:07 +0000
Subject: [PATCH 09/19] use autosetup

---
 apr.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apr.spec b/apr.spec
index 6d2630c..3528aec 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -51,11 +51,7 @@ Apache Portable Runtime (APR) is to provide a free library of
 C data structures and routines.
 
 %prep
-%setup -q
-%patch1 -p1 -b .libdir
-%patch2 -p1 -b .pkgconf
-%patch3 -p1 -b .deepbind
-%patch4 -p1 -b .autoconf-2-71
+%autosetup -p1
 
 %build
 # regenerate configure script etc.
@@ -145,6 +141,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Feb  8 2024 Joe Orton <jorton@redhat.com> - 1.7.3-8
+- use autosetup
+
 * Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From b3f3dc072f529165a4be53b86231baa50f9d95f8 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 8 Feb 2024 08:26:46 +0000
Subject: [PATCH 10/19] add pullrev.sh

---
 pullrev.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 pullrev.sh

diff --git a/pullrev.sh b/pullrev.sh
new file mode 100755
index 0000000..ec8815d
--- /dev/null
+++ b/pullrev.sh
@@ -0,0 +1,53 @@
+#!/bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "What?"
+    exit 1
+fi
+
+repo="https://svn.apache.org/repos/asf/apr/apr/trunk"
+#repo="https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x"
+ver=1.7.3
+prefix="apr-${ver}"
+suffix="r$1${2:++}"
+fn="${prefix}-${suffix}.patch"
+vcurl="http://svn.apache.org/viewvc?view=revision&revision="
+
+if test -f ${fn}; then
+    mv -v -f ${fn} ${fn}\~
+    echo "# $0 $*" > ${fn}
+    sed '1{/#.*pullrev/d;};/^--- /,$d' < ${fn}\~ >> ${fn}
+else
+    echo "# $0 $*" > ${fn}
+fi
+
+new=0
+for r in $*; do
+   if ! grep -q "${vcurl}${r}" ${fn}; then
+       echo "${vcurl}${r}"
+       new=1
+   fi
+done >> ${fn}
+
+[ $new -eq 0 ] || echo >> ${fn}
+
+prev=/dev/null
+for r in $*; do
+    echo "+ fetching ${r}"
+    this=`mktemp /tmp/pullrevXXXXXX`
+    svn diff -c ${r} ${repo} | filterdiff --remove-timestamps --clean -x 'CHANGES' -x 'next-number' -x 'STATUS' \
+        --addprefix="${prefix}/" > ${this}
+    next=`mktemp /tmp/pullrevXXXXXX`
+    combinediff --quiet ${prev} ${this} > ${next}
+    rm -f "${this}"
+    [ "${prev}" = "/dev/null" ] || rm -f "${prev}"
+    prev=${next}
+done
+
+cat ${prev} >> ${fn}
+
+vi "${fn}"
+echo "+ git add ${fn}" 
+git add "${fn}"
+echo "+ spec template:"
+echo "PatchN: ${fn}"

From d9cd0652c6953176ab5b6878d32a4739b4d8cbc3 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 8 Feb 2024 08:27:00 +0000
Subject: [PATCH 11/19] always disable SCTP support at build time.

---
 apr.spec | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apr.spec b/apr.spec
index 3528aec..b20741f 100644
--- a/apr.spec
+++ b/apr.spec
@@ -61,14 +61,12 @@ C data structures and routines.
 # does not use -lrt).
 export ac_cv_search_shm_open=no
 
-# Forcibly disable sctp protocol support
-export apr_cv_sctp=no
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
         --with-devrandom=/dev/urandom \
-        --disable-static
+        --disable-static \
+        --disable-sctp
 %{make_build}
 
 %install
@@ -143,6 +141,7 @@ popd
 %changelog
 * Thu Feb  8 2024 Joe Orton <jorton@redhat.com> - 1.7.3-8
 - use autosetup
+- always disable SCTP support at build time
 
 * Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

From fdcb8e3b159a95ba6cd6fe016c75dbfb5e71083d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 17:17:35 +0000
Subject: [PATCH 12/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index b20741f..b6fc34e 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -139,6 +139,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Feb  8 2024 Joe Orton <jorton@redhat.com> - 1.7.3-8
 - use autosetup
 - always disable SCTP support at build time

From 215749b64ae26c97ef9182ec22ecbadb07fc594d Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Wed, 28 Aug 2024 10:20:08 +0100
Subject: [PATCH 13/19] update to 1.7.5 (#2307902)

Resolves: rhbz#2307902
---
 .gitignore |  1 +
 apr.spec   | 11 +++++------
 sources    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec6cad4..f7d3944 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ apr-1.3.9.tar.bz2
 /apr-1.7.1.tar.bz2
 /apr-1.7.2.tar.bz2
 /apr-1.7.3.tar.bz2
+/apr-1.7.5.tar.bz2
diff --git a/apr.spec b/apr.spec
index b6fc34e..cc0ab8f 100644
--- a/apr.spec
+++ b/apr.spec
@@ -11,8 +11,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.7.3
-Release: 9%{?dist}
+Version: 1.7.5
+Release: 1%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -57,10 +57,6 @@ C data structures and routines.
 # regenerate configure script etc.
 ./buildconf
 
-# Forcibly prevent detection of shm_open (which then picks up but
-# does not use -lrt).
-export ac_cv_search_shm_open=no
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
@@ -139,6 +135,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Aug 28 2024 Joe Orton <jorton@redhat.com> - 1.7.5-1
+- update to 1.7.5 (#2307902)
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/sources b/sources
index c341b14..271da41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apr-1.7.3.tar.bz2) = d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
+SHA512 (apr-1.7.5.tar.bz2) = d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b

From 2aa1c4a647cae1aa4296169fc8a8db5abdb4efc4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 11:22:54 +0000
Subject: [PATCH 14/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index cc0ab8f..364dbad 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -135,6 +135,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Aug 28 2024 Joe Orton <jorton@redhat.com> - 1.7.5-1
 - update to 1.7.5 (#2307902)
 

From da73d7d32b4e89b404e10e9e374de817599c7a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sat, 1 Feb 2025 19:53:01 +0100
Subject: [PATCH 15/19] Add explicit BR: libxcrypt-devel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Esser <besser82@fedoraproject.org>
---
 apr.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index 364dbad..7fab900 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -32,6 +32,7 @@ Patch3: apr-1.7.0-deepbind.patch
 Patch4: apr-1.7.2-autoconf.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
 BuildRequires: make
+BuildRequires: libxcrypt-devel
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -135,6 +136,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1.7.5-3
+- Add explicit BR: libxcrypt-devel
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 36ccacc5eafc01ca00ac084f231b6e68de6bb9db Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Wed, 28 May 2025 16:31:21 +0100
Subject: [PATCH 16/19] update to 1.7.6 (#2366842)

Resolves: rhbz#2366842
---
 .gitignore | 1 +
 apr.spec   | 9 +++++----
 sources    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7d3944..9e9ac78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ apr-1.3.9.tar.bz2
 /apr-1.7.2.tar.bz2
 /apr-1.7.3.tar.bz2
 /apr-1.7.5.tar.bz2
+/apr-1.7.6.tar.bz2
diff --git a/apr.spec b/apr.spec
index 7fab900..7b00b74 100644
--- a/apr.spec
+++ b/apr.spec
@@ -11,8 +11,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.7.5
-Release: 3%{?dist}
+Version: 1.7.6
+Release: 1%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -21,8 +21,6 @@ Release: 3%{?dist}
 # Zlib: strings/apr_strnatcmp.c, include/apr_strings.h
 # Caldera-no-preamble: strings/apr_snprintf.c
 License: Apache-2.0 AND (BSD-4-Clause-UC AND ISC AND Zlib AND Caldera-no-preamble)
-
-
 URL: https://apr.apache.org/
 Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Source1: apr-wrapper.h
@@ -136,6 +134,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed May 28 2025 Joe Orton  <jorton@redhat.com> - 1.7.6-1
+- update to 1.7.6 (#2366842)
+
 * Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1.7.5-3
 - Add explicit BR: libxcrypt-devel
 
diff --git a/sources b/sources
index 271da41..0c31c18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apr-1.7.5.tar.bz2) = d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b
+SHA512 (apr-1.7.6.tar.bz2) = 629b60680d1244641828019db903a1b199e8a19c8f27a5132b93faacb381ce561f88463345ab019258f1f1e8cfdf8aa986ac815153a8e7e04a22b3932f9fedd2

From 45de4d7c21d9c84def115c8812bb3beae43adb3b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:09:17 +0000
Subject: [PATCH 17/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index 7b00b74..9f52ceb 100644
--- a/apr.spec
+++ b/apr.spec
@@ -12,7 +12,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -134,6 +134,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Wed May 28 2025 Joe Orton  <jorton@redhat.com> - 1.7.6-1
 - update to 1.7.6 (#2366842)
 

From 5b1c8c2ab4a44f80de5b604c3dc9f74be96d2d92 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 7 Aug 2025 14:34:46 +0100
Subject: [PATCH 18/19] - fix apr_strtoi64 to use glibc strtol again, and
 enable VLA support - add tests bcond - move configure sanity tests into build
 section - fix cross-compilation detection (#2386875)

---
 apr-1.7.2-autoconf.patch |  21 ----
 apr-1.7.6-autoconf.patch | 200 +++++++++++++++++++++++++++++++++++++++
 apr.spec                 |  47 ++++++---
 3 files changed, 236 insertions(+), 32 deletions(-)
 delete mode 100644 apr-1.7.2-autoconf.patch
 create mode 100644 apr-1.7.6-autoconf.patch

diff --git a/apr-1.7.2-autoconf.patch b/apr-1.7.2-autoconf.patch
deleted file mode 100644
index 368fc79..0000000
--- a/apr-1.7.2-autoconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/build/apr_common.m4 b/build/apr_common.m4
-index ac2312c..5d232c4 100644
---- a/build/apr_common.m4
-+++ b/build/apr_common.m4
-@@ -468,15 +468,8 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
-  fi
-  AC_COMPILE_IFELSE(
-   [AC_LANG_SOURCE(
--   [
--#ifndef PACKAGE_NAME
--#include "confdefs.h"
--#endif
--   ]
--   [[$1]]
--   [int main(int argc, const char *const *argv) {]
-+   [[$1]],
-    [[$2]]
--   [   return 0; }]
-   )], [CFLAGS=$apr_save_CFLAGS
- $3],  [CFLAGS=$apr_save_CFLAGS
- $4])
diff --git a/apr-1.7.6-autoconf.patch b/apr-1.7.6-autoconf.patch
new file mode 100644
index 0000000..58dc4a3
--- /dev/null
+++ b/apr-1.7.6-autoconf.patch
@@ -0,0 +1,200 @@
+
+https://github.com/apache/apr/pull/68
+
+--- apr-1.7.6/build/apr_common.m4.5
++++ apr-1.7.6/build/apr_common.m4
+@@ -467,19 +467,11 @@
+    CFLAGS="$CFLAGS -Werror"
+  fi
+  AC_COMPILE_IFELSE(
+-  [AC_LANG_SOURCE(
+-   [
+-#ifndef PACKAGE_NAME
+-#include "confdefs.h"
+-#endif
+-   ]
+-   [[$1]]
+-   [int main(int argc, const char *const *argv) {]
+-   [[$2]]
+-   [   return 0; }]
+-  )], [CFLAGS=$apr_save_CFLAGS
+-$3],  [CFLAGS=$apr_save_CFLAGS
+-$4])
++  [AC_LANG_PROGRAM([[$1]], [[$2]])],
++  [CFLAGS=$apr_save_CFLAGS
++   $3],
++  [CFLAGS=$apr_save_CFLAGS
++   $4])
+ ])
+ 
+ dnl
+--- apr-1.7.6/build/apr_network.m4.5
++++ apr-1.7.6/build/apr_network.m4
+@@ -259,11 +259,12 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
++#include <stdio.h>
+ ],[
+ int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
+                           (char *) 0, 0, (struct hostent **) 0, &tmp);
+ /* use tmp to suppress the warning */
+-tmp=0;
++puts(tmp ? "non-zero" : "zero");
+ ], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
+ 
+ if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
+@@ -287,11 +288,12 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
++#include <stdio.h>
+ ],[
+ int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
+                           (struct hostent_data *) 0);
+ /* use tmp to suppress the warning */
+-tmp=0;
++puts(tmp ? "non-zero" : "zero");
+ ], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
+ 
+ if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
+@@ -327,12 +329,13 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
++#include <stdio.h>
+ ],[
+ int tmp = getservbyname_r((const char *) 0, (const char *) 0,
+                           (struct servent *) 0, (char *) 0, 0,
+                           (struct servent **) 0);
+ /* use tmp to suppress the warning */
+-tmp=0;
++puts(tmp ? "non-zero" : "zero");
+ ], ac_cv_getservbyname_r_style=glibc2, ac_cv_getservbyname_r_style=none)
+ 
+ if test "$ac_cv_getservbyname_r_style" = "none"; then
+@@ -354,11 +357,12 @@
+     #ifdef HAVE_STDLIB_H
+     #include <stdlib.h>
+     #endif
++    #include <stdio.h>
+     ],[
+     struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0,
+                                           (struct servent *) 0, (char *) 0, 0);
+     /* use tmp to suppress the warning */
+-    tmp=NULL;
++    puts(tmp ? "non-zero" : "zero");
+     ], ac_cv_getservbyname_r_style=solaris, ac_cv_getservbyname_r_style=none)
+ fi
+ 
+@@ -381,11 +385,12 @@
+     #ifdef HAVE_STDLIB_H
+     #include <stdlib.h>
+     #endif
++    #include <stdio.h>
+     ],[
+     int tmp = getservbyname_r((const char *) 0, (const char *) 0,
+                               (struct servent *) 0, (struct servent_data *) 0);
+     /* use tmp to suppress the warning */
+-    tmp=0;
++    puts(tmp ? "non-zero" : "zero");
+     ], ac_cv_getservbyname_r_style=osf1, ac_cv_getservbyname_r_style=none)
+ fi
+ ])
+--- apr-1.7.6/build/buildcheck.sh.5
++++ apr-1.7.6/build/buildcheck.sh
+@@ -15,11 +15,11 @@
+   echo "buildconf: python version $py_version (ok)"
+ fi
+ 
+-# autoconf 2.59 or newer
++# autoconf 2.61 or newer
+ ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
+ if test -z "$ac_version"; then
+   echo "buildconf: autoconf not found."
+-  echo "           You need autoconf version 2.59 or newer installed"
++  echo "           You need autoconf version 2.61 or newer installed"
+   echo "           to build APR from SVN."
+   res=1
+ else
+--- apr-1.7.6/configure.in.5
++++ apr-1.7.6/configure.in
+@@ -145,12 +145,14 @@
+     APR_CROSS_COMPILING=maybe
+   elif test "x$build_alias" != "x$host_alias"; then
+     APR_CROSS_COMPILING=yes
++  else
++    APR_CROSS_COMPILING=no
+   fi
+ else
+     APR_CROSS_COMPILING=no
+ fi
+-
+ AC_SUBST(APR_CROSS_COMPILING)
++AC_MSG_NOTICE([cross-compilation detection: $APR_CROSS_COMPILING])
+ 
+ # Libtool might need this symbol -- it must point to the location of
+ # the generated libtool script (not necessarily the "top" build dir).
+@@ -1876,6 +1878,7 @@
+ AC_CHECK_TYPE(ssize_t, int)
+ AC_C_INLINE
+ AC_C_CONST
++AC_C_VARARRAYS
+ AC_FUNC_SETPGRP
+ 
+ APR_CHECK_SOCKLEN_T
+@@ -1971,6 +1974,8 @@
+     AC_ERROR([could not detect a 64-bit integer type])
+ fi
+ 
++AC_MSG_NOTICE([for apr_(u)int64_t using $int64_strfn and ${int64_value}/${uint64_value}])
++
+ # If present, allow the C99 macro INT64_C to override our conversion.
+ #
+ # HP-UX's ANSI C compiler provides this without any includes, so we
+@@ -2152,7 +2157,6 @@
+     aprlfs=0     
+ fi
+ 
+-AC_MSG_CHECKING([which type to use for apr_off_t])
+ if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
+     # LFS is go!
+     off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
+@@ -2203,7 +2207,7 @@
+    off_t_fmt=d
+    off_t_strfn='strtoi'
+ fi
+-AC_MSG_RESULT($off_t_value)
++AC_MSG_NOTICE([for apr_off_t using $off_t_strfn and $off_t_value])
+ 
+ # Regardless of whether _LARGEFILE64_SOURCE is used, on some
+ # platforms _FILE_OFFSET_BITS will affect the size of ino_t and hence
+@@ -2234,7 +2238,7 @@
+     fi
+     ;;
+ esac
+-AC_MSG_NOTICE([using $ino_t_value for ino_t])
++AC_MSG_NOTICE([for apr_ino_t using $ino_t_value])
+ 
+ # Checks for endianness
+ AC_C_BIGENDIAN
+--- apr-1.7.6/poll/unix/poll.c.5
++++ apr-1.7.6/poll/unix/poll.c
+@@ -73,7 +73,7 @@
+                                    apr_interval_time_t timeout)
+ {
+     int i, num_to_poll;
+-#ifdef HAVE_VLA
++#ifdef HAVE_C_VARARRAYS
+     /* XXX: I trust that this is a segv when insufficient stack exists? */
+     struct pollfd pollset[num + 1]; /* +1 since allocating 0 is undefined behaviour */
+ #elif defined(HAVE_ALLOCA)
+@@ -130,7 +130,7 @@
+         }
+     }
+     
+-#if !defined(HAVE_VLA) && !defined(HAVE_ALLOCA)
++#if !defined(HAVE_C_VARARRAYS) && !defined(HAVE_ALLOCA)
+     if (num > SMALL_POLLSET_LIMIT) {
+         free(pollset);
+     }
diff --git a/apr.spec b/apr.spec
index 9f52ceb..41dd733 100644
--- a/apr.spec
+++ b/apr.spec
@@ -1,5 +1,7 @@
 %define aprver 1
 
+%bcond tests 1
+
 # Arches on which the multilib apr.h hack is needed:
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
 
@@ -12,7 +14,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -27,7 +29,7 @@ Source1: apr-wrapper.h
 Patch1: apr-1.7.2-libdir.patch
 Patch2: apr-1.2.7-pkgconf.patch
 Patch3: apr-1.7.0-deepbind.patch
-Patch4: apr-1.7.2-autoconf.patch
+Patch4: apr-1.7.6-autoconf.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
 BuildRequires: make
 BuildRequires: libxcrypt-devel
@@ -50,7 +52,7 @@ Apache Portable Runtime (APR) is to provide a free library of
 C data structures and routines.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -S gendiff
 
 %build
 # regenerate configure script etc.
@@ -62,6 +64,27 @@ C data structures and routines.
         --with-devrandom=/dev/urandom \
         --disable-static \
         --disable-sctp
+
+# Sanity tests to catch subtle configure script failures:
+#
+# 1. Fail if apr_strtoi64() is not using libc strtol/strtoll
+strfn=`echo XXX APR_INT64_STRFN | cpp -I./include -I./include/arch/unix -include include/arch/unix/apr_private.h \
+            | sed -n '/^XXX/{s/XXX //;p;}'`
+: APR_INT64_STRFN detected as $strfn
+if test "x$strfn" = "x"; then
+    cat config.log
+    : configure failed to detect working strtol, bailing.
+fi
+
+# 2. Fail if LFS support isn't present in a 32-bit build, since this
+# breaks ABI and the soname doesn't change: see #254241
+if grep 'define SIZEOF_VOIDP 4' include/apr.h \
+   && ! grep off64_t include/apr.h; then
+    cat config.log
+    : LFS support not present in 32-bit build
+    exit 1
+fi
+
 %{make_build}
 
 %install
@@ -100,18 +123,14 @@ for f in build/gen-build.py build/install.sh build/config.*; do
 done
 
 %check
-# Fail if LFS support isn't present in a 32-bit build, since this
-# breaks ABI and the soname doesn't change: see #254241
-if grep 'define SIZEOF_VOIDP 4' include/apr.h \
-   && ! grep off64_t include/apr.h; then
-  cat config.log
-  : LFS support not present in 32-bit build
-  exit 1
-fi
+grep ^cross_compiling=no $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config
+
+%if %{with tests}
 pushd test
   make %{?_smp_mflags}
   ./testall -v -q
 popd
+%endif
 
 %ldconfig_scriptlets
 
@@ -134,6 +153,12 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug 07 2025 Joe Orton  <jorton@redhat.com> - 1.7.6-3
+- fix APR_TRY_COMPILE_NO_WARNING in apr_common.m4
+- add tests bcond
+- move configure sanity tests into build section
+- fix cross-compilation detection (#2386875)
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 5b9f0b78b07fe808c529cf49db6366097e1fe384 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:50:31 +0000
Subject: [PATCH 19/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 apr.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr.spec b/apr.spec
index 41dd733..eae3116 100644
--- a/apr.spec
+++ b/apr.spec
@@ -14,7 +14,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Apache-2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD-4-Clause-UC:  strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -153,6 +153,9 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Thu Aug 07 2025 Joe Orton  <jorton@redhat.com> - 1.7.6-3
 - fix APR_TRY_COMPILE_NO_WARNING in apr_common.m4
 - add tests bcond