Merge pull request #34 from airtower-luna/deprecate-monkeysphere

Deprecate Monkeysphere integration
airtower-luna · Mar 12, 2024 · b045d9b · b045d9b
2 parents 476fc54 + fce559c
commit b045d9b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/analysis.yaml b/.github/workflows/analysis.yaml
@@ -28,15 +28,15 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps clang clang-tools libmsv-dev
+          apt-get -y install git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps clang clang-tools
       - uses: actions/checkout@v4
       - name: find usable IPs for tests
         run: |
           echo "test_ips=$(python3 test/check_test_ips.py -H localhost)" >> ${GITHUB_ENV}
       - name: autoreconf
         run: autoreconf -fiv
       - name: configure
-        run: scan-build --use-cc=clang ./configure --enable-msva TEST_IP="${test_ips}" APACHE_MUTEX=pthread CFLAGS=-Wno-error=null-pointer-subtraction
+        run: scan-build --use-cc=clang ./configure TEST_IP="${test_ips}" APACHE_MUTEX=pthread CFLAGS=-Wno-error=null-pointer-subtraction
       - name: store config.log
         uses: actions/upload-artifact@v4
         if: failure()
@@ -66,7 +66,7 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev libmsv-dev pkgconf procps bear cppcheck
+          apt-get -y install git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps bear cppcheck
       - uses: actions/checkout@v4
       - name: autoreconf
         run: autoreconf -fiv
@@ -99,7 +99,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get -y install python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev libmsv-dev pkgconf procps
+          sudo apt-get -y install python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,15 +32,15 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pandoc pkg-config procps iproute2 softhsm2
+          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pandoc pkgconf procps iproute2 softhsm2
       - name: install dependencies (Fedora)
         if: startsWith(matrix.container, 'fedora')
         run: |
-          dnf -y install bzip2 curl gcc gnutls-devel gnutls-utils httpd-devel iproute libtool make pkgconf-pkg-config python3-pyyaml redhat-rpm-config softhsm
+          dnf -y install bzip2 curl gcc gnutls-devel gnutls-utils httpd-devel iproute libtool make pkgconf python3-pyyaml redhat-rpm-config softhsm
       - name: install dependencies (Alpine)
         if: startsWith(matrix.container, 'alpine')
         run: |
-          apk add apache2 apache2-dev apache2-proxy autoconf automake bash build-base gnutls-dev gnutls-utils libtool pkgconfig python3 py3-yaml
+          apk add apache2 apache2-dev apache2-proxy autoconf automake bash build-base gnutls-dev gnutls-utils libtool pkgconf python3 py3-yaml
       - name: set prefix for container-specific artifacts
         # this is because upload-artifact doesn't like ":" in file names
         env:
@@ -64,7 +64,7 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkg-config procps iproute2 softhsm2 clang llvm
+          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkgconf procps iproute2 softhsm2 clang llvm
       - name: build mod_gnutls with coverage support
         uses: ./.github/build-action/
         with:

diff --git a/.github/workflows/valgrind.yaml b/.github/workflows/valgrind.yaml
@@ -26,7 +26,7 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkg-config procps iproute2 softhsm2 valgrind
+          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkgconf procps iproute2 softhsm2 valgrind
       - name: build mod_gnutls and run tests with Valgrind
         uses: ./.github/build-action/
         with:

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Past maintainers and other contributors:
 * [GnuTLS](https://www.gnutls.org/) >= 3.6.3
 * [Apache HTTPD](https://httpd.apache.org/) >= 2.4.17
 * autotools, GNU make, & GCC or Clang
-* libmsv >= 0.1 (Optional, enable with ./configure --enable-msva)
+* libmsv >= 0.1 (deprecated, enable with ./configure --enable-msva)
 * Python 3 (for tests)
 * [PyYAML](https://pyyaml.org/)
 * [Pandoc](https://pandoc.org/) (for documentation, optional)

diff --git a/configure.ac b/configure.ac
@@ -30,7 +30,7 @@ CHECK_APACHE(,$AP_VERSION,
 )
 
 PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.6.3])
-LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
+LIBGNUTLS_VERSION=`pkgconf --modversion gnutls`
 
 dnl Maybe use the binaries for tests, too?
 AC_ARG_WITH([gnutls-dev],
@@ -43,7 +43,7 @@ AC_ARG_WITH([gnutls-dev],
 		[
 			LIBGNUTLS_CFLAGS="-I${with_gnutls_dev}/lib/includes"
 			LIBGNUTLS_LIBS="-lgnutls -L${with_gnutls_dev}/lib/.libs -R${with_gnutls_dev}/lib/.libs"
-			LIBGNUTLS_VERSION=`PKG_CONFIG_PATH="${with_gnutls_dev}/lib" pkg-config --modversion gnutls`
+			LIBGNUTLS_VERSION=`PKG_CONFIG_PATH="${with_gnutls_dev}/lib" pkgconf --modversion gnutls`
 		],
 		[AC_MSG_ERROR([--with-gnutls-dev=DIR requires a directory!])])
 	], [])
@@ -183,7 +183,7 @@ AM_CONDITIONAL([ENABLE_NETNS], [test "$use_netns" != "no"])
 
 AC_ARG_ENABLE(msva,
        AS_HELP_STRING([--enable-msva],
-               [enable Monkeysphere client certificate verification]),
+               [enable Monkeysphere client certificate verification (deprecated)]),
        use_msva=$enableval, use_msva=no)
 AM_CONDITIONAL([USE_MSVA], [test "$use_msva" != "no"])