CVS commit: pkgsrc/devel/apr

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 31 18:41:49 UTC 2023

Modified Files:
        pkgsrc/devel/apr: Makefile buildlink3.mk distinfo
        pkgsrc/devel/apr/patches: patch-atomic_unix_builtins64.c
            patch-include_apr__general.h
            patch-include_arch_unix_apr__arch__atomic.h
Removed Files:
        pkgsrc/devel/apr/patches: patch-time_unix_time.c
            patch-time_win32_time.c

Log Message:
apr: update to 1.7.1.

Changes for APR 1.7.1

  *) SECURITY: CVE-2021-35940 (cve.mitre.org)
     Restore fix for out-of-bounds array dereference in apr_time_exp*() functions.
     (This issue was addressed as CVE-2017-12613 in APR 1.6.3 and
     later 1.6.x releases, but was missing in 1.7.0.)  [Stefan Sperling]

  *) configure: Fix various build issues for compilers enforcing
     strict C99 compliance.  PR 66396, 66408, 66426.
     [Florian Weimer <fweimer redhat.com>, Sam James <sam gentoo.org>]

  *) apr_atomic_read64(): Fix non-atomic read on 32-bit Windows [Ivan Zhakov]

  *) configure: Prefer posix name-based shared memory over SysV IPC.
     [Jim Jagielski]

  *) configure: Add --disable-sctp argument to forcibly disable SCTP
     support, or --enable-sctp which fails if SCTP support is not
     detected.  [Lubos Uhliarik <luhliari redhat.com>, Joe Orton]

  *) Fix handle leak in the Win32 apr_uid_current implementation.
     PR 61165. [Ivan Zhakov]

  *) Add error handling for lseek() failures in apr_file_write() and
     apr_file_writev().  [Joe Orton]

  *) Don't silently set APR_FOPEN_NOCLEANUP for apr_file_mktemp() created file
     to avoid a fd and inode leak when/if later passed to apr_file_setaside().
     [Yann Ylavic]

  *) APR's configure script uses AC_TRY_RUN to detect whether the return type
     of strerror_r is int. When cross-compiling this defaults to no.

     This commit adds an AC_CACHE_CHECK so users who cross-compile APR may
     influence the outcome with a configure variable. [Sebastian Kemper
     <sebastian_ml gmx net>]

  *) Add a cache check with which users who cross-compile APR
     can influence the outcome of the /dev/zero test by setting the variable
     ac_cv_mmap__dev_zero=yes [Sebastian Kemper <sebastian_ml gmx net>]

  *) Trick autoconf into printing the correct default prefix in the help.
     [Stefan Fritsch]

  *) Don't try to use PROC_PTHREAD by default when cross compiling.
     [Yann Ylavic]

  *) Add the ability to cross compile APR. [Graham Leggett]

  *) While cross-compiling, the tools/gen_test_char could not
     be executed at build time, use AX_PROG_CC_FOR_BUILD to
     build native tools/gen_test_char

     Support explicit libtool by variable assigning before buildcheck.sh,
     it is helpful for cross-compiling (such as libtool=aarch64-linux-libtool)
     [Hongxu Jia <hongxu.jia windriver.com>]

  *) Avoid an overflow on 32 bit platforms. [René Hjortskov Nielsen
     <r... hjortskov.dk>]

  *) Use AC_CHECK_SIZEOF, so as to support cross compiling. PR 56053.
     [Mike Frysinger <vapier gentoo.org>]

  *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]

  *) apr_pools: Fix pool debugging output so that creation events are
     always emitted before allocation events and subpool destruction
     events are emitted on pool clear/destroy for proper accounting.
     [Brane Čibej]

  *) apr_socket_listen: Allow larger listen backlog values on Windows 8+.
     [Evgeny Kotkov <evgeny.kotkov visualsvn.com>]

  *) Fixed: apr_get_oslevel() was returning APR_WIN_XP on Windows 10

  *) Fix attempt to free invalid memory on exit when apr_app is used
     on Windows. [Ivan Zhakov]

  *) Fix double free on exit when apr_app is used on Windows. [Ivan Zhakov]

  *) Fix a regression in apr_stat() for root path on Windows. [Ivan Zhakov]


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/devel/apr/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/apr/buildlink3.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/apr/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/apr/patches/patch-atomic_unix_builtins64.c \
    pkgsrc/devel/apr/patches/patch-include_apr__general.h \
    pkgsrc/devel/apr/patches/patch-include_arch_unix_apr__arch__atomic.h
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/apr/patches/patch-time_unix_time.c \
    pkgsrc/devel/apr/patches/patch-time_win32_time.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/apr/Makefile
