Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/docker-ci.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>2022-07-28 13:51:18 +0300
committerMatthieu Gallien <matthieu.gallien@nextcloud.com>2022-07-28 13:51:18 +0300
commit49deea6d1c175b1e8dc7e669b74b60cc3878c6cf (patch)
treeabe7f1877d5467808eda8c5a6df3de15dd33110f
parent9e5bcfa1482b3bf3fc13c1fdfd377b841895a5d3 (diff)
temporarily remove openssl deprectaion warning
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
-rw-r--r--client/Dockerfile3
-rw-r--r--client/openssl-deprecation.patch12
2 files changed, 15 insertions, 0 deletions
diff --git a/client/Dockerfile b/client/Dockerfile
index 1c6a06f..9aa9896 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -107,11 +107,14 @@ RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \
###########################################################################
+COPY openssl-deprecation.patch /tmp/openssl-deprecation.patch
+
# Install openssl
RUN cd /tmp && \
wget https://www.openssl.org/source/openssl-${VER_OPENSSL}.tar.gz && \
tar -xvf openssl-${VER_OPENSSL}.tar.gz && \
cd openssl-${VER_OPENSSL} && \
+ patch -p 0 < ../openssl-deprecation.patch && \
./config && \
make -j$(nproc) && \
make -j$(nproc) install && \
diff --git a/client/openssl-deprecation.patch b/client/openssl-deprecation.patch
new file mode 100644
index 0000000..61d9b4c
--- /dev/null
+++ b/client/openssl-deprecation.patch
@@ -0,0 +1,12 @@
+--- ./include/openssl/engine.h 2022-06-21 15:30:58.000000000 +0200
++++ ./include/openssl/engine-mod.h 2022-07-28 12:31:53.098211984 +0200
+@@ -654,7 +654,7 @@
+ * discarded.
+ */
+ # ifndef OPENSSL_NO_DEPRECATED_3_0
+-OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_default_RSA(void);
++ENGINE *ENGINE_get_default_RSA(void);
+ # endif
+ /* Same for the other "methods" */
+ # ifndef OPENSSL_NO_DEPRECATED_3_0
+