diff options
author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2019-07-05 17:16:43 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-07 10:23:57 +0200 |
commit | 7aeca5c094230aedf7eba3bdb60383327e6359e0 (patch) | |
tree | 9291abb824b7beb9fa75aee6b3f9f09d6606b735 /patches | |
parent | 7acbb4c35059dbab40b889ae7106352e1a757690 (diff) | |
download | ptxdist-7aeca5c094230aedf7eba3bdb60383327e6359e0.tar.gz ptxdist-7aeca5c094230aedf7eba3bdb60383327e6359e0.tar.xz |
nginx: version bump 1.14.2 -> 1.16.0
One patch needed to be regenerated.
The license hash changed because the copyright year was updated.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch (renamed from patches/nginx-1.14.2/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch (renamed from patches/nginx-1.14.2/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch (renamed from patches/nginx-1.14.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch (renamed from patches/nginx-1.14.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (renamed from patches/nginx-1.14.2/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0006-auto-lib-openssl-conf-use-pkg-config.patch (renamed from patches/nginx-1.14.2/0006-auto-lib-openssl-conf-use-pkg-config.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0007-auto-lib-libgd-conf-use-pkg-config.patch (renamed from patches/nginx-1.14.2/0007-auto-lib-libgd-conf-use-pkg-config.patch) | 6 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch (renamed from patches/nginx-1.14.2/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch (renamed from patches/nginx-1.14.2/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch (renamed from patches/nginx-1.14.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch) | 0 | ||||
-rw-r--r-- | patches/nginx-1.16.0/series (renamed from patches/nginx-1.14.2/series) | 0 |
11 files changed, 3 insertions, 3 deletions
diff --git a/patches/nginx-1.14.2/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch index bc4c8d527..bc4c8d527 100644 --- a/patches/nginx-1.14.2/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +++ b/patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch diff --git a/patches/nginx-1.14.2/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch b/patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch index 4742694ce..4742694ce 100644 --- a/patches/nginx-1.14.2/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch +++ b/patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch diff --git a/patches/nginx-1.14.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch index d41f57968..d41f57968 100644 --- a/patches/nginx-1.14.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch +++ b/patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch diff --git a/patches/nginx-1.14.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch index b6bd50cc3..b6bd50cc3 100644 --- a/patches/nginx-1.14.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch +++ b/patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch diff --git a/patches/nginx-1.14.2/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/patches/nginx-1.16.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch index 8d10b7455..8d10b7455 100644 --- a/patches/nginx-1.14.2/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch +++ b/patches/nginx-1.16.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch diff --git a/patches/nginx-1.14.2/0006-auto-lib-openssl-conf-use-pkg-config.patch b/patches/nginx-1.16.0/0006-auto-lib-openssl-conf-use-pkg-config.patch index 00b450eb8..00b450eb8 100644 --- a/patches/nginx-1.14.2/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ b/patches/nginx-1.16.0/0006-auto-lib-openssl-conf-use-pkg-config.patch diff --git a/patches/nginx-1.14.2/0007-auto-lib-libgd-conf-use-pkg-config.patch b/patches/nginx-1.16.0/0007-auto-lib-libgd-conf-use-pkg-config.patch index e63546cd9..2f1c80013 100644 --- a/patches/nginx-1.14.2/0007-auto-lib-libgd-conf-use-pkg-config.patch +++ b/patches/nginx-1.16.0/0007-auto-lib-libgd-conf-use-pkg-config.patch @@ -11,7 +11,7 @@ Signed-off-by: Martin Bark <martin@barkynet.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf -index 87761f14dc29..4c74d8f334d2 100644 +index 678639767a63..1a4379a5e45c 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf @@ -7,8 +7,8 @@ @@ -22,6 +22,6 @@ index 87761f14dc29..4c74d8f334d2 100644 - ngx_feature_libs="-lgd" + ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" + ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" - ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);" + ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); + (void) img" . auto/feature - diff --git a/patches/nginx-1.14.2/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/patches/nginx-1.16.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch index 9ab64af16..9ab64af16 100644 --- a/patches/nginx-1.14.2/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch +++ b/patches/nginx-1.16.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch diff --git a/patches/nginx-1.14.2/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch b/patches/nginx-1.16.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch index 8d4ad867a..8d4ad867a 100644 --- a/patches/nginx-1.14.2/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch +++ b/patches/nginx-1.16.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch diff --git a/patches/nginx-1.14.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch b/patches/nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch index 2fdf43a4c..2fdf43a4c 100644 --- a/patches/nginx-1.14.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch +++ b/patches/nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch diff --git a/patches/nginx-1.14.2/series b/patches/nginx-1.16.0/series index 1e50dfcc4..1e50dfcc4 100644 --- a/patches/nginx-1.14.2/series +++ b/patches/nginx-1.16.0/series |