diff options
author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2019-11-27 18:39:07 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-11-28 17:28:54 +0100 |
commit | 7d87f080aa5740d18c94ac033fa70b76d86f9a21 (patch) | |
tree | ff09a063f3d5a58f533f1be5ee805f269b700165 | |
parent | d4687ecef29d73d5781dd4912ebf88cdcbda7c71 (diff) | |
download | ptxdist-7d87f080aa5740d18c94ac033fa70b76d86f9a21.tar.gz ptxdist-7d87f080aa5740d18c94ac033fa70b76d86f9a21.tar.xz |
nginx: version bump 1.16.0 -> 1.16.1
Also regenerated patches with git-ptx-patches.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch (renamed from patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch (renamed from patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch (renamed from patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch) | 2 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch (renamed from patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch) | 8 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (renamed from patches/nginx-1.16.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch) | 6 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0006-auto-lib-openssl-conf-use-pkg-config.patch (renamed from patches/nginx-1.16.0/0006-auto-lib-openssl-conf-use-pkg-config.patch) | 2 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0007-auto-lib-libgd-conf-use-pkg-config.patch (renamed from patches/nginx-1.16.0/0007-auto-lib-libgd-conf-use-pkg-config.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch (renamed from patches/nginx-1.16.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch) | 2 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch (renamed from patches/nginx-1.16.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch (renamed from patches/nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch) | 10 | ||||
-rw-r--r-- | patches/nginx-1.16.1/series (renamed from patches/nginx-1.16.0/series) | 4 | ||||
-rw-r--r-- | rules/nginx.make | 4 |
12 files changed, 19 insertions, 19 deletions
diff --git a/patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch index bc4c8d527..bc4c8d527 100644 --- a/patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +++ b/patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch diff --git a/patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch b/patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch index 4742694ce..4742694ce 100644 --- a/patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch +++ b/patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch diff --git a/patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch index d41f57968..b468812bd 100644 --- a/patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch +++ b/patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch @@ -104,7 +104,7 @@ index 429468f7fd40..1ed47cca5c89 100644 #include <sys/socket.h> #include <sys/uio.h> diff --git a/auto/os/linux b/auto/os/linux -index 2c8a9bb8e380..eb4513eeed7c 100644 +index 5e280eca75db..50bf84d503d0 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -37,6 +37,7 @@ fi diff --git a/patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch index b6bd50cc3..bd0c07b84 100644 --- a/patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch +++ b/patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch @@ -7,11 +7,11 @@ dependencies. Signed-off-by: Martin Bark <martin@barkynet.com> --- - auto/lib/libxslt/conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + auto/lib/libxslt/conf | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf -index 3a0f37b..3c2a60e 100644 +index 3063ac7ce0c0..3209e3642fdc 100644 --- a/auto/lib/libxslt/conf +++ b/auto/lib/libxslt/conf @@ -12,8 +12,9 @@ @@ -25,4 +25,4 @@ index 3a0f37b..3c2a60e 100644 + ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)" ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; xsltStylesheetPtr sheet = NULL; - xmlDocPtr doc; + xmlDocPtr doc = NULL; diff --git a/patches/nginx-1.16.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/patches/nginx-1.16.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch index 8d10b7455..8a98f197f 100644 --- a/patches/nginx-1.16.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch +++ b/patches/nginx-1.16.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch @@ -105,10 +105,10 @@ index 000000000000..8970f5f6ec73 + +echo " $ngx_sys_nerr" diff --git a/auto/unix b/auto/unix -index 7d47fe3faaf5..ed821b5a5aaa 100644 +index 3da005375cf5..a67ee3e2939c 100644 --- a/auto/unix +++ b/auto/unix -@@ -708,6 +708,10 @@ ngx_feature_incs='#include <errno.h> +@@ -736,6 +736,10 @@ ngx_feature_incs='#include <errno.h> #include <stdio.h>' ngx_feature_path= ngx_feature_libs= @@ -119,7 +119,7 @@ index 7d47fe3faaf5..ed821b5a5aaa 100644 ngx_feature_test='printf("%d", sys_nerr);' . auto/feature -@@ -756,6 +760,12 @@ if [ $ngx_found = no ]; then +@@ -784,6 +788,12 @@ if [ $ngx_found = no ]; then . auto/feature fi diff --git a/patches/nginx-1.16.0/0006-auto-lib-openssl-conf-use-pkg-config.patch b/patches/nginx-1.16.1/0006-auto-lib-openssl-conf-use-pkg-config.patch index 00b450eb8..5cbd262fe 100644 --- a/patches/nginx-1.16.0/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ b/patches/nginx-1.16.1/0006-auto-lib-openssl-conf-use-pkg-config.patch @@ -24,4 +24,4 @@ index 4fb52df7fe17..32ab2a045209 100644 + ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl) $NGX_LIBDL $NGX_LIBPTHREAD" ngx_feature_test="SSL_CTX_set_options(NULL, 0)" . auto/feature - + diff --git a/patches/nginx-1.16.0/0007-auto-lib-libgd-conf-use-pkg-config.patch b/patches/nginx-1.16.1/0007-auto-lib-libgd-conf-use-pkg-config.patch index 2f1c80013..2f1c80013 100644 --- a/patches/nginx-1.16.0/0007-auto-lib-libgd-conf-use-pkg-config.patch +++ b/patches/nginx-1.16.1/0007-auto-lib-libgd-conf-use-pkg-config.patch diff --git a/patches/nginx-1.16.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/patches/nginx-1.16.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch index 9ab64af16..43b3e2e38 100644 --- a/patches/nginx-1.16.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch +++ b/patches/nginx-1.16.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch @@ -9,7 +9,7 @@ Signed-off-by: Martin Bark <martin@barkynet.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h -index 2f6129d8894e..4244086a6362 100644 +index 3036caebf630..e282a1f7533c 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -55,10 +55,12 @@ diff --git a/patches/nginx-1.16.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch b/patches/nginx-1.16.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch index 8d4ad867a..8d4ad867a 100644 --- a/patches/nginx-1.16.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch +++ b/patches/nginx-1.16.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch diff --git a/patches/nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch b/patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch index 2fdf43a4c..d8c4a04b1 100644 --- a/patches/nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch +++ b/patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch @@ -22,18 +22,18 @@ index 8016d802e7a8..a9c6b6ee5eeb 100644 + ngx_feature_run_force_result_int=0 + fi cat << END >> $NGX_AUTO_CONFIG_H - + #ifndef $ngx_feature_name -#define $ngx_feature_name $ngx_feature_run_force_result +#define $ngx_feature_name $ngx_feature_run_force_result_int #endif - + END diff --git a/auto/unix b/auto/unix -index ed821b5a5aaa..e7ad3b5c0be5 100644 +index a67ee3e2939c..1c3c1cf5996f 100644 --- a/auto/unix +++ b/auto/unix -@@ -412,7 +412,8 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)" +@@ -440,7 +440,8 @@ ngx_feature_test="struct in_pktinfo pkt; ngx_feature="IPV6_RECVPKTINFO" ngx_feature_name="NGX_HAVE_IPV6_RECVPKTINFO" @@ -43,7 +43,7 @@ index ed821b5a5aaa..e7ad3b5c0be5 100644 ngx_feature_incs="#include <sys/socket.h> #include <netinet/in.h>" ngx_feature_path= -@@ -640,7 +641,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value +@@ -668,7 +669,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value ngx_feature="AF_INET6" ngx_feature_name="NGX_HAVE_INET6" diff --git a/patches/nginx-1.16.0/series b/patches/nginx-1.16.1/series index 1e50dfcc4..92d0a70c8 100644 --- a/patches/nginx-1.16.0/series +++ b/patches/nginx-1.16.1/series @@ -11,5 +11,5 @@ 0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch #tag:ptxdist --start-number 100 0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch -0101-auto-unix-allow-overriding-the-IPv6-build-test.patch -# 296747e524339625bd4ef3856eac1d8b - git-ptx-patches magic +0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch +# 2d82d97a87698e491d40c417a32a8a6b - git-ptx-patches magic diff --git a/rules/nginx.make b/rules/nginx.make index b7417dd7f..15e71d25a 100644 --- a/rules/nginx.make +++ b/rules/nginx.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NGINX) += nginx # # Paths and names # -NGINX_VERSION := 1.16.0 -NGINX_MD5 := 97207283f30cd90cdba638c3ea30323a +NGINX_VERSION := 1.16.1 +NGINX_MD5 := 45a80f75336c980d240987badc3dcf60 NGINX := nginx-$(NGINX_VERSION) NGINX_SUFFIX := tar.gz NGINX_URL := https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX) |