nginx: version bump 1.10.3 -> 1.12.1

Also update patches from buildroot and replace the missing --with-ipv6
flag by overriding the feature build test results for IPv6 depending on
the GLOBAL_IPV6_OPTION in PTXdist.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

12 files changed, 100 insertions, 34 deletions

diff --git a/patches/nginx-1.10.3/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/patches/nginx-1.12.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
index ae79e1c99..bc4c8d527 100644
--- a/patches/nginx-1.10.3/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
+++ b/patches/nginx-1.12.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
@@ -1,5 +1,5 @@
 From: Samuel Martin <s.martin49@gmail.com>
-Date: Thu, 24 Apr 2014 23:27:32 +0200
+Date: Tue, 4 Jul 2017 11:09:20 -0400
 Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation
  friendly
 
@@ -14,12 +14,14 @@ Refresh for 1.8.0.
 Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
 [martin@barkynet.com: Updated for 1.10.0]
 Signed-off-by: Martin Bark <martin@barkynet.com>
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+Refresh for 1.12.0
 ---
- auto/types/sizeof | 38 ++++++++++++++++++++++++++++----------
- 1 file changed, 28 insertions(+), 10 deletions(-)
+ auto/types/sizeof | 37 ++++++++++++++++++++++++++++---------
+ 1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/auto/types/sizeof b/auto/types/sizeof
-index b5b71bb98275..8528490109ae 100644
+index 480d8cfa49aa..61dcd2de5d44 100644
 --- a/auto/types/sizeof
 +++ b/auto/types/sizeof
 @@ -14,7 +14,7 @@ END
@@ -31,11 +33,11 @@ index b5b71bb98275..8528490109ae 100644
  
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H
+@@ -25,22 +25,41 @@ $NGX_INCLUDE_UNISTD_H
  $NGX_INCLUDE_INTTYPES_H
  $NGX_INCLUDE_AUTO_CONFIG_H
  
