[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/files/

[Sam James]

commit:     01e7465f24f3820f6ee89269dddd70c646ae49e6
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 19 10:42:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 05:32:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e7465f

dev-libs/apr: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/apr/files/apr-1.5.0-cross-types.patch    |  63 --------
 dev-libs/apr/files/apr-1.5.0-libtool.patch        |  17 ---
 dev-libs/apr/files/apr-1.5.0-sysroot.patch        |  37 -----
 dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch |  53 -------
 dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch  |  64 --------
 dev-libs/apr/files/apr-1.7.0-clang-16.patch       | 174 ----------------------
 dev-libs/apr/files/apr-1.7.0-dev-zero.patch       |  34 -----
 7 files changed, 442 deletions(-)

diff --git a/dev-libs/apr/files/apr-1.5.0-cross-types.patch b/dev-libs/apr/files/apr-1.5.0-cross-types.patch
deleted file mode 100644
index 266e5676817f..000000000000
--- a/dev-libs/apr/files/apr-1.5.0-cross-types.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-use standard AC_CHECK_SIZEOF as it supports non-builtin types and
-supports cross-compiling sanely
-
-https://issues.apache.org/bugzilla/show_bug.cgi?id=56053
-
---- a/configure.in
-+++ b/configure.in
-@@ -1684,7 +1684,7 @@ else
-     socklen_t_value="int"
- fi
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
-+AC_CHECK_SIZEOF(pid_t)
- 
- if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
-     pid_t_fmt='#define APR_PID_T_FMT "hd"'
-@@ -1753,7 +1753,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
- APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
- APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
-+AC_CHECK_SIZEOF(ssize_t)
- 
- AC_MSG_CHECKING([which format to use for apr_ssize_t])
- if test -n "$ssize_t_fmt"; then
-@@ -1770,7 +1770,7 @@ fi
- 
- ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
-+AC_CHECK_SIZEOF(size_t)
- 
- AC_MSG_CHECKING([which format to use for apr_size_t])
- if test -n "$size_t_fmt"; then
-@@ -1787,7 +1787,7 @@ fi
- 
- size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-+AC_CHECK_SIZEOF(off_t)
- 
- if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
-     # Enable LFS
-@@ -1866,7 +1866,7 @@ case $host in
-     ;;
- *)
-     ino_t_value=ino_t
--    APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long)
-+    AC_CHECK_SIZEOF(ino_t)
-     if test $ac_cv_sizeof_ino_t = 4; then
-         if test $ac_cv_sizeof_long = 4; then
-             ino_t_value="unsigned long"
-@@ -1886,8 +1886,8 @@ else
-     bigendian=0
- fi
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
--#include <sys/uio.h>],struct iovec,0)
-+AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT
-+#include <sys/uio.h>])
- if test "$ac_cv_sizeof_struct_iovec" = "0"; then
-     have_iovec=0
- else

diff --git a/dev-libs/apr/files/apr-1.5.0-libtool.patch b/dev-libs/apr/files/apr-1.5.0-libtool.patch
deleted file mode 100644
index 5368a2689bdf..000000000000
--- a/dev-libs/apr/files/apr-1.5.0-libtool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-generate a local copy of libtool for use in compiling
-
-https://bugs.gentoo.org/374355
-
---- a/configure.in
-+++ b/configure.in
-@@ -260,9 +260,7 @@ case $host in
-         fi
-     else
-     dnl libtoolize requires that the following not be indented
--    dnl should become LT_INIT(win32-dll)
--AC_LIBTOOL_WIN32_DLL
--AC_PROG_LIBTOOL
-+LT_INIT(win32-dll)
-         # get libtool's setting of shlibpath_var
-         eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
-         if test "x$shlibpath_var" = "x"; then

diff --git a/dev-libs/apr/files/apr-1.5.0-sysroot.patch b/dev-libs/apr/files/apr-1.5.0-sysroot.patch
deleted file mode 100644
index 54c9d649ef07..000000000000
--- a/dev-libs/apr/files/apr-1.5.0-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/385775
-
-utilize $SYSROOT to find the right includedir tree
-
-drop the -L/-R paths since we know our libdir is the standard path which
-the compiler already knows how to locate
-
---- a/apr-config.in
-+++ b/apr-config.in
-@@ -28,7 +28,7 @@ libdir="@libdir@"
- datarootdir="@datadir@"
- datadir="@datadir@"
--installbuilddir="@installbuilddir@"
--includedir="@includedir@"
-+installbuilddir="${SYSROOT}@installbuilddir@"
-+includedir="${SYSROOT}@includedir@"
- 
- CC="@CC@"
- CPP="@CPP@"
-@@ -183,7 +183,7 @@ while test $# -gt 0; do
-     --link-ld)
-     if test "$location" = "installed"; then
-         ### avoid using -L if libdir is a "standard" location like /usr/lib
--        flags="$flags -L$libdir -l${APR_LIBNAME}"
-+        flags="$flags -l${APR_LIBNAME}"
-     else
-         ### this surely can't work since the library is in .libs?
-         flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
-@@ -200,7 +200,7 @@ while test $# -gt 0; do
-         ### avoid using -L if libdir is a "standard" location like /usr/lib
-         # Since the user is specifying they are linking with libtool, we
-         # *know* that -R will be recognized by libtool.
--        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
-+        flags="$flags -l${APR_LIBNAME}"
-     else
-         flags="$flags $LA_FILE"
-     fi

