pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/unit */*unit*: update NGINX Unit from 1.28.0 to 1....
details: https://anonhg.NetBSD.org/pkgsrc/rev/af0c2edd1371
branches: trunk
changeset: 390130:af0c2edd1371
user: osa <osa%pkgsrc.org@localhost>
date: Sat Dec 17 04:37:42 2022 +0000
description:
*/*unit*: update NGINX Unit from 1.28.0 to 1.29.0
Remove python 3.11 patch.
Adopt Solaris/Illumos/SmartOS patch.
<ChangeLog>
*) 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.
</ChangeLog>
diffstat:
www/unit/distinfo | 11 +-
www/unit/patches/patch-auto_events | 50 +++++------
www/unit/patches/patch-src_python_nxt__python.c | 100 ------------------------
www/unit/version.mk | 4 +-
4 files changed, 28 insertions(+), 137 deletions(-)
diffs (264 lines):
diff -r e399e1a7fda9 -r af0c2edd1371 www/unit/distinfo
--- a/www/unit/distinfo Sat Dec 17 03:28:29 2022 +0000
+++ b/www/unit/distinfo Sat Dec 17 04:37:42 2022 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.11 2022/12/06 08:54:23 wiz Exp $
+$NetBSD: distinfo,v 1.12 2022/12/17 04:37:42 osa Exp $
-BLAKE2s (unit-1.28.0.tar.gz) = fe95e41bc6876ae30070ef0a1cba33181df6813bc69d3a246c71c25ff6193d2a
-SHA512 (unit-1.28.0.tar.gz) = 7d2033be3d8e9d15db21b5431348be73a10fbc19bcab7e83d3c5a770e11e23a53967afe051ec53e236896ac9e021d9146501bc32b87254f9b25778b4bc5d1cbe
-Size (unit-1.28.0.tar.gz) = 878878 bytes
-SHA1 (patch-auto_events) = 0347dfefbedaacd206c8c2bfd8ea38b18995dd9f
+BLAKE2s (unit-1.29.0.tar.gz) = 0b3a2354915cbab1b317e46d7886c5f48af0965b2e10bad35572bea01d19b452
+SHA512 (unit-1.29.0.tar.gz) = 6b0a6718be5c3312f5e17fc39ae35ca849049c97d29c63a7effda7f994274af29eed88970389bb3010a2103c431e69920c951de5004853004d1aa604d868bd9f
+Size (unit-1.29.0.tar.gz) = 903909 bytes
+SHA1 (patch-auto_events) = 9fca8c3079f6072eb27f48b026957b1ba83883a2
SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae
-SHA1 (patch-src_python_nxt__python.c) = 18b638d2e2f155e7f2839309552d34772f0f5162
diff -r e399e1a7fda9 -r af0c2edd1371 www/unit/patches/patch-auto_events
--- a/www/unit/patches/patch-auto_events Sat Dec 17 03:28:29 2022 +0000
+++ b/www/unit/patches/patch-auto_events Sat Dec 17 04:37:42 2022 +0000
@@ -1,10 +1,6 @@
-$NetBSD: patch-auto_events,v 1.1 2021/02/14 11:56:57 otis Exp $
-
-Prefer eventports on SunOS
-
---- auto/events.orig 2021-02-04 15:22:33.000000000 +0000
-+++ auto/events
-@@ -5,69 +5,70 @@
+--- auto/events.orig 2022-12-16 22:55:06.825345785 -0500
++++ auto/events 2022-12-16 23:08:43.271944344 -0500
+@@ -5,69 +5,69 @@
# Linux epoll.
@@ -16,7 +12,7 @@
-nxt_feature_test="#include <sys/epoll.h>
- #include <unistd.h>
-
-- int main() {
+- int main(void) {
- int n;
-
- n = epoll_create(1);
@@ -31,7 +27,7 @@
- nxt_feature="Linux signalfd()"
- nxt_feature_name=NXT_HAVE_SIGNALFD
+# Do not use epoll on SunOS/illumos/Smartos
-+# as eventports are preferred there.
++# as eventports are preffered there.
+NXT_HAVE_EPOLL=NO
+if [ $NXT_SYSTEM != "SunOS" ]; then
+ nxt_feature="Linux epoll"
@@ -41,10 +37,9 @@
nxt_feature_libs=
- nxt_feature_test="#include <signal.h>
- #include <sys/signalfd.h>
-+ nxt_feature_test="#include <sys/epoll.h>
- #include <unistd.h>
+- #include <unistd.h>
-
-- int main() {
+- int main(void) {
- int n;
- sigset_t mask;
-
@@ -62,26 +57,23 @@
- nxt_feature_incs=
- nxt_feature_libs=
- nxt_feature_test="#include <sys/eventfd.h>
-- #include <unistd.h>
--
-+
- int main() {
++ nxt_feature_test="#include <sys/epoll.h>
+ #include <unistd.h>
+
+ 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=
@@ -90,19 +82,19 @@
+ nxt_feature_test="#include <signal.h>
+ #include <sys/signalfd.h>
+ #include <unistd.h>
-+
++
+ int main() {
-+ int n;
-+ sigset_t mask;
-+
++ 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=
@@ -110,10 +102,10 @@
+ nxt_feature_libs=
+ nxt_feature_test="#include <sys/eventfd.h>
+ #include <unistd.h>
-+
++
+ int main() {
+ int n;
-+
++
+ n = eventfd(0, 0);
+ close(n);
+ return 0;
diff -r e399e1a7fda9 -r af0c2edd1371 www/unit/patches/patch-src_python_nxt__python.c
--- a/www/unit/patches/patch-src_python_nxt__python.c Sat Dec 17 03:28:29 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-$NetBSD: patch-src_python_nxt__python.c,v 1.1 2022/12/06 08:54:23 wiz Exp $
-
-Python 3.11 support.
-https://github.com/nginx/unit/commit/491d0f700f5690eba0f1fcf2124f3a37ef73eb1a
-
---- src/python/nxt_python.c.orig 2022-09-12 23:26:26.000000000 +0000
-+++ src/python/nxt_python.c
-@@ -22,6 +22,10 @@ typedef struct {
- } nxt_py_thread_info_t;
-
-
-+#if PY_MAJOR_VERSION == 3
-+static nxt_int_t nxt_python3_init_config(nxt_int_t pep405);
-+#endif
-+
- static nxt_int_t nxt_python_start(nxt_task_t *task,
- nxt_process_data_t *data);
- static nxt_int_t nxt_python_set_target(nxt_task_t *task,
-@@ -64,6 +68,63 @@ static nxt_py_thread_info_t *nxt_py_thr
- static nxt_python_proto_t nxt_py_proto;
-
-
-+#if PY_VERSION_HEX >= NXT_PYTHON_VER(3, 8)
-+
-+static nxt_int_t
-+nxt_python3_init_config(nxt_int_t pep405)
-+{
-+ PyStatus status;
-+ PyConfig config;
-+
-+ PyConfig_InitIsolatedConfig(&config);
-+
-+ if (pep405) {
-+ status = PyConfig_SetString(&config, &config.program_name,
-+ nxt_py_home);
-+ if (PyStatus_Exception(status)) {
-+ goto pyinit_exception;
-+ }
-+
-+ } else {
-+ status =PyConfig_SetString(&config, &config.home, nxt_py_home);
-+ if (PyStatus_Exception(status)) {
-+ goto pyinit_exception;
-+ }
-+ }
-+
-+ status = Py_InitializeFromConfig(&config);
-+ if (PyStatus_Exception(status)) {
-+ goto pyinit_exception;
-+ }
-+ PyConfig_Clear(&config);
-+
-+ return NXT_OK;
-+
-+pyinit_exception:
-+
-+ PyConfig_Clear(&config);
-+
-+ return NXT_ERROR;
-+}
-+
-+#elif PY_MAJOR_VERSION == 3
-+
-+static nxt_int_t
-+nxt_python3_init_config(nxt_int_t pep405)
-+{
-+ if (pep405) {
-+ Py_SetProgramName(nxt_py_home);
-+
-+ } else {
-+ Py_SetPythonHome(nxt_py_home);
-+ }
-+
-+ return NXT_OK;
-+}
-+
-+#endif
-+
-+
- static nxt_int_t
- nxt_python_start(nxt_task_t *task, nxt_process_data_t *data)
- {
-@@ -127,11 +188,15 @@ nxt_python_start(nxt_task_t *task, nxt_p
- if (pep405) {
- mbstowcs(nxt_py_home, c->home, len);
- mbstowcs(nxt_py_home + len, bin_python, sizeof(bin_python));
-- Py_SetProgramName(nxt_py_home);
-
- } else {
- mbstowcs(nxt_py_home, c->home, len + 1);
-- Py_SetPythonHome(nxt_py_home);
-+ }
-+
-+ ret = nxt_python3_init_config(pep405);
-+ if (nxt_slow_path(ret == NXT_ERROR)) {
-+ nxt_alert(task, "Failed to initialise config");
-+ return NXT_ERROR;
- }
-
- #else
diff -r e399e1a7fda9 -r af0c2edd1371 www/unit/version.mk
--- a/www/unit/version.mk Sat Dec 17 03:28:29 2022 +0000
+++ b/www/unit/version.mk Sat Dec 17 04:37:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.6 2022/09/14 05:31:41 osa Exp $
+# $NetBSD: version.mk,v 1.7 2022/12/17 04:37:42 osa Exp $
#
# UNIT_EXTENSION_DIR
# Relative path to ${PREFIX} for NGINX Unit's modules.
@@ -12,7 +12,7 @@
UNITVERSION_MK= defined
# Define NGINX Unit's version.
-UNIT_VERSION= 1.28.0
+UNIT_VERSION= 1.29.0
# Define NGINX Unit's modules directory
UNIT_EXTENSION_DIR= libexec/unit/modules
Home |
Main Index |
Thread Index |
Old Index