CVS commit: pkgsrc/devel/cmocka

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/cmocka
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 11 Jun 2026 07:20:58 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun 11 07:20:58 UTC 2026

Modified Files:
        pkgsrc/devel/cmocka: Makefile PLIST distinfo
Removed Files:
        pkgsrc/devel/cmocka/patches: patch-CompilerChecks.cmake
            patch-include_cmocka.h

Log Message:
cmocka: update to 2.0.2.

## [2.0.2] - 2026-01-12

### Fixed

- Fixed typo in `CMOCKA_NO_DEPRECATION_WARNINGS`

## [2.0.1] - 2025-12-19

### Added

- Option to disable deprecation warnings via `CMOCKA_NO_DEPRECATION_WARNINGS`

### Changed

- Documentation theme is now downloaded during `make docs` instead of at configure time

### Fixed

- Fixed const-correctness issues throughout the library

## [2.0.0] - 2025-12-04

### Added

#### Test Filtering
- Environment variable support for test filtering:
  - `CMOCKA_TEST_FILTER`: Filter tests to run by pattern
  - `CMOCKA_SKIP_FILTER`: Filter tests to skip by pattern
- Improved `cmocka_set_test_filter()` and `cmocka_set_skip_filter()` functions

#### Output Formats
- **TAP 14 support**: Updated Test Anything Protocol output to
  version 14 with YAML diagnostics
  - YAML-formatted error messages with proper indentation
  - `severity` field for distinguishing failures from errors
  - Improved SKIP directive format

#### Type-Safe Assertions and Mocking
- Type-safe assertion macros for integers:
  - `assert_int_equal()` / `assert_int_not_equal()`
  - `assert_uint_equal()` / `assert_uint_not_equal()`
  - `assert_int_in_range()` / `assert_int_not_in_range()`
  - `assert_uint_in_range()` / `assert_uint_not_in_range()`
  - `assert_int_in_set()` / `assert_int_not_in_set()`
  - `assert_uint_in_set()` / `assert_uint_not_in_set()`

- Type-safe mocking macros for different types:
  - `will_return_int()`, `will_return_uint()`,
    `will_return_float()`, `will_return_double()`,
    `will_return_ptr()`
  - `will_return_*_count()`, `will_return_*_always()`,
    `will_return_*_maybe()` variants
  - `will_set_parameter_int()`, `will_set_parameter_uint()`,
    `will_set_parameter_float()`, `will_set_parameter_double()`,
    `will_set_parameter_ptr()`
  - `will_set_parameter_*_count()`,
    `will_set_parameter_*_always()`,
    `will_set_parameter_*_maybe()` variants
  - `mock_int()`, `mock_uint()`, `mock_float()`, `mock_double()`,
    `mock_ptr()`

- Type-safe expect macros:
  - `expect_int_value()` / `expect_uint_value()`
  - `expect_int_not_value()` / `expect_uint_not_value()`
  - `expect_int_in_range()` / `expect_uint_in_range()`
  - `expect_int_not_in_range()` / `expect_uint_not_in_range()`
  - `expect_int_in_set()` / `expect_uint_in_set()`
  - `expect_int_not_in_set()` / `expect_uint_not_in_set()`
  - `expect_check_int()` / `expect_check_uint()`

#### Float and Double Support
- Floating-point assertion macros:
  - `assert_float_equal()` / `assert_float_not_equal()`
  - `assert_double_equal()` / `assert_double_not_equal()` with
    epsilon parameter
  - `assert_float_in_range()` / `assert_float_not_in_range()`
  - `assert_float_in_set()` / `assert_float_not_in_set()`

- Floating-point expect macros:
  - `expect_float()` / `expect_not_float()`
  - `expect_double()` / `expect_not_double()`
  - `expect_float_in_range()` / `expect_float_not_in_range()`
  - `expect_float_in_set()` / `expect_float_not_in_set()`

- `mock_double()` / `mock_parameter_double()` for mocking double
  values

#### Assertion Enhancements
- Pointer assertion macros with custom error messages:
  - `assert_ptr_equal_msg()` / `assert_ptr_not_equal_msg()`
  - `assert_null_msg()` / `assert_non_null_msg()`

- `assert_true()` and `assert_false()` now provide more verbose
  error messages

- Memory comparison improvements with better error display

#### Testing Features
- `has_mock()`: Check if a mock value is available before calling
  `mock()`
- `stop()`: New feature to stop test execution while allowing
  remaining tests to run
- `expect_check_data()`: New API for parameter validation with
  custom data (replaces deprecated `expect_check()`)
- `expect_check_data_any()`: Variant for checking pointer/struct
  parameters
