gentoo auto-resync : 13:11:2022 - 18:49:18

3 files changed, 37 insertions, 1 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index c0b5ceabbadf..74b77bf5cbcf 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -6,9 +6,10 @@ AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f887
 AUX apr-1.7.0-CVE-2021-35940.patch 1749 BLAKE2B 256687934fd6b2af494198456d059f8a6edaaeb8b17f9186d0801bef489443faffefda3724d6c083f05811356c5168db31e5defbe19394699092090f7befdae6 SHA512 a2419817809dfd92a6d3b12e2067a802505d77d400fd47a4b9bb6fd5ae94c4be092e0d3b5894de429c6cc4a82d8133b801636bcab93d0f740c8f06a46516cd72
 AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db9163e45b1bef1fe97082db28efd6f6079d75253e961ca257bd31f53f814bdb11a2c6554fd5d1925d26fe7b42664db42 SHA512 63a56be83f555a78f422f9ce7074e5c3a497a4996d32ead78d9e1a05fba2e0dbdfb135c34143676b8ad16e8276642843d5ed8b17a540be58c6bf7e9662896c2f
 AUX apr-1.7.0-clang-16.patch 4341 BLAKE2B 3d8a7d0e62016c4fd7f1b851d06ef595f8ddbacc4af2e3142cc922c711c6b56b2b99158abdffa611e20407f53f95ef5dc6ffe24cca90457d6d381176e2ce27a0 SHA512 adef5a1bccb6ccd4627c7e8416168aec3e87cb071f3c313ac18f0d246c502d1fc8cc41196e2c49958c1c52d01ffc82758e12ece802cf19bc675813a8064c74f5
+AUX apr-1.7.0-dev-zero.patch 1314 BLAKE2B 22f334d721dccb71bfc3197c3b343d79f9fb33523558c0e46daad37b910aba066fd4b62e62a7875317ffa4db7dcc47004ee8bed245c7ba6fb90a67e18c1b8c6d SHA512 ad95469e7690efab945491156eb923eb95cc767bac1098b0a2ae7779cab5ea33875af23c47962cf49327cef91e02dbc3c8ecee9832978316a5c191dc20a7d07f
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
 EBUILD apr-1.7.0-r5.ebuild 4567 BLAKE2B 4a6d38c41ab104532969f0bf6d19815dbdbf9c84de1bd1c66aade7ae37bdfc3d93018b1aac4dadf1f8c25738ad9a8d61ddff7255b0564059d0da1f3840d35d9d SHA512 009766ba30c28970c67364568e4239cf458b7a437644756ed9b6022db830266834b5233ed60db99ae88b0bae54629c5a563fce7b9d8ebaefb408e597ea87d291
-EBUILD apr-1.7.0-r6.ebuild 4624 BLAKE2B 64b6a74b0d0b88ac92bf4249b440e3b41bc06687efd31970596771532604798a62e25373e4f0f785b74a3472b95427e140a3c2730f0962e5906c0ce858dc6cbe SHA512 37bd853a818154762242877a38264f2e8aef0686915175c394999d10d15f534ed01116538c1634918cea315db1f95ad0c3cea0c35a6bf2be926d6abeb308887c
+EBUILD apr-1.7.0-r6.ebuild 4674 BLAKE2B 467757f5357be50e0743134f4b406d98867dc5e03721375211d6144f924ff3840766a59dc8f45e73a6f30204bcc814546fec25d9c7ecfddc40e85a127d29ad55 SHA512 d013a2ae91053f9493c7f5d38f970735d08d47a4e413e967456d88aa88cbd33df96b452e0436d39fb47f97a5b37ab085ef236e2e39632047ace1788e02f50854
 MISC metadata.xml 511 BLAKE2B 5b4f31f74a9e3fe93b63bb337b5e0b7396c18439c269de0ec6c8308becf69ac8474d72dc921c80c06321bcaf708d49c9e26ec282036e84a9b03c08858c942980 SHA512 82063beddf8ce88d5f151ddeb8b3b69c10124af1c7b727b4c73885b4b14a427e93cd4164ddd4e3dfcdf7175727a8dffa357f1f14c3daee192a255f8995e6b0b5
diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 4ba3505bd8f8..4d8630a847e9 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
 	"${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
 	"${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004
+	"${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833
 )
 
 src_prepare() {
diff --git a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch b/dev-libs/apr/files/apr-1.7.0-dev-zero.patch
new file mode 100644
index 000000000000..be6433dd46bc
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.0-dev-zero.patch
@@ -0,0 +1,34 @@
+APR (ab)uses AC_TRY_RUN to determine if:
+
+* We have /dev/zero
+* We can mmap /dev/zero
+
+The APR ebuild sets ac_cv_file__dev_zero=yes when cross compiling
+to fill in an answer for the first question, but the configure script
+immediately defeats that when answering the second.
+
+AC_TRY_FUN takes four arguments: the test, and what happens on success,
+failure, and cross-compiling. The APR script uses this as a "gate" to
+clear ac_cv_file__dev_zero when /dev/zero exists but it turns out not
+to be useable. They take a pessimistic approach: if you can't "prove"
+it is mmap-able, clear the flag.
+
+This patch changes that to leave the flag alone while cross compiling;
+just assume /dev/zero is mmap-able. It relies on ac_cv_file__dev_zero
+to be correctly set for the target. The fourth parameter is changed to
+[:] and not [] because [] engages autoconf's default cross-compiling
+behavior, which raises an error.
+
+Signed-off-by: Alexandra Parker <alex.iris.parker@gmail.com>
+
+--- a/configure.in	2022-01-09 00:31:05.552582255 -0800
++++ b/configure.in	2022-01-09 00:31:19.824582533 -0800
+@@ -1203,7 +1203,7 @@
+             return 3;
+         }
+         return 0;
+-    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
++    }], [], [ac_cv_file__dev_zero=no], [:])
+ 
+     AC_MSG_RESULT($ac_cv_file__dev_zero)
+ fi