From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 3 Apr 2023 08:00:21 +0000 (+0000)
Subject: Merge r1908933 from trunk:
X-Git-Tag: 2.4.58-rc1-candidate~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ba6cdefff1c45d75846c134e57b56883271c48f;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1908933 from trunk:

* Use latest released versions of APR and APR-UTIL for building
Submitted by: rpluem
Reviewed by: ruediger


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908934 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b36f6bd4687..86363a3028d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -74,10 +74,10 @@ jobs:
               TEST_INSTALL=1
               SKIP_TESTING=1
           # -------------------------------------------------------------------------
-          - name: All-modules, APR 1.7.2, APR-util 1.6.3
+          - name: All-modules, APR 1.7.3, APR-util 1.6.3
             config: --enable-mods-shared=reallyall
             env: |
-              APR_VERSION=1.7.2
+              APR_VERSION=1.7.3
               APU_VERSION=1.6.3
               APU_CONFIG="--with-crypto --with-ldap"
           # -------------------------------------------------------------------------
@@ -139,11 +139,11 @@ jobs:
               TESTS="t/modules/dav.t"
             pkgs: litmus
           # -------------------------------------------------------------------------
-          - name: APR 1.7.2, APR-util 1.6.3, LDAP
+          - name: APR 1.7.3, APR-util 1.6.3, LDAP
             config: --enable-mods-shared=reallyall
             pkgs: ldap-utils
             env: |
-              APR_VERSION=1.7.2
+              APR_VERSION=1.7.3
               APU_VERSION=1.6.3
               APU_CONFIG="--with-crypto --with-ldap"
               TEST_MALLOC=1
@@ -184,8 +184,8 @@ jobs:
           #   config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=all
           #   pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests
           #   env: |
-          #     APR_VERSION=1.7.2
-          #     APU_VERSION=1.6.1
+          #     APR_VERSION=1.7.3
+          #     APU_VERSION=1.6.3
           #     APU_CONFIG="--with-crypto"
           #     NO_TEST_FRAMEWORK=1
           #     TEST_INSTALL=1
@@ -201,8 +201,8 @@ jobs:
           #     python3-pytest nghttp2-client python3-cryptography python3-requests python3-filelock
           #     golang-1.17 curl
           #   env: |
-          #     APR_VERSION=1.7.2
-          #     APU_VERSION=1.6.1
+          #     APR_VERSION=1.7.3
+          #     APU_VERSION=1.6.3
           #     APU_CONFIG="--with-crypto"
           #     GOROOT=/usr/lib/go-1.17
           #     NO_TEST_FRAMEWORK=1
@@ -216,8 +216,8 @@ jobs:
           #  config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=event
           #  pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests cargo cbindgen
           #  env: |
-          #    APR_VERSION=1.7.2
-          #    APU_VERSION=1.6.1
+          #    APR_VERSION=1.7.3
+          #    APU_VERSION=1.6.3
           #    APU_CONFIG="--with-crypto"
           #    NO_TEST_FRAMEWORK=1
           #    TEST_INSTALL=1
@@ -236,8 +236,8 @@ jobs:
           #     PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
           #     NOTEST_CFLAGS="-Werror"
           #     CC="gcc -m32"
-          #     APR_VERSION=1.7.0
-          #     APU_VERSION=1.6.1
+          #     APR_VERSION=1.7.3
+          #     APU_VERSION=1.6.3
           # APU_CONFIG="--with-crypto --with-ldap"
     runs-on: ubuntu-latest
     env: