mirror of
https://github.com/hoellen/dockerfiles.git
synced 2025-04-20 04:19:18 +00:00
boring-nginx: patch not needed anymore
This commit is contained in:
parent
7a706dd896
commit
3dbde9e891
@ -7,8 +7,6 @@ ARG NGINX_VERSION=1.11.6
|
|||||||
ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4 2178 520A 9993 A1C0 52F8"
|
ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4 2178 520A 9993 A1C0 52F8"
|
||||||
ARG BUILD_CORES
|
ARG BUILD_CORES
|
||||||
|
|
||||||
COPY boring.patch /tmp/boring.patch
|
|
||||||
|
|
||||||
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
|
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
|
||||||
&& NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
|
&& NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
|
||||||
&& BUILD_DEPS=" \
|
&& BUILD_DEPS=" \
|
||||||
@ -59,7 +57,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
|
|||||||
&& if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
|
&& if [ "${FINGERPRINT}" != "${GPG_NGINX}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
|
||||||
&& echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
|
&& echo "All seems good, now unpacking ${NGINX_TARBALL}..." \
|
||||||
&& tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
|
&& tar xzf ${NGINX_TARBALL} && cd nginx-${NGINX_VERSION} \
|
||||||
&& patch -p1 < /tmp/boring.patch \
|
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
--prefix=/etc/nginx \
|
--prefix=/etc/nginx \
|
||||||
--sbin-path=/usr/sbin/nginx \
|
--sbin-path=/usr/sbin/nginx \
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
diff -Naur nginx-1.11.5/src/event/ngx_event_openssl.c nginx-1.11.5-patched/src/event/ngx_event_openssl.c
|
|
||||||
--- nginx-1.11.5/src/event/ngx_event_openssl.c 2016-10-11 18:30:28.956383557 +0200
|
|
||||||
+++ nginx-1.11.5-patched/src/event/ngx_event_openssl.c 2016-10-11 18:34:41.226899170 +0200
|
|
||||||
@@ -2016,7 +2016,9 @@
|
|
||||||
|
|
||||||
/* handshake failures */
|
|
||||||
if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC /* 103 */
|
|
||||||
+#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
|
|
||||||
|| n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG /* 129 */
|
|
||||||
+#endif
|
|
||||||
|| n == SSL_R_DIGEST_CHECK_FAILED /* 149 */
|
|
||||||
|| n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */
|
|
||||||
|| n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */
|
|
||||||
@@ -2024,7 +2026,9 @@
|
|
||||||
#ifdef SSL_R_NO_CIPHERS_PASSED
|
|
||||||
|| n == SSL_R_NO_CIPHERS_PASSED /* 182 */
|
|
||||||
#endif
|
|
||||||
+#ifdef SSL_R_NO_CIPHERS_SPECIFIED
|
|
||||||
|| n == SSL_R_NO_CIPHERS_SPECIFIED /* 183 */
|
|
||||||
+#endif
|
|
||||||
|| n == SSL_R_NO_COMPRESSION_SPECIFIED /* 187 */
|
|
||||||
|| n == SSL_R_NO_SHARED_CIPHER /* 193 */
|
|
||||||
|| n == SSL_R_RECORD_LENGTH_MISMATCH /* 213 */
|
|
||||||
diff -Naur nginx-1.11.5/src/http/ngx_http_upstream.c nginx-1.11.5-patched/src/http/ngx_http_upstream.c
|
|
||||||
--- nginx-1.11.5/src/http/ngx_http_upstream.c 2016-10-11 18:31:13.368121756 +0200
|
|
||||||
+++ nginx-1.11.5-patched/src/http/ngx_http_upstream.c 2016-10-11 18:35:17.470686369 +0200
|
|
||||||
@@ -1696,7 +1696,7 @@
|
|
||||||
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
|
||||||
"upstream SSL server name: \"%s\"", name.data);
|
|
||||||
|
|
||||||
- if (SSL_set_tlsext_host_name(c->ssl->connection, name.data) == 0) {
|
|
||||||
+ if (SSL_set_tlsext_host_name(c->ssl->connection, (const char*) name.data) == 0) {
|
|
||||||
ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0,
|
|
||||||
"SSL_set_tlsext_host_name(\"%s\") failed", name.data);
|
|
||||||
return NGX_ERROR;
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user