head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.28 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.26 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.24 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.22 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.20 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.18 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.16 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.14 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.12 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.10 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.8 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.6 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.4 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.2 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.1.0.14 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.12 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.10 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.8 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.6 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.4 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.2 pkgsrc-2021Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2022.12.17.17.51.45; author gutteridge; state Exp; branches; next 1.2; commitid Llp7CPPGHriSaW5E; 1.2 date 2022.12.17.04.37.42; author osa; state Exp; branches; next 1.1; commitid UalGwBk541H7MR5E; 1.1 date 2021.02.14.11.56.57; author otis; state Exp; branches; next ; commitid 4RgJ5pkNwSzILFHC; desc @@ 1.3 log @unit: fix patch format (NFC) @ text @$NetBSD$ Prefer eventports on SunOS --- auto/events.orig 2022-12-16 22:55:06.825345785 -0500 +++ auto/events @@@@ -5,69 +5,69 @@@@ # Linux epoll. -nxt_feature="Linux epoll" -nxt_feature_name=NXT_HAVE_EPOLL -nxt_feature_run= -nxt_feature_incs= -nxt_feature_libs= -nxt_feature_test="#include - #include - - int main(void) { - int n; - - n = epoll_create(1); - close(n); - return 0; - }" -. auto/feature - -if [ $nxt_found = yes ]; then - NXT_HAVE_EPOLL=YES - - nxt_feature="Linux signalfd()" - nxt_feature_name=NXT_HAVE_SIGNALFD +# Do not use epoll on SunOS/illumos/Smartos +# as eventports are preferred there. +NXT_HAVE_EPOLL=NO +if [ $NXT_SYSTEM != "SunOS" ]; then + nxt_feature="Linux epoll" + nxt_feature_name=NXT_HAVE_EPOLL nxt_feature_run= nxt_feature_incs= nxt_feature_libs= - nxt_feature_test="#include - #include - #include - - int main(void) { - int n; - sigset_t mask; - - sigemptyset(&mask); - n = signalfd(-1, &mask, 0); - close(n); - return 0; - }" - . auto/feature - - - nxt_feature="Linux eventfd()" - nxt_feature_name=NXT_HAVE_EVENTFD - nxt_feature_run= - nxt_feature_incs= - nxt_feature_libs= - nxt_feature_test="#include + nxt_feature_test="#include #include int main(void) { int n; - n = eventfd(0, 0); + n = epoll_create(1); close(n); return 0; }" . auto/feature -else - NXT_HAVE_EPOLL=NO + if [ $nxt_found = yes ]; then + NXT_HAVE_EPOLL=YES + nxt_feature="Linux signalfd()" + nxt_feature_name=NXT_HAVE_SIGNALFD + nxt_feature_run= + nxt_feature_incs= + nxt_feature_libs= + nxt_feature_test="#include + #include + #include + + int main() { + int n; + sigset_t mask; + + sigemptyset(&mask); + n = signalfd(-1, &mask, 0); + close(n); + return 0; + }" + + . auto/feature + + nxt_feature="Linux eventfd()" + nxt_feature_name=NXT_HAVE_EVENTFD + nxt_feature_run= + nxt_feature_incs= + nxt_feature_libs= + nxt_feature_test="#include + #include + + int main() { + int n; + + n = eventfd(0, 0); + close(n); + return 0; + }" + . auto/feature + fi fi - # FreeBSD, MacOSX, NetBSD, OpenBSD kqueue. nxt_feature="kqueue" @ 1.2 log @*/*unit*: update NGINX Unit from 1.28.0 to 1.29.0 Remove python 3.11 patch. Adopt Solaris/Illumos/SmartOS patch. *) Change: removed $uri auto-append for "share" when loading configuration. *) Change: prefer system crypto policy instead of hardcoding a default. *) Feature: njs support with the basic syntax of JS template literals. *) Feature: support per-application cgroups on Linux. *) Feature: the $request_time variable contains the request processing time. *) Feature: "prefix" option in Python applications to set WSGI "SCRIPT_NAME" and ASGI root-path variables. *) Feature: compatibility with Python 3.11. *) Feature: compatibility with OpenSSL 3. *) Feature: compatibility with PHP 8.2. *) Feature: compatibility with Node.js 19.0. *) Feature: Ruby Rack v3 support. *) Bugfix: fix error in connection statistics when using proxy. *) Bugfix: fix HTTP cookie parsing when the value contains an equals sign. *) Bugfix: PHP directory URLs without a trailing '/' would give a 503 error (fixed with a 301 re-direct). *) Bugfix: missing error checks in the C API. *) Bugfix: report the regex status in configure summary. @ text @d1 4 d6 1 a6 1 +++ auto/events 2022-12-16 23:08:43.271944344 -0500 d34 1 a34 1 +# as eventports are preffered there. @ 1.1 log @www/unit: import unit-1.22.0 NGINX Unit is a polyglot app server, a reverse proxy, and a static file server, available for Unix-like systems. It was built by nginx team members from scratch to be highly efficient and fully configurable at runtime. Vast majority of work done by Sergey A. Osokin WWW: http://unit.nginx.org/ @ text @d1 3 a3 7 $NetBSD$ Prefer eventports on SunOS --- auto/events.orig 2021-02-04 15:22:33.000000000 +0000 +++ auto/events @@@@ -5,69 +5,70 @@@@ d15 1 a15 1 - int main() { d30 1 a30 1 +# as eventports are preferred there. d40 1 a40 2 + nxt_feature_test="#include #include d42 1 a42 1 - int main() { d60 4 a63 4 - #include - + int main() { d65 1 a65 1 - a66 1 + d72 1 a72 1 - a74 1 + a76 1 + d85 1 a85 1 + d87 3 a89 3 + int n; + sigset_t mask; + d95 1 d97 1 a97 2 + + d105 1 a105 1 + d108 1 a108 1 + @