diff options
Diffstat (limited to 'misc')
24 files changed, 247 insertions, 37 deletions
diff --git a/misc/compat13x/Makefile b/misc/compat13x/Makefile index 758f710146af..34058bc451a4 100644 --- a/misc/compat13x/Makefile +++ b/misc/compat13x/Makefile @@ -1,5 +1,5 @@ PORTNAME= compat13x -PORTVERSION= 13.5.1305000.20250516 +PORTVERSION= 13.5.1305000.20250911 CATEGORIES= misc MASTER_SITES= LOCAL/arrowd PKGNAMESUFFIX= -${ARCH} @@ -12,18 +12,27 @@ LICENSE= BSD2CLAUSE USES= tar:xz NO_BUILD= yes -ONLY_FOR_ARCHS= aarch64 amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc powerpc64 powerpc64le PLIST= ${PKGDIR}/pkg-plist.${ARCH} TARGET_DIR= ${PREFIX}/lib/compat TARGET32_DIR= ${PREFIX}/lib32/compat USE_LDCONFIG= ${TARGET_DIR} -NO_SHLIB_REQUIRES_GLOB= *:32 COMPAT_LIBS= libcrypto.so.111 \ libdialog.so.9 \ + libdpv.so.2 \ libnv.so.0 \ libssl.so.111 +OPTIONS_DEFINE= COMPAT32 +OPTIONS_DEFAULT=COMPAT32 +OPTIONS_EXCLUDE_aarch64=COMPAT32 +OPTIONS_EXCLUDE_i386=COMPAT32 +OPTIONS_EXCLUDE_powerpc=COMPAT32 +OPTIONS_EXCLUDE_powerpc64le=COMPAT32 +COMPAT32_DESC= Install 32-bit compat libraries +OPTIONS_SUB= yes + .include "${.CURDIR}/../compat4x/Makefile.makedist" .include <bsd.port.pre.mk> @@ -36,16 +45,18 @@ IGNORE= is for FreeBSD 13.x and newer RUN_DEPENDS+= compat14x-${ARCH}>=0:misc/compat14x .endif -.if ${ARCH} == amd64 +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MCOMPAT32} USE_LDCONFIG32= ${TARGET32_DIR} .endif do-install: @${MKDIR} -m 0755 ${STAGEDIR}${TARGET_DIR} (cd ${WRKSRC}/lib && ${INSTALL_LIB} *.so.* ${STAGEDIR}${TARGET_DIR}) -.if ${ARCH} == amd64 + +do-install-COMPAT32-on: @${MKDIR} ${STAGEDIR}${TARGET32_DIR} (cd ${WRKSRC}/lib32 && ${INSTALL_LIB} *.so.* ${STAGEDIR}${TARGET32_DIR}) -.endif .include <bsd.port.post.mk> diff --git a/misc/compat13x/distinfo b/misc/compat13x/distinfo index 3530110000a3..f40264439642 100644 --- a/misc/compat13x/distinfo +++ b/misc/compat13x/distinfo @@ -1,7 +1,13 @@ -TIMESTAMP = 1747389524 -SHA256 (compat13x-aarch64-13.5.1305000.20250516.tar.xz) = da6774b0ecc1d9493e208dea4f247f1c23f359e22437b3ba60c07ec6674b7c49 -SIZE (compat13x-aarch64-13.5.1305000.20250516.tar.xz) = 1319304 -SHA256 (compat13x-amd64-13.5.1305000.20250516.tar.xz) = 0a1e1990bd75ae1ca682fc919eb1ebdf1765708076287fb5e51b73a1b47c4497 -SIZE (compat13x-amd64-13.5.1305000.20250516.tar.xz) = 2700856 -SHA256 (compat13x-i386-13.5.1305000.20250516.tar.xz) = 585221d7b33ea788ce96ac1a18a3d3cc6a820dd64a0c275ed15aedf23541dea7 -SIZE (compat13x-i386-13.5.1305000.20250516.tar.xz) = 1437620 +TIMESTAMP = 1757569790 +SHA256 (compat13x-aarch64-13.5.1305000.20250911.tar.xz) = 04edb35bfae92926c358fee331d13a492d4325feadc2e04eb810a81d20c779fa +SIZE (compat13x-aarch64-13.5.1305000.20250911.tar.xz) = 1198640 +SHA256 (compat13x-amd64-13.5.1305000.20250911.tar.xz) = c1b9809a6d7b2e9652907a397c16c3f2d2bc16df16dd9accd4d532507dad4daf +SIZE (compat13x-amd64-13.5.1305000.20250911.tar.xz) = 2456728 +SHA256 (compat13x-i386-13.5.1305000.20250911.tar.xz) = fdd2e9b18f72448ccda181315060c84ac831d359285a40cd84b1e5602f3b54ba +SIZE (compat13x-i386-13.5.1305000.20250911.tar.xz) = 1299132 +SHA256 (compat13x-powerpc-13.5.1305000.20250911.tar.xz) = 040fc11c6dace71f616a4f8ffbfaa80fde270d9f56024d5b4fc2d3613c607893 +SIZE (compat13x-powerpc-13.5.1305000.20250911.tar.xz) = 1065128 +SHA256 (compat13x-powerpc64-13.5.1305000.20250911.tar.xz) = 83a0a7cdd6f9c18e9b4fc88b5421e19f6d7ba4a726664e6cd2f7c911d7f5abc2 +SIZE (compat13x-powerpc64-13.5.1305000.20250911.tar.xz) = 2054152 +SHA256 (compat13x-powerpc64le-13.5.1305000.20250911.tar.xz) = 1d673f23524732c70f5b3f1d2a4b56f245de4d3f89adb321eb5fb370b353b573 +SIZE (compat13x-powerpc64le-13.5.1305000.20250911.tar.xz) = 1311480 diff --git a/misc/compat13x/pkg-plist.aarch64 b/misc/compat13x/pkg-plist.aarch64 index 9dbf2f634e46..afbd14a066b9 100644 --- a/misc/compat13x/pkg-plist.aarch64 +++ b/misc/compat13x/pkg-plist.aarch64 @@ -1,5 +1,5 @@ lib/compat/libcrypto.so.111 lib/compat/libdialog.so.9 -@comment lib/compat/libncursesw.so.9 +lib/compat/libdpv.so.2 lib/compat/libnv.so.0 lib/compat/libssl.so.111 diff --git a/misc/compat13x/pkg-plist.amd64 b/misc/compat13x/pkg-plist.amd64 index 4ea5ff3d48e0..8cd6a53163df 100644 --- a/misc/compat13x/pkg-plist.amd64 +++ b/misc/compat13x/pkg-plist.amd64 @@ -1,10 +1,10 @@ lib/compat/libcrypto.so.111 lib/compat/libdialog.so.9 -@comment lib/compat/libncursesw.so.9 +lib/compat/libdpv.so.2 lib/compat/libnv.so.0 lib/compat/libssl.so.111 -lib32/compat/libcrypto.so.111 -lib32/compat/libdialog.so.9 -@comment lib32/compat/libncursesw.so.9 -lib32/compat/libnv.so.0 -lib32/compat/libssl.so.111 +%%COMPAT32%%lib32/compat/libcrypto.so.111 +%%COMPAT32%%lib32/compat/libdialog.so.9 +%%COMPAT32%%lib32/compat/libdpv.so.2 +%%COMPAT32%%lib32/compat/libnv.so.0 +%%COMPAT32%%lib32/compat/libssl.so.111 diff --git a/misc/compat13x/pkg-plist.i386 b/misc/compat13x/pkg-plist.i386 index 9dbf2f634e46..afbd14a066b9 100644 --- a/misc/compat13x/pkg-plist.i386 +++ b/misc/compat13x/pkg-plist.i386 @@ -1,5 +1,5 @@ lib/compat/libcrypto.so.111 lib/compat/libdialog.so.9 -@comment lib/compat/libncursesw.so.9 +lib/compat/libdpv.so.2 lib/compat/libnv.so.0 lib/compat/libssl.so.111 diff --git a/misc/compat13x/pkg-plist.powerpc b/misc/compat13x/pkg-plist.powerpc new file mode 100644 index 000000000000..afbd14a066b9 --- /dev/null +++ b/misc/compat13x/pkg-plist.powerpc @@ -0,0 +1,5 @@ +lib/compat/libcrypto.so.111 +lib/compat/libdialog.so.9 +lib/compat/libdpv.so.2 +lib/compat/libnv.so.0 +lib/compat/libssl.so.111 diff --git a/misc/compat13x/pkg-plist.powerpc64 b/misc/compat13x/pkg-plist.powerpc64 new file mode 100644 index 000000000000..8cd6a53163df --- /dev/null +++ b/misc/compat13x/pkg-plist.powerpc64 @@ -0,0 +1,10 @@ +lib/compat/libcrypto.so.111 +lib/compat/libdialog.so.9 +lib/compat/libdpv.so.2 +lib/compat/libnv.so.0 +lib/compat/libssl.so.111 +%%COMPAT32%%lib32/compat/libcrypto.so.111 +%%COMPAT32%%lib32/compat/libdialog.so.9 +%%COMPAT32%%lib32/compat/libdpv.so.2 +%%COMPAT32%%lib32/compat/libnv.so.0 +%%COMPAT32%%lib32/compat/libssl.so.111 diff --git a/misc/compat13x/pkg-plist.powerpc64le b/misc/compat13x/pkg-plist.powerpc64le new file mode 100644 index 000000000000..afbd14a066b9 --- /dev/null +++ b/misc/compat13x/pkg-plist.powerpc64le @@ -0,0 +1,5 @@ +lib/compat/libcrypto.so.111 +lib/compat/libdialog.so.9 +lib/compat/libdpv.so.2 +lib/compat/libnv.so.0 +lib/compat/libssl.so.111 diff --git a/misc/compat14x/Makefile b/misc/compat14x/Makefile index eca6fe06759f..73b3bdad5efa 100644 --- a/misc/compat14x/Makefile +++ b/misc/compat14x/Makefile @@ -1,5 +1,5 @@ PORTNAME= compat14x -PORTVERSION= 14.2.1402000.20250903 +PORTVERSION= 14.2.1402000.20250910 CATEGORIES= misc MASTER_SITES= LOCAL/arrowd PKGNAMESUFFIX= -${ARCH} @@ -21,6 +21,9 @@ USE_LDCONFIG= ${TARGET_DIR} COMPAT_LIBS= libasn1.so.11 \ libcom_err.so.5 \ libcrypto.so.30 \ + libdialog.so.10 \ + libdpv.so.3 \ + libfigpar.so.0 \ libgssapi.so.10 \ libgssapi_krb5.so.10 \ libgssapi_ntlm.so.10 \ diff --git a/misc/compat14x/distinfo b/misc/compat14x/distinfo index 7102a078bed0..804dc0579dfa 100644 --- a/misc/compat14x/distinfo +++ b/misc/compat14x/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1756986241 -SHA256 (compat14x-aarch64-14.2.1402000.20250903.tar.xz) = 0f03dc8a15ccc5240669774936c4af09171af5a63b738a60ae43ca5bcd6ebbec -SIZE (compat14x-aarch64-14.2.1402000.20250903.tar.xz) = 3723432 -SHA256 (compat14x-amd64-14.2.1402000.20250903.tar.xz) = 05b173c28008fc4b2d696960c068db744e0369d9cd9efefa5e59ac115199b38d -SIZE (compat14x-amd64-14.2.1402000.20250903.tar.xz) = 4419272 -SHA256 (compat14x-i386-14.2.1402000.20250903.tar.xz) = 025eb2dfa241177891b64ce977675d4e8a2473d71158e56b61ec1b06495b1782 -SIZE (compat14x-i386-14.2.1402000.20250903.tar.xz) = 2266828 -SHA256 (compat14x-powerpc-14.2.1402000.20250903.tar.xz) = 32e0988b97a98eb2d955f57c66fe807bcafdfe27767f29c6d3ab9e1775b4b07e -SIZE (compat14x-powerpc-14.2.1402000.20250903.tar.xz) = 1964692 -SHA256 (compat14x-powerpc64-14.2.1402000.20250903.tar.xz) = abd254c63f1c09ced73d76cd2e5da5f0536873d78ee919d477aad3f494de4064 -SIZE (compat14x-powerpc64-14.2.1402000.20250903.tar.xz) = 3835228 -SHA256 (compat14x-powerpc64le-14.2.1402000.20250903.tar.xz) = 275124cc29235f5e70aeaa3e50d7a7d9ec9052ca4f76d07f4f84b1b618e4e6cf -SIZE (compat14x-powerpc64le-14.2.1402000.20250903.tar.xz) = 2328468 +TIMESTAMP = 1757529623 +SHA256 (compat14x-aarch64-14.2.1402000.20250910.tar.xz) = 5137d893183c18bfbd0b654f1e9257b257503c3aaab8d9473ee549f412633c38 +SIZE (compat14x-aarch64-14.2.1402000.20250910.tar.xz) = 3904516 +SHA256 (compat14x-amd64-14.2.1402000.20250910.tar.xz) = 774043fbffc48c7c02d726d05918416223215c8cb5a2048f7d87566d3bd817a1 +SIZE (compat14x-amd64-14.2.1402000.20250910.tar.xz) = 4586556 +SHA256 (compat14x-i386-14.2.1402000.20250910.tar.xz) = 11a26673269fbb089d43430fcad63176f84bde4f78c853421fc311c256224d4f +SIZE (compat14x-i386-14.2.1402000.20250910.tar.xz) = 2369928 +SHA256 (compat14x-powerpc-14.2.1402000.20250910.tar.xz) = 4285f1a445a0499f2ee465ea3f3e769ca32e7ff9e5595a2f7bb9300a70596183 +SIZE (compat14x-powerpc-14.2.1402000.20250910.tar.xz) = 2060428 +SHA256 (compat14x-powerpc64-14.2.1402000.20250910.tar.xz) = a7266abf08b1f1bcdde45b4b4544e20e76e7002cf8c18df00a36a268cf177cd4 +SIZE (compat14x-powerpc64-14.2.1402000.20250910.tar.xz) = 4081496 +SHA256 (compat14x-powerpc64le-14.2.1402000.20250910.tar.xz) = 386cccd72061bf8591b8d0511094cd2053c530fffd75fc45e8ff380430ff95d4 +SIZE (compat14x-powerpc64le-14.2.1402000.20250910.tar.xz) = 2436152 diff --git a/misc/compat14x/pkg-plist.aarch64 b/misc/compat14x/pkg-plist.aarch64 index bcd7c956d0ca..c848e17bde85 100644 --- a/misc/compat14x/pkg-plist.aarch64 +++ b/misc/compat14x/pkg-plist.aarch64 @@ -1,6 +1,9 @@ lib/compat/libasn1.so.11 lib/compat/libcom_err.so.5 lib/compat/libcrypto.so.30 +lib/compat/libdialog.so.10 +lib/compat/libdpv.so.3 +lib/compat/libfigpar.so.0 lib/compat/libgssapi.so.10 lib/compat/libgssapi_krb5.so.10 lib/compat/libgssapi_ntlm.so.10 diff --git a/misc/compat14x/pkg-plist.amd64 b/misc/compat14x/pkg-plist.amd64 index dac199620ab7..e7b9a99e9f3e 100644 --- a/misc/compat14x/pkg-plist.amd64 +++ b/misc/compat14x/pkg-plist.amd64 @@ -1,6 +1,9 @@ lib/compat/libasn1.so.11 lib/compat/libcom_err.so.5 lib/compat/libcrypto.so.30 +lib/compat/libdialog.so.10 +lib/compat/libdpv.so.3 +lib/compat/libfigpar.so.0 lib/compat/libgssapi.so.10 lib/compat/libgssapi_krb5.so.10 lib/compat/libgssapi_ntlm.so.10 @@ -24,6 +27,9 @@ lib/compat/libwind.so.11 %%COMPAT32%%lib32/compat/libasn1.so.11 %%COMPAT32%%lib32/compat/libcom_err.so.5 %%COMPAT32%%lib32/compat/libcrypto.so.30 +%%COMPAT32%%lib32/compat/libdialog.so.10 +%%COMPAT32%%lib32/compat/libdpv.so.3 +%%COMPAT32%%lib32/compat/libfigpar.so.0 %%COMPAT32%%lib32/compat/libgssapi.so.10 %%COMPAT32%%lib32/compat/libgssapi_krb5.so.10 %%COMPAT32%%lib32/compat/libgssapi_ntlm.so.10 diff --git a/misc/compat14x/pkg-plist.i386 b/misc/compat14x/pkg-plist.i386 index bcd7c956d0ca..c848e17bde85 100644 --- a/misc/compat14x/pkg-plist.i386 +++ b/misc/compat14x/pkg-plist.i386 @@ -1,6 +1,9 @@ lib/compat/libasn1.so.11 lib/compat/libcom_err.so.5 lib/compat/libcrypto.so.30 +lib/compat/libdialog.so.10 +lib/compat/libdpv.so.3 +lib/compat/libfigpar.so.0 lib/compat/libgssapi.so.10 lib/compat/libgssapi_krb5.so.10 lib/compat/libgssapi_ntlm.so.10 diff --git a/misc/compat14x/pkg-plist.powerpc b/misc/compat14x/pkg-plist.powerpc index bcd7c956d0ca..c848e17bde85 100644 --- a/misc/compat14x/pkg-plist.powerpc +++ b/misc/compat14x/pkg-plist.powerpc @@ -1,6 +1,9 @@ lib/compat/libasn1.so.11 lib/compat/libcom_err.so.5 lib/compat/libcrypto.so.30 +lib/compat/libdialog.so.10 +lib/compat/libdpv.so.3 +lib/compat/libfigpar.so.0 lib/compat/libgssapi.so.10 lib/compat/libgssapi_krb5.so.10 lib/compat/libgssapi_ntlm.so.10 diff --git a/misc/compat14x/pkg-plist.powerpc64 b/misc/compat14x/pkg-plist.powerpc64 index dac199620ab7..e7b9a99e9f3e 100644 --- a/misc/compat14x/pkg-plist.powerpc64 +++ b/misc/compat14x/pkg-plist.powerpc64 @@ -1,6 +1,9 @@ lib/compat/libasn1.so.11 lib/compat/libcom_err.so.5 lib/compat/libcrypto.so.30 +lib/compat/libdialog.so.10 +lib/compat/libdpv.so.3 +lib/compat/libfigpar.so.0 lib/compat/libgssapi.so.10 lib/compat/libgssapi_krb5.so.10 lib/compat/libgssapi_ntlm.so.10 @@ -24,6 +27,9 @@ lib/compat/libwind.so.11 %%COMPAT32%%lib32/compat/libasn1.so.11 %%COMPAT32%%lib32/compat/libcom_err.so.5 %%COMPAT32%%lib32/compat/libcrypto.so.30 +%%COMPAT32%%lib32/compat/libdialog.so.10 +%%COMPAT32%%lib32/compat/libdpv.so.3 +%%COMPAT32%%lib32/compat/libfigpar.so.0 %%COMPAT32%%lib32/compat/libgssapi.so.10 %%COMPAT32%%lib32/compat/libgssapi_krb5.so.10 %%COMPAT32%%lib32/compat/libgssapi_ntlm.so.10 diff --git a/misc/compat14x/pkg-plist.powerpc64le b/misc/compat14x/pkg-plist.powerpc64le index bcd7c956d0ca..c848e17bde85 100644 --- a/misc/compat14x/pkg-plist.powerpc64le +++ b/misc/compat14x/pkg-plist.powerpc64le @@ -1,6 +1,9 @@ lib/compat/libasn1.so.11 lib/compat/libcom_err.so.5 lib/compat/libcrypto.so.30 +lib/compat/libdialog.so.10 +lib/compat/libdpv.so.3 +lib/compat/libfigpar.so.0 lib/compat/libgssapi.so.10 lib/compat/libgssapi_krb5.so.10 lib/compat/libgssapi_ntlm.so.10 diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile index c443c45207ca..a5fdc59d8af2 100644 --- a/misc/getopt/Makefile +++ b/misc/getopt/Makefile @@ -19,6 +19,7 @@ CONFIGURE_ARGS= --disable-asciidoc \ --disable-nls \ --disable-makeinstall-chown \ --disable-makeinstall-setuid \ + --disable-year2038 \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig GNU_CONFIGURE= yes diff --git a/misc/ggml/Makefile b/misc/ggml/Makefile index b332c2d881c5..db050b78c558 100644 --- a/misc/ggml/Makefile +++ b/misc/ggml/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++17-lang python:run shebangfix USE_LDCONFIG= yes +BROKEN_i386= compilation fails: LLVM ERROR: out of memory + USE_GITHUB= yes GH_ACCOUNT= ggerganov GH_TAGNAME= 83835ff diff --git a/misc/openhab2-addons/Makefile b/misc/openhab2-addons/Makefile index a5b1dc8d24c0..95f062fe4346 100644 --- a/misc/openhab2-addons/Makefile +++ b/misc/openhab2-addons/Makefile @@ -11,6 +11,9 @@ WWW= https://www.openhab.org/ LICENSE= EPL +DEPRECATED= superseeded by misc/openhab-addons +EXPIRATION_DATE=2025-12-31 + RUN_DEPENDS= ${LOCALBASE}/libexec/openhab2/addons/README:misc/openhab2 USERS= openhab diff --git a/misc/openhab2/Makefile b/misc/openhab2/Makefile index 21438f0a2bbf..b6b4d85cc277 100644 --- a/misc/openhab2/Makefile +++ b/misc/openhab2/Makefile @@ -12,6 +12,9 @@ WWW= https://www.openhab.org/ LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.TXT +DEPRECATED= superseeded by misc/openhab +EXPIRATION_DATE=2025-12-31 + USES= cpe java zip JAVA_VERSION= 8 USE_RC_SUBR= openhab2 diff --git a/misc/patchutils/files/patch-src_interdiff.c b/misc/patchutils/files/patch-src_interdiff.c new file mode 100644 index 000000000000..bea783320fa6 --- /dev/null +++ b/misc/patchutils/files/patch-src_interdiff.c @@ -0,0 +1,38 @@ +--- src/interdiff.c.orig 2025-08-22 00:37:41.000000000 -0700 ++++ src/interdiff.c 2025-09-11 13:06:21.163966000 -0700 +@@ -832,9 +832,9 @@ + + fflush (NULL); + char *argv[2 + num_diff_opts + 2 + 1]; +- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *)); ++ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *)); + memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *)); +- memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *)); ++ memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *)); + in = xpipe (DIFF, &child, "r", argv); + + /* Eat the first line */ +@@ -1194,9 +1194,9 @@ + fflush (NULL); + + char *argv[2 + num_diff_opts + 2 + 1]; +- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *)); ++ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *)); + memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *)); +- memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *)); ++ memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *)); + in = xpipe (DIFF, &child, "r", argv); + + /* Eat the first line */ +@@ -1613,9 +1613,9 @@ + sprintf (options, "-U%d", max_context); + + char *argv[2 + num_diff_opts + 2 + 1]; +- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *)); ++ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *)); + memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *)); +- memcpy (argv + 2 + num_diff_opts, (const char *[]) { f1, f2, NULL }, (2 + 1) * sizeof (char *)); ++ memcpy (argv + 2 + num_diff_opts, ((const char *[]) { f1, f2, NULL }), (2 + 1) * sizeof (char *)); + if (debug) { + fputs ("+", stdout); + for (int i = 0; argv[i]; i++) { diff --git a/misc/rump/Makefile b/misc/rump/Makefile index a74a651c2bfa..fbd18a09c008 100644 --- a/misc/rump/Makefile +++ b/misc/rump/Makefile @@ -1,6 +1,6 @@ PORTNAME= rump PORTVERSION= 20170822 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MAINTAINER= vanilla@FreeBSD.org @@ -23,7 +23,7 @@ USES= compiler .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD -CFLAGS+= -Wno-error=strict-prototypes -Wno-error=array-parameter +CFLAGS+= -Wno-error=strict-prototypes -Wno-error=array-parameter -Wno-error=cast-function-type-mismatch .endif .if ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/misc/rump/files/patch-src_lib_librumpuser_sp__common.c b/misc/rump/files/patch-src_lib_librumpuser_sp__common.c new file mode 100644 index 000000000000..2ba3cefa3eab --- /dev/null +++ b/misc/rump/files/patch-src_lib_librumpuser_sp__common.c @@ -0,0 +1,43 @@ +--- src/lib/librumpuser/sp_common.c.orig 2025-09-09 03:27:37 UTC ++++ src/lib/librumpuser/sp_common.c +@@ -701,15 +701,21 @@ static int + + /*ARGSUSED*/ + static int +-notsupp(void) ++addrparse_notsupp(const char *addr __unused, struct sockaddr **sa __unused, ++ int allow_wildcard __unused) + { + + fprintf(stderr, "rump_sp: support not yet implemented\n"); + return EOPNOTSUPP; + } + ++static void ++cleanup_success(struct sockaddr *sa __unused) ++{ ++} ++ + static int +-success(void) ++connecthook_success(int s __unused) + { + + return 0; +@@ -724,12 +730,12 @@ static struct { + cleanup_fn cleanup; + } parsetab[] = { + { "tcp", PF_INET, sizeof(struct sockaddr_in), +- tcp_parse, tcp_connecthook, (cleanup_fn)success }, ++ tcp_parse, tcp_connecthook, cleanup_success }, + { "unix", PF_LOCAL, sizeof(struct sockaddr_un), +- unix_parse, (connecthook_fn)success, unix_cleanup }, ++ unix_parse, connecthook_success, unix_cleanup }, + { "tcp6", PF_INET6, sizeof(struct sockaddr_in6), +- (addrparse_fn)notsupp, (connecthook_fn)success, +- (cleanup_fn)success }, ++ addrparse_notsupp, connecthook_success, ++ cleanup_success }, + }; + #define NPARSE (sizeof(parsetab)/sizeof(parsetab[0])) + diff --git a/misc/rump/files/patch-src_sys_kern_kern__hook.c b/misc/rump/files/patch-src_sys_kern_kern__hook.c new file mode 100644 index 000000000000..965b8a46b4a1 --- /dev/null +++ b/misc/rump/files/patch-src_sys_kern_kern__hook.c @@ -0,0 +1,56 @@ +--- src/sys/kern/kern_hook.c.orig 2025-09-09 03:38:01 UTC ++++ src/sys/kern/kern_hook.c +@@ -102,7 +102,7 @@ hook_proc_run(hook_list_t *list, struct proc *p) + struct hook_desc *hd; + + LIST_FOREACH(hd, list, hk_list) +- ((void (*)(struct proc *, void *))*hd->hk_fn)(p, hd->hk_arg); ++ ((void (*)(struct proc *, void *))(void *)*hd->hk_fn)(p, hd->hk_arg); + } + + /* +@@ -168,7 +168,7 @@ mountroothook_establish(void (*fn)(device_t), device_t + void * + mountroothook_establish(void (*fn)(device_t), device_t dev) + { +- return hook_establish(&mountroothook_list, (void (*)(void *))fn, dev); ++ return hook_establish(&mountroothook_list, (void (*)(void *))(void *)fn, dev); + } + + void +@@ -201,7 +201,7 @@ exechook_establish(void (*fn)(struct proc *, void *), + void * + exechook_establish(void (*fn)(struct proc *, void *), void *arg) + { +- return hook_establish(&exechook_list, (void (*)(void *))fn, arg); ++ return hook_establish(&exechook_list, (void (*)(void *))(void *)fn, arg); + } + + void +@@ -228,7 +228,7 @@ exithook_establish(void (*fn)(struct proc *, void *), + void *rv; + + rw_enter(&exec_lock, RW_WRITER); +- rv = hook_establish(&exithook_list, (void (*)(void *))fn, arg); ++ rv = hook_establish(&exithook_list, (void (*)(void *))(void *)fn, arg); + rw_exit(&exec_lock); + return rv; + } +@@ -256,7 +256,7 @@ forkhook_establish(void (*fn)(struct proc *, struct pr + void * + forkhook_establish(void (*fn)(struct proc *, struct proc *)) + { +- return hook_establish(&forkhook_list, (void (*)(void *))fn, NULL); ++ return hook_establish(&forkhook_list, (void (*)(void *))(void *)fn, NULL); + } + + void +@@ -274,7 +274,7 @@ doforkhooks(struct proc *p2, struct proc *p1) + struct hook_desc *hd; + + LIST_FOREACH(hd, &forkhook_list, hk_list) { +- ((void (*)(struct proc *, struct proc *))*hd->hk_fn) ++ ((void (*)(struct proc *, struct proc *))(void *)*hd->hk_fn) + (p2, p1); + } + } |