pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/unit: update from 1.22.0 to 1.23.0.



Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Thu Mar 25 17:04:25 2021 -0400
Changeset:	cfbc5160ea98575372384cb80c82e1454e79421d

Removed Files:
	unit/patches/patch-src_nxt__cert.c
	unit/patches/patch-src_nxt__router.c
	unit/patches/patch-src_nxt__unit.c

Log Message:
wip/unit: update from 1.22.0 to 1.23.0.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cfbc5160ea98575372384cb80c82e1454e79421d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 unit/patches/patch-src_nxt__cert.c   | 34 ----------------------------------
 unit/patches/patch-src_nxt__router.c | 17 -----------------
 unit/patches/patch-src_nxt__unit.c   | 19 -------------------
 3 files changed, 70 deletions(-)

diffs:
diff --git a/unit/patches/patch-src_nxt__cert.c b/unit/patches/patch-src_nxt__cert.c
deleted file mode 100644
index ace7d55913..0000000000
--- a/unit/patches/patch-src_nxt__cert.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Use more portable way to find regular files.
-
---- src/nxt_cert.c.orig	2020-10-08 16:04:40.000000000 +0000
-+++ src/nxt_cert.c
-@@ -9,6 +9,9 @@
- #include <nxt_cert.h>
- 
- #include <dirent.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include <openssl/bio.h>
- #include <openssl/pem.h>
-@@ -809,6 +812,7 @@ nxt_cert_store_load(nxt_task_t *task, nx
-     nxt_runtime_t    *rt;
-     struct dirent    *de;
-     nxt_cert_item_t  *item;
-+    struct stat      cert_statbuf;
- 
-     rt = task->thread->runtime;
- 
-@@ -838,7 +842,8 @@ nxt_cert_store_load(nxt_task_t *task, nx
-             break;
-         }
- 
--        if (de->d_type != DT_REG) {
-+        if (stat(de->d_name, &cert_statbuf) == -1 ||
-+            (cert_statbuf.st_mode & S_IFREG) == 0) {
-             continue;
-         }
- 
diff --git a/unit/patches/patch-src_nxt__router.c b/unit/patches/patch-src_nxt__router.c
deleted file mode 100644
index 2564532e7f..0000000000
--- a/unit/patches/patch-src_nxt__router.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Silence warning.
-
-This patch is going to be reviewed by the vendor.
-
---- src/nxt_router.c.orig	2020-10-08 16:04:40.000000000 +0000
-+++ src/nxt_router.c
-@@ -3692,7 +3692,7 @@ nxt_router_thread_exit_handler(nxt_task_
-     nxt_event_engine_t   *engine;
-     nxt_thread_handle_t  handle;
- 
--    handle = (nxt_thread_handle_t) obj;
-+    handle = (nxt_thread_handle_t)(uintptr_t) obj;
-     link = data;
- 
-     nxt_thread_wait(handle);
diff --git a/unit/patches/patch-src_nxt__unit.c b/unit/patches/patch-src_nxt__unit.c
deleted file mode 100644
index a06964f633..0000000000
--- a/unit/patches/patch-src_nxt__unit.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Use more apropriate format specifier for shm prefix.
-
-This patch is going to be reviewed by the vendor.
-
---- src/nxt_unit.c.orig	2020-11-19 18:12:30.000000000 +0000
-+++ src/nxt_unit.c
-@@ -3762,8 +3762,8 @@ nxt_unit_shm_open(nxt_unit_ctx_t *ctx, s
- #if (NXT_HAVE_MEMFD_CREATE || NXT_HAVE_SHM_OPEN)
-     char             name[64];
- 
--    snprintf(name, sizeof(name), NXT_SHM_PREFIX "unit.%d.%p",
--             lib->pid, (void *) pthread_self());
-+    snprintf(name, sizeof(name), NXT_SHM_PREFIX "unit.%d.%p",
-+             lib->pid, (void *) (uintptr_t)pthread_self());
- #endif
- 
- #if (NXT_HAVE_MEMFD_CREATE)


Home | Main Index | Thread Index | Old Index