nginx: update to 1.9.13

3 files changed, 20 insertions, 22 deletions

diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index c0393c2c8..c275b1bee 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.12
+PKG_VERSION:=		1.9.13
 PKG_RELEASE:=		1
-PKG_HASH:=		1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042
+PKG_HASH:=		f7cd529a5879cd9cd5b62e6fc4a3a7e8d8363cb12c080ab480cc718c55736609
 PKG_DESCR:=		powerful http reverse proxy and webserver
 PKG_SECTION:=		net/http
 PKG_BUILDDEP:=		pcre zlib
diff --git a/package/nginx/patches/patch-auto_install b/package/nginx/patches/patch-auto_install
index 6c7701de3..0c9f06568 100644
--- a/package/nginx/patches/patch-auto_install
+++ b/package/nginx/patches/patch-auto_install
@@ -1,18 +1,16 @@
---- nginx-1.9.12.orig/auto/install	2016-02-24 15:53:23.000000000 +0100
-+++ nginx-1.9.12/auto/install	2016-03-04 19:55:33.000000000 +0100
-@@ -107,12 +107,9 @@ $NGX_OBJS/nginx.8:	$NGX_MAN $NGX_AUTO_CO
+--- nginx-1.9.13.orig/auto/install	2016-03-29 17:09:30.000000000 +0200
++++ nginx-1.9.13/auto/install	2016-04-01 23:45:09.250318293 +0200
+@@ -107,11 +107,8 @@ $NGX_OBJS/nginx.8:	$NGX_MAN $NGX_AUTO_CO
  install:	build $NGX_INSTALL_PERL_MODULES
  	test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
  
--	test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
+-	test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \\
 -		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
--	test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \
--		|| mv '\$(DESTDIR)$NGX_SBIN_PATH' \
+-	test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\
+-		|| mv '\$(DESTDIR)$NGX_SBIN_PATH' \\
 -			'\$(DESTDIR)$NGX_SBIN_PATH.old'
--	cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
-+	test -d '\$(DESTDIR)$NGX_SBIN_PATH' \
++	test -d '\$(DESTDIR)$NGX_SBIN_PATH' \\
 +		|| mkdir -p '\$(DESTDIR)$NGX_SBIN_PATH'
-+	cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH/'
+ 	cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
  
- 	test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \
- 		|| mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
+ 	test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\
diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix
index bd63345f9..a8af00a70 100644
--- a/package/nginx/patches/patch-auto_unix
+++ b/package/nginx/patches/patch-auto_unix
@@ -1,5 +1,5 @@
---- nginx-1.9.12.orig/auto/unix	2016-02-24 15:53:23.000000000 +0100
-+++ nginx-1.9.12/auto/unix	2016-03-04 19:56:52.000000000 +0100
+--- 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
 @@ -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=
-@@ -609,6 +610,7 @@ ngx_feature_test="char buf[1]; struct io
+@@ -648,6 +649,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=
-@@ -623,6 +625,7 @@ if [ $ngx_found = no ]; then
+@@ -662,6 +664,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=
-@@ -638,6 +641,7 @@ if [ $ngx_found = no ]; then
+@@ -677,6 +680,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>'
-@@ -695,7 +699,7 @@ ngx_feature_test="void *p; p = memalign(
+@@ -734,7 +738,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=
-@@ -708,7 +712,7 @@ ngx_feature_test="void *p;
+@@ -747,7 +751,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>"
-@@ -723,7 +727,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -762,7 +766,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=
-@@ -737,7 +741,7 @@ ngx_feature_test="int  id;
+@@ -776,7 +780,7 @@ ngx_feature_test="int  id;
  
  ngx_feature="POSIX semaphores"
  ngx_feature_name="NGX_HAVE_POSIX_SEM"