diff --git a/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch b/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch
deleted file mode 100644
index f23d729f523e..000000000000
--- a/dev-libs/apr/files/apr-1.7.0-CVE-2021-35940.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-
-SECURITY: CVE-2021-35940 (cve.mitre.org)
-
-Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
-was addressed in 1.6.x in 1.6.3 and later via r1807976.
-
-The fix was merged back to 1.7.x in r1891198.
-
-Since this was a regression in 1.7.0, a new CVE name has been assigned
-to track this, CVE-2021-35940.
-
-Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue.
-
-https://svn.apache.org/viewvc?view=revision&revision=1891198
-
-Index: time/unix/time.c
-===================================================================
---- a/time/unix/time.c	(revision 1891197)
-+++ b/time/unix/time.c	(revision 1891198)
-@@ -142,6 +142,9 @@
-     static const int dayoffset[12] =
-     {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
- 
-+    if (xt->tm_mon < 0 || xt->tm_mon >= 12)
-+        return APR_EBADDATE;
-+
-     /* shift new year to 1st March in order to make leap year calc easy */
- 
-     if (xt->tm_mon < 2)
-Index: time/win32/time.c
-===================================================================
---- a/time/win32/time.c	(revision 1891197)
-+++ b/time/win32/time.c	(revision 1891198)
-@@ -54,6 +54,9 @@
-     static const int dayoffset[12] =
-     {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
- 
-+    if (tm->wMonth < 1 || tm->wMonth > 12)
-+        return APR_EBADDATE;
-+
-     /* Note; the caller is responsible for filling in detailed tm_usec,
-      * tm_gmtoff and tm_isdst data when applicable.
-      */
-@@ -228,6 +231,9 @@
-     static const int dayoffset[12] =
-     {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
- 
-+    if (xt->tm_mon < 0 || xt->tm_mon >= 12)
-+        return APR_EBADDATE;
-+
-     /* shift new year to 1st March in order to make leap year calc easy */
- 
-     if (xt->tm_mon < 2)

diff --git a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch
deleted file mode 100644
index 488c3c59321d..000000000000
--- a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5593f23e8e062da108ed585535e7281b87346ee1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@g.o>
-Date: Wed, 25 Nov 2020 09:36:25 +0000
-Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of
- '"confdefs.h"'
-
-The failure is observed on `autoconf-2.69d` (soon to be released
-as `autoconf-2.70`). There `int64_t` detection fails as:
-
-```
-$ autoreconf && ./configure
-...
-checking whether int64_t and int use fmt %d... no
-checking whether int64_t and long use fmt %ld... no
-checking whether int64_t and long long use fmt %lld... no
-configure: error: could not determine the string function for int64_t
-```
-
-This happens because `./configure` always stumbles on warning:
-
-```
-configure:3350: gcc -c -g -O2 -Werror  conftest.c >&5
-In file included from conftest.c:31:
-confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror]
-   22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
-      |
-```
-
-It's triggered by double inclusion of `"confdefs.h"` contents:
-explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly
-via `AC_LANG_SOURCE` use.
-
-To fix it and avoid having to define `main()` declaration the change
-uses `AC_LANG_PROGRAM` instead.
-
-Tested on both `autoconf-2.69` and `autoconf-2.69d`.
-
-Bug: https://bugs.gentoo.org/738156
-Bug: https://bugs.gentoo.org/750353
-Signed-off-by: Sergei Trofimovich <slyfox@g.o>
----
- build/apr_common.m4 | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/build/apr_common.m4 b/build/apr_common.m4
-index f4e2dfd0a7..6f5782e674 100644
---- a/build/apr_common.m4
-+++ b/build/apr_common.m4
-@@ -504,13 +504,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
-    CFLAGS="$CFLAGS -Werror"
-  fi
-  AC_COMPILE_IFELSE(
--  [AC_LANG_SOURCE(
--   [#include "confdefs.h"
--   ]
--   [[$1]]
--   [int main(int argc, const char *const *argv) {]
-+  [AC_LANG_PROGRAM(
-+   [[$1]],
-    [[$2]]
--   [   return 0; }]
-   )], [CFLAGS=$apr_save_CFLAGS
- $3],  [CFLAGS=$apr_save_CFLAGS
- $4])

diff --git a/dev-libs/apr/files/apr-1.7.0-clang-16.patch b/dev-libs/apr/files/apr-1.7.0-clang-16.patch
deleted file mode 100644
index 2244b07a14ff..000000000000
--- a/dev-libs/apr/files/apr-1.7.0-clang-16.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-https://bugs.gentoo.org/870004
-
-Fixed upstream, hopefully (it's hard to keep track of 1.7.x branch churn):
-- https://bz.apache.org/bugzilla/show_bug.cgi?id=64753
-- https://bz.apache.org/bugzilla/show_bug.cgi?id=65087
---- a/build/apr_common.m4
-+++ b/build/apr_common.m4
-@@ -467,6 +467,7 @@ changequote([, ])dnl
- AC_MSG_CHECKING(size of $2)
- AC_CACHE_VAL(AC_CV_NAME,
- [AC_TRY_RUN([#include <stdio.h>
-+#include <stdlib.h>
- $1
- #ifdef WIN32
- #define binmode "b"
-@@ -531,7 +532,8 @@ AC_TRY_RUN([
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int main()
- {
-   char buf[1024];
-   if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
---- a/build/apr_network.m4
-+++ b/build/apr_network.m4
-@@ -63,6 +63,10 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-+#include <stdlib.h>
-+
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- 
- int main(void) {
-     struct addrinfo hints, *ai;
-@@ -136,6 +140,11 @@ dnl
- AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [
-   AC_CACHE_CHECK(for working getnameinfo, ac_cv_working_getnameinfo,[
-   AC_TRY_RUN( [
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
-@@ -195,6 +204,8 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [
- #include <netdb.h>
- #endif
- 
-+#include <stdlib.h>
-+
- int main(void) {
-     if (EAI_ADDRFAMILY < 0) {
-         exit(0);
-@@ -388,9 +399,14 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [
-   AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[
-   AC_TRY_RUN( [
- #include <stdio.h>
-+#include <stdlib.h>
-+
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#endif
-+#end
-+#ifdef HAVE_STRING_H
-+#include <string.h>
-+#endifif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-@@ -734,6 +750,9 @@ AC_TRY_COMPILE([
- #ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
- #endif
-+
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- ],[
- inet_addr("127.0.0.1");
- ],[
-@@ -754,6 +773,9 @@ fi
- AC_DEFUN([APR_CHECK_INET_NETWORK], [
- AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
- AC_TRY_COMPILE([
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
---- a/configure.in
-+++ b/configure.in
-@@ -1440,8 +1440,6 @@ AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
- AC_DECL_SYS_SIGLIST
- 
- AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
--APR_CHECK_INET_ADDR
--APR_CHECK_INET_NETWORK
- AC_SUBST(apr_inaddr_none)
- AC_CHECK_FUNC(_getch)
- AC_CHECK_FUNCS(strerror_r, [ strerror_r="1" ], [ strerror_r="0" ])
-@@ -1547,6 +1545,9 @@ APR_FLAG_HEADERS(
-     sys/un.h		\
-     sys/wait.h)
- 
-+APR_CHECK_INET_ADDR
-+APR_CHECK_INET_NETWORK
-+
- # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
- # being included by itself.  Check for <netinet/tcp.h> manually,
- # including another header file first.
-@@ -2208,7 +2209,8 @@ AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
--main()
-+#include <stdlib.h>
-+int main()
- {
-     struct rlimit limit;
-     limit.rlim_cur = 0;
-@@ -2247,7 +2249,7 @@ AC_TRY_RUN([
- #ifndef SEM_FAILED
- #define SEM_FAILED (-1)
- #endif
--main()
-+int main()
- {
-     sem_t *psem;
-     const char *sem_name = "/apr_autoconf";
-@@ -2307,6 +2309,7 @@ if test "$threads" = "1"; then
-       AC_TRY_RUN([
- #include <sys/types.h>
- #include <pthread.h>
-+#include <stdlib.h>
-         int main()
-         {
-             pthread_mutex_t mutex;
-@@ -2435,6 +2438,8 @@ int fd;
- struct flock proc_mutex_lock_it = {0};
- const char *fname = "conftest.fcntl";
- 
-+int lockit();
-+
- int main()
- {
-     int rc, status;;
---- a/poll/os2/pollset.c
-+++ b/poll/os2/pollset.c
-@@ -308,7 +308,7 @@ APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset)
- 
- 
- 
--APR_DECLARE(const char *) apr_poll_method_defname()
-+APR_DECLARE(const char *) apr_poll_method_defname(void)
- {
-     return "select";
- }
---- a/poll/unix/pollset.c
-+++ b/poll/unix/pollset.c
-@@ -188,7 +188,7 @@ APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset)
-     return pollset->provider->name;
- }
- 
--APR_DECLARE(const char *) apr_poll_method_defname()
-+APR_DECLARE(const char *) apr_poll_method_defname(void)
- {
-     const apr_pollset_provider_t *provider = NULL;
- 

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
deleted file mode 100644
index be6433dd46bc..000000000000
--- a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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@×××××.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