Sync from SUSE:SLFO:Main apr revision da56a5717e07507b60aebfdc189f1f6f

apr-1.7.4.tar.bz2.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJHBAABCgAxFiEEZbLUT+dL1ePeOsPwgngd5G1ZVPoFAmQ3ZCsTHGNvdmVuZXJA
-YXBhY2hlLm9yZwAKCRCCeB3kbVlU+mb9D/9Wl1CGZ/biEYEyLPAq3Ik0DrGvSQ49
-5wfaBCABRDBD2otD9YSuNrV+RZYkYys6xdPdGrQxUDkv5mh0hLZRvSK/Uf7eD9sD
-sDZ5ZSj6+KWvpww8+QWiYOFZLKFqcdt7/g8CWZYy+h2wkAB3jSeOW6kmum2MNowI
-8fE9ESMHwaR1nSNo+q7fTg4CyGtObEbDOcWdKwDW1Ib68Z2nj3zSz4i+rpZQZmCF
-FvPvQIYcM/TDFhitsJwc8f11NJhtZybmAnmH1kl8Ncy8WScuj08nltEpvBdPgw8V
-DG7tPrHNfbQnB3FUeBMlT8L1D6gGD7FZgynWmG49yc7V1Ll0JyW701mXsRcRCg6E
-6xMBTeAek/QQthguAmpCsRMiLrPPMiCLs8B9vlnMWQEqYG0ng9ehzXVAWz4ix5K+
-hWmVa95MHpxcoZ5joJL7G1AiVFjRuBJxyBA36qnYzleQWhtvmIW2Onf7QaknlXoC
-3ABOa6OCs8DTMynoPlLJKsPACNrOQX79rIg4xfr0jSueDJnBnfF1CVSJES7+75n8
-dt0kMm5Y718a44Vji9MtJrOXGDk9FhR8J3j++AE0vlYVpOGh5CXr2Ow0eldmaKWu
-bgtlUdB7ai3kLjtBNUBjWiz7mniDiSPSp6eskVlbmTnOkkqqXXJMyQjJ+XIGdXQJ
-8aDQ7ocCun+qhA==
-=eV/3
------END PGP SIGNATURE-----

apr-1.7.5.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEZbLUT+dL1ePeOsPwgngd5G1ZVPoFAmbFEoUACgkQgngd5G1Z
+VPp2/A/9Fy5UENuZ/D2E1T/+tA5gwDK62JNUYnKhlP8PxvBtxBBYmgYlo4HpSROt
+Z2GrvYn/khEEDgUHAVAVu+ehcgVoEJa1+DgNvhzYOc3XQjkPU3qEHrWuNuRYhlkT
+yAgXY5HgbEjc2im+SpeTL9K2it5ChEftw4b4WhSn6sdlglh+ncRkaH2f+YNQQ4et
+9NQkjyh/Z4ANeqGn3I8BvllxTgAbE4RQVTFi8O0rLY1cjj4gpP/HJ0K3wMBk+rzc
+V4llx8X2fdlNmxHB+FRFRVNAhdrMUkcOwRwbWb8CbkBPXKaoBbPyXUDeWTkzkfLs
+mVprIf3WCAtb92rGZj5tx8PMFzTCS36nZPI7Vm1nsB5BumOF1/TWWewkgBIXIgaP
+2dP4ySz97BSWJObHrySq+89nK3nisvxoP3gquhJDd8ilnlNv/BezQEuCxzid4ka/
++7DD65mEiEYYUR1DnyMR30vRf2FDR343TvgCsxGrs/dFC8aRySlq0EatslO36NYm
+g5Z7O9h0D/cXleU3Py6veMzCSwYOvKlrjROBF4CBJi+grsoPzSogfxP50DbD64N9
+DJGRVnl4WwWtXN+Za1ACeP6HaTMXghofNnmNUCg1BrsSlrOBY4dE7L3cO4QQ6shc
+xkzgzKt8/IfnTkYB6Uj068VXFAnNmEhiNQMVuvKLMOHjaZcj+vs=
+=XgMB
+-----END PGP SIGNATURE-----

apr-visibility.patch

@@ -1,8 +1,8 @@
-Index: apr-1.7.0/include/apr.h.in
+Index: apr-1.7.5/include/apr.h.in
 ===================================================================
