summaryrefslogtreecommitdiff
path: root/package/nginx/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/nginx/patches')
-rw-r--r--package/nginx/patches/patch-auto_os_linux12
-rw-r--r--package/nginx/patches/patch-auto_types_sizeof6
-rw-r--r--package/nginx/patches/patch-auto_unix20
3 files changed, 19 insertions, 19 deletions
diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux
index 20ecc70f0..0281b2def 100644
--- a/package/nginx/patches/patch-auto_os_linux
+++ b/package/nginx/patches/patch-auto_os_linux
@@ -1,5 +1,5 @@
---- nginx-1.9.12.orig/auto/os/linux 2016-02-24 15:53:23.000000000 +0100
-+++ nginx-1.9.12/auto/os/linux 2016-03-04 19:55:33.000000000 +0100
+--- nginx-1.11.10.orig/auto/os/linux 2017-02-14 16:36:04.000000000 +0100
++++ nginx-1.11.10/auto/os/linux 2017-03-18 08:19:23.069283778 +0100
@@ -36,7 +36,7 @@ fi
ngx_feature="epoll"
@@ -9,7 +9,7 @@
ngx_feature_incs="#include <sys/epoll.h>"
ngx_feature_path=
ngx_feature_libs=
-@@ -93,7 +93,7 @@ ngx_feature_test="int fd; struct stat sb
+@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb
CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
ngx_feature="sendfile()"
ngx_feature_name="NGX_HAVE_SENDFILE"
@@ -18,7 +18,7 @@
ngx_feature_incs="#include <sys/sendfile.h>
#include <errno.h>"
ngx_feature_path=
-@@ -114,7 +114,7 @@ fi
+@@ -131,7 +131,7 @@ fi
CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
ngx_feature="sendfile64()"
ngx_feature_name="NGX_HAVE_SENDFILE64"
@@ -27,7 +27,7 @@
ngx_feature_incs="#include <sys/sendfile.h>
#include <errno.h>"
ngx_feature_path=
-@@ -132,7 +132,7 @@ ngx_include="sys/prctl.h"; . auto/includ
+@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ
ngx_feature="prctl(PR_SET_DUMPABLE)"
ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
@@ -36,7 +36,7 @@
ngx_feature_incs="#include <sys/prctl.h>"
ngx_feature_path=
ngx_feature_libs=
-@@ -153,20 +153,6 @@ ngx_feature_test="cpu_set_t mask;
+@@ -170,20 +170,6 @@ ngx_feature_test="cpu_set_t mask;
sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
. auto/feature
diff --git a/package/nginx/patches/patch-auto_types_sizeof b/package/nginx/patches/patch-auto_types_sizeof
index f8df78410..8c959a2fb 100644
--- a/package/nginx/patches/patch-auto_types_sizeof
+++ b/package/nginx/patches/patch-auto_types_sizeof
@@ -1,10 +1,10 @@
---- 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
+--- nginx-1.11.10.orig/auto/types/sizeof 2017-02-14 16:36:04.000000000 +0100
++++ nginx-1.11.10/auto/types/sizeof 2017-03-18 08:21:47.830902623 +0100
@@ -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
diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix
index 844660fc5..ceaf9eb2a 100644
--- a/package/nginx/patches/patch-auto_unix
+++ b/package/nginx/patches/patch-auto_unix
@@ -1,6 +1,6 @@
---- 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
+--- nginx-1.11.10.orig/auto/unix 2017-02-14 16:36:04.000000000 +0100
++++ nginx-1.11.10/auto/unix 2017-03-18 08:19:23.073283934 +0100
+@@ -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
@@ -8,7 +8,7 @@
ngx_feature_incs="#include <sys/event.h>
#include <sys/time.h>"
ngx_feature_path=
-@@ -687,6 +688,7 @@ ngx_feature_test="char buf[1]; struct io
+@@ -702,6 +703,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=
-@@ -701,6 +703,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
@@ -24,7 +24,7 @@
ngx_feature_incs='#include <errno.h>
#include <stdio.h>'
ngx_feature_path=
-@@ -716,6 +719,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
@@ -32,7 +32,7 @@
ngx_feature_incs='#include <errno.h>
#include <string.h>
#include <stdio.h>'
-@@ -773,7 +777,7 @@ ngx_feature_test="void *p; p = memalign(
+@@ -788,7 +792,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=
-@@ -786,7 +790,7 @@ ngx_feature_test="void *p;
+@@ -801,7 +805,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>"
-@@ -801,7 +805,7 @@ ngx_feature_test='void *p; int fd;
+@@ -816,7 +820,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=
-@@ -815,7 +819,7 @@ ngx_feature_test="int id;
+@@ -830,7 +834,7 @@ ngx_feature_test="int id;
ngx_feature="POSIX semaphores"
ngx_feature_name="NGX_HAVE_POSIX_SEM"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 11:00:11 +0000