diff --git a/www-servers/nginx/nginx-1.19.8.recipe b/www-servers/nginx/nginx-1.23.2.recipe similarity index 95% rename from www-servers/nginx/nginx-1.19.8.recipe rename to www-servers/nginx/nginx-1.23.2.recipe index 9f6268e03..a30a14e8f 100644 --- a/www-servers/nginx/nginx-1.19.8.recipe +++ b/www-servers/nginx/nginx-1.23.2.recipe @@ -6,19 +6,19 @@ including Yandex, Mail.Ru, VK, and Rambler. According to Netcraft, nginx \ served or proxied 21.89% busiest sites in June 2015." HOMEPAGE="http://nginx.org/" COPYRIGHT="2002-2019 Igor Sysoev - 2011-2019 Nginx, Inc." + 2011-2022 Nginx, Inc." # "it's complicated", cf. http://packages.gentoo.org/package/www-servers/nginx LICENSE="BSD (2-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://nginx.org/download/nginx-$portVersion.tar.gz" -CHECKSUM_SHA256="308919b1a1359315a8066578472f998f14cb32af8de605a3743acca834348b05" +CHECKSUM_SHA256="a80cc272d3d72aaee70aa8b517b4862a635c0256790434dbfc4d618a999b0b46" PATCHES="nginx-$portVersion.patchset" ADDITIONAL_FILES=" userlaunch.in setup-nginx.sh " -ARCHITECTURES="all ?x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" diff --git a/www-servers/nginx/patches/nginx-1.19.8.patchset b/www-servers/nginx/patches/nginx-1.23.2.patchset similarity index 96% rename from www-servers/nginx/patches/nginx-1.19.8.patchset rename to www-servers/nginx/patches/nginx-1.23.2.patchset index 1c47c54bc..113940b41 100644 --- a/www-servers/nginx/patches/nginx-1.19.8.patchset +++ b/www-servers/nginx/patches/nginx-1.23.2.patchset @@ -1,4 +1,4 @@ -From 70cbc8dc33fcda173b352d6c44c362393a7a8f5c Mon Sep 17 00:00:00 2001 +From 3b8c3669270d005909c11ee15c330d0060ce7295 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sun, 14 Mar 2021 18:05:04 -0400 Subject: Haiku fixes @@ -33,7 +33,7 @@ index c764fdd..0604d7e 100644 diff --git a/auto/options b/auto/options -index 80be906..491600b 100644 +index 48f3a1a..fca45b7 100644 --- a/auto/options +++ b/auto/options @@ -13,6 +13,7 @@ NGX_CONF_PATH= @@ -44,7 +44,7 @@ index 80be906..491600b 100644 NGX_USER= NGX_GROUP= NGX_BUILD= -@@ -190,6 +191,7 @@ do +@@ -191,6 +192,7 @@ do --sbin-path=*) NGX_SBIN_PATH="$value" ;; --modules-path=*) NGX_MODULES_PATH="$value" ;; --conf-path=*) NGX_CONF_PATH="$value" ;; @@ -52,7 +52,7 @@ index 80be906..491600b 100644 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; --pid-path=*) NGX_PID_PATH="$value" ;; --lock-path=*) NGX_LOCK_PATH="$value" ;; -@@ -420,6 +422,7 @@ cat << END +@@ -422,6 +424,7 @@ cat << END --sbin-path=PATH set nginx binary pathname --modules-path=PATH set modules path --conf-path=PATH set nginx.conf pathname @@ -60,7 +60,7 @@ index 80be906..491600b 100644 --error-log-path=PATH set error log pathname --pid-path=PATH set nginx.pid pathname --lock-path=PATH set nginx.lock pathname -@@ -603,6 +606,7 @@ NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx} +@@ -606,6 +609,7 @@ NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx} NGX_MODULES_PATH=${NGX_MODULES_PATH:-modules} NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf} NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` @@ -69,7 +69,7 @@ index 80be906..491600b 100644 NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock} diff --git a/auto/os/conf b/auto/os/conf -index 7c6cb69..d770822 100644 +index d7f6e03..d429afe 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -77,6 +77,24 @@ case "$NGX_PLATFORM" in @@ -107,10 +107,10 @@ index 7c6cb69..d770822 100644 NGX_MACH_CACHE_LINE=32 ;; diff --git a/auto/sources b/auto/sources -index 3dad111..e4eb087 100644 +index a539093..3d897f8 100644 --- a/auto/sources +++ b/auto/sources -@@ -208,6 +208,7 @@ DARWIN_DEPS="src/os/unix/ngx_darwin_config.h src/os/unix/ngx_darwin.h" +@@ -209,6 +209,7 @@ DARWIN_DEPS="src/os/unix/ngx_darwin_config.h src/os/unix/ngx_darwin.h" DARWIN_SRCS=src/os/unix/ngx_darwin_init.c DARWIN_SENDFILE_SRCS=src/os/unix/ngx_darwin_sendfile_chain.c @@ -119,7 +119,7 @@ index 3dad111..e4eb087 100644 WIN32_INCS="$CORE_INCS $EVENT_INCS src/os/win32" diff --git a/auto/summary b/auto/summary -index 9aa776e..c02bdf0 100644 +index b3c07ee..e7cffa0 100644 --- a/auto/summary +++ b/auto/summary @@ -49,6 +49,7 @@ cat << END @@ -131,7 +131,7 @@ index 9aa776e..c02bdf0 100644 END diff --git a/auto/unix b/auto/unix -index 9c402e7..2e7e72c 100644 +index 8671019..166f4a5 100644 --- a/auto/unix +++ b/auto/unix @@ -278,6 +278,18 @@ if [ $ngx_found = no ]; then @@ -396,7 +396,7 @@ index 1568023..e7037f7 100644 break; } diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c -index f87e009..3b65196 100644 +index 07cd05e..8188ee5 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -87,7 +87,9 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) @@ -409,7 +409,7 @@ index f87e009..3b65196 100644 sigaddset(&set, SIGINT); sigaddset(&set, ngx_signal_value(NGX_RECONFIGURE_SIGNAL)); sigaddset(&set, ngx_signal_value(NGX_REOPEN_SIGNAL)); -@@ -786,12 +788,14 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker) +@@ -767,12 +769,14 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker) ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); @@ -425,4 +425,5 @@ index f87e009..3b65196 100644 if (ccf->rlimit_nofile != NGX_CONF_UNSET) { rlmt.rlim_cur = (rlim_t) ccf->rlimit_nofile; -- -2.30.0 +2.37.3 +