From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH] nginx: version bump 1.14.2 -> 1.16.0
Date: Fri, 5 Jul 2019 17:16:43 +0200 [thread overview]
Message-ID: <20190705151643.12669-1-clemens.gruber@pqgruber.com> (raw)
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>
---
...to-type-sizeof-rework-autotest-to-be-cross-compila.patch | 0
...to-feature-add-mechanism-allowing-to-force-feature.patch | 0
...to-set-ngx_feature_run_force_result-for-each-featu.patch | 0
.../0004-auto-lib-libxslt-conf-use-pkg-config.patch | 0
...05-auto-unix-make-sys_nerr-guessing-cross-friendly.patch | 0
.../0006-auto-lib-openssl-conf-use-pkg-config.patch | 0
.../0007-auto-lib-libgd-conf-use-pkg-config.patch | 6 +++---
...c-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch | 0
...to-endianness-add-mechanism-allowing-to-force-resu.patch | 0
...101-auto-unix-allow-overriding-the-IPv6-build-test.patch | 0
patches/{nginx-1.14.2 => nginx-1.16.0}/series | 0
rules/nginx.make | 6 +++---
12 files changed, 6 insertions(+), 6 deletions(-)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0004-auto-lib-libxslt-conf-use-pkg-config.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0006-auto-lib-openssl-conf-use-pkg-config.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0007-auto-lib-libgd-conf-use-pkg-config.patch (90%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch (100%)
rename patches/{nginx-1.14.2 => nginx-1.16.0}/series (100%)
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
similarity index 100%
rename from patches/nginx-1.14.2/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
rename to 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
similarity index 90%
rename from patches/nginx-1.14.2/0007-auto-lib-libgd-conf-use-pkg-config.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
rename to 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
similarity index 100%
rename from patches/nginx-1.14.2/series
rename to patches/nginx-1.16.0/series
diff --git a/rules/nginx.make b/rules/nginx.make
index 523476a76..b7417dd7f 100644
--- a/rules/nginx.make
+++ b/rules/nginx.make
@@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NGINX) += nginx
#
# Paths and names
#
-NGINX_VERSION := 1.14.2
-NGINX_MD5 := 239b829a13cea1d244c1044e830bd9c2
+NGINX_VERSION := 1.16.0
+NGINX_MD5 := 97207283f30cd90cdba638c3ea30323a
NGINX := nginx-$(NGINX_VERSION)
NGINX_SUFFIX := tar.gz
NGINX_URL := https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX)
NGINX_SOURCE := $(SRCDIR)/$(NGINX).$(NGINX_SUFFIX)
NGINX_DIR := $(BUILDDIR)/$(NGINX)
NGINX_LICENSE := BSD-2-Clause
-NGINX_LICENSE_FILES := file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe
+NGINX_LICENSE_FILES := file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075
# ----------------------------------------------------------------------------
# Prepare
--
2.22.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2019-07-05 15:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190705151643.12669-1-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox