From 83d433acfd35cc766236428cffc7d5cec15e26b5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 29 Oct 2021 15:07:38 +0200 Subject: nginx: update to 1.21.3 --- package/nginx/Makefile | 7 +-- package/nginx/patches/patch-auto_cc_conf | 28 ----------- package/nginx/patches/patch-auto_os_darwin | 10 ++-- package/nginx/patches/patch-auto_os_linux | 14 +++--- package/nginx/patches/patch-auto_unix | 58 ++-------------------- .../nginx/patches/patch-src_os_unix_ngx_errno_c | 8 +-- 6 files changed, 24 insertions(+), 101 deletions(-) delete mode 100644 package/nginx/patches/patch-auto_cc_conf (limited to 'package/nginx') diff --git a/package/nginx/Makefile b/package/nginx/Makefile index fc43d851d..a02d56941 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.12.0 +PKG_VERSION:= 1.21.3 PKG_RELEASE:= 1 -PKG_HASH:= b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 +PKG_HASH:= 14774aae0d151da350417efc4afda5cce5035056e71894836797e1f6e2d1175a PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= pcre zlib @@ -47,7 +47,8 @@ CONFIGURE_ARGS:= --prefix=/srv/www \ --http-proxy-temp-path=/var/lib/nginx/proxy \ --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ --http-scgi-temp-path=/var/lib/nginx/uwsgi \ - --http-uwsgi-temp-path=/var/lib/nginx/uwsgi + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ + --without-http_upstream_zone_module ifeq ($(ADK_PACKAGE_NGINX_WITH_LIBRESSL),y) CONFIGURE_ARGS+= --with-http_ssl_module diff --git a/package/nginx/patches/patch-auto_cc_conf b/package/nginx/patches/patch-auto_cc_conf deleted file mode 100644 index 99550ab48..000000000 --- a/package/nginx/patches/patch-auto_cc_conf +++ /dev/null @@ -1,28 +0,0 @@ ---- nginx-1.9.12.orig/auto/cc/conf 2016-02-24 15:53:23.000000000 +0100 -+++ nginx-1.9.12/auto/cc/conf 2016-03-04 19:56:52.000000000 +0100 -@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="gcc builtin atomic operations" - ngx_feature_name=NGX_HAVE_GCC_ATOMIC - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic" - ngx_feature_incs= - ngx_feature_path= - ngx_feature_libs= -@@ -200,7 +201,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - else - ngx_feature="C99 variadic macros" - ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" -- ngx_feature_run=yes -+ ngx_feature_run=no - ngx_feature_incs="#include - #define var(dummy, ...) sprintf(__VA_ARGS__)" - ngx_feature_path= -@@ -214,7 +215,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - - ngx_feature="gcc variadic macros" - ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" -- ngx_feature_run=yes -+ ngx_feature_run=no - ngx_feature_incs="#include - #define var(dummy, args...) sprintf(args)" - ngx_feature_path= diff --git a/package/nginx/patches/patch-auto_os_darwin b/package/nginx/patches/patch-auto_os_darwin index 456c4a7d3..eb10369e6 100644 --- a/package/nginx/patches/patch-auto_os_darwin +++ b/package/nginx/patches/patch-auto_os_darwin @@ -1,6 +1,6 @@ ---- nginx-1.9.12.orig/auto/os/darwin 2016-02-24 15:53:23.000000000 +0100 -+++ nginx-1.9.12/auto/os/darwin 2016-03-04 19:56:52.000000000 +0100 -@@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES +--- nginx-1.21.3.orig/auto/os/darwin 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/auto/os/darwin 2021-10-29 14:50:09.085546624 +0200 +@@ -33,6 +33,7 @@ NGX_KQUEUE_CHECKED=YES 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 #include " ngx_feature_path= -@@ -60,6 +61,7 @@ ngx_feature_test="int kq; +@@ -63,6 +64,7 @@ ngx_feature_test="int kq; ngx_feature="Darwin 64-bit kqueue millisecond timeout bug" ngx_feature_name=NGX_DARWIN_KEVENT_BUG ngx_feature_run=bug @@ -16,7 +16,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -90,6 +92,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS" +@@ -92,6 +94,7 @@ ngx_feature_test="int kq; ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" ngx_feature_run=yes diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux index 0281b2def..0e33cb195 100644 --- a/package/nginx/patches/patch-auto_os_linux +++ b/package/nginx/patches/patch-auto_os_linux @@ -1,5 +1,5 @@ ---- 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 +--- nginx-1.21.3.orig/auto/os/linux 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/auto/os/linux 2021-10-29 14:50:09.089546624 +0200 @@ -36,7 +36,7 @@ fi ngx_feature="epoll" @@ -9,7 +9,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb +@@ -135,7 +135,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= -@@ -131,7 +131,7 @@ fi +@@ -156,7 +156,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= -@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ +@@ -174,7 +174,7 @@ ngx_include="sys/prctl.h"; . auto/includ ngx_feature="prctl(PR_SET_DUMPABLE)" ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" @@ -36,8 +36,8 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -170,20 +170,6 @@ ngx_feature_test="cpu_set_t mask; - sched_setaffinity(0, sizeof(cpu_set_t), &mask)" +@@ -215,20 +215,6 @@ ngx_feature_test="struct __user_cap_data + (void) SYS_capset" . auto/feature - diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix index ceaf9eb2a..796bd5cc6 100644 --- a/package/nginx/patches/patch-auto_unix +++ b/package/nginx/patches/patch-auto_unix @@ -1,56 +1,6 @@ ---- 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 -+ ngx_feature_run_force_result="$ngx_force_have_timer_event" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -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 -+ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include ' - ngx_feature_path= -@@ -716,6 +718,7 @@ if [ $ngx_found = no ]; then - ngx_feature="_sys_nerr" - ngx_feature_name="NGX_SYS_NERR" - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include ' - ngx_feature_path= -@@ -731,6 +734,7 @@ if [ $ngx_found = no ]; then - ngx_feature='maximum errno' - ngx_feature_name=NGX_SYS_NERR - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include - #include ' -@@ -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" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs= -@@ -801,7 +805,7 @@ ngx_feature_test="void *p; - - ngx_feature='mmap("/dev/zero", MAP_SHARED)' - ngx_feature_name="NGX_HAVE_MAP_DEVZERO" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include - #include - #include " -@@ -816,7 +820,7 @@ ngx_feature_test='void *p; int fd; +--- nginx-1.21.3.orig/auto/unix 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/auto/unix 2021-10-29 14:54:32.249555992 +0200 +@@ -833,7 +833,7 @@ ngx_feature_test='void *p; int fd; ngx_feature="System V shared memory" ngx_feature_name="NGX_HAVE_SYSVSHM" @@ -59,7 +9,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -830,7 +834,7 @@ ngx_feature_test="int id; +@@ -847,7 +847,7 @@ ngx_feature_test="int id; ngx_feature="POSIX semaphores" ngx_feature_name="NGX_HAVE_POSIX_SEM" diff --git a/package/nginx/patches/patch-src_os_unix_ngx_errno_c b/package/nginx/patches/patch-src_os_unix_ngx_errno_c index 70020937a..fc9142273 100644 --- a/package/nginx/patches/patch-src_os_unix_ngx_errno_c +++ b/package/nginx/patches/patch-src_os_unix_ngx_errno_c @@ -1,5 +1,5 @@ ---- nginx-1.2.2.orig/src/os/unix/ngx_errno.c 2012-07-02 18:51:02.000000000 +0200 -+++ nginx-1.2.2/src/os/unix/ngx_errno.c 2012-07-16 09:32:48.000000000 +0200 +--- nginx-1.21.3.orig/src/os/unix/ngx_errno.c 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/src/os/unix/ngx_errno.c 2021-10-29 14:50:09.101546624 +0200 @@ -8,6 +8,9 @@ #include #include @@ -8,5 +8,5 @@ +#define NGX_SYS_NERR 128 +#endif - /* - * The strerror() messages are copied because: + static ngx_str_t ngx_unknown_error = ngx_string("Unknown error"); + -- cgit v1.2.3