---- apr-1.7.0.orig/include/apr.h.in
-+++ apr-1.7.0/include/apr.h.in
-@@ -495,7 +495,7 @@ typedef  apr_uint32_t            apr_uin
+--- apr-1.7.5.orig/include/apr.h.in
++++ apr-1.7.5/include/apr.h.in
+@@ -504,7 +504,7 @@ typedef  apr_uint32_t            apr_uin
   * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
   * linked to the dynamic library.
   */
@@ -11,7 +11,7 @@ Index: apr-1.7.0/include/apr.h.in
  
  /**
   * The public APR functions using variable arguments are declared with 
-@@ -508,7 +508,7 @@ typedef  apr_uint32_t            apr_uin
+@@ -517,7 +517,7 @@ typedef  apr_uint32_t            apr_uin
   *
   * </PRE>
   */
@@ -20,7 +20,7 @@ Index: apr-1.7.0/include/apr.h.in
  
  /**
   * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
-@@ -524,7 +524,7 @@ typedef  apr_uint32_t            apr_uin
+@@ -533,7 +533,7 @@ typedef  apr_uint32_t            apr_uin
   *
   * </PRE>
   */
@@ -29,10 +29,10 @@ Index: apr-1.7.0/include/apr.h.in
  
  #elif defined(APR_DECLARE_STATIC)
  #define APR_DECLARE(type)            type __stdcall
-Index: apr-1.6.3/include/apr_support.h
+Index: apr-1.7.5/include/apr_support.h
 ===================================================================
---- apr-1.7.0.orig/include/apr_support.h
-+++ apr-1.7.0/include/apr_support.h
+--- apr-1.7.5.orig/include/apr_support.h
++++ apr-1.7.5/include/apr_support.h
 @@ -45,7 +45,7 @@ extern "C" {
   *        otherwise wait for data to be able to be written. 
   * @return APR_TIMEUP if we run out of time.

apr.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue Sep 17 12:25:38 UTC 2024 - pgajdos@suse.com
+
+- version update to 1.7.5 [bsc#1229783] CVE-2023-49582
+  *) Unix: Implement apr_shm_perms_set() for the "POSIX shm_open()"
+     and "classic mmap" shared memory implementations.  [Joe Orton,
+     Ruediger Pluem]
+  *) Fix missing ';' for XML/HTML hex entities from apr_escape_entity().
+     [Yann Ylavic]
+  *) Fix crash in apr_pool_create() with --enable-pool-debug=all|owner.
+     [Yann Ylavic]
+  *) Improve platform detection by updating config.guess and config.sub.
+     [Rainer Jung]
+  *) CMake: Add support for CMAKE_WARNING_AS_ERROR. [Ivan Zhakov]
+  *) CMake: Enable support for MSVC runtime library selection by abstraction.
+     [Ivan Zhakov]
+  *) CMake: Export installed targets (libapr-1, apr-1, libaprapp-1, aprapp-1)
+     to apr:: namespace. [Ivan Zhakov]
+- modified patches
+  % apr-visibility.patch (refreshed)
+  % reproducible.patch (refreshed)
+
+-------------------------------------------------------------------
+Mon Dec 18 13:12:00 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add reproducible.patch to drop build host name (boo#1084909)
+
 -------------------------------------------------------------------
 Thu Apr 20 10:29:07 UTC 2023 - pgajdos@suse.com
 

apr.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apr
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 %define         installbuilddir %{_libdir}/apr-%{aprver}/build
 %define         includedir %{_includedir}/apr-%{aprver}
 Name:           apr
-Version:        1.7.4
+Version:        1.7.5
 Release:        0
 Summary:        Apache Portable Runtime (APR) Library
 License:        Apache-2.0
@@ -34,6 +34,7 @@ Patch5:         apr-visibility.patch
 Patch9:         apr-proc-mutex-map-anon.patch
 # prevent random failures of the testsuite (sendfile test)
 Patch10:        apr-test-sendfile-timeout.patch
+Patch11:        reproducible.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  libuuid-devel

reproducible.patch

@@ -0,0 +1,17 @@
+Author: Bernhard M. Wiedemann <bwiedemann suse de>
+Date: 2023-12-18
+Subject: drop build machine host name
+
+Index: apr-1.7.5/configure
+===================================================================
+--- apr-1.7.5.orig/configure
++++ apr-1.7.5/configure
+@@ -36085,7 +36085,7 @@ printf "%s\n" "$as_me: executing $ac_fil
+     cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+ # Generated automatically by $as_me ($PACKAGE) $VERSION
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Libtool was configured on build.opensuse.org
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ 
+ # Provide generalized library-building support services.