diff options
-rw-r--r-- | devel/compdbgen/Makefile | 10 | ||||
-rw-r--r-- | devel/compdbgen/distinfo | 6 | ||||
-rw-r--r-- | devel/compdbgen/files/extra-patch-mainloop.c | 35 |
3 files changed, 5 insertions, 46 deletions
diff --git a/devel/compdbgen/Makefile b/devel/compdbgen/Makefile index fad3099fd807..275233fc3148 100644 --- a/devel/compdbgen/Makefile +++ b/devel/compdbgen/Makefile @@ -1,5 +1,5 @@ PORTNAME= compdbgen -DISTVERSION= g20250911 +DISTVERSION= g20250914 CATEGORIES= devel MAINTAINER= jrm@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= Virus-V -GH_TAGNAME= 726a5c1d9b94650ced9dc13044e9459bc8780364 +GH_TAGNAME= d839843448cbcf7ff394dcd32df586a0ab9aa156 GH_TUPLE= DaveGamble:cJSON:c859b25da02955fef659d658b8f324b5cde87be3:cJSONS/cjson PLIST_FILES= bin/${PORTNAME} @@ -22,10 +22,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-mainloop.c -.endif - .include <bsd.port.mk> diff --git a/devel/compdbgen/distinfo b/devel/compdbgen/distinfo index 144a02dca51c..9fe73365320e 100644 --- a/devel/compdbgen/distinfo +++ b/devel/compdbgen/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757696416 -SHA256 (Virus-V-compdbgen-g20250911-726a5c1d9b94650ced9dc13044e9459bc8780364_GH0.tar.gz) = 2075a2df4237ab78926c75936f4ccdd991ff196e27567219cc46ae3f9f02a251 -SIZE (Virus-V-compdbgen-g20250911-726a5c1d9b94650ced9dc13044e9459bc8780364_GH0.tar.gz) = 58854 +TIMESTAMP = 1757907486 +SHA256 (Virus-V-compdbgen-g20250914-d839843448cbcf7ff394dcd32df586a0ab9aa156_GH0.tar.gz) = 9cf61309142803849f6b0175aa867c5932f916d11b6d90c1eba307e762c26d21 +SIZE (Virus-V-compdbgen-g20250914-d839843448cbcf7ff394dcd32df586a0ab9aa156_GH0.tar.gz) = 58912 SHA256 (DaveGamble-cJSON-c859b25da02955fef659d658b8f324b5cde87be3_GH0.tar.gz) = 880a86445ad5cf38f877bac31198268d8fac5d2ce996ebf55d3066a4109ddd8d SIZE (DaveGamble-cJSON-c859b25da02955fef659d658b8f324b5cde87be3_GH0.tar.gz) = 356505 diff --git a/devel/compdbgen/files/extra-patch-mainloop.c b/devel/compdbgen/files/extra-patch-mainloop.c deleted file mode 100644 index 33a01eecebac..000000000000 --- a/devel/compdbgen/files/extra-patch-mainloop.c +++ /dev/null @@ -1,35 +0,0 @@ ---- mainloop.c.orig 2025-09-11 04:56:11 UTC -+++ mainloop.c -@@ -433,20 +433,32 @@ static void enter_syscall(struct glbctx *info, struct - static int json_item_cnt = 0; - struct syscall *sc; - u_int i, narg; -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1400000 -+ register_t *args; -+#else - syscallarg_t *args; -+#endif - - /* ignore other syscall except execve */ - if (pl->pl_syscall_code != SYS_execve) { - return; - } - -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1400000 -+ args = calloc(pl->pl_syscall_narg, sizeof(register_t)); -+#else - args = calloc(pl->pl_syscall_narg, sizeof(syscallarg_t)); -+#endif - if (args == NULL) { - err(1, "malloc syscall args failed\n"); - } - - if (ptrace(PT_GET_SC_ARGS, t->tid, (caddr_t)args, -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1400000 -+ sizeof(register_t) * pl->pl_syscall_narg) != 0) { -+#else - sizeof(syscallarg_t) * pl->pl_syscall_narg) != 0) { -+#endif - goto _EXIT; - } - |