nginx: update to 1.11.1

3 files changed, 21 insertions, 36 deletions

diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index c275b1bee..3e6b44ccf 100644
--- a/package/nginx/Makefile
+++ b/package/nginx/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		nginx
-PKG_VERSION:=		1.9.13
+PKG_VERSION:=		1.11.1
 PKG_RELEASE:=		1
-PKG_HASH:=		f7cd529a5879cd9cd5b62e6fc4a3a7e8d8363cb12c080ab480cc718c55736609
+PKG_HASH:=		5d8dd0197e3ffeb427729c045382182fb28db8e045c635221b2e0e6722821ad0
 PKG_DESCR:=		powerful http reverse proxy and webserver
 PKG_SECTION:=		net/http
 PKG_BUILDDEP:=		pcre zlib
diff --git a/package/nginx/patches/patch-auto_types_sizeof b/package/nginx/patches/patch-auto_types_sizeof
index 838cbd10c..f8df78410 100644
--- a/package/nginx/patches/patch-auto_types_sizeof
+++ b/package/nginx/patches/patch-auto_types_sizeof
@@ -1,15 +1,6 @@
---- nginx-1.9.12.orig/auto/types/sizeof	2016-02-24 15:53:23.000000000 +0100
-+++ nginx-1.9.12/auto/types/sizeof	2016-03-04 19:55:33.000000000 +0100
-@@ -14,7 +14,7 @@ END
- 
- ngx_size=
- 
--cat << END > $NGX_AUTOTEST.c
-+cat << _EOF > $NGX_AUTOTEST.c
- 
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -25,29 +25,43 @@ $NGX_INCLUDE_UNISTD_H
+--- nginx-1.11.1.orig/auto/types/sizeof	2016-05-31 15:43:50.000000000 +0200
++++ nginx-1.11.1/auto/types/sizeof	2016-06-05 23:06:21.837900876 +0200
+@@ -25,22 +25,41 @@ $NGX_INCLUDE_UNISTD_H
  $NGX_INCLUDE_INTTYPES_H
  $NGX_INCLUDE_AUTO_CONFIG_H
  
@@ -31,12 +22,14 @@
      return 0;
  }
  
--END
--
-+_EOF
+ END
+ 
  
 -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"
+-
 +_ngx_typename=`echo "$ngx_type" | sed 's/ /_/g;s/\*/p/'`
 +ngx_size="-1"
 +ngx_size=`for i in 1 2 4 8 16 ; do \
@@ -45,10 +38,9 @@
 +    $NGX_AUTOTEST.c -o $NGX_AUTOTEST \
 +    $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\
 +    echo $i ; break ; done`
- 
--eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
++ 
 +rm -rf $NGX_AUTOTEST*
- 
++ 
 +if test -z $ngx_size ; then
 +    ngx_size=-1
 +fi
@@ -59,10 +51,3 @@
      echo " $ngx_size bytes"
  fi
  
--
--rm -rf $NGX_AUTOTEST*
--
--
- case $ngx_size in
-     4)
-         ngx_max_value=2147483647
diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix
index a8af00a70..844660fc5 100644
--- a/package/nginx/patches/patch-auto_unix
+++ b/package/nginx/patches/patch-auto_unix
@@ -1,5 +1,5 @@
---- nginx-1.9.13.orig/auto/unix	2016-03-29 17:09:30.000000000 +0200
-+++ nginx-1.9.13/auto/unix	2016-04-01 23:41:30.424200796 +0200
+--- nginx-1.11.1.orig/auto/unix	2016-05-31 15:43:50.000000000 +0200
++++ nginx-1.11.1/auto/unix	2016-06-05 23:03:17.314771093 +0200
 @@ -99,6 +99,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
          ngx_feature="kqueue's EVFILT_TIMER"
          ngx_feature_name="NGX_HAVE_TIMER_EVENT"
@@ -8,7 +8,7 @@
          ngx_feature_incs="#include <sys/event.h>
                            #include <sys/time.h>"
          ngx_feature_path=
-@@ -648,6 +649,7 @@ ngx_feature_test="char buf[1]; struct io
+@@ -687,6 +688,7 @@ ngx_feature_test="char buf[1]; struct io
  ngx_feature="sys_nerr"
  ngx_feature_name="NGX_SYS_NERR"
  ngx_feature_run=value
@@ -16,7 +16,7 @@
  ngx_feature_incs='#include <errno.h>
                    #include <stdio.h>'
  ngx_feature_path=
-@@ -662,6 +664,7 @@ if [ $ngx_found = no ]; then
+@@ -701,6 +703,7 @@ if [ $ngx_found = no ]; then
      ngx_feature="_sys_nerr"
      ngx_feature_name="NGX_SYS_NERR"
      ngx_feature_run=value
@@ -24,7 +24,7 @@
      ngx_feature_incs='#include <errno.h>
                        #include <stdio.h>'
      ngx_feature_path=
-@@ -677,6 +680,7 @@ if [ $ngx_found = no ]; then
+@@ -716,6 +719,7 @@ if [ $ngx_found = no ]; then
      ngx_feature='maximum errno'
      ngx_feature_name=NGX_SYS_NERR
      ngx_feature_run=value
@@ -32,7 +32,7 @@
      ngx_feature_incs='#include <errno.h>
                        #include <string.h>
                        #include <stdio.h>'
-@@ -734,7 +738,7 @@ ngx_feature_test="void *p; p = memalign(
+@@ -773,7 +777,7 @@ ngx_feature_test="void *p; p = memalign(
  
  ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
  ngx_feature_name="NGX_HAVE_MAP_ANON"
@@ -41,7 +41,7 @@
  ngx_feature_incs="#include <sys/mman.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -747,7 +751,7 @@ ngx_feature_test="void *p;
+@@ -786,7 +790,7 @@ ngx_feature_test="void *p;
  
  ngx_feature='mmap("/dev/zero", MAP_SHARED)'
  ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
@@ -50,7 +50,7 @@
  ngx_feature_incs="#include <sys/mman.h>
                    #include <sys/stat.h>
                    #include <fcntl.h>"
-@@ -762,7 +766,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -801,7 +805,7 @@ ngx_feature_test='void *p; int  fd;
  
  ngx_feature="System V shared memory"
  ngx_feature_name="NGX_HAVE_SYSVSHM"
@@ -59,7 +59,7 @@
  ngx_feature_incs="#include <sys/ipc.h>
                    #include <sys/shm.h>"
  ngx_feature_path=
-@@ -776,7 +780,7 @@ ngx_feature_test="int  id;
+@@ -815,7 +819,7 @@ ngx_feature_test="int  id;
  
  ngx_feature="POSIX semaphores"
  ngx_feature_name="NGX_HAVE_POSIX_SEM"