update to openssl1.0.2t on x86 s390x (kubernetes#113)

stolostron · Oct 16, 2019 · ef8f5d2 · ef8f5d2
1 parent 91425d9
commit ef8f5d2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/docker/openresty/1.13.6.2/alpine/Dockerfile b/docker/openresty/1.13.6.2/alpine/Dockerfile
@@ -11,7 +11,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
 # Docker Build Arguments
 ARG PREFIX_DIR="/opt/ibm/router"
 ARG RESTY_VERSION="1.13.6.2"
-ARG RESTY_OPENSSL_VERSION="1.0.2k"
+ARG RESTY_OPENSSL_VERSION="1.0.2t"
 ARG RESTY_OPENSSL_FIPS_VERSION="fips-2.0.16"
 ARG RESTY_PCRE_VERSION="8.42"
 ARG RESTY_J="1"

diff --git a/docker/openresty/1.13.6.2/alpine/Dockerfile.s390x b/docker/openresty/1.13.6.2/alpine/Dockerfile.s390x
@@ -11,7 +11,7 @@ LABEL maintainer="Evan Wies <evan@neomantra.net>"
 # Docker Build Arguments
 ARG PREFIX_DIR="/opt/ibm/router"
 ARG RESTY_VERSION="1.13.6.2"
-ARG RESTY_OPENSSL_VERSION="1.0.2k"
+ARG RESTY_OPENSSL_VERSION="1.0.2t"
 ARG RESTY_OPENSSL_FIPS_VERSION="fips-2.0.16"
 ARG RESTY_J="1"
 ARG RESTY_CONFIG_OPTIONS="\

diff --git a/docker/openresty/1.13.6.2/fips-code/Makefile b/docker/openresty/1.13.6.2/fips-code/Makefile
@@ -15,7 +15,7 @@ ALL_INCS = -I src/core \
 	-I /tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/include/luajit-2.1 \
 	-I ../ngx_stream_lua-0.0.5/src/api \
 	-I /tmp/pcre-8.42 \
-	-I /tmp/openssl-1.0.2k/.openssl/include \
+	-I /tmp/openssl-1.0.2t/.openssl/include \
 	-I /usr/include/libxml2 \
 	-I objs \
 	-I src/http \
@@ -95,7 +95,7 @@ CORE_DEPS = src/core/nginx.h \
 	src/event/ngx_event_openssl.h \
 	src/core/ngx_regex.h \
 	/tmp/pcre-8.42/pcre.h \
-	/tmp/openssl-1.0.2k/.openssl/include/openssl/ssl.h \
+	/tmp/openssl-1.0.2t/.openssl/include/openssl/ssl.h \
 	objs/ngx_auto_config.h
 
 
@@ -109,7 +109,7 @@ CORE_INCS = -I src/core \
 	-I /tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/include/luajit-2.1 \
 	-I ../ngx_stream_lua-0.0.5/src/api \
 	-I /tmp/pcre-8.42 \
-	-I /tmp/openssl-1.0.2k/.openssl/include \
+	-I /tmp/openssl-1.0.2t/.openssl/include \
 	-I /usr/include/libxml2 \
 	-I objs
 
@@ -842,7 +842,7 @@ objs/nginx:	objs/src/core/nginx.o \
 	objs/addon/src/ngx_stream_lua_logby.o \
 	objs/addon/src/ngx_stream_lua_prereadby.o \
 	objs/ngx_modules.o \
-	-L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl /tmp/pcre-8.42/.libs/libpcre.a /tmp/openssl-1.0.2k/.openssl/lib/libssl.a /tmp/openssl-1.0.2k/.openssl/lib/libcrypto.a -lz \
+	-L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl /tmp/pcre-8.42/.libs/libpcre.a /tmp/openssl-1.0.2t/.openssl/lib/libssl.a /tmp/openssl-1.0.2t/.openssl/lib/libcrypto.a -lz \
 	-Wl,-E
 
 
@@ -3302,10 +3302,10 @@ objs/src/http/modules/ngx_http_geoip_module.o:	$(ADDON_DEPS) \
 	&& $(MAKE) libpcre.la
 
 
-/tmp/openssl-1.0.2k/.openssl/include/openssl/ssl.h:	objs/Makefile
-	cd /tmp/openssl-1.0.2k \
+/tmp/openssl-1.0.2t/.openssl/include/openssl/ssl.h:	objs/Makefile
+	cd /tmp/openssl-1.0.2t \
 	&& if [ -f Makefile ]; then $(MAKE) clean; fi \
-	&& ./config --prefix=/tmp/openssl-1.0.2k/.openssl no-shared fips \
+	&& ./config --prefix=/tmp/openssl-1.0.2t/.openssl no-shared fips \
 	&& $(MAKE) \
 	&& $(MAKE) install_sw LIBDIR=lib
 

diff --git a/docker/openresty/1.13.6.2/fips-code/Makefile.s390x b/docker/openresty/1.13.6.2/fips-code/Makefile.s390x
@@ -15,7 +15,7 @@ ALL_INCS = -I src/core \
 	-I ../ngx_lua-0.10.13/src/api \
 	-I /tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/include/luajit-2.1 \
 	-I ../ngx_stream_lua-0.0.5/src/api \
-	-I /tmp/openssl-1.0.2k/.openssl/include \
+	-I /tmp/openssl-1.0.2t/.openssl/include \
 	-I /usr/include/libxml2 \
 	-I objs \
 	-I src/http \
@@ -94,7 +94,7 @@ CORE_DEPS = src/core/nginx.h \
 	src/core/ngx_thread_pool.h \
 	src/event/ngx_event_openssl.h \
 	src/core/ngx_regex.h \
-	/tmp/openssl-1.0.2k/.openssl/include/openssl/ssl.h \
+	/tmp/openssl-1.0.2t/.openssl/include/openssl/ssl.h \
 	objs/ngx_auto_config.h
 
 
@@ -107,7 +107,7 @@ CORE_INCS = -I src/core \
 	-I ../ngx_lua-0.10.13/src/api \
 	-I /tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/include/luajit-2.1 \
 	-I ../ngx_stream_lua-0.0.5/src/api \
-	-I /tmp/openssl-1.0.2k/.openssl/include \
+	-I /tmp/openssl-1.0.2t/.openssl/include \
 	-I /usr/include/libxml2 \
 	-I objs
 
@@ -839,7 +839,7 @@ objs/nginx:	objs/src/core/nginx.o \
 	objs/addon/src/ngx_stream_lua_logby.o \
 	objs/addon/src/ngx_stream_lua_prereadby.o \
 	objs/ngx_modules.o \
-	-L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl -lpcre /tmp/openssl-1.0.2k/.openssl/lib/libssl.a /tmp/openssl-1.0.2k/.openssl/lib/libcrypto.a -lz \
+	-L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-rpath,/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -Wl,-E -Wl,-E -lpthread -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl -L/tmp/openresty-1.13.6.2/build/luajit-root/opt/ibm/router/luajit/lib -lluajit-5.1 -lm -ldl -lpcre /tmp/openssl-1.0.2t/.openssl/lib/libssl.a /tmp/openssl-1.0.2t/.openssl/lib/libcrypto.a -lz \
 	-Wl,-E
 
 
@@ -3283,10 +3283,10 @@ objs/src/http/modules/ngx_http_geoip_module.o:	$(ADDON_DEPS) \
 		src/http/modules/ngx_http_geoip_module.c
 
 
-/tmp/openssl-1.0.2k/.openssl/include/openssl/ssl.h:	objs/Makefile
-	cd /tmp/openssl-1.0.2k \
+/tmp/openssl-1.0.2t/.openssl/include/openssl/ssl.h:	objs/Makefile
+	cd /tmp/openssl-1.0.2t \
 	&& if [ -f Makefile ]; then $(MAKE) clean; fi \
-	&& ./config --prefix=/tmp/openssl-1.0.2k/.openssl no-shared fips \
+	&& ./config --prefix=/tmp/openssl-1.0.2t/.openssl no-shared fips \
 	&& $(MAKE) \
 	&& $(MAKE) install_sw LIBDIR=lib