new version 1.7.2

2023-02-03 03:36:28 +01:00 · 2023-02-03 03:36:28 +01:00 · 280f685fb3
commit 280f685fb3
parent 75cd4416ea
14 changed files with 54 additions and 724 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,3 +15,5 @@ apr-1.3.9.tar.bz2
 /apr-1.6.3.tar.bz2
 /apr-1.6.5.tar.bz2
 /apr-1.7.0.tar.bz2
 /apr-1.7.1.tar.bz2
 /apr-1.7.2.tar.bz2
--- a/apr-1.7.0-autoconf.patch
+++ b/apr-1.7.0-autoconf.patch
@ -1,19 +0,0 @@
 --- a/build/apr_common.m4	2021/03/06 18:45:02	1887278
 +++ b/build/apr_common.m4	2021/03/06 22:20:59	1887279
@@ -467,13 +467,9 @@
    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])
--- a/apr-1.7.0-r1891269+.patch
+++ b/apr-1.7.0-r1891269+.patch
@ -1,239 +0,0 @@
 # ./pullrev.sh 1891269 1891198 1891196
 http://svn.apache.org/viewvc?view=revision&revision=1891269
 http://svn.apache.org/viewvc?view=revision&revision=1891198
 http://svn.apache.org/viewvc?view=revision&revision=1891196
 --- apr-1.7.0/include/arch/unix/apr_arch_thread_mutex.h
 +++ apr-1.7.0/include/arch/unix/apr_arch_thread_mutex.h
@@ -33,8 +33,10 @@
 struct apr_thread_mutex_t {
     apr_pool_t *pool;
     pthread_mutex_t mutex;
 +#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
     apr_thread_cond_t *cond;
     int locked, num_waiters;
 +#endif
 };
 #endif
 --- apr-1.7.0/locks/unix/thread_mutex.c
 +++ apr-1.7.0/locks/unix/thread_mutex.c
