]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
cirrus: Don't explicitly install openldap*-client on FreeBSD
authorTobias Brunner <tobias@strongswan.org>
Thu, 6 Oct 2022 10:06:36 +0000 (12:06 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 6 Oct 2022 10:26:50 +0000 (12:26 +0200)
This avoids a conflicts as mysql80-client has a dependency on either
openldap24-client (FreeBSD 12) or openldap26-client (FreeBSD 13) so e.g.
installing openldap24-client on FreeBSD 13 causes

  openldap26-client-2.6.3 conflicts with openldap24-client-2.4.59_4 on /usr/local/bin/ldapadd

Similarly, when installing openldap26-client on FreeBSD 12.  So just let
the mysql80-client package decide which version is installed.

scripts/test.sh

index 41c0d1c3b0510c3f7f7714bf02a93cbe67c77833..79e9cda7adac2819e6e598ee5fa02eb14b704a35 100755 (executable)
@@ -324,7 +324,7 @@ freebsd)
                        --enable-unbound --enable-unity --enable-xauth-eap --enable-xauth-pam
                        --with-printf-hooks=builtin --enable-attr-sql --enable-sql
                        --enable-farp"
-       DEPS="git gmp openldap24-client libxml2 mysql80-client sqlite3 unbound ldns tpm2-tss"
+       DEPS="git gmp libxml2 mysql80-client sqlite3 unbound ldns tpm2-tss"
        ;;
 fuzzing)
        CFLAGS="$CFLAGS -DNO_CHECK_MEMWIPE"