From 4018696ee3ca4a5746a8ea89de654907f8625768 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Mar 2016 22:46:49 +0100 Subject: nginx: update to latest, add patches from buildroot --- package/nginx/patches/patch-auto_os_linux | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/nginx/patches/patch-auto_os_linux') diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux index 070345162..20ecc70f0 100644 --- a/package/nginx/patches/patch-auto_os_linux +++ b/package/nginx/patches/patch-auto_os_linux @@ -1,6 +1,6 @@ ---- nginx-1.7.9.orig/auto/os/linux 2014-12-23 09:28:38.000000000 -0600 -+++ nginx-1.7.9/auto/os/linux 2014-12-25 00:19:14.581499365 -0600 -@@ -48,7 +48,7 @@ fi +--- 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 +@@ -36,7 +36,7 @@ fi ngx_feature="epoll" ngx_feature_name="NGX_HAVE_EPOLL" @@ -9,7 +9,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -105,7 +105,7 @@ ngx_feature_test="int fd; struct stat sb +@@ -93,7 +93,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 #include " ngx_feature_path= -@@ -126,7 +126,7 @@ fi +@@ -114,7 +114,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 #include " ngx_feature_path= -@@ -144,7 +144,7 @@ ngx_include="sys/prctl.h"; . auto/includ +@@ -132,7 +132,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 " ngx_feature_path= ngx_feature_libs= -@@ -165,20 +165,6 @@ ngx_feature_test="cpu_set_t mask; +@@ -153,20 +153,6 @@ ngx_feature_test="cpu_set_t mask; sched_setaffinity(0, sizeof(cpu_set_t), &mask)" . auto/feature -- cgit v1.2.3