@@ -102,6 +102,7 @@
 {
     apr_status_t rv;
 +#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
     if (mutex->cond) {
         apr_status_t rv2;
@@ -133,6 +134,7 @@
         return rv;
     }
 +#endif
     rv = pthread_mutex_lock(&mutex->mutex);
 #ifdef HAVE_ZOS_PTHREADS
@@ -148,6 +150,7 @@
 {
     apr_status_t rv;
 +#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
     if (mutex->cond) {
         apr_status_t rv2;
@@ -177,6 +180,7 @@
         return rv;
     }
 +#endif
     rv = pthread_mutex_trylock(&mutex->mutex);
     if (rv) {
@@ -281,6 +285,7 @@
 {
     apr_status_t status;
 +#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
     if (mutex->cond) {
         status = pthread_mutex_lock(&mutex->mutex);
         if (status) {
@@ -303,6 +308,7 @@
         mutex->locked = 0;
     }
 +#endif
     status = pthread_mutex_unlock(&mutex->mutex);
 #ifdef HAVE_ZOS_PTHREADS
@@ -318,9 +324,12 @@
 {
     apr_status_t rv, rv2 = APR_SUCCESS;
 +#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
     if (mutex->cond) {
         rv2 = apr_thread_cond_destroy(mutex->cond);
     }
 +#endif
 +
     rv = apr_pool_cleanup_run(mutex->pool, mutex, thread_mutex_cleanup);
     if (rv == APR_SUCCESS) {
         rv = rv2;
 --- apr-1.7.0/random/unix/sha2.c
 +++ apr-1.7.0/random/unix/sha2.c
@@ -425,7 +425,7 @@
         usedspace = freespace = 0;
 }
 -void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 +void apr__SHA256_Final(sha2_byte digest[SHA256_DIGEST_LENGTH], SHA256_CTX* context) {
         sha2_word32     *d = (sha2_word32*)digest;
         unsigned int    usedspace;
@@ -496,7 +496,7 @@
         usedspace = 0;
 }
 -char *apr__SHA256_End(SHA256_CTX* context, char buffer[]) {
 +char *apr__SHA256_End(SHA256_CTX* context, char buffer[SHA256_DIGEST_STRING_LENGTH]) {
         sha2_byte       digest[SHA256_DIGEST_LENGTH], *d = digest;
         int             i;
 --- apr-1.7.0/time/unix/time.c
 +++ apr-1.7.0/time/unix/time.c
@@ -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)
 --- apr-1.7.0/time/win32/time.c
 +++ apr-1.7.0/time/win32/time.c
@@ -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)
 --- apr-1.7.0/file_io/unix/readwrite.c
 +++ apr-1.7.0/file_io/unix/readwrite.c
@@ -146,7 +146,7 @@
 APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
 {
 -    apr_size_t rv;
 +    apr_size_t rv = APR_SUCCESS;
     if (thefile->buffered) {
         char *pos = (char *)buf;
@@ -160,13 +160,14 @@
              * logically reading from
              */
             apr_int64_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
 -            if (offset != thefile->filePtr)
 -                lseek(thefile->filedes, offset, SEEK_SET);
 +            if (offset != thefile->filePtr) {
 +                thefile->filePtr = lseek(thefile->filedes, offset, SEEK_SET);
 +                if (thefile->filePtr == -1) rv = errno;
 +            }
             thefile->bufpos = thefile->dataRead = 0;
             thefile->direction = 1;
         }
 -        rv = 0;
         while (rv == 0 && size > 0) {
             if (thefile->bufpos == thefile->bufsize)   /* write buffer is full*/
                 rv = apr_file_flush_locked(thefile);
@@ -244,12 +245,15 @@
              */
             apr_int64_t offset = thefile->filePtr - thefile->dataRead +
                                  thefile->bufpos;
 -            if (offset != thefile->filePtr)
 -                lseek(thefile->filedes, offset, SEEK_SET);
 +            if (offset != thefile->filePtr) {
 +                thefile->filePtr = lseek(thefile->filedes, offset, SEEK_SET);
 +                if (thefile->filePtr == -1) rv = errno;
 +            }
             thefile->bufpos = thefile->dataRead = 0;
         }
         file_unlock(thefile);
 +        if (rv) return rv;
     }
     if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
 --- apr-1.7.0/locks/unix/proc_mutex.c
 +++ apr-1.7.0/locks/unix/proc_mutex.c
@@ -1518,11 +1518,10 @@
 APR_DECLARE(const char *) apr_proc_mutex_defname(void)
 {
 -    apr_status_t rv;
     apr_proc_mutex_t mutex;
 -    if ((rv = proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT,
 -                                       NULL)) != APR_SUCCESS) {
 +    if (proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT,
 +                                 NULL) != APR_SUCCESS) {
         return "unknown";
     }
 --- apr-1.7.0/memory/unix/apr_pools.c
 +++ apr-1.7.0/memory/unix/apr_pools.c
@@ -1338,7 +1338,7 @@
     apr_size_t free_index;
     pool_concurrency_set_used(pool);
 -    ps.node = active = pool->active;
 +    ps.node = pool->active;
     ps.pool = pool;
     ps.vbuff.curpos  = ps.node->first_avail;
 --- apr-1.7.0/test/teststr.c
 +++ apr-1.7.0/test/teststr.c
@@ -394,6 +394,19 @@
     ABTS_STR_EQUAL(tc, apr_cstr_skip_prefix("",      "12"),    NULL);
 }
 +static void pstrcat(abts_case *tc, void *data)
 +{
 +    ABTS_STR_EQUAL(tc, apr_pstrcat(p, "a", "bc", "def", NULL),
 +                   "abcdef");
 +    ABTS_STR_EQUAL(tc, apr_pstrcat(p, NULL), "");
 +    ABTS_STR_EQUAL(tc, apr_pstrcat(p,
 +                                   "a", "b", "c", "d", "e",
 +                                   "f", "g", "h", "i", "j",
 +                                   "1", "2", "3", "4", "5",
 +                                   NULL),
 +                   "abcdefghij12345");
 +}
 +
 abts_suite *teststr(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
@@ -412,6 +425,7 @@
     abts_run_test(suite, string_cpystrn, NULL);
     abts_run_test(suite, snprintf_overflow, NULL);
     abts_run_test(suite, skip_prefix, NULL);
 +    abts_run_test(suite, pstrcat, NULL);
     return suite;
 }
--- a/apr-1.7.2-autoconf.patch
+++ b/apr-1.7.2-autoconf.patch
@ -0,0 +1,21 @@
 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])
--- a/apr-1.7.2-disable-atomic-read-test.patch
+++ b/apr-1.7.2-disable-atomic-read-test.patch
@ -0,0 +1,14 @@
 diff --git a/test/testatomic.c b/test/testatomic.c
 index bf388c7..03e1c32 100644
 --- a/test/testatomic.c
 +++ b/test/testatomic.c
@@ -953,7 +953,8 @@ abts_suite *testatomic(abts_suite *suite)
     abts_run_test(suite, test_atomics_threaded64, NULL);
     abts_run_test(suite, test_atomics_busyloop_threaded, NULL);
     abts_run_test(suite, test_atomics_busyloop_threaded64, NULL);
 -    abts_run_test(suite, test_atomics_threaded_setread64, NULL);
 +//    disable this test due to i686 issues
 +//    abts_run_test(suite, test_atomics_threaded_setread64, NULL);
 #endif
     return suite;
--- a/apr-1.7.2-libdir.patch
+++ b/apr-1.7.2-libdir.patch
@ -1,9 +1,8 @@
-
+diff --git a/apr-config.in b/apr-config.in
- avoid adding %{_libdir} to --link-ld output
+index bed47ca..d4bf4d8 100644
-
+--- a/apr-config.in
--- apr-1.2.2/apr-config.in.libdir
+++ b/apr-config.in
-+++ apr-1.2.2/apr-config.in
+@@ -198,8 +198,10 @@ while test $# -gt 0; do
@@ -181,8 +181,10 @@
     ;;
     --link-ld)
     if test "$location" = "installed"; then
@ -13,6 +12,6 @@
 +            flags="$flags -L$libdir"
 +        fi
 +        flags="$flags -l${APR_LIBNAME}"
     elif test "$location" = "crosscompile"; then
         flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
     else
         ### this surely can't work since the library is in .libs?
         flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
--- a/apr-configure-c99-1.patch
+++ b/apr-configure-c99-1.patch
@ -1,112 +0,0 @@
 ------------------------------------------------------------------------
 r1882980 | jim | 2020-10-29 21:23:11 +0100 (Thu, 29 Oct 2020) | 2 lines
 calls to exit() require stdlib.h or else we get -Werror,-Wimplicit-function-declaration
 ------------------------------------------------------------------------
 diff --git a/build/apr_common.m4 b/build/apr_common.m4
 index 6f5782e674384dbd..b8c14b977cfc422b 100644
 --- a/build/apr_common.m4
 +++ b/build/apr_common.m4
@@ -527,6 +527,7 @@ AC_TRY_RUN([
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 +#include <stdlib.h>
 main()
 {
   char buf[1024];
 diff --git a/build/apr_network.m4 b/build/apr_network.m4
 index 248898283080317d..d330ba16f38f649f 100644
 --- a/build/apr_network.m4
 +++ b/build/apr_network.m4
@@ -63,6 +63,9 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 int main(void) {
     struct addrinfo hints, *ai;
@@ -151,6 +154,9 @@ AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 int main(void) {
     struct sockaddr_in sa;
@@ -194,6 +200,9 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 int main(void) {
     if (EAI_ADDRFAMILY < 0) {
@@ -403,6 +412,9 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [
 #ifndef HAVE_SOCKLEN_T
 typedef int socklen_t;
 #endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 int main(void) {
     int listen_s, connected_s, client_s;
     int listen_port, rc;
@@ -588,6 +600,9 @@ typedef int socklen_t;
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 int main(void) {
     int listen_s, connected_s, client_s;
     int listen_port, rc;
 diff --git a/configure.in b/configure.in
 index 6833b32d04de9639..7f6352860dfe41d5 100644
 --- a/configure.in
 +++ b/configure.in
@@ -2208,6 +2208,7 @@ AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 +#include <stdlib.h>
 main()
 {
     struct rlimit limit;
@@ -2244,6 +2245,7 @@ AC_TRY_RUN([
 #include <stdlib.h>
 #include <fcntl.h>
 #include <semaphore.h>
 +#include <stdlib.h>
 #ifndef SEM_FAILED
 #define SEM_FAILED (-1)
 #endif
@@ -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;
@@ -2430,7 +2433,9 @@ AC_TRY_RUN([
 #endif
 #include <fcntl.h>
 #include <errno.h>
 -
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 int fd;
 struct flock proc_mutex_lock_it = {0};
 const char *fname = "conftest.fcntl";
--- a/apr-configure-c99-2.patch
+++ b/apr-configure-c99-2.patch
@ -1,26 +0,0 @@
 ------------------------------------------------------------------------
 r1906349 | jorton | 2023-01-03 09:51:28 +0100 (Tue, 03 Jan 2023) | 8 lines
 Merge r1906347 from trunk:
 Fix configure for compilers which don't accept implicit
 int (no longer part of C since C99).
 Submitted by: Florian Weimer <fweimer redhat.com>
 PR: 66396
 ------------------------------------------------------------------------
 diff --git a/build/apr_common.m4 b/build/apr_common.m4
 index b8c14b977cfc422b..2cb366c39b78380e 100644
 --- a/build/apr_common.m4
 +++ b/build/apr_common.m4
@@ -528,7 +528,7 @@ AC_TRY_RUN([
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 -main()
 +int main(void)
 {
   char buf[1024];
   if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
--- a/apr-configure-c99-3.patch
+++ b/apr-configure-c99-3.patch
@ -1,142 +0,0 @@
 ------------------------------------------------------------------------
 r1906595 | jorton | 2023-01-11 10:44:46 +0100 (Wed, 11 Jan 2023) | 7 lines
 Merge r1906594 from trunk:
 Fix further strict C99 compliance issue. (fixes #37)
 PR: 66408
 Submitted by: Sam James <sam gentoo.org>
 ------------------------------------------------------------------------
 diff --git a/build/apr_network.m4 b/build/apr_network.m4
 index d330ba16f38f649f..f70431a800f2dfdd 100644
 --- a/build/apr_network.m4
 +++ b/build/apr_network.m4
@@ -66,6 +66,12 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 +#ifdef HAVE_NETINET_IN_H
 +#include <netinet/in.h>
 +#endif
 +#ifdef HAVE_ARPA_INET_H
 +#include <arpa/inet.h>
 +#endif
 int main(void) {
     struct addrinfo hints, *ai;
@@ -397,9 +403,11 @@ 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
 +#include <string.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -749,6 +757,12 @@ AC_TRY_COMPILE([
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 +#ifdef HAVE_SYS_SOCKET_H
 +#include <sys/socket.h>
 +#endif
 +#ifdef HAVE_NETINET_IN_H
 +#include <netinet/in.h>
 +#endif
 ],[
 inet_addr("127.0.0.1");
 ],[
@@ -769,6 +783,10 @@ 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>
 +#ifdef HAVE_NETINET_IN_H
 +#include <netinet/in.h>
 +#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -942,7 +960,9 @@ AC_DEFUN([APR_CHECK_MCAST], [
 AC_CACHE_CHECK([for struct ip_mreq], [apr_cv_struct_ipmreq], [
 AC_TRY_COMPILE([
 #include <sys/types.h>
 +#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 +#endif
 ], [
     struct ip_mreq mip;
     mip.imr_interface.s_addr = INADDR_ANY;
 diff --git a/configure.in b/configure.in
 index 7f6352860dfe41d5..7ab8277a2782dbef 100644
 --- 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.
@@ -2249,7 +2250,7 @@ AC_TRY_RUN([
 #ifndef SEM_FAILED
 #define SEM_FAILED (-1)
 #endif
 -main()
 +int main()
 {
     sem_t *psem;
     const char *sem_name = "/apr_autoconf";
@@ -2440,6 +2441,8 @@ int fd;
 struct flock proc_mutex_lock_it = {0};
 const char *fname = "conftest.fcntl";
 +int lockit();
 +
 int main()
 {
     int rc, status;;
 diff --git a/poll/os2/pollset.c b/poll/os2/pollset.c
 index 2ec848105be1e1bf..87b3c1841f7e64f3 100644
 --- 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";
 }
 diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c
 index 8fa817330f65e515..11b57365257bec54 100644
 --- 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;
--- a/apr-configure-c99-4.patch
+++ b/apr-configure-c99-4.patch
@ -1,116 +0,0 @@
 ------------------------------------------------------------------------
 r1871981 | minfrin | 2019-12-26 02:19:49 +0100 (Thu, 26 Dec 2019) | 3 lines
 Backport r1871980.
 Use AC_CHECK_SIZEOF, so as to support cross compiling. PR 56053.
 ------------------------------------------------------------------------
 diff --git a/build/apr_common.m4 b/build/apr_common.m4
 index 2cb366c39b78380e..7239a19995218ccc 100644
 --- a/build/apr_common.m4
 +++ b/build/apr_common.m4
@@ -451,43 +451,6 @@ fi
 ])
 -dnl
 -dnl APR_CHECK_SIZEOF_EXTENDED(INCLUDES, TYPE [, CROSS_SIZE])
 -dnl
 -dnl A variant of AC_CHECK_SIZEOF which allows the checking of
 -dnl sizes of non-builtin types
 -dnl
 -AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
 -[changequote(<<, >>)dnl
 -dnl The name to #define.
 -define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
 -dnl The cache variable name.
 -define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *], [_p]))dnl
 -changequote([, ])dnl
 -AC_MSG_CHECKING(size of $2)
 -AC_CACHE_VAL(AC_CV_NAME,
 -[AC_TRY_RUN([#include <stdio.h>
 -$1
 -#ifdef WIN32
 -#define binmode "b"
 -#else
 -#define binmode
 -#endif
 -main()
 -{
 -  FILE *f=fopen("conftestval", "w" binmode);
 -  if (!f) exit(1);
 -  fprintf(f, "%d\n", sizeof($2));
 -  exit(0);
 -}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,,
 -AC_CV_NAME=$3))])dnl
 -AC_MSG_RESULT($AC_CV_NAME)
 -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The size of ]$2)
 -undefine([AC_TYPE_NAME])dnl
 -undefine([AC_CV_NAME])dnl
 -])
 -
 -
 dnl
 dnl APR_TRY_COMPILE_NO_WARNING(INCLUDES, FUNCTION-BODY,
 dnl             [ACTIONS-IF-NO-WARNINGS], [ACTIONS-IF-WARNINGS])
 diff --git a/configure.in b/configure.in
 index 7ab8277a2782dbef..d858951af97f3a1b 100644
 --- a/configure.in
 +++ b/configure.in
@@ -1799,7 +1799,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"'
@@ -1871,7 +1871,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [
 APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
 ])
 -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
 +AC_CHECK_SIZEOF(ssize_t)
 dnl the else cases below should no longer occur;
 AC_MSG_CHECKING([which format to use for apr_ssize_t])
@@ -1889,7 +1889,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)
 # else cases below should no longer occur;
 AC_MSG_CHECKING([which format to use for apr_size_t])
@@ -1907,7 +1907,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
@@ -2001,7 +2001,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"
@@ -2021,8 +2021,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
--- a/apr-configure-c99-5.patch
+++ b/apr-configure-c99-5.patch
@ -1,24 +0,0 @@
 ------------------------------------------------------------------------
 r1882981 | jim | 2020-10-29 21:32:54 +0100 (Thu, 29 Oct 2020) | 5 lines
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 is required for inet_addr
 ------------------------------------------------------------------------
 diff --git a/build/apr_network.m4 b/build/apr_network.m4
 index f70431a800f2dfdd..ba7bf9aa2497df82 100644
 --- a/build/apr_network.m4
 +++ b/build/apr_network.m4
@@ -160,6 +160,9 @@ AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 +#ifdef HAVE_ARPA_INET_H
 +#include <arpa/inet.h>
 +#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
--- a/apr-configure-c99-6.patch
+++ b/apr-configure-c99-6.patch
@ -1,19 +0,0 @@
 Avoid an implicit int in the definition of the main function.
 Avoids build problems with future C compilers which will not
 support them by default.
 Submitted upstream: <https://bz.apache.org/bugzilla/show_bug.cgi?id=66426>
 diff --git a/configure.in b/configure.in
 index d858951af97f3a1b..6346d8026e7a251d 100644
 --- a/configure.in
 +++ b/configure.in
@@ -2210,7 +2210,7 @@ AC_TRY_RUN([
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <stdlib.h>
 -main()
 +int main(void)
 {
     struct rlimit limit;
     limit.rlim_cur = 0;
--- a/apr.spec
+++ b/apr.spec
@ -11,8 +11,8 @@
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.7.0
+Version: 1.7.2
-Release: 21%{?dist}
+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,
@ -23,17 +23,11 @@ License: ASL 2.0 and BSD with advertising and ISC and BSD
 URL: https://apr.apache.org/
 Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Source1: apr-wrapper.h
-Patch1: apr-1.2.2-libdir.patch
+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.0-autoconf.patch
+Patch4: apr-1.7.2-autoconf.patch
-Patch5: apr-1.7.0-r1891269+.patch
+Patch5: apr-1.7.2-disable-atomic-read-test.patch
 Patch6: apr-configure-c99-1.patch
 Patch7: apr-configure-c99-2.patch
 Patch8: apr-configure-c99-3.patch
 Patch9: apr-configure-c99-4.patch
 Patch10: apr-configure-c99-5.patch
 Patch11: apr-configure-c99-6.patch
 BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
 BuildRequires: make
@ -60,13 +54,7 @@ C data structures and routines.
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .deepbind
 %patch4 -p1 -b .autoconf-2-71
-%patch5 -p1 -b .r1891269+
+%patch5 -p1 -b .dis-atomic-rd-test
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %build
 # regenerate configure script etc.
@ -156,6 +144,9 @@ popd
 %{_datadir}/aclocal/*.m4
 %changelog
 * Thu Feb 02 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.2-1
 - new version 1.7.2
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (apr-1.7.0.tar.bz2) = 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
+SHA512 (apr-1.7.2.tar.bz2) = 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
`@ -1 +1 @@`
	`SHA512 (apr-1.7.0.tar.bz2) = 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148`	`SHA512 (apr-1.7.2.tar.bz2) = 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e`