diff options
Diffstat (limited to 'sysutils')
36 files changed, 1394 insertions, 134 deletions
diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile index 4ea159067368..72c3f17e70b4 100644 --- a/sysutils/appjail-devel/Makefile +++ b/sysutils/appjail-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= appjail -DISTVERSION= 3.8.0.20250503 +DISTVERSION= 3.9.0.20250517 PORTEPOCH= 1 CATEGORIES= sysutils PKGNAMESUFFIX= -devel @@ -16,7 +16,7 @@ CONFLICTS= appjail USE_GITHUB= yes GH_ACCOUNT= DtxdF GH_PROJECT= AppJail -GH_TAGNAME= 8f14cd3aa30a72c2daf1af64037c2efd002f1e8d +GH_TAGNAME= e571c6043be415eb7dd36f5e29cbdfafd3a6e859 MAKE_ARGS= APPJAIL_VERSION=${DISTVERSION}+${GH_TAGNAME} ALL_TARGET= utils-strip diff --git a/sysutils/appjail-devel/distinfo b/sysutils/appjail-devel/distinfo index 6d6e42400e7a..b967ea8c42bc 100644 --- a/sysutils/appjail-devel/distinfo +++ b/sysutils/appjail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746298533 -SHA256 (DtxdF-AppJail-3.8.0.20250503-8f14cd3aa30a72c2daf1af64037c2efd002f1e8d_GH0.tar.gz) = 3576a8524467b9e7866c80f1a161ccf6f78cf2f54f2321aaa652673a3e3478ff -SIZE (DtxdF-AppJail-3.8.0.20250503-8f14cd3aa30a72c2daf1af64037c2efd002f1e8d_GH0.tar.gz) = 1007478 +TIMESTAMP = 1747507486 +SHA256 (DtxdF-AppJail-3.9.0.20250517-e571c6043be415eb7dd36f5e29cbdfafd3a6e859_GH0.tar.gz) = 7b44bc3051bd88e257984866bf382e4578ef9b8a6450dffbac5de7dc199d12c5 +SIZE (DtxdF-AppJail-3.9.0.20250517-e571c6043be415eb7dd36f5e29cbdfafd3a6e859_GH0.tar.gz) = 1016835 diff --git a/sysutils/appjail-devel/pkg-plist b/sysutils/appjail-devel/pkg-plist index d0f5e7c437b9..9aa5761fcd6d 100644 --- a/sysutils/appjail-devel/pkg-plist +++ b/sysutils/appjail-devel/pkg-plist @@ -4,6 +4,7 @@ bin/appjail-config-user bin/appjail-dns bin/appjail-user @sample %%ETCDIR%%/appjail.conf.sample +etc/bash_completion.d/_appjail.bash etc/rc.d/appjail etc/rc.d/appjail-dns etc/rc.d/appjail-health @@ -158,6 +159,7 @@ libexec/appjail/network/network %%DATADIR%%/scripts/ajconf.sh %%DATADIR%%/scripts/ajdns.sh %%DATADIR%%/scripts/ajuser.sh +%%DATADIR%%/scripts/appjail-completion.bash %%DATADIR%%/scripts/ascii2oct.sh %%DATADIR%%/scripts/bind-ddns-hook.sh %%DATADIR%%/scripts/create-bridge.sh diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile index 6c0fc3aaab16..966b3f4c8c77 100644 --- a/sysutils/appjail/Makefile +++ b/sysutils/appjail/Makefile @@ -1,6 +1,6 @@ PORTNAME= appjail DISTVERSIONPREFIX= v -DISTVERSION= 3.8.0 +DISTVERSION= 3.9.0 CATEGORIES= sysutils MAINTAINER= DtxdF@disroot.org diff --git a/sysutils/appjail/distinfo b/sysutils/appjail/distinfo index 28c40e0ae61c..ed7ec0d0784a 100644 --- a/sysutils/appjail/distinfo +++ b/sysutils/appjail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746253176 -SHA256 (DtxdF-AppJail-v3.8.0_GH0.tar.gz) = c0ebfff06fc60920ba580629c051c3c06f4ac0e5b77f09f55713f9045a254ab6 -SIZE (DtxdF-AppJail-v3.8.0_GH0.tar.gz) = 1007245 +TIMESTAMP = 1747503555 +SHA256 (DtxdF-AppJail-v3.9.0_GH0.tar.gz) = 437fed67d953492dca0e84ce6c7db349f9406487687ae98cca112f1ee1b50f56 +SIZE (DtxdF-AppJail-v3.9.0_GH0.tar.gz) = 1016550 diff --git a/sysutils/appjail/pkg-plist b/sysutils/appjail/pkg-plist index d0f5e7c437b9..9aa5761fcd6d 100644 --- a/sysutils/appjail/pkg-plist +++ b/sysutils/appjail/pkg-plist @@ -4,6 +4,7 @@ bin/appjail-config-user bin/appjail-dns bin/appjail-user @sample %%ETCDIR%%/appjail.conf.sample +etc/bash_completion.d/_appjail.bash etc/rc.d/appjail etc/rc.d/appjail-dns etc/rc.d/appjail-health @@ -158,6 +159,7 @@ libexec/appjail/network/network %%DATADIR%%/scripts/ajconf.sh %%DATADIR%%/scripts/ajdns.sh %%DATADIR%%/scripts/ajuser.sh +%%DATADIR%%/scripts/appjail-completion.bash %%DATADIR%%/scripts/ascii2oct.sh %%DATADIR%%/scripts/bind-ddns-hook.sh %%DATADIR%%/scripts/create-bridge.sh diff --git a/sysutils/b3sum/Makefile b/sysutils/b3sum/Makefile index ad64b22e6bdc..df912274ce3d 100644 --- a/sysutils/b3sum/Makefile +++ b/sysutils/b3sum/Makefile @@ -1,5 +1,5 @@ PORTNAME= b3sum -PORTVERSION= 1.8.1 +PORTVERSION= 1.8.2 CATEGORIES= sysutils MAINTAINER= sunpoet@FreeBSD.org diff --git a/sysutils/b3sum/Makefile.crates b/sysutils/b3sum/Makefile.crates index fb43b5994aa1..4687ea056f03 100644 --- a/sysutils/b3sum/Makefile.crates +++ b/sysutils/b3sum/Makefile.crates @@ -3,14 +3,14 @@ CARGO_CRATES= anstream-0.6.18 \ anstyle-parse-0.2.6 \ anstyle-query-1.1.2 \ anstyle-wincon-3.0.7 \ - anyhow-1.0.97 \ + anyhow-1.0.98 \ arrayref-0.3.9 \ arrayvec-0.7.6 \ bitflags-2.9.0 \ - cc-1.2.17 \ + cc-1.2.19 \ cfg-if-1.0.0 \ - clap-4.5.35 \ - clap_builder-4.5.35 \ + clap-4.5.37 \ + clap_builder-4.5.37 \ clap_derive-4.5.32 \ clap_lex-0.7.4 \ colorchoice-1.0.3 \ @@ -19,19 +19,19 @@ CARGO_CRATES= anstream-0.6.18 \ crossbeam-epoch-0.9.18 \ crossbeam-utils-0.8.21 \ duct-0.13.7 \ - errno-0.3.10 \ + errno-0.3.11 \ fastrand-2.3.0 \ getrandom-0.3.2 \ glob-0.3.2 \ heck-0.5.0 \ hex-0.4.3 \ is_terminal_polyfill-1.70.1 \ - libc-0.2.171 \ - linux-raw-sys-0.9.3 \ + libc-0.2.172 \ + linux-raw-sys-0.9.4 \ memmap2-0.9.5 \ once_cell-1.21.3 \ os_pipe-1.2.1 \ - proc-macro2-1.0.94 \ + proc-macro2-1.0.95 \ quote-1.0.40 \ r-efi-5.2.0 \ rayon-core-1.12.1 \ diff --git a/sysutils/b3sum/distinfo b/sysutils/b3sum/distinfo index 56a343bafd33..40815a6c95a9 100644 --- a/sysutils/b3sum/distinfo +++ b/sysutils/b3sum/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1744288748 +TIMESTAMP = 1745936040 SHA256 (rust/crates/anstream-0.6.18.crate) = 8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b SIZE (rust/crates/anstream-0.6.18.crate) = 29681 SHA256 (rust/crates/anstyle-1.0.10.crate) = 55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9 @@ -9,22 +9,22 @@ SHA256 (rust/crates/anstyle-query-1.1.2.crate) = 79947af37f4177cfead1110013d6789 SIZE (rust/crates/anstyle-query-1.1.2.crate) = 9969 SHA256 (rust/crates/anstyle-wincon-3.0.7.crate) = ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e SIZE (rust/crates/anstyle-wincon-3.0.7.crate) = 12400 -SHA256 (rust/crates/anyhow-1.0.97.crate) = dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f -SIZE (rust/crates/anyhow-1.0.97.crate) = 52221 +SHA256 (rust/crates/anyhow-1.0.98.crate) = e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487 +SIZE (rust/crates/anyhow-1.0.98.crate) = 53334 SHA256 (rust/crates/arrayref-0.3.9.crate) = 76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb SIZE (rust/crates/arrayref-0.3.9.crate) = 9186 SHA256 (rust/crates/arrayvec-0.7.6.crate) = 7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50 SIZE (rust/crates/arrayvec-0.7.6.crate) = 31237 SHA256 (rust/crates/bitflags-2.9.0.crate) = 5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd SIZE (rust/crates/bitflags-2.9.0.crate) = 47654 -SHA256 (rust/crates/cc-1.2.17.crate) = 1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a -SIZE (rust/crates/cc-1.2.17.crate) = 105794 +SHA256 (rust/crates/cc-1.2.19.crate) = 8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362 +SIZE (rust/crates/cc-1.2.19.crate) = 105910 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 -SHA256 (rust/crates/clap-4.5.35.crate) = d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944 -SIZE (rust/crates/clap-4.5.35.crate) = 56970 -SHA256 (rust/crates/clap_builder-4.5.35.crate) = 2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9 -SIZE (rust/crates/clap_builder-4.5.35.crate) = 168525 +SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071 +SIZE (rust/crates/clap-4.5.37.crate) = 56962 +SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2 +SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761 SHA256 (rust/crates/clap_derive-4.5.32.crate) = 09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7 SIZE (rust/crates/clap_derive-4.5.32.crate) = 33441 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6 @@ -41,8 +41,8 @@ SHA256 (rust/crates/crossbeam-utils-0.8.21.crate) = d0a5c400df2834b80a4c3327b3aa SIZE (rust/crates/crossbeam-utils-0.8.21.crate) = 42691 SHA256 (rust/crates/duct-0.13.7.crate) = e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c SIZE (rust/crates/duct-0.13.7.crate) = 30055 -SHA256 (rust/crates/errno-0.3.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d -SIZE (rust/crates/errno-0.3.10.crate) = 11824 +SHA256 (rust/crates/errno-0.3.11.crate) = 976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e +SIZE (rust/crates/errno-0.3.11.crate) = 12048 SHA256 (rust/crates/fastrand-2.3.0.crate) = 37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be SIZE (rust/crates/fastrand-2.3.0.crate) = 15076 SHA256 (rust/crates/getrandom-0.3.2.crate) = 73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0 @@ -55,18 +55,18 @@ SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486 SIZE (rust/crates/hex-0.4.3.crate) = 13299 SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492 -SHA256 (rust/crates/libc-0.2.171.crate) = c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6 -SIZE (rust/crates/libc-0.2.171.crate) = 785246 -SHA256 (rust/crates/linux-raw-sys-0.9.3.crate) = fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413 -SIZE (rust/crates/linux-raw-sys-0.9.3.crate) = 2311047 +SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa +SIZE (rust/crates/libc-0.2.172.crate) = 791646 +SHA256 (rust/crates/linux-raw-sys-0.9.4.crate) = cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12 +SIZE (rust/crates/linux-raw-sys-0.9.4.crate) = 2311088 SHA256 (rust/crates/memmap2-0.9.5.crate) = fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f SIZE (rust/crates/memmap2-0.9.5.crate) = 33280 SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d SIZE (rust/crates/once_cell-1.21.3.crate) = 34534 SHA256 (rust/crates/os_pipe-1.2.1.crate) = 5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982 SIZE (rust/crates/os_pipe-1.2.1.crate) = 10691 -SHA256 (rust/crates/proc-macro2-1.0.94.crate) = a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84 -SIZE (rust/crates/proc-macro2-1.0.94.crate) = 52391 +SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778 +SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820 SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d SIZE (rust/crates/quote-1.0.40.crate) = 31063 SHA256 (rust/crates/r-efi-5.2.0.crate) = 74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5 @@ -117,5 +117,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564 SHA256 (rust/crates/wit-bindgen-rt-0.39.0.crate) = 6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1 SIZE (rust/crates/wit-bindgen-rt-0.39.0.crate) = 12241 -SHA256 (BLAKE3-team-BLAKE3-1.8.1_GH0.tar.gz) = fc2aac36643db7e45c3653fd98a2a745e6d4d16ff3711e4b7abd3b88639463dd -SIZE (BLAKE3-team-BLAKE3-1.8.1_GH0.tar.gz) = 264282 +SHA256 (BLAKE3-team-BLAKE3-1.8.2_GH0.tar.gz) = 6b51aefe515969785da02e87befafc7fdc7a065cd3458cf1141f29267749e81f +SIZE (BLAKE3-team-BLAKE3-1.8.2_GH0.tar.gz) = 264657 diff --git a/sysutils/cmocka/Makefile b/sysutils/cmocka/Makefile index a3251bfe04a9..ff5c0a0da5a7 100644 --- a/sysutils/cmocka/Makefile +++ b/sysutils/cmocka/Makefile @@ -1,33 +1,18 @@ PORTNAME= cmocka -PORTVERSION= 1.1.5 +DISTVERSION= 1.1.7 CATEGORIES= sysutils -MASTER_SITES= https://cmocka.org/files/1.1/ \ - LOCAL/dteske +MASTER_SITES= https://cmocka.org/files/1.1/ MAINTAINER= dteske@FreeBSD.org COMMENT= Unit testing framework for C with support for mock objects WWW= https://cmocka.org/ LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake tar:xz +USES= cmake:testing pathfix tar:xz USE_LDCONFIG= yes -PLIST_FILES= include/cmocka.h \ - include/cmocka_pbc.h \ - lib/cmake/cmocka/cmocka-config-version.cmake \ - lib/cmake/cmocka/cmocka-config.cmake \ - lib/libcmocka.so \ - lib/libcmocka.so.0 \ - lib/libcmocka.so.0.7.0 \ - libdata/pkgconfig/cmocka.pc - -OPTIONS_DEFINE= STATIC - -STATIC_CMAKE_BOOL= WITH_STATIC_LIB -STATIC_PLIST_FILES= lib/libcmocka.a - -post-install-STATIC-on: - @${MV} "${STAGEDIR}${PREFIX}/lib/libcmocka-static.a" "${STAGEDIR}${PREFIX}/lib/libcmocka.a" +CMAKE_TESTING_ON= UNIT_TESTING .include <bsd.port.mk> diff --git a/sysutils/cmocka/distinfo b/sysutils/cmocka/distinfo index daba23502fd0..8a457bfb00a9 100644 --- a/sysutils/cmocka/distinfo +++ b/sysutils/cmocka/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1572277190 -SHA256 (cmocka-1.1.5.tar.xz) = f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 -SIZE (cmocka-1.1.5.tar.xz) = 81004 +TIMESTAMP = 1683241770 +SHA256 (cmocka-1.1.7.tar.xz) = 810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82 +SIZE (cmocka-1.1.7.tar.xz) = 84064 diff --git a/sysutils/cmocka/files/patch-git-01-0e70150002ab7bcb626109b287f23c62ecf97565 b/sysutils/cmocka/files/patch-git-01-0e70150002ab7bcb626109b287f23c62ecf97565 new file mode 100644 index 000000000000..087c9d890010 --- /dev/null +++ b/sysutils/cmocka/files/patch-git-01-0e70150002ab7bcb626109b287f23c62ecf97565 @@ -0,0 +1,1282 @@ +Patch-Source: https://gitlab.com/cmocka/cmocka/-/commit/0e70150002ab7bcb626109b287f23c62ecf97565 +-- +From 0e70150002ab7bcb626109b287f23c62ecf97565 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 5 Oct 2020 13:28:11 +0200 +Subject: [PATCH] cmocka: Replace LargestIntegralType with uintmax_t + +This requires #include <stdint.h> + +Fixes #38 +Fixes #49 +--- + example/allocate_module_test.c | 1 + + example/assert_macro_test.c | 1 + + example/assert_module_test.c | 1 + + example/calculator_test.c | 1 + + example/mock/chef_wrap/chef.c | 1 + + example/mock/chef_wrap/waiter_test_wrap.c | 1 + + include/cmocka.h | 162 ++++++++-------------- + src/cmocka.c | 148 ++++++++++---------- + tests/test_alloc.c | 1 + + tests/test_assert_macros.c | 1 + + tests/test_assert_macros_fail.c | 1 + + tests/test_basics.c | 1 + + tests/test_cmockery.c | 1 + + tests/test_double_macros.c | 1 + + tests/test_exception_handler.c | 1 + + tests/test_fixtures.c | 1 + + tests/test_float_macros.c | 1 + + tests/test_group_fixtures.c | 1 + + tests/test_group_setup_assert.c | 1 + + tests/test_group_setup_fail.c | 1 + + tests/test_groups.c | 1 + + tests/test_ordering.c | 1 + + tests/test_ordering_fail.c | 1 + + tests/test_returns.c | 1 + + tests/test_returns_fail.c | 1 + + tests/test_setup_fail.c | 1 + + tests/test_skip.c | 1 + + tests/test_skip_filter.c | 1 + + tests/test_strmatch.c | 1 + + tests/test_wildcard.c | 1 + + 30 files changed, 156 insertions(+), 182 deletions(-) + +diff --git a/example/allocate_module_test.c b/example/allocate_module_test.c +index 562aea2..eb3602f 100644 +--- example/allocate_module_test.c ++++ example/allocate_module_test.c +@@ -16,6 +16,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + extern void leak_memory(void); +diff --git a/example/assert_macro_test.c b/example/assert_macro_test.c +index 2cd355c..093a884 100644 +--- example/assert_macro_test.c ++++ example/assert_macro_test.c +@@ -16,6 +16,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + #include "assert_macro.h" +diff --git a/example/assert_module_test.c b/example/assert_module_test.c +index f387754..41b5a75 100644 +--- example/assert_module_test.c ++++ example/assert_module_test.c +@@ -16,6 +16,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + #include "assert_module.h" +diff --git a/example/calculator_test.c b/example/calculator_test.c +index ab8cad8..a3d862a 100644 +--- example/calculator_test.c ++++ example/calculator_test.c +@@ -16,6 +16,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include "cmocka.h" + #include <stdio.h> + +diff --git a/example/mock/chef_wrap/chef.c b/example/mock/chef_wrap/chef.c +index 1429cde..1c74125 100644 +--- example/mock/chef_wrap/chef.c ++++ example/mock/chef_wrap/chef.c +@@ -18,6 +18,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <stdio.h> + #include <errno.h> +diff --git a/example/mock/chef_wrap/waiter_test_wrap.c b/example/mock/chef_wrap/waiter_test_wrap.c +index 4146818..04fe721 100644 +--- example/mock/chef_wrap/waiter_test_wrap.c ++++ example/mock/chef_wrap/waiter_test_wrap.c +@@ -24,6 +24,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + #include "waiter_test_wrap.h" +diff --git a/include/cmocka.h b/include/cmocka.h +index a21d965..6f56520 100644 +--- include/cmocka.h ++++ include/cmocka.h +@@ -57,32 +57,13 @@ int __stdcall IsDebuggerPresent(); + * @{ + */ + +-/* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */ +-#ifndef __WORDSIZE +-# if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__sparc_v9__) || defined(__sparcv9) +-# define __WORDSIZE 64 +-# else +-# define __WORDSIZE 32 +-# endif +-#endif ++/* XXX: stdint.h is a new requirement to include, but things haven't adapted ++ to it yet, so include it here too. ++ since it's a requirement to use the header at all, there's no harm in ++ including it? */ ++#include <stdint.h> + +-#ifdef DOXYGEN +-/** +- * Largest integral type. This type should be large enough to hold any +- * pointer or integer supported by the compiler. +- */ +-typedef uintmax_t LargestIntegralType; +-#else /* DOXGEN */ +-#ifndef LargestIntegralType +-# if __WORDSIZE == 64 && !defined(_WIN64) +-# define LargestIntegralType unsigned long int +-# else +-# define LargestIntegralType unsigned long long int +-# endif +-#endif /* LargestIntegralType */ +-#endif /* DOXYGEN */ +- +-/* Printf format used to display LargestIntegralType as a hexidecimal. */ ++/* Printf format used to display uintmax_t as a hexidecimal. */ + #ifndef LargestIntegralTypePrintfFormat + # ifdef _WIN32 + # define LargestIntegralTypePrintfFormat "0x%I64x" +@@ -95,7 +76,7 @@ typedef uintmax_t LargestIntegralType; + # endif /* _WIN32 */ + #endif /* LargestIntegralTypePrintfFormat */ + +-/* Printf format used to display LargestIntegralType as a decimal. */ ++/* Printf format used to display uintmax_t as a decimal. */ + #ifndef LargestIntegralTypePrintfFormatDecimal + # ifdef _WIN32 + # define LargestIntegralTypePrintfFormatDecimal "%I64u" +@@ -116,44 +97,15 @@ typedef uintmax_t LargestIntegralType; + # define DoublePrintfFormat "%f" + #endif /* DoublePrintfFormat */ + +-/* Perform an unsigned cast to LargestIntegralType. */ ++/* Perform an unsigned cast to uintmax_t. */ + #define cast_to_largest_integral_type(value) \ +- ((LargestIntegralType)(value)) +- +-/* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) +-# if defined(_WIN32) +- /* WIN32 is an ILP32 platform */ +- typedef unsigned int uintptr_t; +-# elif defined(_WIN64) +- typedef unsigned long int uintptr_t; +-# else /* _WIN32 */ +- +-/* ILP32 and LP64 platforms */ +-# ifdef __WORDSIZE /* glibc */ +-# if __WORDSIZE == 64 +- typedef unsigned long int uintptr_t; +-# else +- typedef unsigned int uintptr_t; +-# endif /* __WORDSIZE == 64 */ +-# else /* __WORDSIZE */ +-# if defined(_LP64) || defined(_I32LPx) +- typedef unsigned long int uintptr_t; +-# else +- typedef unsigned int uintptr_t; +-# endif +-# endif /* __WORDSIZE */ +-# endif /* _WIN32 */ +- +-# define _UINTPTR_T +-# define _UINTPTR_T_DEFINED +-#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ ++ ((uintmax_t)(value)) + + /* Perform an unsigned cast to uintptr_t. */ + #define cast_to_pointer_integral_type(value) \ +- ((uintptr_t)((size_t)(value))) ++ ((uintptr_t)(value)) + +-/* Perform a cast of a pointer to LargestIntegralType */ ++/* Perform a cast of a pointer to uintmax_t */ + #define cast_ptr_to_largest_integral_type(value) \ + cast_to_largest_integral_type(cast_to_pointer_integral_type(value)) + +@@ -240,7 +192,7 @@ cast_to_largest_integral_type(cast_to_pointer_integral_type(value)) + * + * @see will_return() + */ +-LargestIntegralType mock(void); ++uintmax_t mock(void); + #else + #define mock() _mock(__func__, __FILE__, __LINE__) + #endif +@@ -324,7 +276,7 @@ type mock_ptr_type(#type); + * @see mock() + * @see will_return_count() + */ +-void will_return(#function, LargestIntegralType value); ++void will_return(#function, uintmax_t value); + #else + #define will_return(function, value) \ + _will_return(#function, __FILE__, __LINE__, \ +@@ -347,7 +299,7 @@ void will_return(#function, LargestIntegralType value); + * + * @see mock() + */ +-void will_return_count(#function, LargestIntegralType value, int count); ++void will_return_count(#function, uintmax_t value, int count); + #else + #define will_return_count(function, value, count) \ + _will_return(#function, __FILE__, __LINE__, \ +@@ -370,7 +322,7 @@ void will_return_count(#function, LargestIntegralType value, int count); + * @see will_return_count() + * @see mock() + */ +-void will_return_always(#function, LargestIntegralType value); ++void will_return_always(#function, uintmax_t value); + #else + #define will_return_always(function, value) \ + will_return_count(function, (value), WILL_RETURN_ALWAYS) +@@ -398,7 +350,7 @@ void will_return_always(#function, LargestIntegralType value); + * @see will_return_count() + * @see mock() + */ +-void will_return_maybe(#function, LargestIntegralType value); ++void will_return_maybe(#function, uintmax_t value); + #else + #define will_return_maybe(function, value) \ + will_return_count(function, (value), WILL_RETURN_ONCE) +@@ -494,7 +446,7 @@ void expect_check(#function, #parameter, #check_function, const void *check_data + * + * @see check_expected(). + */ +-void expect_in_set(#function, #parameter, LargestIntegralType value_array[]); ++void expect_in_set(#function, #parameter, uintmax_t value_array[]); + #else + #define expect_in_set(function, parameter, value_array) \ + expect_in_set_count(function, parameter, value_array, 1) +@@ -519,7 +471,7 @@ void expect_in_set(#function, #parameter, LargestIntegralType value_array[]); + * + * @see check_expected(). + */ +-void expect_in_set_count(#function, #parameter, LargestIntegralType value_array[], size_t count); ++void expect_in_set_count(#function, #parameter, uintmax_t value_array[], size_t count); + #else + #define expect_in_set_count(function, parameter, value_array, count) \ + _expect_in_set(#function, #parameter, __FILE__, __LINE__, value_array, \ +@@ -541,7 +493,7 @@ void expect_in_set_count(#function, #parameter, LargestIntegralType value_array[ + * + * @see check_expected(). + */ +-void expect_not_in_set(#function, #parameter, LargestIntegralType value_array[]); ++void expect_not_in_set(#function, #parameter, uintmax_t value_array[]); + #else + #define expect_not_in_set(function, parameter, value_array) \ + expect_not_in_set_count(function, parameter, value_array, 1) +@@ -566,7 +518,7 @@ void expect_not_in_set(#function, #parameter, LargestIntegralType value_array[]) + * + * @see check_expected(). + */ +-void expect_not_in_set_count(#function, #parameter, LargestIntegralType value_array[], size_t count); ++void expect_not_in_set_count(#function, #parameter, uintmax_t value_array[], size_t count); + #else + #define expect_not_in_set_count(function, parameter, value_array, count) \ + _expect_not_in_set( \ +@@ -592,7 +544,7 @@ void expect_not_in_set_count(#function, #parameter, LargestIntegralType value_ar + * + * @see check_expected(). + */ +-void expect_in_range(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum); ++void expect_in_range(#function, #parameter, uintmax_t minimum, uintmax_t maximum); + #else + #define expect_in_range(function, parameter, minimum, maximum) \ + expect_in_range_count(function, parameter, minimum, maximum, 1) +@@ -619,7 +571,7 @@ void expect_in_range(#function, #parameter, LargestIntegralType minimum, Largest + * + * @see check_expected(). + */ +-void expect_in_range_count(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum, size_t count); ++void expect_in_range_count(#function, #parameter, uintmax_t minimum, uintmax_t maximum, size_t count); + #else + #define expect_in_range_count(function, parameter, minimum, maximum, count) \ + _expect_in_range(#function, #parameter, __FILE__, __LINE__, minimum, \ +@@ -643,7 +595,7 @@ void expect_in_range_count(#function, #parameter, LargestIntegralType minimum, L + * + * @see check_expected(). + */ +-void expect_not_in_range(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum); ++void expect_not_in_range(#function, #parameter, uintmax_t minimum, uintmax_t maximum); + #else + #define expect_not_in_range(function, parameter, minimum, maximum) \ + expect_not_in_range_count(function, parameter, minimum, maximum, 1) +@@ -670,7 +622,7 @@ void expect_not_in_range(#function, #parameter, LargestIntegralType minimum, Lar + * + * @see check_expected(). + */ +-void expect_not_in_range_count(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum, size_t count); ++void expect_not_in_range_count(#function, #parameter, uintmax_t minimum, uintmax_t maximum, size_t count); + #else + #define expect_not_in_range_count(function, parameter, minimum, maximum, \ + count) \ +@@ -695,7 +647,7 @@ void expect_not_in_range_count(#function, #parameter, LargestIntegralType minimu + * @see expect_memory() + * @see expect_any() + */ +-void expect_value(#function, #parameter, LargestIntegralType value); ++void expect_value(#function, #parameter, uintmax_t value); + #else + #define expect_value(function, parameter, value) \ + expect_value_count(function, parameter, value, 1) +@@ -722,7 +674,7 @@ void expect_value(#function, #parameter, LargestIntegralType value); + * @see expect_not_string() + * @see expect_not_memory() + */ +-void expect_value_count(#function, #parameter, LargestIntegralType value, size_t count); ++void expect_value_count(#function, #parameter, uintmax_t value, size_t count); + #else + #define expect_value_count(function, parameter, value, count) \ + _expect_value(#function, #parameter, __FILE__, __LINE__, \ +@@ -743,7 +695,7 @@ void expect_value_count(#function, #parameter, LargestIntegralType value, size_t + * + * @see check_expected(). + */ +-void expect_not_value(#function, #parameter, LargestIntegralType value); ++void expect_not_value(#function, #parameter, uintmax_t value); + #else + #define expect_not_value(function, parameter, value) \ + expect_not_value_count(function, parameter, value, 1) +@@ -767,7 +719,7 @@ void expect_not_value(#function, #parameter, LargestIntegralType value); + * + * @see check_expected(). + */ +-void expect_not_value_count(#function, #parameter, LargestIntegralType value, size_t count); ++void expect_not_value_count(#function, #parameter, uintmax_t value, size_t count); + #else + #define expect_not_value_count(function, parameter, value, count) \ + _expect_not_value(#function, #parameter, __FILE__, __LINE__, \ +@@ -1438,7 +1390,7 @@ void assert_memory_not_equal(const void *a, const void *b, size_t size); + * + * @param[in] maximum The maximum value allowed. + */ +-void assert_in_range(LargestIntegralType value, LargestIntegralType minimum, LargestIntegralType maximum); ++void assert_in_range(uintmax_t value, uintmax_t minimum, uintmax_t maximum); + #else + #define assert_in_range(value, minimum, maximum) \ + _assert_in_range( \ +@@ -1461,7 +1413,7 @@ void assert_in_range(LargestIntegralType value, LargestIntegralType minimum, Lar + * + * @param[in] maximum The maximum value to compare. + */ +-void assert_not_in_range(LargestIntegralType value, LargestIntegralType minimum, LargestIntegralType maximum); ++void assert_not_in_range(uintmax_t value, uintmax_t minimum, uintmax_t maximum); + #else + #define assert_not_in_range(value, minimum, maximum) \ + _assert_not_in_range( \ +@@ -1483,7 +1435,7 @@ void assert_not_in_range(LargestIntegralType value, LargestIntegralType minimum, + * + * @param[in] count The size of the values array. + */ +-void assert_in_set(LargestIntegralType value, LargestIntegralType values[], size_t count); ++void assert_in_set(uintmax_t value, uintmax_t values[], size_t count); + #else + #define assert_in_set(value, values, number_of_values) \ + _assert_in_set(value, values, number_of_values, __FILE__, __LINE__) +@@ -1502,7 +1454,7 @@ void assert_in_set(LargestIntegralType value, LargestIntegralType values[], size + * + * @param[in] count The size of the values array. + */ +-void assert_not_in_set(LargestIntegralType value, LargestIntegralType values[], size_t count); ++void assert_not_in_set(uintmax_t value, uintmax_t values[], size_t count); + #else + #define assert_not_in_set(value, values, number_of_values) \ + _assert_not_in_set(value, values, number_of_values, __FILE__, __LINE__) +@@ -2181,8 +2133,8 @@ void expect_assert_failure(function fn_call); + typedef void (*UnitTestFunction)(void **state); + + /* Function that determines whether a function parameter value is correct. */ +-typedef int (*CheckParameterValue)(const LargestIntegralType value, +- const LargestIntegralType check_value_data); ++typedef int (*CheckParameterValue)(const uintmax_t value, ++ const uintmax_t check_value_data); + + /* Type of the unit test function. */ + typedef enum UnitTestFunctionType { +@@ -2236,7 +2188,7 @@ typedef struct CheckParameterEvent { + SourceLocation location; + const char *parameter_name; + CheckParameterValue check_value; +- LargestIntegralType check_value_data; ++ uintmax_t check_value_data; + } CheckParameterEvent; + + /* Used by expect_assert_failure() and mock_assert(). */ +@@ -2245,7 +2197,7 @@ extern jmp_buf global_expect_assert_env; + extern const char * global_last_failed_assert; + + /* Retrieves a value for the given function, as set by "will_return". */ +-LargestIntegralType _mock(const char * const function, const char* const file, ++uintmax_t _mock(const char * const function, const char* const file, + const int line); + + void _expect_function_call( +@@ -2261,36 +2213,36 @@ void _expect_check( + const char* const function, const char* const parameter, + const char* const file, const int line, + const CheckParameterValue check_function, +- const LargestIntegralType check_data, CheckParameterEvent * const event, ++ const uintmax_t check_data, CheckParameterEvent * const event, + const int count); + + void _expect_in_set( + const char* const function, const char* const parameter, +- const char* const file, const int line, const LargestIntegralType values[], ++ const char* const file, const int line, const uintmax_t values[], + const size_t number_of_values, const int count); + void _expect_not_in_set( + const char* const function, const char* const parameter, +- const char* const file, const int line, const LargestIntegralType values[], ++ const char* const file, const int line, const uintmax_t values[], + const size_t number_of_values, const int count); + + void _expect_in_range( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType minimum, +- const LargestIntegralType maximum, const int count); ++ const uintmax_t minimum, ++ const uintmax_t maximum, const int count); + void _expect_not_in_range( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType minimum, +- const LargestIntegralType maximum, const int count); ++ const uintmax_t minimum, ++ const uintmax_t maximum, const int count); + + void _expect_value( + const char* const function, const char* const parameter, +- const char* const file, const int line, const LargestIntegralType value, ++ const char* const file, const int line, const uintmax_t value, + const int count); + void _expect_not_value( + const char* const function, const char* const parameter, +- const char* const file, const int line, const LargestIntegralType value, ++ const char* const file, const int line, const uintmax_t value, + const int count); + + void _expect_string( +@@ -2317,17 +2269,17 @@ void _expect_any( + + void _check_expected( + const char * const function_name, const char * const parameter_name, +- const char* file, const int line, const LargestIntegralType value); ++ const char* file, const int line, const uintmax_t value); + + void _will_return(const char * const function_name, const char * const file, +- const int line, const LargestIntegralType value, ++ const int line, const uintmax_t value, + const int count); +-void _assert_true(const LargestIntegralType result, ++void _assert_true(const uintmax_t result, + const char* const expression, + const char * const file, const int line); +-void _assert_return_code(const LargestIntegralType result, ++void _assert_return_code(const uintmax_t result, + size_t rlen, +- const LargestIntegralType error, ++ const uintmax_t error, + const char * const expression, + const char * const file, + const int line); +@@ -2344,10 +2296,10 @@ void _assert_double_not_equal(const double a, const double n, + const double epsilon, const char* const file, + const int line); + void _assert_int_equal( +- const LargestIntegralType a, const LargestIntegralType b, ++ const uintmax_t a, const uintmax_t b, + const char * const file, const int line); + void _assert_int_not_equal( +- const LargestIntegralType a, const LargestIntegralType b, ++ const uintmax_t a, const uintmax_t b, + const char * const file, const int line); + void _assert_string_equal(const char * const a, const char * const b, + const char * const file, const int line); +@@ -2360,16 +2312,16 @@ void _assert_memory_not_equal(const void * const a, const void * const b, + const size_t size, const char* const file, + const int line); + void _assert_in_range( +- const LargestIntegralType value, const LargestIntegralType minimum, +- const LargestIntegralType maximum, const char* const file, const int line); ++ const uintmax_t value, const uintmax_t minimum, ++ const uintmax_t maximum, const char* const file, const int line); + void _assert_not_in_range( +- const LargestIntegralType value, const LargestIntegralType minimum, +- const LargestIntegralType maximum, const char* const file, const int line); ++ const uintmax_t value, const uintmax_t minimum, ++ const uintmax_t maximum, const char* const file, const int line); + void _assert_in_set( +- const LargestIntegralType value, const LargestIntegralType values[], ++ const uintmax_t value, const uintmax_t values[], + const size_t number_of_values, const char* const file, const int line); + void _assert_not_in_set( +- const LargestIntegralType value, const LargestIntegralType values[], ++ const uintmax_t value, const uintmax_t values[], + const size_t number_of_values, const char* const file, const int line); + + void* _test_malloc(const size_t size, const char* file, const int line); +diff --git a/src/cmocka.c b/src/cmocka.c +index 52897e1..62d4284 100644 +--- src/cmocka.c ++++ src/cmocka.c +@@ -1,6 +1,6 @@ + /* + * Copyright 2008 Google Inc. +- * Copyright 2014-2018 Andreas Schneider <asn@cryptomilk.org> ++ * Copyright 2014-2020 Andreas Schneider <asn@cryptomilk.org> + * Copyright 2015 Jakub Hrozek <jakub.hrozek@posteo.se> + * + * Licensed under the Apache License, Version 2.0 (the "License"); +@@ -111,14 +111,14 @@ + + + /* +- * Declare and initialize a LargestIntegralType variable name ++ * Declare and initialize a uintmax_t variable name + * with value the conversion of ptr. + */ + #define declare_initialize_value_pointer_pointer(name, ptr) \ +- LargestIntegralType name ; \ +- name = (LargestIntegralType) (uintptr_t) ptr ++ uintmax_t name ; \ ++ name = (uintmax_t)((uintptr_t)(ptr)) + +-/* Cast a LargestIntegralType to pointer_type. */ ++/* Cast a uintmax_t to pointer_type. */ + #define cast_largest_integral_type_to_pointer( \ + pointer_type, largest_integral_type) \ + ((pointer_type)(uintptr_t)(largest_integral_type)) +@@ -158,7 +158,7 @@ typedef int (*EqualityFunction)(const void *left, const void *right); + /* Value of a symbol and the place it was declared. */ + typedef struct SymbolValue { + SourceLocation location; +- LargestIntegralType value; ++ uintmax_t value; + } SymbolValue; + + /* +@@ -183,14 +183,14 @@ typedef void (*CleanupListValue)(const void *value, void *cleanup_value_data); + /* Structure used to check the range of integer types.a */ + typedef struct CheckIntegerRange { + CheckParameterEvent event; +- LargestIntegralType minimum; +- LargestIntegralType maximum; ++ uintmax_t minimum; ++ uintmax_t maximum; + } CheckIntegerRange; + + /* Structure used to check whether an integer value is in a set. */ + typedef struct CheckIntegerSet { + CheckParameterEvent event; +- const LargestIntegralType *set; ++ const uintmax_t *set; + size_t size_of_set; + } CheckIntegerSet; + +@@ -702,7 +702,7 @@ static void free_value(const void *value, void *cleanup_value_data) { + static void free_symbol_map_value(const void *value, + void *cleanup_value_data) { + SymbolMapValue * const map_value = (SymbolMapValue*)value; +- const LargestIntegralType children = cast_ptr_to_largest_integral_type(cleanup_value_data); ++ const uintmax_t children = cast_ptr_to_largest_integral_type(cleanup_value_data); + assert_non_null(value); + if (children == 0) { + list_free(&map_value->symbol_values_list_head, +@@ -947,14 +947,14 @@ static size_t check_for_leftover_values( + + + /* Get the next return value for the specified mock function. */ +-LargestIntegralType _mock(const char * const function, const char* const file, ++uintmax_t _mock(const char * const function, const char* const file, + const int line) { + void *result; + const int rc = get_symbol_value(&global_function_result_map_head, + &function, 1, &result); + if (rc) { + SymbolValue * const symbol = (SymbolValue*)result; +- const LargestIntegralType value = symbol->value; ++ const uintmax_t value = symbol->value; + global_last_mock_value_location = symbol->location; + if (rc == 1) { + free(symbol); +@@ -1055,7 +1055,7 @@ void _function_called(const char *const function, + + /* Add a return value for the specified mock function name. */ + void _will_return(const char * const function_name, const char * const file, +- const int line, const LargestIntegralType value, ++ const int line, const uintmax_t value, + const int count) { + SymbolValue * const return_value = + (SymbolValue*)malloc(sizeof(*return_value)); +@@ -1077,7 +1077,7 @@ void _expect_check( + const char* const function, const char* const parameter, + const char* const file, const int line, + const CheckParameterValue check_function, +- const LargestIntegralType check_data, ++ const uintmax_t check_data, + CheckParameterEvent * const event, const int count) { + CheckParameterEvent * const check = + event ? event : (CheckParameterEvent*)malloc(sizeof(*check)); +@@ -1241,8 +1241,8 @@ static int double_values_not_equal_display_error(const double left, + + /* Returns 1 if the specified values are equal. If the values are not equal + * an error is displayed and 0 is returned. */ +-static int values_equal_display_error(const LargestIntegralType left, +- const LargestIntegralType right) { ++static int values_equal_display_error(const uintmax_t left, ++ const uintmax_t right) { + const int equal = left == right; + if (!equal) { + cm_print_error(LargestIntegralTypePrintfFormat " != " +@@ -1254,8 +1254,8 @@ static int values_equal_display_error(const LargestIntegralType left, + /* + * Returns 1 if the specified values are not equal. If the values are equal + * an error is displayed and 0 is returned. */ +-static int values_not_equal_display_error(const LargestIntegralType left, +- const LargestIntegralType right) { ++static int values_not_equal_display_error(const uintmax_t left, ++ const uintmax_t right) { + const int not_equal = left != right; + if (!not_equal) { + cm_print_error(LargestIntegralTypePrintfFormat " == " +@@ -1273,12 +1273,12 @@ static int values_not_equal_display_error(const LargestIntegralType left, + * displayed. + */ + static int value_in_set_display_error( +- const LargestIntegralType value, ++ const uintmax_t value, + const CheckIntegerSet * const check_integer_set, const int invert) { + int succeeded = invert; + assert_non_null(check_integer_set); + { +- const LargestIntegralType * const set = check_integer_set->set; ++ const uintmax_t * const set = check_integer_set->set; + const size_t size_of_set = check_integer_set->size_of_set; + size_t i; + for (i = 0; i < size_of_set; i++) { +@@ -1310,8 +1310,8 @@ static int value_in_set_display_error( + * specified range an error is displayed and 0 is returned. + */ + static int integer_in_range_display_error( +- const LargestIntegralType value, const LargestIntegralType range_min, +- const LargestIntegralType range_max) { ++ const uintmax_t value, const uintmax_t range_min, ++ const uintmax_t range_max) { + if (value >= range_min && value <= range_max) { + return 1; + } +@@ -1330,8 +1330,8 @@ static int integer_in_range_display_error( + * specified range an error is displayed and zero is returned. + */ + static int integer_not_in_range_display_error( +- const LargestIntegralType value, const LargestIntegralType range_min, +- const LargestIntegralType range_max) { ++ const uintmax_t value, const uintmax_t range_min, ++ const uintmax_t range_max) { + if (value < range_min || value > range_max) { + return 1; + } +@@ -1431,8 +1431,8 @@ static int memory_not_equal_display_error( + + + /* CheckParameterValue callback to check whether a value is within a set. */ +-static int check_in_set(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_in_set(const uintmax_t value, ++ const uintmax_t check_value_data) { + return value_in_set_display_error(value, + cast_largest_integral_type_to_pointer(CheckIntegerSet*, + check_value_data), 0); +@@ -1440,8 +1440,8 @@ static int check_in_set(const LargestIntegralType value, + + + /* CheckParameterValue callback to check whether a value isn't within a set. */ +-static int check_not_in_set(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_not_in_set(const uintmax_t value, ++ const uintmax_t check_value_data) { + return value_in_set_display_error(value, + cast_largest_integral_type_to_pointer(CheckIntegerSet*, + check_value_data), 1); +@@ -1453,12 +1453,12 @@ static int check_not_in_set(const LargestIntegralType value, + static void expect_set( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType values[], const size_t number_of_values, ++ const uintmax_t values[], const size_t number_of_values, + const CheckParameterValue check_function, const int count) { + CheckIntegerSet * const check_integer_set = + (CheckIntegerSet*)malloc(sizeof(*check_integer_set) + + (sizeof(values[0]) * number_of_values)); +- LargestIntegralType * const set = (LargestIntegralType*)( ++ uintmax_t * const set = (uintmax_t*)( + check_integer_set + 1); + declare_initialize_value_pointer_pointer(check_data, check_integer_set); + assert_non_null(values); +@@ -1476,7 +1476,7 @@ static void expect_set( + void _expect_in_set( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType values[], const size_t number_of_values, ++ const uintmax_t values[], const size_t number_of_values, + const int count) { + expect_set(function, parameter, file, line, values, number_of_values, + check_in_set, count); +@@ -1487,7 +1487,7 @@ void _expect_in_set( + void _expect_not_in_set( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType values[], const size_t number_of_values, ++ const uintmax_t values[], const size_t number_of_values, + const int count) { + expect_set(function, parameter, file, line, values, number_of_values, + check_not_in_set, count); +@@ -1495,8 +1495,8 @@ void _expect_not_in_set( + + + /* CheckParameterValue callback to check whether a value is within a range. */ +-static int check_in_range(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_in_range(const uintmax_t value, ++ const uintmax_t check_value_data) { + CheckIntegerRange * const check_integer_range = + cast_largest_integral_type_to_pointer(CheckIntegerRange*, + check_value_data); +@@ -1507,8 +1507,8 @@ static int check_in_range(const LargestIntegralType value, + + + /* CheckParameterValue callback to check whether a value is not within a range. */ +-static int check_not_in_range(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_not_in_range(const uintmax_t value, ++ const uintmax_t check_value_data) { + CheckIntegerRange * const check_integer_range = + cast_largest_integral_type_to_pointer(CheckIntegerRange*, + check_value_data); +@@ -1523,7 +1523,7 @@ static int check_not_in_range(const LargestIntegralType value, + static void expect_range( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType minimum, const LargestIntegralType maximum, ++ const uintmax_t minimum, const uintmax_t maximum, + const CheckParameterValue check_function, const int count) { + CheckIntegerRange * const check_integer_range = + (CheckIntegerRange*)malloc(sizeof(*check_integer_range)); +@@ -1539,7 +1539,7 @@ static void expect_range( + void _expect_in_range( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType minimum, const LargestIntegralType maximum, ++ const uintmax_t minimum, const uintmax_t maximum, + const int count) { + expect_range(function, parameter, file, line, minimum, maximum, + check_in_range, count); +@@ -1550,7 +1550,7 @@ void _expect_in_range( + void _expect_not_in_range( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType minimum, const LargestIntegralType maximum, ++ const uintmax_t minimum, const uintmax_t maximum, + const int count) { + expect_range(function, parameter, file, line, minimum, maximum, + check_not_in_range, count); +@@ -1559,8 +1559,8 @@ void _expect_not_in_range( + + /* CheckParameterValue callback to check whether a value is equal to an + * expected value. */ +-static int check_value(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_value(const uintmax_t value, ++ const uintmax_t check_value_data) { + return values_equal_display_error(value, check_value_data); + } + +@@ -1569,7 +1569,7 @@ static int check_value(const LargestIntegralType value, + void _expect_value( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType value, const int count) { ++ const uintmax_t value, const int count) { + _expect_check(function, parameter, file, line, check_value, value, NULL, + count); + } +@@ -1577,8 +1577,8 @@ void _expect_value( + + /* CheckParameterValue callback to check whether a value is not equal to an + * expected value. */ +-static int check_not_value(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_not_value(const uintmax_t value, ++ const uintmax_t check_value_data) { + return values_not_equal_display_error(value, check_value_data); + } + +@@ -1587,15 +1587,15 @@ static int check_not_value(const LargestIntegralType value, + void _expect_not_value( + const char* const function, const char* const parameter, + const char* const file, const int line, +- const LargestIntegralType value, const int count) { ++ const uintmax_t value, const int count) { + _expect_check(function, parameter, file, line, check_not_value, value, + NULL, count); + } + + + /* CheckParameterValue callback to check whether a parameter equals a string. */ +-static int check_string(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_string(const uintmax_t value, ++ const uintmax_t check_value_data) { + return string_equal_display_error( + cast_largest_integral_type_to_pointer(char*, value), + cast_largest_integral_type_to_pointer(char*, check_value_data)); +@@ -1616,8 +1616,8 @@ void _expect_string( + + /* CheckParameterValue callback to check whether a parameter is not equals to + * a string. */ +-static int check_not_string(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_not_string(const uintmax_t value, ++ const uintmax_t check_value_data) { + return string_not_equal_display_error( + cast_largest_integral_type_to_pointer(char*, value), + cast_largest_integral_type_to_pointer(char*, check_value_data)); +@@ -1637,8 +1637,8 @@ void _expect_not_string( + + /* CheckParameterValue callback to check whether a parameter equals an area of + * memory. */ +-static int check_memory(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_memory(const uintmax_t value, ++ const uintmax_t check_value_data) { + CheckMemoryData * const check = cast_largest_integral_type_to_pointer( + CheckMemoryData*, check_value_data); + assert_non_null(check); +@@ -1681,8 +1681,8 @@ void _expect_memory( + + /* CheckParameterValue callback to check whether a parameter is not equal to + * an area of memory. */ +-static int check_not_memory(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_not_memory(const uintmax_t value, ++ const uintmax_t check_value_data) { + CheckMemoryData * const check = cast_largest_integral_type_to_pointer( + CheckMemoryData*, check_value_data); + assert_non_null(check); +@@ -1704,8 +1704,8 @@ void _expect_not_memory( + + + /* CheckParameterValue callback that always returns 1. */ +-static int check_any(const LargestIntegralType value, +- const LargestIntegralType check_value_data) { ++static int check_any(const uintmax_t value, ++ const uintmax_t check_value_data) { + (void)value; + (void)check_value_data; + return 1; +@@ -1723,7 +1723,7 @@ void _expect_any( + + void _check_expected( + const char * const function_name, const char * const parameter_name, +- const char* file, const int line, const LargestIntegralType value) { ++ const char* file, const int line, const uintmax_t value) { + void *result = NULL; + const char* symbols[] = {function_name, parameter_name}; + const int rc = get_symbol_value(&global_function_parameter_map_head, +@@ -1780,7 +1780,7 @@ void mock_assert(const int result, const char* const expression, + } + + +-void _assert_true(const LargestIntegralType result, ++void _assert_true(const uintmax_t result, + const char * const expression, + const char * const file, const int line) { + if (!result) { +@@ -1789,14 +1789,14 @@ void _assert_true(const LargestIntegralType result, + } + } + +-void _assert_return_code(const LargestIntegralType result, ++void _assert_return_code(const uintmax_t result, + size_t rlen, +- const LargestIntegralType error, ++ const uintmax_t error, + const char * const expression, + const char * const file, + const int line) + { +- LargestIntegralType valmax; ++ uintmax_t valmax; + + + switch (rlen) { +@@ -1872,7 +1872,7 @@ void _assert_double_not_equal(const double a, + } + + void _assert_int_equal( +- const LargestIntegralType a, const LargestIntegralType b, ++ const uintmax_t a, const uintmax_t b, + const char * const file, const int line) { + if (!values_equal_display_error(a, b)) { + _fail(file, line); +@@ -1881,7 +1881,7 @@ void _assert_int_equal( + + + void _assert_int_not_equal( +- const LargestIntegralType a, const LargestIntegralType b, ++ const uintmax_t a, const uintmax_t b, + const char * const file, const int line) { + if (!values_not_equal_display_error(a, b)) { + _fail(file, line); +@@ -1925,8 +1925,8 @@ void _assert_memory_not_equal(const void * const a, const void * const b, + + + void _assert_in_range( +- const LargestIntegralType value, const LargestIntegralType minimum, +- const LargestIntegralType maximum, const char* const file, ++ const uintmax_t value, const uintmax_t minimum, ++ const uintmax_t maximum, const char* const file, + const int line) { + if (!integer_in_range_display_error(value, minimum, maximum)) { + _fail(file, line); +@@ -1934,16 +1934,16 @@ void _assert_in_range( + } + + void _assert_not_in_range( +- const LargestIntegralType value, const LargestIntegralType minimum, +- const LargestIntegralType maximum, const char* const file, ++ const uintmax_t value, const uintmax_t minimum, ++ const uintmax_t maximum, const char* const file, + const int line) { + if (!integer_not_in_range_display_error(value, minimum, maximum)) { + _fail(file, line); + } + } + +-void _assert_in_set(const LargestIntegralType value, +- const LargestIntegralType values[], ++void _assert_in_set(const uintmax_t value, ++ const uintmax_t values[], + const size_t number_of_values, const char* const file, + const int line) { + CheckIntegerSet check_integer_set; +@@ -1954,8 +1954,8 @@ void _assert_in_set(const LargestIntegralType value, + } + } + +-void _assert_not_in_set(const LargestIntegralType value, +- const LargestIntegralType values[], ++void _assert_not_in_set(const uintmax_t value, ++ const uintmax_t values[], + const size_t number_of_values, const char* const file, + const int line) { + CheckIntegerSet check_integer_set; +@@ -3079,8 +3079,8 @@ int _cmocka_run_group_tests(const char *group_name, + size_t i; + int rc; + +- /* Make sure LargestIntegralType is at least the size of a pointer. */ +- assert_true(sizeof(LargestIntegralType) >= sizeof(void*)); ++ /* Make sure uintmax_t is at least the size of a pointer. */ ++ assert_true(sizeof(uintmax_t) >= sizeof(void*)); + + cm_tests = libc_calloc(1, sizeof(struct CMUnitTestState) * num_tests); + if (cm_tests == NULL) { +@@ -3370,8 +3370,8 @@ int _run_tests(const UnitTest * const tests, const size_t number_of_tests) { + print_message("[==========] Running %"PRIdS " test(s).\n", + number_of_tests - setups - teardowns); + +- /* Make sure LargestIntegralType is at least the size of a pointer. */ +- assert_true(sizeof(LargestIntegralType) >= sizeof(void*)); ++ /* Make sure uintmax_t is at least the size of a pointer. */ ++ assert_true(sizeof(uintmax_t) >= sizeof(void*)); + + while (current_test < number_of_tests) { + const ListNode *test_check_point = NULL; +diff --git a/tests/test_alloc.c b/tests/test_alloc.c +index 966814a..3948084 100644 +--- tests/test_alloc.c ++++ tests/test_alloc.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_assert_macros.c b/tests/test_assert_macros.c +index 1a00880..3a7a0fe 100644 +--- tests/test_assert_macros.c ++++ tests/test_assert_macros.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_assert_macros_fail.c b/tests/test_assert_macros_fail.c +index aea919a..fc354d4 100644 +--- tests/test_assert_macros_fail.c ++++ tests/test_assert_macros_fail.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_basics.c b/tests/test_basics.c +inde 1bb493f..9866d81 100644 +--- tests/test_basics.c ++++ tests/test_basics.c +@@ -20,6 +20,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static int setup(void **state) { +diff --git a/tests/test_cmockery.c b/tests/test_cmockery.c +index 83a7451..027b1ac 100644 +--- tests/test_cmockery.c ++++ tests/test_cmockery.c +@@ -17,6 +17,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmockery/cmockery.h> + + /* A test case that does nothing and succeeds. */ +diff --git a/tests/test_double_macros.c b/tests/test_double_macros.c +index 138c579..b892272 100644 +--- tests/test_double_macros.c ++++ tests/test_double_macros.c +@@ -20,6 +20,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + /* A test case that does check if double is equal. */ +diff --git a/tests/test_exception_handler.c b/tests/test_exception_handler.c +index 23c19cd..769eed8 100644 +--- tests/test_exception_handler.c ++++ tests/test_exception_handler.c +@@ -1,6 +1,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + #include <signal.h> +diff --git a/tests/test_fixtures.c b/tests/test_fixtures.c +index 6d39487..e6d05d1 100644 +--- tests/test_fixtures.c ++++ tests/test_fixtures.c +@@ -1,6 +1,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + #include <stdlib.h> +diff --git a/tests/test_float_macros.c b/tests/test_float_macros.c +index a9c7251..6ce8906 100644 +--- tests/test_float_macros.c ++++ tests/test_float_macros.c +@@ -20,6 +20,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + /* A test case that does check if float is equal. */ +diff --git a/tests/test_group_fixtures.c b/tests/test_group_fixtures.c +index 64f0ab7..e9b4ad3 100644 +--- tests/test_group_fixtures.c ++++ tests/test_group_fixtures.c +@@ -4,6 +4,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static int group_setup(void **state) +diff --git a/tests/test_group_setup_assert.c b/tests/test_group_setup_assert.c +index eef61f8..92f88b6 100644 +--- tests/test_group_setup_assert.c ++++ tests/test_group_setup_assert.c +@@ -4,6 +4,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static int group_setup_failing(void **state) +diff --git a/tests/test_group_setup_fail.c b/tests/test_group_setup_fail.c +index 7815c03..1f2e701 100644 +--- tests/test_group_setup_fail.c ++++ tests/test_group_setup_fail.c +@@ -4,6 +4,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static int group_setup_failing(void **state) +diff --git a/tests/test_groups.c b/tests/test_groups.c +index af9e2b8..ea936c0 100644 +--- tests/test_groups.c ++++ tests/test_groups.c +@@ -20,6 +20,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static int setup(void **state) { +diff --git a/tests/test_ordering.c b/tests/test_ordering.c +index 817c0ba..fab2568 100644 +--- tests/test_ordering.c ++++ tests/test_ordering.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_ordering_fail.c b/tests/test_ordering_fail.c +index 652f5ad..88b4e29 100644 +--- tests/test_ordering_fail.c ++++ tests/test_ordering_fail.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_returns.c b/tests/test_returns.c +index b9370c9..574fa00 100644 +--- tests/test_returns.c ++++ tests/test_returns.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_returns_fail.c b/tests/test_returns_fail.c +index 81197d3..fa7f291 100644 +--- tests/test_returns_fail.c ++++ tests/test_returns_fail.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + #include <cmocka_private.h> + +diff --git a/tests/test_setup_fail.c b/tests/test_setup_fail.c +index e3f8df8..9affaa6 100644 +--- tests/test_setup_fail.c ++++ tests/test_setup_fail.c +@@ -3,6 +3,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static int setup_fail(void **state) { +diff --git a/tests/test_skip.c b/tests/test_skip.c +index 127161a..0a6953d 100644 +--- tests/test_skip.c ++++ tests/test_skip.c +@@ -17,6 +17,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + /* A test case that does check if an int is equal. */ +diff --git a/tests/test_skip_filter.c b/tests/test_skip_filter.c +index e40209e..56dc262 100644 +--- tests/test_skip_filter.c ++++ tests/test_skip_filter.c +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static void test_skip1(void **state) +diff --git a/tests/test_strmatch.c b/tests/test_strmatch.c +index f2d966b..f8d088c 100644 +--- tests/test_strmatch.c ++++ tests/test_strmatch.c +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + #include "../src/cmocka.c" +diff --git a/tests/test_wildcard.c b/tests/test_wildcard.c +index 10ee195..3b85bb3 100644 +--- tests/test_wildcard.c ++++ tests/test_wildcard.c +@@ -17,6 +17,7 @@ + #include <stdarg.h> + #include <stddef.h> + #include <setjmp.h> ++#include <stdint.h> + #include <cmocka.h> + + static void test_ok1(void **state) diff --git a/sysutils/cmocka/files/patch-include_cmocka.h b/sysutils/cmocka/files/patch-include_cmocka.h deleted file mode 100644 index 0e7a5ae749e3..000000000000 --- a/sysutils/cmocka/files/patch-include_cmocka.h +++ /dev/null @@ -1,19 +0,0 @@ ---- include/cmocka.h.orig 2018-09-06 06:15:11 UTC -+++ include/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(_UINTPTR_T_DECLARED) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -137,6 +137,7 @@ typedef uintmax_t LargestIntegralType; - - # define _UINTPTR_T - # define _UINTPTR_T_DEFINED -+# define _UINTPTR_T_DECLARED - #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ - - /* Perform an unsigned cast to uintptr_t. */ diff --git a/sysutils/cmocka/pkg-plist b/sysutils/cmocka/pkg-plist new file mode 100644 index 000000000000..bfdf2cf649db --- /dev/null +++ b/sysutils/cmocka/pkg-plist @@ -0,0 +1,9 @@ +include/cmocka.h +include/cmocka_pbc.h +lib/cmake/cmocka/cmocka-config-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/cmocka/cmocka-config-version.cmake +lib/cmake/cmocka/cmocka-config.cmake +lib/libcmocka.so +lib/libcmocka.so.0 +lib/libcmocka.so.0.8.0 +libdata/pkgconfig/cmocka.pc diff --git a/sysutils/httm/Makefile b/sysutils/httm/Makefile index ce18d00723ef..e66152396ece 100644 --- a/sysutils/httm/Makefile +++ b/sysutils/httm/Makefile @@ -1,5 +1,5 @@ PORTNAME= httm -DISTVERSION= 0.47.0 +DISTVERSION= 0.47.1 CATEGORIES= sysutils MAINTAINER= bofh@FreeBSD.org diff --git a/sysutils/httm/Makefile.crates b/sysutils/httm/Makefile.crates index e47e254aa53b..5faebca22b72 100644 --- a/sysutils/httm/Makefile.crates +++ b/sysutils/httm/Makefile.crates @@ -1,9 +1,3 @@ -===> License MPL20 accepted by the user -===> httm-0.47.0 depends on file: /usr/local/sbin/pkg - found -===> Fetching all distfiles required by httm-0.47.0 for building -===> Extracting for httm-0.47.0 -=> SHA256 Checksum OK for kimono-koans-httm-0.47.0_GH0.tar.gz. -===> Moving crates to /usr/ports/sysutils/httm/work/httm-0.47.0/cargo-crates CARGO_CRATES= ahash-0.3.8 \ aho-corasick-1.1.3 \ ansi_term-0.12.1 \ @@ -22,8 +16,8 @@ CARGO_CRATES= ahash-0.3.8 \ cfg-if-1.0.0 \ cfg_aliases-0.2.1 \ clap-2.34.0 \ - clap-4.5.37 \ - clap_builder-4.5.37 \ + clap-4.5.38 \ + clap_builder-4.5.38 \ clap_lex-0.7.4 \ colorchoice-1.0.3 \ console-0.15.5 \ @@ -76,7 +70,7 @@ CARGO_CRATES= ahash-0.3.8 \ memchr-2.7.4 \ memoffset-0.8.0 \ nix-0.24.3 \ - nix-0.30.0 \ + nix-0.30.1 \ nu-ansi-term-0.50.1 \ num-conv-0.1.0 \ num_threads-0.1.6 \ diff --git a/sysutils/httm/distinfo b/sysutils/httm/distinfo index 7c0effed99a4..9be2027f1a86 100644 --- a/sysutils/httm/distinfo +++ b/sysutils/httm/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1746269811 +TIMESTAMP = 1747596368 SHA256 (rust/crates/ahash-0.3.8.crate) = e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217 SIZE (rust/crates/ahash-0.3.8.crate) = 28650 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916 @@ -35,10 +35,10 @@ SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355 SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c SIZE (rust/crates/clap-2.34.0.crate) = 202210 -SHA256 (rust/crates/clap-4.5.37.crate) = eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071 -SIZE (rust/crates/clap-4.5.37.crate) = 56962 -SHA256 (rust/crates/clap_builder-4.5.37.crate) = efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2 -SIZE (rust/crates/clap_builder-4.5.37.crate) = 168761 +SHA256 (rust/crates/clap-4.5.38.crate) = ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000 +SIZE (rust/crates/clap-4.5.38.crate) = 57140 +SHA256 (rust/crates/clap_builder-4.5.38.crate) = 379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120 +SIZE (rust/crates/clap_builder-4.5.38.crate) = 169177 SHA256 (rust/crates/clap_lex-0.7.4.crate) = f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6 SIZE (rust/crates/clap_lex-0.7.4.crate) = 12858 SHA256 (rust/crates/colorchoice-1.0.3.crate) = 5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990 @@ -143,8 +143,8 @@ SHA256 (rust/crates/memoffset-0.8.0.crate) = d61c719bcfbcf5d62b3a09efa6088de8c54 SIZE (rust/crates/memoffset-0.8.0.crate) = 8912 SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069 SIZE (rust/crates/nix-0.24.3.crate) = 266843 -SHA256 (rust/crates/nix-0.30.0.crate) = 537bc3c4a347b87fd52ac6c03a02ab1302962cfd93373c5d7a112cdc337854cc -SIZE (rust/crates/nix-0.30.0.crate) = 342229 +SHA256 (rust/crates/nix-0.30.1.crate) = 74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6 +SIZE (rust/crates/nix-0.30.1.crate) = 342015 SHA256 (rust/crates/nu-ansi-term-0.50.1.crate) = d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399 SIZE (rust/crates/nu-ansi-term-0.50.1.crate) = 28536 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9 @@ -325,5 +325,5 @@ SHA256 (rust/crates/xattr-1.5.0.crate) = 0d65cbf2f12c15564212d48f4e3dfb87923d25d SIZE (rust/crates/xattr-1.5.0.crate) = 14694 SHA256 (rust/crates/yaml-rust-0.3.5.crate) = e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992 SIZE (rust/crates/yaml-rust-0.3.5.crate) = 42087 -SHA256 (kimono-koans-httm-0.47.0_GH0.tar.gz) = bf0d12b822d13838bdad289b59dfa4bcc5436b1d6621abb8e400cd1f52e12f5d -SIZE (kimono-koans-httm-0.47.0_GH0.tar.gz) = 136271 +SHA256 (kimono-koans-httm-0.47.1_GH0.tar.gz) = 30174bbf0ee2c29590e2ae768393ca7ffc302f2a4b4bc481f363f8e51cfcf757 +SIZE (kimono-koans-httm-0.47.1_GH0.tar.gz) = 136345 diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile index f19b66b5eaf0..273be8e965af 100644 --- a/sysutils/khelpcenter/Makefile +++ b/sysutils/khelpcenter/Makefile @@ -1,5 +1,6 @@ PORTNAME= khelpcenter DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile index 332f38b232ca..10d542ff6e2d 100644 --- a/sysutils/parallel/Makefile +++ b/sysutils/parallel/Makefile @@ -1,5 +1,5 @@ PORTNAME= parallel -PORTVERSION= 20250322 +PORTVERSION= 20250422 CATEGORIES= sysutils MASTER_SITES= GNU diff --git a/sysutils/parallel/distinfo b/sysutils/parallel/distinfo index c9efbaa6b996..543a6040a4fe 100644 --- a/sysutils/parallel/distinfo +++ b/sysutils/parallel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744288754 -SHA256 (parallel-20250322.tar.bz2) = c82896e779b18c2a157527f32f35de9a6d984f8b8ebad2b41dbc78c33adbaabe -SIZE (parallel-20250322.tar.bz2) = 2698080 +TIMESTAMP = 1745936042 +SHA256 (parallel-20250422.tar.bz2) = 10f0a7b7fbed87edcbd63a403fdc0ee1a1f86c241a3605f33162b4b9aff248dd +SIZE (parallel-20250422.tar.bz2) = 2699404 diff --git a/sysutils/py-overlord/Makefile b/sysutils/py-overlord/Makefile index 165ec6590bc8..0569e20f6f99 100644 --- a/sysutils/py-overlord/Makefile +++ b/sysutils/py-overlord/Makefile @@ -1,6 +1,6 @@ PORTNAME= overlord DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 +DISTVERSION= 0.8.0 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-overlord/distinfo b/sysutils/py-overlord/distinfo index 6ad62c0dcf30..6db614683251 100644 --- a/sysutils/py-overlord/distinfo +++ b/sysutils/py-overlord/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746251670 -SHA256 (DtxdF-overlord-v0.7.0_GH0.tar.gz) = 42ad4181c3085e83622b19a90f928765b2c0e79be56a9c2aca016abc35d1a338 -SIZE (DtxdF-overlord-v0.7.0_GH0.tar.gz) = 85747 +TIMESTAMP = 1747505959 +SHA256 (DtxdF-overlord-v0.8.0_GH0.tar.gz) = 82702793843f66848f963159b8840026ed0edb8f224111cdec30c0934aaba339 +SIZE (DtxdF-overlord-v0.8.0_GH0.tar.gz) = 85852 diff --git a/sysutils/rubygem-chef-bin/Makefile b/sysutils/rubygem-chef-bin/Makefile index 3ea55379c098..776c3261571a 100644 --- a/sysutils/rubygem-chef-bin/Makefile +++ b/sysutils/rubygem-chef-bin/Makefile @@ -1,5 +1,5 @@ PORTNAME= chef-bin -PORTVERSION= 18.7.3 +PORTVERSION= 18.7.6 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-chef-bin/distinfo b/sysutils/rubygem-chef-bin/distinfo index d219b16bde67..bd6d2efd0e46 100644 --- a/sysutils/rubygem-chef-bin/distinfo +++ b/sysutils/rubygem-chef-bin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744289338 -SHA256 (rubygem/chef-bin-18.7.3.gem) = bb054446c882e942d09fc9f3809afb5dcf9546e19d7022c1b2020529b20e8060 -SIZE (rubygem/chef-bin-18.7.3.gem) = 10240 +TIMESTAMP = 1745936412 +SHA256 (rubygem/chef-bin-18.7.6.gem) = 0b22fe1216c311fab775e2530a7e0fbaed42ab5db4f9040e8d849a6b61c3fda7 +SIZE (rubygem/chef-bin-18.7.6.gem) = 10240 diff --git a/sysutils/rubygem-chef-config/Makefile b/sysutils/rubygem-chef-config/Makefile index 317483d810a1..758a96f20235 100644 --- a/sysutils/rubygem-chef-config/Makefile +++ b/sysutils/rubygem-chef-config/Makefile @@ -1,5 +1,5 @@ PORTNAME= chef-config -PORTVERSION= 18.7.3 +PORTVERSION= 18.7.6 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-chef-config/distinfo b/sysutils/rubygem-chef-config/distinfo index 0289f66f4779..4268f01315f5 100644 --- a/sysutils/rubygem-chef-config/distinfo +++ b/sysutils/rubygem-chef-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744289340 -SHA256 (rubygem/chef-config-18.7.3.gem) = 832040834ca156add42ea31e9bcda71311621e4cc71ad9591bbf7b7306cd137e -SIZE (rubygem/chef-config-18.7.3.gem) = 52736 +TIMESTAMP = 1745936414 +SHA256 (rubygem/chef-config-18.7.6.gem) = e2ab4585da4f1b333af9da947800290e1243cf763f3779a776ed187c7ac0b8b7 +SIZE (rubygem/chef-config-18.7.6.gem) = 52736 diff --git a/sysutils/rubygem-chef-utils/Makefile b/sysutils/rubygem-chef-utils/Makefile index b18709273bbc..41bc44764407 100644 --- a/sysutils/rubygem-chef-utils/Makefile +++ b/sysutils/rubygem-chef-utils/Makefile @@ -1,5 +1,5 @@ PORTNAME= chef-utils -PORTVERSION= 18.7.3 +PORTVERSION= 18.7.6 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-chef-utils/distinfo b/sysutils/rubygem-chef-utils/distinfo index 913557bd57d2..5fada48500fc 100644 --- a/sysutils/rubygem-chef-utils/distinfo +++ b/sysutils/rubygem-chef-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744289342 -SHA256 (rubygem/chef-utils-18.7.3.gem) = c4ba6d831f2af20f681d1ac5dd7a8675b155eb59b91d45ab0663f22fb8ab0777 -SIZE (rubygem/chef-utils-18.7.3.gem) = 34816 +TIMESTAMP = 1745936416 +SHA256 (rubygem/chef-utils-18.7.6.gem) = 6c015a47e3b7862e85be0396121c2bf5db97549ed1861328f90b687b7e8813c9 +SIZE (rubygem/chef-utils-18.7.6.gem) = 34816 diff --git a/sysutils/rubygem-chef-winrm/Makefile b/sysutils/rubygem-chef-winrm/Makefile index d2169920eb22..db25e70ee590 100644 --- a/sysutils/rubygem-chef-winrm/Makefile +++ b/sysutils/rubygem-chef-winrm/Makefile @@ -1,5 +1,5 @@ PORTNAME= chef-winrm -PORTVERSION= 2.3.11 +PORTVERSION= 2.4.3 CATEGORIES= sysutils rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ - rubygem-chef-gyoku>=1.4.1:textproc/rubygem-chef-gyoku \ + rubygem-chef-gyoku>=1.5<2:textproc/rubygem-chef-gyoku \ rubygem-erubi>=1.8:www/rubygem-erubi \ rubygem-gssapi>=1.2<2:security/rubygem-gssapi \ rubygem-httpclient>=2.2.0.2<3:www/rubygem-httpclient \ diff --git a/sysutils/rubygem-chef-winrm/distinfo b/sysutils/rubygem-chef-winrm/distinfo index 3d67fecd9802..2cee9a6fef02 100644 --- a/sysutils/rubygem-chef-winrm/distinfo +++ b/sysutils/rubygem-chef-winrm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740022428 -SHA256 (rubygem/chef-winrm-2.3.11.gem) = 555e5e13a0e5724d0a5cdfa124ea4d4b2b6b9802fe46214beac8c2c33bbed26e -SIZE (rubygem/chef-winrm-2.3.11.gem) = 42496 +TIMESTAMP = 1745936418 +SHA256 (rubygem/chef-winrm-2.4.3.gem) = 1a59dbf82b0ba91141ef460ba23739957f30b7e69ea073c0f1806058af05cbc9 +SIZE (rubygem/chef-winrm-2.4.3.gem) = 42496 diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile index 6594196f16de..eb1e81682112 100644 --- a/sysutils/rubygem-chef/Makefile +++ b/sysutils/rubygem-chef/Makefile @@ -1,5 +1,5 @@ PORTNAME= chef -PORTVERSION= 18.7.3 +PORTVERSION= 18.7.6 CATEGORIES= sysutils MASTER_SITES= RG @@ -29,7 +29,7 @@ RUN_DEPENDS= rubygem-addressable>=0:www/rubygem-addressable \ rubygem-mixlib-archive>=0.4<2.0:devel/rubygem-mixlib-archive \ rubygem-mixlib-authentication>=2.1<4:devel/rubygem-mixlib-authentication \ rubygem-mixlib-cli>=2.1.1<3.0:devel/rubygem-mixlib-cli \ - rubygem-mixlib-log>=2.0.3<3.1.1_99:devel/rubygem-mixlib-log \ + rubygem-mixlib-log>=2.0.3<3.2:devel/rubygem-mixlib-log \ rubygem-mixlib-shellout>=3.1.1<4.0:devel/rubygem-mixlib-shellout \ rubygem-net-ftp>=0:ftp/rubygem-net-ftp \ rubygem-net-sftp>=2.1.2<5.0:security/rubygem-net-sftp \ diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo index 1cd40b9c6945..5aac38e4923d 100644 --- a/sysutils/rubygem-chef/distinfo +++ b/sysutils/rubygem-chef/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744289336 -SHA256 (rubygem/chef-18.7.3.gem) = 5d9718b60e3622ca9b786ccf29b4dd99d8b76c599661b79f30d0e34060bc28f1 -SIZE (rubygem/chef-18.7.3.gem) = 1756160 +TIMESTAMP = 1745936410 +SHA256 (rubygem/chef-18.7.6.gem) = fc50599c8d315d88b4564e2f08c3e2698e36e087c76c57a9d95aad064b187a3b +SIZE (rubygem/chef-18.7.6.gem) = 1757696 diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index e223e9c5827e..226f35aff982 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,5 +1,6 @@ PORTNAME= syslog-ng DISTVERSION= 4.8.2 +PORTREVISION= 1 CATEGORIES= sysutils # official master site: MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ diff --git a/sysutils/terraform-switcher/Makefile b/sysutils/terraform-switcher/Makefile index 86b1c5bcf81d..e515008abe1d 100644 --- a/sysutils/terraform-switcher/Makefile +++ b/sysutils/terraform-switcher/Makefile @@ -1,6 +1,6 @@ PORTNAME= terraform-switcher DISTVERSIONPREFIX= v -DISTVERSION= 1.4.4 +DISTVERSION= 1.4.5 CATEGORIES= sysutils MAINTAINER= dutra@FreeBSD.org diff --git a/sysutils/terraform-switcher/distinfo b/sysutils/terraform-switcher/distinfo index f84d58def37c..c00e4e3e1387 100644 --- a/sysutils/terraform-switcher/distinfo +++ b/sysutils/terraform-switcher/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1745258026 -SHA256 (go/sysutils_terraform-switcher/terraform-switcher-v1.4.4/v1.4.4.mod) = 4d9ad3db0e5ef623291c8f66982b59b4410a2acbb6638feae0dffb78555089e6 -SIZE (go/sysutils_terraform-switcher/terraform-switcher-v1.4.4/v1.4.4.mod) = 2445 -SHA256 (go/sysutils_terraform-switcher/terraform-switcher-v1.4.4/v1.4.4.zip) = e962afd84059be45b9ccf6ac2adfe74a3435b093c863a79381d703f85ff50be0 -SIZE (go/sysutils_terraform-switcher/terraform-switcher-v1.4.4/v1.4.4.zip) = 4895648 +TIMESTAMP = 1747441416 +SHA256 (go/sysutils_terraform-switcher/terraform-switcher-v1.4.5/v1.4.5.mod) = cab217815f250766b58140e2029f1e4e8646380a9f75fd87175c3df4910ee9dc +SIZE (go/sysutils_terraform-switcher/terraform-switcher-v1.4.5/v1.4.5.mod) = 2337 +SHA256 (go/sysutils_terraform-switcher/terraform-switcher-v1.4.5/v1.4.5.zip) = 37404b4eccedf57430f4328a56f7eca1f1e7c5d6cbde243f6d9e95e167bdda17 +SIZE (go/sysutils_terraform-switcher/terraform-switcher-v1.4.5/v1.4.5.zip) = 4894620 diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile index 1c26bbd12318..7e8f2c09720a 100644 --- a/sysutils/x86info/Makefile +++ b/sysutils/x86info/Makefile @@ -10,6 +10,9 @@ WWW= https://github.com/kernelslacker/x86info LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +DEPRECATED= Abandoned upstream, fails to identify anything remotely new according to upstream issue reports +EXPIRATION_DATE=2025-06-30 + LIB_DEPENDS= libpci.so:devel/libpci ONLY_FOR_ARCHS= i386 amd64 |