We are not using p11-kit-server anymore

Signed-off-by: Simo Sorce <[email protected]>
latchset · Aug 28, 2024 · 82f466a · 82f466a
1 parent afb3551
commit 82f466a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
                 dnf -y install nss-softokn nss-tools nss-softokn-devel \
                   nss-devel
               elif [ "${{ matrix.token }}" = "softhsm" ]; then
-                dnf -y install softhsm p11-kit-devel p11-kit-server
+                dnf -y install softhsm p11-kit-devel
               fi
             elif [ -f /etc/debian_version ]; then
               apt-get -q update

diff --git a/packaging/pkcs11-provider.spec b/packaging/pkcs11-provider.spec
@@ -29,7 +29,6 @@ BuildRequires: openssl
 BuildRequires: softhsm
 BuildRequires: opensc
 BuildRequires: p11-kit-devel
-BuildRequires: p11-kit-server
 BuildRequires: gnutls-utils
 BuildRequires: xz
 BuildRequires: expect

diff --git a/tests/integration/bind.sh b/tests/integration/bind.sh
@@ -17,7 +17,7 @@ install_dependencies()
     dnf install -y --skip-broken \
         meson \
         p11-kit httpd mod_ssl openssl-devel gnutls-utils nss-tools \
-        p11-kit-devel p11-kit-server opensc softhsm-devel procps-ng \
+        p11-kit-devel opensc softhsm-devel procps-ng \
         openssl util-linux bind9-next opensc
 }
 

diff --git a/tests/integration/httpd.sh b/tests/integration/httpd.sh
@@ -19,7 +19,7 @@ install_dependencies()
     dnf install -y --skip-broken \
         meson \
         p11-kit httpd mod_ssl openssl-devel gnutls-utils nss-tools \
-        p11-kit-devel p11-kit-server opensc softhsm-devel procps-ng \
+        p11-kit-devel opensc softhsm-devel procps-ng \
         openssl util-linux
 }
 

diff --git a/tests/integration/libssh.sh b/tests/integration/libssh.sh
@@ -14,7 +14,7 @@ install_dependencies()
     title PARA "Install dependencies"
 
     dnf install -y --skip-broken cmake libcmocka libcmocka-devel softhsm \
-      nss-tools gnutls-utils p11-kit p11-kit-devel p11-kit-server opensc \
+      nss-tools gnutls-utils p11-kit p11-kit-devel opensc \
       softhsm-devel socket_wrapper nss_wrapper uid_wrapper pam_wrapper \
       priv_wrapper openssh-server zlib-devel git meson \
       openssl-devel gcc g++ libcmocka-devel

diff --git a/tests/softhsm-proxy.sh b/tests/softhsm-proxy.sh
diff --git a/tests/test-wrapper b/tests/test-wrapper
@@ -41,12 +41,6 @@ if [ -f "${TEST_PATH}/t${TEST_NAME}.c" ]; then
     COMMAND="$CHECKER $COMMAND"
 fi
 
-for option in "${TEST_PARAMS[@]}"; do
-    if [[ "$option" == "proxy" ]]; then
-        COMMAND="${TESTSSRCDIR}/softhsm-proxy.sh $COMMAND"
-    fi
-done
-
 LOGFILE="${TESTBLDDIR}/${TEST_NAME}.${TOKEN_DRIVER}.log"
 
 echo "Executing ${COMMAND}"