[meta-oe][walnascar][PATCH 1/5] c-ares: upgrade 1.34.1 -> 1.34.2

[meta-oe][walnascar][PATCH 1/5] c-ares: upgrade 1.34.1 -> 1.34.2

[Armin Kuster]

From: Jason Schonberg <schonm@gmail.com>

Changelog: https://github.com/c-ares/c-ares/releases/tag/v1.34.2

This release contains a fix for downstream packages detecting the c-ares
version based on the contents of the header file rather than the
distributed pkgconf or cmake files.

Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b0cc9ddc32e9e81a95606cb47bd7a5bf9b674a26)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../c-ares/{c-ares_1.34.1.bb => c-ares_1.34.2.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/c-ares/{c-ares_1.34.1.bb => c-ares_1.34.2.bb} (91%)

diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.34.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.34.2.bb
similarity index 91%
rename from meta-oe/recipes-support/c-ares/c-ares_1.34.1.bb
rename to meta-oe/recipes-support/c-ares/c-ares_1.34.2.bb
index 877e29d9f2..21a0e37e6c 100644
--- a/meta-oe/recipes-support/c-ares/c-ares_1.34.1.bb
+++ b/meta-oe/recipes-support/c-ares/c-ares_1.34.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3"
 
 SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
            file://run-ptest"
-SRC_URI[sha256sum] = "7e846f1742ab5998aced36d170408557de5292b92ec404fb0f7422f946d60103"
+SRC_URI[sha256sum] = "35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[manpages] = ""
-- 
2.43.0

[meta-oe][walnascar][PATCH 2/5] c-ares: upgrade 1.34.2 -> 1.34.3

[Armin Kuster]

From: Jason Schonberg <schonm@gmail.com>

Changelog: https://github.com/c-ares/c-ares/releases/tag/v1.34.3

Changes:

    Build the release package in an automated way so we can provide provenance as per SLSA3. PR #906

Bugfixes:

    Some upstream servers are non-compliant with EDNS options, resend queries without EDNS. Issue #911
    Android: <=7 needs sys/system_properties.h a70637c
    Android: CMake needs -D_GNU_SOURCE and others. PR #915
    TSAN warns on missing lock, but lock isn't actually necessary. PR #915
    ares_getaddrinfo() for AF_UNSPEC should retry IPv4 if only IPv6 is received. 765d558
    ares_send() shouldn't return ARES_EBADRESP, its ARES_EBADQUERY. 91519e7
    Fix typos in man pages. PR #905

Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d8eaa791dd9836a3bcba7590d208e8bdea9ef5b0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../c-ares/{c-ares_1.34.2.bb => c-ares_1.34.3.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/c-ares/{c-ares_1.34.2.bb => c-ares_1.34.3.bb} (91%)

diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.34.2.bb b/meta-oe/recipes-support/c-ares/c-ares_1.34.3.bb
similarity index 91%
rename from meta-oe/recipes-support/c-ares/c-ares_1.34.2.bb
rename to meta-oe/recipes-support/c-ares/c-ares_1.34.3.bb
index 21a0e37e6c..c02bdbcc5c 100644
--- a/meta-oe/recipes-support/c-ares/c-ares_1.34.2.bb
+++ b/meta-oe/recipes-support/c-ares/c-ares_1.34.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3"
 
 SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
            file://run-ptest"
-SRC_URI[sha256sum] = "35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a"
+SRC_URI[sha256sum] = "26e1f7771da23e42a18fdf1e58912a396629e53a2ac71b130af93bbcfb90adbe"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[manpages] = ""
-- 
2.43.0

[meta-oe][walnascar][PATCH 3/5] catch2: upgrade 3.8.0 -> 3.8.1

[Armin Kuster]

From: Yi Zhao <yi.zhao@windriver.com>

ChangeLog:
https://github.com/catchorg/Catch2/releases/tag/v3.8.1

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4e54d20446c509c35d030bd411a767fae8f36c3d)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-test/catch2/{catch2_3.8.0.bb => catch2_3.8.1.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-test/catch2/{catch2_3.8.0.bb => catch2_3.8.1.bb} (92%)

diff --git a/meta-oe/recipes-test/catch2/catch2_3.8.0.bb b/meta-oe/recipes-test/catch2/catch2_3.8.1.bb
similarity index 92%
rename from meta-oe/recipes-test/catch2/catch2_3.8.0.bb
rename to meta-oe/recipes-test/catch2/catch2_3.8.1.bb
index dd7ec5469a..f106b39de4 100644
--- a/meta-oe/recipes-test/catch2/catch2_3.8.0.bb
+++ b/meta-oe/recipes-test/catch2/catch2_3.8.1.bb
@@ -5,7 +5,7 @@ LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
 SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https"
-SRCREV = "914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a"
+SRCREV = "2b60af89e23d28eefc081bc930831ee9d45ea58b"
 
 S = "${WORKDIR}/git"
 
-- 
2.43.0

[meta-oe][walnascar][PATCH 4/5] php: upgrade 8.4.5 -> 8.4.6

[Armin Kuster]

From: Wang Mingyu <wangmy@fujitsu.com>

0003-iconv-fix-detection.patch
refreshed for 8.4.6

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 250084b15e7b7bd6a4d9faeb3d1db6551504830a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../php/php/0003-iconv-fix-detection.patch            | 11 ++++-------
 .../php/{php_8.4.5.bb => php_8.4.6.bb}                |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-devtools/php/{php_8.4.5.bb => php_8.4.6.bb} (99%)

diff --git a/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
index 46505cd329..745bc2140d 100644
--- a/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
+++ b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
@@ -1,7 +1,7 @@
-From 35ac74fce1a60025f8d126783b8aa7014eefdf53 Mon Sep 17 00:00:00 2001
+From d9fc6b314cefe010a0deb6e591719cfb0ff226a5 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:10:33 -0500
-Subject: [PATCH 3/5] iconv: fix detection
+Subject: [PATCH] iconv: fix detection
 
 Upstream-Status: Pending
 
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/build/php.m4 b/build/php.m4
-index e45b22b76..1bd3ccceb 100644
+index d8a5cbf0..aee21924 100644
 --- a/build/php.m4
 +++ b/build/php.m4
-@@ -1820,7 +1820,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+@@ -1829,7 +1829,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
      [Define to 1 if you have the 'libiconv' function.])
  
    dnl Check libc first if no path is provided in --with-iconv.
@@ -33,6 +33,3 @@ index e45b22b76..1bd3ccceb 100644
      dnl Reset LIBS temporarily as it may have already been included -liconv in.
      LIBS_save=$LIBS
      LIBS=
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php_8.4.5.bb b/meta-oe/recipes-devtools/php/php_8.4.6.bb
similarity index 99%
rename from meta-oe/recipes-devtools/php/php_8.4.5.bb
rename to meta-oe/recipes-devtools/php/php_8.4.6.bb
index cf4b756b85..5629a3dd3d 100644
--- a/meta-oe/recipes-devtools/php/php_8.4.5.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.6.bb
@@ -29,7 +29,7 @@ SRC_URI:append:class-target = " \
 
 S = "${WORKDIR}/php-${PV}"
 
-SRC_URI[sha256sum] = "9378c78887d0cd7462fc5c17f2de30c852f20f79d28795e2573fe3250d39436e"
+SRC_URI[sha256sum] = "9cf2734509b603f6589617ab52a9712a03e0fe059951cddd2d4623df4bf7c6c6"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
 CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
-- 
2.43.0

[meta-oe][walnascar][PATCH 5/5] apache2: Scrub -ffile-prefix-map in build.nice file

[Armin Kuster]

From: Khem Raj <raj.khem@gmail.com>

Fixes
QA Issue: File /usr/libexec/apache2/build/config.nice in package apache2-dev contains reference to TMPDIR [buildpaths]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f00a3f153a0b2a1bd9e77f24f857df12b41bcbba)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb
index d4ae26d9c7..9ef8c13b79 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb
@@ -138,7 +138,7 @@ do_install:append:class-target() {
     sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
            -e 's,${DEBUG_PREFIX_MAP},,g' \
            -e 's,${RECIPE_SYSROOT},,g' \
-           -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \
+           -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \
            -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
            -e 's,${WORKDIR}/recipe-sysroot/,,g' \
            -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice
-- 
2.43.0