Created attachment 247237 [details] See Comment I am currently preparing the machine which hosts the CTM files in order to deal with src-13, src-14 and ports using gitup. This PR adds 5 patch files to misc/ctm: 1. patch-r01_fix_warnings_in_mkCTM_mkctm.c As the name says, this fixes warnings when building mkctm. 2. patch-r02-fix_logf_name_clash_in_mkCTM_mkctm.c (*) This patch fixes the build for mkctm by avoiding using logf as variable name. 3. patch-r03-add_symlink_handling_to_mkCTM_mkctm.c This adds handling of symlinks to the CTM generator. 4. patch-r04-add_symlink_handling_to_ctm This adds handling of symlinks to ctm itself. Without that, the src-1[34] deltas won't apply. 5. patch-r05-add_ownermail_to_ctm__smail_ctm__smail.c (*) This adds an option to ctm_smail which is needed on the ctm generator machine. Patches marked with (*) were not created by me but probably by sms and are already in use on the the generator machine. They just have not been integrated into the port yet...
Created attachment 247330 [details] misc_ctm_r01.diff
Please DO NOT USE the initially uploaded patch. Another bug in ctm had to be fixed first (it couldn't cope with e.g. a file being replaced by a dir). This made the new code for handling symlinks simpler so I decided to create a new set of patch files. So please use misc_ctm_r01.diff.
Created attachment 262962 [details] misc_ctm_r02.diff This is a new version of the patch which fixes ctm (and mkctm) when a filename contains spaces. This is needed for src-cur.15927.gz because with crypto/krb5/src/tests/fuzzing/fuzz_asn_seed_corpus/encode_pa_enc_ts (no usec)_45.bin such a file was introduced.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a896ee9704c42d897d7446cf1494cbb763c83bd commit 2a896ee9704c42d897d7446cf1494cbb763c83bd Author: Torsten Zuehlsdorff <tz@FreeBSD.org> AuthorDate: 2026-03-24 22:05:39 +0000 Commit: Torsten Zuehlsdorff <tz@FreeBSD.org> CommitDate: 2026-03-25 14:43:04 +0000 misc/ctm: fix build warnings, add symlink and filename encoding support Fix compiler warnings in mkctm.c, resolve logf name clash, fix change counting, and add symlink handling needed for src-13/14 deltas. Also add filename encoding for paths with special characters and ownermail support for ctm_smail. PR: 275921 Approved by: se@FreeBSD.org (maintainer timeout) misc/ctm/Makefile | 2 +- .../patch-r01-fix_warnings_in_mkCTM_mkctm.c (new) | 20 ++ ...-r02-fix_logf_name_clash_in_mkCTM_mkctm.c (new) | 120 +++++++++ ...ix_recreating_failure_in_ctm_ctm__pass2.c (new) | 35 +++ ..._ignoring_to_few_changes_in_mkCTM_mkctm.c (new) | 38 +++ ...r10-add_symlink_handling_to_mkCTM_mkctm.c (new) | 94 +++++++ .../patch-r11-add_symlink_handling_to_ctm (new) | 286 +++++++++++++++++++++ ...h-r15-add_filenameencode_to_mkCTM_mkctm.c (new) | 130 ++++++++++ .../patch-r16-add_filenameencode_to_ctm (new) | 107 ++++++++ ...-add_ownermail_to_ctm__smail_ctm__smail.c (new) | 156 +++++++++++ 10 files changed, 987 insertions(+), 1 deletion(-)