Update patches to work with 1.14.0, drop one already upstreamed patch
and change the LICENSE hash (copyright year was modified).
Also no longer drop the LIBDL and LIBPTHREAD libs when using the
pkg-config --libs output, now we append them. (See patch 0006)
Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
...x-PCRE-condition-WRT-the-http-and-ht.patch | 29 -----------
...-rework-autotest-to-be-cross-compila.patch | 0
...-mechanism-allowing-to-force-feature.patch | 0
...ture_run_force_result-for-each-featu.patch | 50 +++++++++----------
...auto-lib-libxslt-conf-use-pkg-config.patch | 0
...ake-sys_nerr-guessing-cross-friendly.patch | 0
...auto-lib-openssl-conf-use-pkg-config.patch | 13 +++--
...7-auto-lib-libgd-conf-use-pkg-config.patch | 0
...linux_config.h-only-include-dlfcn.h-.patch | 0
...add-mechanism-allowing-to-force-resu.patch | 0
...allow-overriding-the-IPv6-build-test.patch | 0
patches/{nginx-1.12.2 => nginx-1.14.0}/series | 3 +-
rules/nginx.make | 11 ++--
13 files changed, 40 insertions(+), 66 deletions(-)
delete mode 100644
patches/nginx-1.12.2/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
(100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
(100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
(85%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0004-auto-lib-libxslt-conf-use-pkg-config.patch (100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0006-auto-lib-openssl-conf-use-pkg-config.patch (78%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0007-auto-lib-libgd-conf-use-pkg-config.patch (100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
(100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
(100%)
rename patches/{nginx-1.12.2 =>
nginx-1.14.0}/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch (100%)
rename patches/{nginx-1.12.2 => nginx-1.14.0}/series (84%)
diff --git
a/patches/nginx-1.12.2/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
b/patches/nginx-1.12.2/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
deleted file mode 100644
index 08e350549..000000000
---
a/patches/nginx-1.12.2/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Samuel Martin <s.marti...@gmail.com>
-Date: Fri, 14 Jul 2017 11:50:08 +0200
-Subject: [PATCH] auto/lib/conf: fix PCRE condition WRT the http and
- http_rewrite options
-
-http_rewrite module cannot be selected when http server is disabled, so
-fix the PCRE check condition to avoid irrelevant check failure.
-
-Fixes:
-
http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log
-
-Signed-off-by: Samuel Martin <s.marti...@gmail.com>
----
- auto/lib/conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/auto/lib/conf b/auto/lib/conf
-index 0b8545a3752f..2c7af104008b 100644
---- a/auto/lib/conf
-+++ b/auto/lib/conf
-@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
- . auto/lib/pcre/conf
-
- else
-- if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
-+ if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
-
- cat << END
-
diff --git
a/patches/nginx-1.12.2/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
b/patches/nginx-1.14.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
similarity index 100%
rename from
patches/nginx-1.12.2/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
rename to
patches/nginx-1.14.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
diff --git
a/patches/nginx-1.12.2/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
b/patches/nginx-1.14.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
similarity index 100%
rename from
patches/nginx-1.12.2/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
rename to
patches/nginx-1.14.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
diff --git
a/patches/nginx-1.12.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
b/patches/nginx-1.14.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
similarity index 85%
rename from
patches/nginx-1.12.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
rename to
patches/nginx-1.14.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
index 36cd8badc..d41f57968 100644
---
a/patches/nginx-1.12.2/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
+++
b/patches/nginx-1.14.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
@@ -24,18 +24,18 @@ Signed-off-by: Danomi Manchego <danomimanchego...@gmail.com>
6 files changed, 20 insertions(+)
diff --git a/auto/cc/conf b/auto/cc/conf
-index b3b9f92eb005..8aa95a042057 100644
+index afbca62bcef9..ad42c8000cca 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
-@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
- ngx_feature="gcc builtin atomic operations"
- ngx_feature_name=NGX_HAVE_GCC_ATOMIC
- ngx_feature_run=yes
-+ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic"
- ngx_feature_incs=
- ngx_feature_path=
- ngx_feature_libs=
-@@ -201,6 +202,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -184,6 +184,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+ ngx_feature="gcc builtin atomic operations"
+ ngx_feature_name=NGX_HAVE_GCC_ATOMIC
+ ngx_feature_run=yes
++ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic"
+ ngx_feature_incs=
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -205,6 +206,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
ngx_feature="C99 variadic macros"
ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
ngx_feature_run=yes
@@ -43,7 +43,7 @@ index b3b9f92eb005..8aa95a042057 100644
ngx_feature_incs="#include <stdio.h>
#define var(dummy, ...) sprintf(__VA_ARGS__)"
ngx_feature_path=
-@@ -215,6 +217,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -219,6 +221,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
ngx_feature="gcc variadic macros"
ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
ngx_feature_run=yes
@@ -52,7 +52,7 @@ index b3b9f92eb005..8aa95a042057 100644
#define var(dummy, args...) sprintf(args)"
ngx_feature_path=
diff --git a/auto/cc/name b/auto/cc/name
-index 35d319e615bc..87c6248e7d1d 100644
+index ded93f5bc989..7c3cb74a2bd1 100644
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -8,6 +8,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
@@ -76,10 +76,10 @@ index d1e484ab32ee..37249161ea2f 100644
#include <atomic_ops.h>"
ngx_feature_path=
diff --git a/auto/os/darwin b/auto/os/darwin
-index b4b3ad306308..2bcfdfbff97d 100644
+index 429468f7fd40..1ed47cca5c89 100644
--- a/auto/os/darwin
+++ b/auto/os/darwin
-@@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES
+@@ -33,6 +33,7 @@ NGX_KQUEUE_CHECKED=YES
ngx_feature="kqueue's EVFILT_TIMER"
ngx_feature_name="NGX_HAVE_TIMER_EVENT"
ngx_feature_run=yes
@@ -87,7 +87,7 @@ index b4b3ad306308..2bcfdfbff97d 100644
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
-@@ -60,6 +61,7 @@ ngx_feature_test="int kq;
+@@ -63,6 +64,7 @@ ngx_feature_test="int kq;
ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
ngx_feature_name=NGX_DARWIN_KEVENT_BUG
ngx_feature_run=bug
@@ -95,7 +95,7 @@ index b4b3ad306308..2bcfdfbff97d 100644
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
-@@ -90,6 +92,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS"
+@@ -92,6 +94,7 @@ ngx_feature_test="int kq;
ngx_feature="sendfile()"
ngx_feature_name="NGX_HAVE_SENDFILE"
ngx_feature_run=yes
@@ -104,7 +104,7 @@ index b4b3ad306308..2bcfdfbff97d 100644
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/auto/os/linux b/auto/os/linux
-index fae8842c6454..cd40c7b8b6d8 100644
+index 2c8a9bb8e380..eb4513eeed7c 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -37,6 +37,7 @@ fi
@@ -140,7 +140,7 @@ index fae8842c6454..cd40c7b8b6d8 100644
ngx_feature_path=
ngx_feature_libs=
diff --git a/auto/unix b/auto/unix
-index 5ef74d4a8993..7d47fe3faaf5 100644
+index 43d3b25a5456..3da005375cf5 100644
--- a/auto/unix
+++ b/auto/unix
@@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
@@ -151,7 +151,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
-@@ -702,6 +703,7 @@ ngx_feature_test="char buf[1]; struct iovec vec[1];
ssize_t n;
+@@ -730,6 +731,7 @@ ngx_feature_test="char buf[1]; struct iovec vec[1];
ssize_t n;
ngx_feature="sys_nerr"
ngx_feature_name="NGX_SYS_NERR"
ngx_feature_run=value
@@ -159,7 +159,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs='#include <errno.h>
#include <stdio.h>'
ngx_feature_path=
-@@ -716,6 +718,7 @@ if [ $ngx_found = no ]; then
+@@ -744,6 +746,7 @@ if [ $ngx_found = no ]; then
ngx_feature="_sys_nerr"
ngx_feature_name="NGX_SYS_NERR"
ngx_feature_run=value
@@ -167,7 +167,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs='#include <errno.h>
#include <stdio.h>'
ngx_feature_path=
-@@ -731,6 +734,7 @@ if [ $ngx_found = no ]; then
+@@ -759,6 +762,7 @@ if [ $ngx_found = no ]; then
ngx_feature='maximum errno'
ngx_feature_name=NGX_SYS_NERR
ngx_feature_run=value
@@ -175,7 +175,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs='#include <errno.h>
#include <string.h>
#include <stdio.h>'
-@@ -789,6 +793,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096);
+@@ -841,6 +845,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096);
ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
ngx_feature_name="NGX_HAVE_MAP_ANON"
ngx_feature_run=yes
@@ -183,7 +183,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs="#include <sys/mman.h>"
ngx_feature_path=
ngx_feature_libs=
-@@ -802,6 +807,7 @@ ngx_feature_test="void *p;
+@@ -854,6 +859,7 @@ ngx_feature_test="void *p;
ngx_feature='mmap("/dev/zero", MAP_SHARED)'
ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
ngx_feature_run=yes
@@ -191,7 +191,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs="#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>"
-@@ -817,6 +823,7 @@ ngx_feature_test='void *p; int fd;
+@@ -869,6 +875,7 @@ ngx_feature_test='void *p; int fd;
ngx_feature="System V shared memory"
ngx_feature_name="NGX_HAVE_SYSVSHM"
ngx_feature_run=yes
@@ -199,7 +199,7 @@ index 5ef74d4a8993..7d47fe3faaf5 100644
ngx_feature_incs="#include <sys/ipc.h>
#include <sys/shm.h>"
ngx_feature_path=
-@@ -831,6 +838,7 @@ ngx_feature_test="int id;
+@@ -883,6 +890,7 @@ ngx_feature_test="int id;
ngx_feature="POSIX semaphores"
ngx_feature_name="NGX_HAVE_POSIX_SEM"
ngx_feature_run=yes
diff --git
a/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
b/patches/nginx-1.14.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch
similarity index 100%
rename from patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
rename to patches/nginx-1.14.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch
diff --git
a/patches/nginx-1.12.2/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
b/patches/nginx-1.14.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
similarity index 100%
rename from
patches/nginx-1.12.2/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
rename to
patches/nginx-1.14.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
diff --git
a/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
b/patches/nginx-1.14.0/0006-auto-lib-openssl-conf-use-pkg-config.patch
similarity index 78%
rename from patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
rename to patches/nginx-1.14.0/0006-auto-lib-openssl-conf-use-pkg-config.patch
index b5772e411..00b450eb8 100644
--- a/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
+++ b/patches/nginx-1.14.0/0006-auto-lib-openssl-conf-use-pkg-config.patch
@@ -11,18 +11,17 @@ Signed-off-by: Martin Bark <mar...@barkynet.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
-index 39d9602..995c6f3 100644
+index 4fb52df7fe17..32ab2a045209 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
-@@ -58,8 +58,9 @@ else
+@@ -59,8 +59,8 @@ else
ngx_feature_name="NGX_OPENSSL"
ngx_feature_run=no
ngx_feature_incs="#include <openssl/ssl.h>"
- ngx_feature_path=
-- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
-+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|
-+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
-+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
+- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD"
++ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I
openssl|sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
++ 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.12.2/0007-auto-lib-libgd-conf-use-pkg-config.patch
b/patches/nginx-1.14.0/0007-auto-lib-libgd-conf-use-pkg-config.patch
similarity index 100%
rename from patches/nginx-1.12.2/0007-auto-lib-libgd-conf-use-pkg-config.patch
rename to patches/nginx-1.14.0/0007-auto-lib-libgd-conf-use-pkg-config.patch
diff --git
a/patches/nginx-1.12.2/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
b/patches/nginx-1.14.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
similarity index 100%
rename from
patches/nginx-1.12.2/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
rename to
patches/nginx-1.14.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
diff --git
a/patches/nginx-1.12.2/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
b/patches/nginx-1.14.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
similarity index 100%
rename from
patches/nginx-1.12.2/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
rename to
patches/nginx-1.14.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
diff --git
a/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
b/patches/nginx-1.14.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
similarity index 100%
rename from
patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
rename to
patches/nginx-1.14.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
diff --git a/patches/nginx-1.12.2/series b/patches/nginx-1.14.0/series
similarity index 84%
rename from patches/nginx-1.12.2/series
rename to patches/nginx-1.14.0/series
index 68b0e8997..1e50dfcc4 100644
--- a/patches/nginx-1.12.2/series
+++ b/patches/nginx-1.14.0/series
@@ -9,8 +9,7 @@
0006-auto-lib-openssl-conf-use-pkg-config.patch
0007-auto-lib-libgd-conf-use-pkg-config.patch
0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
-0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.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
-# 3a5ee77373446a5a6dd9d189d51ecdc2 - git-ptx-patches magic
+# 296747e524339625bd4ef3856eac1d8b - git-ptx-patches magic
diff --git a/rules/nginx.make b/rules/nginx.make
index 3dc0c3724..8f85595db 100644
--- a/rules/nginx.make
+++ b/rules/nginx.make
@@ -17,15 +17,15 @@ PACKAGES-$(PTXCONF_NGINX) += nginx
#
# Paths and names
#
-NGINX_VERSION := 1.12.2
-NGINX_MD5 := 4d2fc76211435f029271f1cf6d7eeae3
+NGINX_VERSION := 1.14.0
+NGINX_MD5 := 2d856aca3dfe1d32e3c9f8c4cac0cc95
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=903753de5f86a1ee0341fd2f9491b282
+NGINX_LICENSE_FILES := file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe
# ----------------------------------------------------------------------------
# Prepare
@@ -81,6 +81,7 @@ NGINX_CONF_OPT := \
--without-http_limit_req_module \
--without-http_map_module \
--without-http_memcached_module \
+ --without-http_mirror_module \
--without-http_referer_module \
--without-http_split_clients_module \
--without-http_ssi_module \
@@ -94,7 +95,11 @@ NGINX_CONF_OPT := \
--without-mail_pop3_module \
--without-mail_smtp_module \
--without-stream_access_module \
+ --without-stream_geo_module \
--without-stream_limit_conn_module \
+ --without-stream_map_module \
+ --without-stream_return_module \
+ --without-stream_split_clients_module \
--without-stream_upstream_hash_module \
--without-stream_upstream_least_conn_module \
--without-stream_upstream_zone_module
--
2.17.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