--int main() {
+-int main(void) {
 -    printf("%d", (int) sizeof($ngx_type));
 +#if !defined( PASTE)
 +#define PASTE2( x, y) x##y
@@ -56,6 +58,9 @@ index b5b71bb98275..8528490109ae 100644
 -END
 +_EOF
  
+ 
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+-          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
 +_ngx_typename=`echo "$ngx_type" | sed 's/ /_/g;s/\*/p/'`
 +ngx_size="-1"
 +ngx_size=`for i in 1 2 4 8 16 ; do \
@@ -65,9 +70,6 @@ index b5b71bb98275..8528490109ae 100644
 +    $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\
 +    echo $i ; break ; done`
  
--ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
--          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
--
 -eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
 +rm -rf $NGX_AUTOTEST*
  
diff --git a/patches/nginx-1.10.3/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch b/patches/nginx-1.12.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
index 83c6d5a19..4742694ce 100644
--- a/patches/nginx-1.10.3/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
+++ b/patches/nginx-1.12.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
@@ -16,7 +16,7 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  1 file changed, 59 insertions(+), 21 deletions(-)
 
 diff --git a/auto/feature b/auto/feature
-index 1145f28684b1..a194b85651a5 100644
+index 3561f5941f24..8016d802e7a8 100644
 --- a/auto/feature
 +++ b/auto/feature
 @@ -52,50 +52,88 @@ if [ -x $NGX_AUTOTEST ]; then
diff --git a/patches/nginx-1.10.3/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/patches/nginx-1.12.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
index b3c2bc34c..36cd8badc 100644
--- a/patches/nginx-1.10.3/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
+++ b/patches/nginx-1.12.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
@@ -24,7 +24,7 @@ Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
  6 files changed, 20 insertions(+)
 
 diff --git a/auto/cc/conf b/auto/cc/conf
-index f2c25ede0330..983677622c20 100644
+index b3b9f92eb005..8aa95a042057 100644
 --- a/auto/cc/conf
 +++ b/auto/cc/conf
 @@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
@@ -76,7 +76,7 @@ index d1e484ab32ee..37249161ea2f 100644
                        #include <atomic_ops.h>"
      ngx_feature_path=
 diff --git a/auto/os/darwin b/auto/os/darwin
-index 9b31b1f692ce..575c669eec86 100644
+index b4b3ad306308..2bcfdfbff97d 100644
 --- a/auto/os/darwin
 +++ b/auto/os/darwin
 @@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES
@@ -104,7 +104,7 @@ index 9b31b1f692ce..575c669eec86 100644
                    #include <sys/socket.h>
                    #include <sys/uio.h>
 diff --git a/auto/os/linux b/auto/os/linux
-index c932267574d1..9ec8ed96e7ed 100644
+index fae8842c6454..cd40c7b8b6d8 100644
 --- a/auto/os/linux
 +++ b/auto/os/linux
 @@ -37,6 +37,7 @@ fi
@@ -115,7 +115,7 @@ index c932267574d1..9ec8ed96e7ed 100644
  ngx_feature_incs="#include <sys/epoll.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -94,6 +95,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
+@@ -111,6 +112,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
  ngx_feature="sendfile()"
  ngx_feature_name="NGX_HAVE_SENDFILE"
  ngx_feature_run=yes
@@ -123,7 +123,7 @@ index c932267574d1..9ec8ed96e7ed 100644
  ngx_feature_incs="#include <sys/sendfile.h>
                    #include <errno.h>"
  ngx_feature_path=
-@@ -115,6 +117,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+@@ -132,6 +134,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
  ngx_feature="sendfile64()"
  ngx_feature_name="NGX_HAVE_SENDFILE64"
  ngx_feature_run=yes
@@ -131,7 +131,7 @@ index c932267574d1..9ec8ed96e7ed 100644
  ngx_feature_incs="#include <sys/sendfile.h>
                    #include <errno.h>"
  ngx_feature_path=
-@@ -133,6 +136,7 @@ ngx_include="sys/prctl.h"; . auto/include
+@@ -150,6 +153,7 @@ ngx_include="sys/prctl.h"; . auto/include
  ngx_feature="prctl(PR_SET_DUMPABLE)"
  ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
  ngx_feature_run=yes
@@ -140,10 +140,10 @@ index c932267574d1..9ec8ed96e7ed 100644
  ngx_feature_path=
  ngx_feature_libs=
 diff --git a/auto/unix b/auto/unix
-index 8c0e8135cd03..3b16db3a6fa7 100755
+index 5ef74d4a8993..7d47fe3faaf5 100644
 --- a/auto/unix
 +++ b/auto/unix
-@@ -99,6 +99,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
+@@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
          ngx_feature="kqueue's EVFILT_TIMER"
          ngx_feature_name="NGX_HAVE_TIMER_EVENT"
          ngx_feature_run=yes
@@ -151,7 +151,7 @@ index 8c0e8135cd03..3b16db3a6fa7 100755
          ngx_feature_incs="#include <sys/event.h>
                            #include <sys/time.h>"
          ngx_feature_path=
-@@ -649,6 +650,7 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n;
+@@ -702,6 +703,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 8c0e8135cd03..3b16db3a6fa7 100755
  ngx_feature_incs='#include <errno.h>
                    #include <stdio.h>'
  ngx_feature_path=
-@@ -663,6 +665,7 @@ if [ $ngx_found = no ]; then
+@@ -716,6 +718,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 8c0e8135cd03..3b16db3a6fa7 100755
      ngx_feature_incs='#include <errno.h>
                        #include <stdio.h>'
      ngx_feature_path=
-@@ -678,6 +681,7 @@ if [ $ngx_found = no ]; then
+@@ -731,6 +734,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 8c0e8135cd03..3b16db3a6fa7 100755
      ngx_feature_incs='#include <errno.h>
                        #include <string.h>
                        #include <stdio.h>'
-@@ -736,6 +740,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096);
+@@ -789,6 +793,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 8c0e8135cd03..3b16db3a6fa7 100755
  ngx_feature_incs="#include <sys/mman.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -749,6 +754,7 @@ ngx_feature_test="void *p;
+@@ -802,6 +807,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 8c0e8135cd03..3b16db3a6fa7 100755
  ngx_feature_incs="#include <sys/mman.h>
                    #include <sys/stat.h>
                    #include <fcntl.h>"
-@@ -764,6 +770,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -817,6 +823,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 8c0e8135cd03..3b16db3a6fa7 100755
  ngx_feature_incs="#include <sys/ipc.h>
                    #include <sys/shm.h>"
  ngx_feature_path=
-@@ -778,6 +785,7 @@ ngx_feature_test="int  id;
+@@ -831,6 +838,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.10.3/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/patches/nginx-1.12.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch
index d61a5dc59..d61a5dc59 100644
--- a/patches/nginx-1.10.3/0004-auto-lib-libxslt-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch
diff --git a/patches/nginx-1.10.3/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/patches/nginx-1.12.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
index 75dc4caac..8d10b7455 100644
--- a/patches/nginx-1.10.3/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
+++ b/patches/nginx-1.12.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 3b16db3a6fa7..2595959d877c 100755
+index 7d47fe3faaf5..ed821b5a5aaa 100644
 --- a/auto/unix
 +++ b/auto/unix
-@@ -655,6 +655,10 @@ ngx_feature_incs='#include <errno.h>
+@@ -708,6 +708,10 @@ ngx_feature_incs='#include <errno.h>
                    #include <stdio.h>'
  ngx_feature_path=
  ngx_feature_libs=
@@ -119,7 +119,7 @@ index 3b16db3a6fa7..2595959d877c 100755
  ngx_feature_test='printf("%d", sys_nerr);'
  . auto/feature
  
-@@ -703,6 +707,12 @@ if [ $ngx_found = no ]; then
+@@ -756,6 +760,12 @@ if [ $ngx_found = no ]; then
      . auto/feature
  fi
  
diff --git a/patches/nginx-1.10.3/0006-auto-lib-openssl-conf-use-pkg-config.patch b/patches/nginx-1.12.1/0006-auto-lib-openssl-conf-use-pkg-config.patch
index d2856b67a..21ebd769b 100644
--- a/patches/nginx-1.10.3/0006-auto-lib-openssl-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.1/0006-auto-lib-openssl-conf-use-pkg-config.patch
@@ -11,10 +11,10 @@ Signed-off-by: Martin Bark <martin@barkynet.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
-index 39d96023732a..995c6f395f06 100644
+index e7d3795b2a8f..a24695c53bfb 100644
 --- a/auto/lib/openssl/conf
 +++ b/auto/lib/openssl/conf
-@@ -50,8 +50,8 @@ else
+@@ -58,8 +58,8 @@ else
          ngx_feature_name="NGX_OPENSSL"
          ngx_feature_run=no
          ngx_feature_incs="#include <openssl/ssl.h>"
diff --git a/patches/nginx-1.10.3/0007-auto-lib-libgd-conf-use-pkg-config.patch b/patches/nginx-1.12.1/0007-auto-lib-libgd-conf-use-pkg-config.patch
index be50cba29..e63546cd9 100644
--- a/patches/nginx-1.10.3/0007-auto-lib-libgd-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.1/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 6e4e91cf02ba..1c536a20698d 100644
+index 87761f14dc29..4c74d8f334d2 100644
 --- a/auto/lib/libgd/conf
 +++ b/auto/lib/libgd/conf
 @@ -7,8 +7,8 @@
diff --git a/patches/nginx-1.10.3/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/patches/nginx-1.12.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
index 9ab64af16..9ab64af16 100644
--- a/patches/nginx-1.10.3/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
+++ b/patches/nginx-1.12.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
diff --git a/patches/nginx-1.12.1/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch b/patches/nginx-1.12.1/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
new file mode 100644
index 000000000..08e350549
--- /dev/null
+++ b/patches/nginx-1.12.1/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
@@ -0,0 +1,29 @@
+From: Samuel Martin <s.martin49@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.martin49@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.10.3/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch b/patches/nginx-1.12.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
index d72cd52d1..8d4ad867a 100644
--- a/patches/nginx-1.10.3/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
+++ b/patches/nginx-1.12.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
@@ -8,7 +8,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/auto/endianness b/auto/endianness
-index 70b0a106cd64..ab9d69a0c265 100644
+index 1b552b6b37b8..0f2394cfb6a1 100644
 --- a/auto/endianness
 +++ b/auto/endianness
 @@ -32,7 +32,7 @@ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
diff --git a/patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch b/patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
new file mode 100644
index 000000000..93813beb7
--- /dev/null
+++ b/patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
@@ -0,0 +1,33 @@
+From: Clemens Gruber <clemens.gruber@pqgruber.com>
+Date: Thu, 3 Aug 2017 15:47:08 +0200
+Subject: [PATCH] auto/unix: allow overriding the IPv6 build tests
+
+Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
+---
+ auto/unix | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/auto/unix b/auto/unix
+index ed821b5a5aaa..dba1be478b9d 100644
+--- a/auto/unix
++++ b/auto/unix
+@@ -412,7 +412,8 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
+ 
+ ngx_feature="IPV6_RECVPKTINFO"
+ ngx_feature_name="NGX_HAVE_IPV6_RECVPKTINFO"
+-ngx_feature_run=no
++ngx_feature_run_force_result="$ngx_force_ipv6"
++ngx_feature_run=value
+ ngx_feature_incs="#include <sys/socket.h>
+                   #include <netinet/in.h>"
+ ngx_feature_path=
+@@ -640,7 +640,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"
+-ngx_feature_run=no
++ngx_feature_run_force_result="$ngx_force_ipv6"
++ngx_feature_run=value
+ ngx_feature_incs="#include <sys/socket.h>
+                   #include <netinet/in.h>
+                   #include <arpa/inet.h>"
diff --git a/patches/nginx-1.10.3/series b/patches/nginx-1.12.1/series
index fd983089b..68b0e8997 100644
--- a/patches/nginx-1.10.3/series
+++ b/patches/nginx-1.12.1/series
@@ -1,5 +1,5 @@
 # generated by git-ptx-patches
-#tag:base --start-number 1
+#tag:base --start-number 0
 #tag:buildroot --start-number 1
 0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
 0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
@@ -9,6 +9,8 @@
 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
-# f7e851b17ea369d52a0840b8e7489232  - git-ptx-patches magic
+0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
+# 3a5ee77373446a5a6dd9d189d51ecdc2  - git-ptx-patches magic