Merge pull request #582 from nextcloud/addLibp11ForDesktopFilesClient

add new dependency of desktop files client in CI images
nextcloud · Aug 25, 2023 · 2699262 · 2699262
2 parents dda883c + c3c00f2
commit 2699262
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/client-appimage/Dockerfile b/client-appimage/Dockerfile
@@ -8,6 +8,7 @@ ARG BUILD_QT
 ENV VER_QT kde-5.15
 ENV VER_QT_DATE 2023-08-22
 ENV VER_OPENSSL 3.0.10
+ENV VER_LIBP11 libp11-0.4.12
 ENV VER_KFRAMEWORKS 5.107.0
 
 ENV QT_ROOT /opt/qt${VER_QT}
@@ -126,6 +127,16 @@ RUN cd /tmp && \
  cd .. && \
  rm -rf openssl*
 
+# Install libp11 for PKCS#11 encryption
+RUN cd /tmp && \
+ wget https://github.com/OpenSC/libp11/releases/download/${VER_LIBP11}/${VER_LIBP11}.tar.gz && \
+ tar xvf ${VER_LIBP11}.tar.gz && \
+ cd ${VER_LIBP11} && \
+ export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig && \
+ ./configure && make && make install && \
+ cd .. && \
+ rm -rf ${VER_LIBP11}
+
 ###########################################################################
 
 # Download Qt sources

diff --git a/client/Dockerfile b/client/Dockerfile
@@ -8,6 +8,7 @@ ARG BUILD_QT
 ENV VER_QT kde-5.15
 ENV VER_QT_DATE 2023-08-21
 ENV VER_OPENSSL 3.0.10
+ENV VER_LIBP11 libp11-0.4.12
 ENV VER_KFRAMEWORKS 5.107.0
 
 ENV QT_ROOT /opt/qt${VER_QT}
@@ -122,6 +123,16 @@ RUN cd /tmp && \
  cd .. && \
  rm -rf openssl*
 
+# Install libp11 for PKCS#11 encryption
+RUN cd /tmp && \
+ wget https://github.com/OpenSC/libp11/releases/download/${VER_LIBP11}/${VER_LIBP11}.tar.gz && \
+ tar xvf ${VER_LIBP11}.tar.gz && \
+ cd ${VER_LIBP11} && \
+ export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig && \
+ ./configure && make && make install && \
+ cd .. && \
+ rm -rf ${VER_LIBP11}
+
 ###########################################################################
 
 # Download Qt sources