Merge r1920050 from trunk:

CI: Install libsasl2-dev to fix build errors with APR trunk/apr-util 1.7.x

https://lists.apache.org/thread/8hhs2otod7fo44964yd1csck3ddm1fq2

CI: Add job to test LDAP with the (apr 1.7.x, apr-util 1.7.x) combination.

Github: closes #474

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

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index cbc6fd55d657f1efb1618c033188895bbe435bdc..e3ff70d341e4b269e05073a23df012c86ad11d95 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -153,6 +153,20 @@ jobs:
               TEST_ARGS="-defines LDAP"
               TESTS="t/modules/"
           # -------------------------------------------------------------------------
+          - name: APR 1.7.x, APR-util 1.7.x, LDAP
+            config: --enable-mods-shared=reallyall
+            pkgs: ldap-utils
+            env: |
+              APR_VERSION=1.7.x
+              APU_VERSION=1.7.x
+              APU_CONFIG="--with-crypto --with-ldap"
+              TEST_MALLOC=1
+              TEST_LDAP=1
+              TEST_ARGS="-defines LDAP"
+              TESTS="t/modules/"
+              CLEAR_CACHE=1
+          # -------------------------------------------------------------------------
+          ### TODO: if: *condition_not_24x
           - name: APR trunk thread debugging
             config: --enable-mods-shared=reallyall --with-mpm=event
             env: |
@@ -258,7 +272,7 @@ jobs:
                     cpanminus libtool-bin libapr1-dev libaprutil1-dev
                     liblua5.3-dev libbrotli-dev libcurl4-openssl-dev     
                     libnghttp2-dev libjansson-dev libpcre2-dev gdb
-                    perl-doc ${{ matrix.pkgs }}
+                    perl-doc libsasl2-dev ${{ matrix.pkgs }}
     - uses: actions/checkout@v4
     - name: Cache installed libraries
       uses: actions/cache@v4