diff -u pkgsrc/devel/apr/Makefile:1.83 pkgsrc/devel/apr/Makefile:1.84
--- pkgsrc/devel/apr/Makefile:1.83      Sun Nov 28 12:57:05 2021
+++ pkgsrc/devel/apr/Makefile   Tue Jan 31 18:41:49 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.83 2021/11/28 12:57:05 he Exp $
+# $NetBSD: Makefile,v 1.84 2023/01/31 18:41:49 wiz Exp $
 #
 # Take care, changelogs often include "PR 12345" strings
 # which cause GNATS indigestion.
 
-DISTNAME=      apr-1.7.0
-PKGREVISION=   2
+DISTNAME=      apr-1.7.1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_APACHE:=apr/}
 EXTRACT_SUFX=  .tar.bz2
@@ -14,6 +13,9 @@ HOMEPAGE=     https://apr.apache.org/
 COMMENT=       Apache Portable Runtime
 LICENSE=       apache-2.0
 
+# bug in 1.7.1 tarball
+WRKSRC=                ${WRKDIR}/apr-1.7.1-rc2
+
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 PKGCONFIG_OVERRIDE+=   apr.pc.in

Index: pkgsrc/devel/apr/buildlink3.mk
diff -u pkgsrc/devel/apr/buildlink3.mk:1.36 pkgsrc/devel/apr/buildlink3.mk:1.37
--- pkgsrc/devel/apr/buildlink3.mk:1.36 Sun Dec  1 09:45:49 2013
+++ pkgsrc/devel/apr/buildlink3.mk      Tue Jan 31 18:41:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2013/12/01 09:45:49 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2023/01/31 18:41:49 wiz Exp $
 
 BUILDLINK_TREE+=       apr
 
@@ -16,6 +16,7 @@ BUILDLINK_FILES.apr+= lib/apr.exp
 ${BUILDLINK_DIR}/bin/apr-config: buildlink-directories
        ${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apr-1-config ${BUILDLINK_DIR}/bin/apr-config
 
+.PHONY: buildlink-apr-cookie
 buildlink-apr-cookie: ${BUILDLINK_DIR}/bin/apr-config
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/devel/apr/distinfo
diff -u pkgsrc/devel/apr/distinfo:1.49 pkgsrc/devel/apr/distinfo:1.50
--- pkgsrc/devel/apr/distinfo:1.49      Sun Nov 28 12:57:05 2021
+++ pkgsrc/devel/apr/distinfo   Tue Jan 31 18:41:49 2023
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.49 2021/11/28 12:57:05 he Exp $
+$NetBSD: distinfo,v 1.50 2023/01/31 18:41:49 wiz Exp $
 
-BLAKE2s (apr-1.7.0.tar.bz2) = f6126e30d08bc9dd7333bb9ee5814d606ae3b8f26f31ac6132bc918c22e57de0
-SHA512 (apr-1.7.0.tar.bz2) = 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-Size (apr-1.7.0.tar.bz2) = 872238 bytes
+BLAKE2s (apr-1.7.1.tar.bz2) = f409825011ba80d53c16f08a0fa5fa40b451dd9db26e2db3edf863ff3499ef23
+SHA512 (apr-1.7.1.tar.bz2) = c23d074fc5d7e0934815b0c87e2c788f8670c3061f30b5dc1fd1d9571e7ec2a43143b52ee1fd6be5dc2d662069eaba2be918d7e8b9a55095a9e33affc68b53f9
+Size (apr-1.7.1.tar.bz2) = 890114 bytes
 SHA1 (patch-atomic_unix_builtins.c) = e90d0232013650c3d227fa3a8be952c51b7148e8
-SHA1 (patch-atomic_unix_builtins64.c) = e24316e93dae12efc1cbfc3f444e8622df5e5833
-SHA1 (patch-include_apr__general.h) = bff357eee11218a6c53769278fc3f9094b062fdf
-SHA1 (patch-include_arch_unix_apr__arch__atomic.h) = 6f226add54f5966a50985441f6903853a0728c88
-SHA1 (patch-time_unix_time.c) = d3da97cb4b6c7b6416fecb49006470db46084276
-SHA1 (patch-time_win32_time.c) = aee61377826292c238352241a304eb6905a1b2dc
+SHA1 (patch-atomic_unix_builtins64.c) = a009c6418c13919080757cba6e4b9630013f4bc7
+SHA1 (patch-include_apr__general.h) = 08959c41f37b166c2d45fcefdf65acc47c593206
+SHA1 (patch-include_arch_unix_apr__arch__atomic.h) = ffa08ccc2bd600f20da0ea33c1b006467ca3154f

Index: pkgsrc/devel/apr/patches/patch-atomic_unix_builtins64.c
diff -u pkgsrc/devel/apr/patches/patch-atomic_unix_builtins64.c:1.1 pkgsrc/devel/apr/patches/patch-atomic_unix_builtins64.c:1.2
--- pkgsrc/devel/apr/patches/patch-atomic_unix_builtins64.c:1.1 Thu Feb 20 06:25:28 2020
+++ pkgsrc/devel/apr/patches/patch-atomic_unix_builtins64.c     Tue Jan 31 18:41:49 2023
@@ -1,21 +1,21 @@
-$NetBSD: patch-atomic_unix_builtins64.c,v 1.1 2020/02/20 06:25:28 rin Exp $
+$NetBSD: patch-atomic_unix_builtins64.c,v 1.2 2023/01/31 18:41:49 wiz Exp $
 
 Work around missing 64bit atomic builtins for non-x86 ILP32 platforms.
 
---- atomic/unix/builtins64.c.orig      2020-02-19 16:06:32.153732769 +0900
-+++ atomic/unix/builtins64.c   2020-02-19 16:08:48.239198201 +0900
+--- atomic/unix/builtins64.c.orig      2022-06-27 21:55:09.000000000 +0000
++++ atomic/unix/builtins64.c
 @@ -16,7 +16,7 @@
  
  #include "apr_arch_atomic.h"
  
--#ifdef USE_ATOMICS_BUILTINS
+-#ifdef USE_ATOMICS_BUILTINS64
 +#if defined (USE_ATOMICS_BUILTINS) && !defined (NEED_ATOMICS_GENERIC64)
  
- APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem)
- {
-@@ -61,4 +61,4 @@ APR_DECLARE(apr_uint64_t) apr_atomic_xch
-     return __sync_lock_test_and_set(mem, val);
+ #if defined(__arm__) || defined(__powerpc__) || defined(__powerpc64__)
+ #define WEAK_MEMORY_ORDERING 1
+@@ -106,4 +106,4 @@ APR_DECLARE(apr_uint64_t) apr_atomic_xch
+ #endif
  }
  