- Errno mocking convenience macros: `will_set_errno()`,
  `will_set_errno_always()`

#### Output Customization
- Multiple simultaneous output formats support (can combine
  STANDARD, SUBUNIT, TAP, XML)
- Output function override capability via `cmocka_set_callbacks()`
- `cmocka_print_error()`: Public API for printing errors using
  configured output format

#### Documentation and Examples
- Improved API documentation with better examples
- Added `expect_check_data()` examples
- Added errno mocking examples
- Added parameter setting examples
- Better mock object examples

#### Build System and Compatibility
- CMake minimum required version bumped to 3.13
- CMake namespace support (`cmocka::cmocka`, `cmocka::static`)
- Meson build system support
- `extern "C"` wrapper for C++ compatibility
- Version header (`cmocka_version.h`)

### Changed

#### API Improvements
- Changed internal value handling to use `CMockaValueData` union
  for better type safety
- `_mock()` now returns `CMockaValueData` instead of raw values
- Improved error messages throughout the library
- Error messages now print to stdout instead of stderr
- Better display of memory comparison errors
- Enhanced string replacement implementation

#### Code Quality
- Use `bool` instead of `int` for boolean values throughout
- Use `stdint.h` types (`intmax_t`, `uintmax_t`) instead of
  custom types
- Reduced call stack consumption in printf functions
- Added compiler attributes to non-returning functions
- Use `__builtin_align_down` when available
- Better alignment handling (MALLOC_ALIGNMENT set to 16)

#### Build Configuration
- Require C99 standard
- C extensions enabled by default
- Windows DLL export improvements with `CMOCKA_DLLEXTERN`
- `WINDOWS_EXPORT_ALL_SYMBOLS` support
- Address sanitizer support for MSVC
- Stack protector flags always passed to linker

#### Documentation Improvements
- Enhanced API documentation with better organization
- Cleaned up internal functions from public documentation
- Better grouping of macros and functions
- Improved page layout and styling
- Updated README with more details

#### Examples
- Modernized and rebuilt calculator example
- Added new assert_macro examples demonstrating common assertions
- Removed deprecated allocate module example (use AddressSanitizer instead)

### Deprecated

- `expect_check()`: Use `expect_check_data()` instead
- `check_expected()`: Use `check_expected_int()` or
  `check_expected_uint()` instead
- `assert_in_range()`: Use `assert_int_in_range()` or
  `assert_uint_in_range()` instead
- `assert_not_in_range()`: Use `assert_int_not_in_range()` or
  `assert_uint_not_in_range()` instead
- `assert_in_set()`: Use `assert_int_in_set()` or
  `assert_uint_in_set()` instead
- `expect_in_range()`: Use `expect_int_in_range()` or
  `expect_uint_in_range()` instead
- `expect_not_in_range()`: Use `expect_int_not_in_range()` or
  `expect_uint_not_in_range()` instead
- `expect_value()`: Use `expect_int_value()` or
  `expect_uint_value()` instead
- `expect_not_value()`: Use `expect_int_not_value()` or
  `expect_uint_not_value()` instead
- `will_return()`: Use type-specific variants
  (`will_return_int()`, etc.) instead
- `will_return_count()`: Use type-specific variants instead
- `will_return_always()`: Use type-specific variants instead
- `will_set_parameter()`: Use type-specific variants instead
- Old MSVC support (pre-2008) dropped
- Cmockery legacy support removed

### Fixed

- Fixed missing `cmocka_version.h` in documentation
- Fixed TAP output for skipped tests
- Fixed floating-point comparison for `INFINITY` and `NAN`
- Fixed `expect_not_float()` implementation
- Fixed `mock_float()` implementation
- Fixed `assert_double_not_equal()` float handling
- Fixed `expect_function_calls()` for counts of 0
- Fixed NULL pointer dereference in `_function_called()`
- Fixed pointer assertions with function pointers
- Fixed segmentation fault handling in tests
- Fixed setjmp in `expect_assert_failure` macro
- Fixed unexpanded `%s` in leftover values error messages
- Fixed XML output duration formatting
- Fixed XML string sanitization (escape slashes and special
  characters)
- Fixed Windows x64 builds
- Fixed Windows UWP build errors (C4703)
- Fixed MinGW pkgconfig path relocation
- Fixed test calloc overflow checking
- Fixed symbol map freeing to avoid undefined behavior
- Fixed memory equal display implementation
- Fixed comparison between pointer and integer issues
- Fixed possible data loss on MSVC
- Fixed conversion warnings from `time_t` to `double`

### Infrastructure

- Added GitLab CI pipeline with multiple platforms:
  - Linux (Ubuntu, Fedora, Debian)
  - Windows (MinGW, MSVC)
  - FreeBSD
  - Code coverage analysis
  - Static analysis (Coverity, cppcheck)
  - Address and UB sanitizers
