<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d45fb4ddb633b0289d21a88c0f0f2846ec7dd015">https://github.com/macports/macports-ports/commit/d45fb4ddb633b0289d21a88c0f0f2846ec7dd015</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d45fb4ddb63 apr: update to version 1.7.2 (#17703)
</span>d45fb4ddb63 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d45fb4ddb633b0289d21a88c0f0f2846ec7dd015
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Wed Feb 15 14:26:06 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> apr: update to version 1.7.2 (#17703)
</span>---
devel/apr/Portfile | 17 ++---
devel/apr/files/apr-1.7.0-CVE-2021-35940.patch | 53 --------------
devel/apr/files/dynamic_lookup-11.patch | 47 ------------
devel/apr/files/patch-configure.diff | 99 --------------------------
devel/apr/files/patch-configure_ipv6.diff | 13 ----
5 files changed, 6 insertions(+), 223 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apr/Portfile b/devel/apr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d97e2ca88a..3ec0917cc8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/apr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@
</span> PortSystem 1.0
name apr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
maintainers {geeklair.net:dluke @danielluke}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ homepage https://apr.apache.org/
</span> master_sites apache:apr
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4b282845f4ba1c4949b7b386c438e5ef98deaf4b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 872238
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 75638e939a8aa9adea254f26011b13255e46811a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 890218
</span>
# Xcode 3.x's gcc-4.0 generates bad code in apr's translation which can be caught by enabling
# debugging in apr, apr-util, and subversion with LANG="en_US.UTF-8"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,12 +38,7 @@ configure.args --with-installbuilddir=${prefix}/share/apr-1/build \
</span> --enable-nonportable-atomics \
ac_cv_func_setpgrp_void=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ipv6 patch for https://bz.apache.org/bugzilla/show_bug.cgi?id=65087
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles apr_h_patch.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure_ipv6.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dynamic_lookup-11.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apr-1.7.0-CVE-2021-35940.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles apr_h_patch.diff
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apr/files/apr-1.7.0-CVE-2021-35940.patch b/devel/apr/files/apr-1.7.0-CVE-2021-35940.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d4a45be931..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apr/files/apr-1.7.0-CVE-2021-35940.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SECURITY: CVE-2021-35940 (cve.mitre.org)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-was addressed in 1.6.x in 1.6.3 and later via r1807976.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The fix was merged back to 1.7.x in r1891198.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since this was a regression in 1.7.0, a new CVE name has been assigned
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to track this, CVE-2021-35940.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://svn.apache.org/viewvc?view=revision&revision=1891198
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: time/unix/time.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- time/unix/time.c (revision 1891197)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ time/unix/time.c (revision 1891198)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,6 +142,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const int dayoffset[12] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return APR_EBADDATE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* shift new year to 1st March in order to make leap year calc easy */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (xt->tm_mon < 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: time/win32/time.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- time/win32/time.c (revision 1891197)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ time/win32/time.c (revision 1891198)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,6 +54,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const int dayoffset[12] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (tm->wMonth < 1 || tm->wMonth > 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return APR_EBADDATE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Note; the caller is responsible for filling in detailed tm_usec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * tm_gmtoff and tm_isdst data when applicable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,6 +231,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const int dayoffset[12] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return APR_EBADDATE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* shift new year to 1st March in order to make leap year calc easy */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (xt->tm_mon < 2)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apr/files/dynamic_lookup-11.patch b/devel/apr/files/dynamic_lookup-11.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ce9477d7f3a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apr/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Handle macOS 11 and later properly. Copied from libtool port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/libtool.m4.orig 2019-04-01 17:56:21.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/libtool.m4 2020-08-06 07:33:01.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1067,16 +1067,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[[012]][[,.]]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ${MACOSX_DEPLOYMENT_TARGET},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[[012]],*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-04-01 17:56:23.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-08-06 07:33:01.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13923,16 +13923,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ${MACOSX_DEPLOYMENT_TARGET},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012],*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apr/files/patch-configure.diff b/devel/apr/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 17385fa2edc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apr/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,99 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-04-01 12:56:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-06-28 07:51:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22913,6 +22913,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char buf[1024];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24476,6 +24477,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define binmode "b"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24801,6 +24803,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define binmode "b"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24864,6 +24867,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define binmode "b"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24928,6 +24932,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define binmode "b"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25586,6 +25591,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/uio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define binmode "b"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26211,6 +26217,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/resource.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct rlimit limit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26810,6 +26817,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_mutex_t mutex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28748,6 +28756,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SYS_TYPES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29586,6 +29596,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_NETDB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29658,6 +29669,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_NETDB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29707,6 +29719,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_NETDB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apr/files/patch-configure_ipv6.diff b/devel/apr/files/patch-configure_ipv6.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e189a40bdc6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apr/files/patch-configure_ipv6.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-01-17 18:02:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-01-17 18:02:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29722,6 +29722,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_NETINET_IN_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_ARPA_INET_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct sockaddr_in sa;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>