From 32d9336e958a85389614c1d9d2b2a74b251e1ec2 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Wed, 15 Aug 2018 10:24:31 +1000
Subject: [PATCH] ansible: upgrade to OpenSSL 1.1.0i & 1.0.2p in sharedlibs

---
 .../ubuntu1604_sharedlibs.Dockerfile.j2       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2
index 0caeb72fd..f80eee9f9 100644
--- a/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu1604_sharedlibs.Dockerfile.j2
@@ -31,25 +31,25 @@ RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
 
 RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
 
-ENV OPENSSL102DIR /opt/openssl-1.0.2n
+ENV OPENSSL102DIR /opt/openssl-1.0.2p
 
-RUN mkdir -p /tmp/openssl_1.0.2n && \
-    cd /tmp/openssl_1.0.2n && \
-    curl -sL https://github.com/openssl/openssl/archive/OpenSSL_1_0_2n.tar.gz | tar zxv --strip=1 && \
+RUN mkdir -p /tmp/openssl_1.0.2p && \
+    cd /tmp/openssl_1.0.2p && \
+    curl -sL https://github.com/openssl/openssl/archive/OpenSSL_1_0_2p.tar.gz | tar zxv --strip=1 && \
     ./Configure shared linux-x86_64 --prefix=$OPENSSL102DIR -fPIC && \
     make -j 6 && \
     make install && \
-    rm -rf /tmp/openssl_1.0.2n
+    rm -rf /tmp/openssl_1.0.2p
 
-ENV OPENSSL110DIR /opt/openssl-1.1.0g
+ENV OPENSSL110DIR /opt/openssl-1.1.0i
 
-RUN mkdir -p /tmp/openssl_1.1.0g && \
-    cd /tmp/openssl_1.1.0g && \
-    curl -sL https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz | tar zxv --strip=1 && \
+RUN mkdir -p /tmp/openssl_1.1.0i && \
+    cd /tmp/openssl_1.1.0i && \
+    curl -sL https://github.com/openssl/openssl/archive/OpenSSL_1_1_0i.tar.gz | tar zxv --strip=1 && \
     ./config --prefix=$OPENSSL110DIR && \
     make -j 6 && \
     make install && \
-    rm -rf /tmp/openssl_1.1.0g
+    rm -rf /tmp/openssl_1.1.0i
 
 ENV OPENSSL111DIR /opt/openssl-1.1.1-pre1