- Added SBOM template in CycloneDX format
- Added clang-format configuration
- Added .editorconfig
- Added CONTRIBUTING.md
- Added Coverity modeling files


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/cmocka/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/cmocka/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/cmocka/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/cmocka/patches/patch-CompilerChecks.cmake \
    pkgsrc/devel/cmocka/patches/patch-include_cmocka.h

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

Modified files:

Index: pkgsrc/devel/cmocka/Makefile
diff -u pkgsrc/devel/cmocka/Makefile:1.14 pkgsrc/devel/cmocka/Makefile:1.15
--- pkgsrc/devel/cmocka/Makefile:1.14   Wed Jul 23 08:09:09 2025
+++ pkgsrc/devel/cmocka/Makefile        Thu Jun 11 07:20:58 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2025/07/23 08:09:09 pin Exp $
+# $NetBSD: Makefile,v 1.15 2026/06/11 07:20:58 wiz Exp $
 
-DISTNAME=      cmocka-1.1.8
+DISTNAME=      cmocka-2.0.2
 CATEGORIES=    devel
 MASTER_SITES=  https://cmocka.org/files/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -10,9 +10,5 @@ HOMEPAGE=     https://cmocka.org/
 COMMENT=       Unit testing framework for C supporting mock objects
 LICENSE=       apache-2.0
 
-# GCC 4.3/4.4 provides wrong warnings:
-# cmocka.c:3281: error: 'setup_name' may be used uninitialized in this function
-CMAKE_CONFIGURE_ARGS+= -DWITH_WERROR_UNINITIALIZED_FLAG=0
-
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/cmocka/PLIST
diff -u pkgsrc/devel/cmocka/PLIST:1.6 pkgsrc/devel/cmocka/PLIST:1.7
--- pkgsrc/devel/cmocka/PLIST:1.6       Wed Jul 23 08:09:09 2025
+++ pkgsrc/devel/cmocka/PLIST   Thu Jun 11 07:20:58 2026
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2025/07/23 08:09:09 pin Exp $
+@comment $NetBSD: PLIST,v 1.7 2026/06/11 07:20:58 wiz Exp $
 include/cmocka.h
 include/cmocka_pbc.h
+include/cmocka_version.h
 lib/cmake/cmocka/cmocka-config-version.cmake
 lib/cmake/cmocka/cmocka-config.cmake
 lib/cmake/cmocka/cmocka-targets-noconfig.cmake
 lib/cmake/cmocka/cmocka-targets.cmake
 lib/libcmocka.so
 lib/libcmocka.so.0
-lib/libcmocka.so.0.8.1
+lib/libcmocka.so.1.0.2
 lib/pkgconfig/cmocka.pc

Index: pkgsrc/devel/cmocka/distinfo
diff -u pkgsrc/devel/cmocka/distinfo:1.13 pkgsrc/devel/cmocka/distinfo:1.14
--- pkgsrc/devel/cmocka/distinfo:1.13   Wed Jul 23 08:09:09 2025
+++ pkgsrc/devel/cmocka/distinfo        Thu Jun 11 07:20:58 2026
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.13 2025/07/23 08:09:09 pin Exp $
+$NetBSD: distinfo,v 1.14 2026/06/11 07:20:58 wiz Exp $
 
-BLAKE2s (cmocka-1.1.8.tar.xz) = 1d6c29c4031008e8e44cb9838ff1ea20498f3b67ac22c36c631cf906adbd667c
-SHA512 (cmocka-1.1.8.tar.xz) = 59c3d8732c5558abf4dd9aedac2d5e41cf7693c26a88932449c3dec7be7903c479515f15b4ab8876e4b03f3b4b68460ef34bc6ce079677262638c15e29da37ef
-Size (cmocka-1.1.8.tar.xz) = 77872 bytes
-SHA1 (patch-CompilerChecks.cmake) = cca13b204281b4e36f011178ccfd9a38b8897918
-SHA1 (patch-include_cmocka.h) = 262f1a4a82e518021e1bcdb22c7fa24792099788
+BLAKE2s (cmocka-2.0.2.tar.xz) = 8e8d3539ead9c0debd8091421589b33e6a731178026cc46eb5f282a762f18638
+SHA512 (cmocka-2.0.2.tar.xz) = d02d65f0881f18f30b9e46c325acfa349261339daa2c1bf3a4e6360976f13b31588e997415197220f6def156f77d9864994d4e3cfd09c8f16a8594d0a4789a16
+Size (cmocka-2.0.2.tar.xz) = 121144 bytes

Prev by Date: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index