--#endif /* USE_ATOMICS_BUILTINS */
+-#endif /* USE_ATOMICS_BUILTINS64 */
 +#endif /* USE_ATOMICS_BUILTINS && !NEED_ATOMICS_GENERIC64 */
Index: pkgsrc/devel/apr/patches/patch-include_apr__general.h
diff -u pkgsrc/devel/apr/patches/patch-include_apr__general.h:1.1 pkgsrc/devel/apr/patches/patch-include_apr__general.h:1.2
--- pkgsrc/devel/apr/patches/patch-include_apr__general.h:1.1   Tue Nov 25 14:55:46 2014
+++ pkgsrc/devel/apr/patches/patch-include_apr__general.h       Tue Jan 31 18:41:49 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-include_apr__general.h,v 1.1 2014/11/25 14:55:46 joerg Exp $
+$NetBSD: patch-include_apr__general.h,v 1.2 2023/01/31 18:41:49 wiz Exp $
+
+Unconditionally use the !ARM, !CRAY version of APR_OFFSET.
 
 --- include/apr_general.h.orig 2014-11-21 11:49:41.000000000 +0000
 +++ include/apr_general.h
Index: pkgsrc/devel/apr/patches/patch-include_arch_unix_apr__arch__atomic.h
diff -u pkgsrc/devel/apr/patches/patch-include_arch_unix_apr__arch__atomic.h:1.1 pkgsrc/devel/apr/patches/patch-include_arch_unix_apr__arch__atomic.h:1.2
--- pkgsrc/devel/apr/patches/patch-include_arch_unix_apr__arch__atomic.h:1.1    Thu Feb 20 06:25:28 2020
+++ pkgsrc/devel/apr/patches/patch-include_arch_unix_apr__arch__atomic.h        Tue Jan 31 18:41:49 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-include_arch_unix_apr__arch__atomic.h,v 1.1 2020/02/20 06:25:28 rin Exp $
+$NetBSD: patch-include_arch_unix_apr__arch__atomic.h,v 1.2 2023/01/31 18:41:49 wiz Exp $
 
 Work around missing 64bit atomic builtins for non-x86 ILP32 platforms.
 
---- include/arch/unix/apr_arch_atomic.h.orig   2020-02-19 15:50:52.065380193 +0900
-+++ include/arch/unix/apr_arch_atomic.h        2020-02-19 15:51:59.253483287 +0900
+--- include/arch/unix/apr_arch_atomic.h.orig   2022-06-27 21:55:09.000000000 +0000
++++ include/arch/unix/apr_arch_atomic.h
 @@ -26,6 +26,9 @@
  /* noop */
  #elif HAVE_ATOMIC_BUILTINS
@@ -11,6 +11,6 @@ Work around missing 64bit atomic builtin
 +#   ifndef __LP64__
 +#     define NEED_ATOMICS_GENERIC64
 +#   endif
- #elif defined(SOLARIS2) && SOLARIS2 >= 10
- #   define USE_ATOMICS_SOLARIS
- #   define NEED_ATOMICS_GENERIC64
+ #   if HAVE_ATOMIC_BUILTINS64
+ #   define USE_ATOMICS_BUILTINS64
+ #   else