- Update from version 2.15.0 to 2.16.0 - Update of rootfile - Changelog 2.16.0 Publish docs to GitLab pages doc: default index for fontconfig-devel to index.html Update URLs for docs doc: Fix a typo of the summary for FcFontSetSort Clean up .uuid files with fc-cache -f too Fix undesired unref of FcConfig on Win32 meson.build: Fix a typo in POT names meson.build: Add missing --msgid-bugs-address Sort out bitmap related config files Add test cases for 70-no-bitmap-and-emoji.conf and 70-no-bitmap-except-emoji.conf meson: Add missing checkup Add a missing dependency for CI on FreeBSD meson: try to figure out libintl dependency ci: Fix a typo in build script ci: Add config.log for artifacts ci: Add missing dependencies ci: Disable cache update meson: Fix build fail with NLS enabled on BSD meson: Add libxml2 support ci: Add libxml2 build for meson meson: Workaround an exception ci: Workaround an error with libxml2 on Android meson: Add iconv checkup for all platforms Fix incompatible pointer type on MinGW meson: Use c_shared_args to take care of --default-library=both on Win32 ci: Fix a typo ci: disable iconv for MSVC ci: build with expat on MSVC doc: Use sans-serif instead of sans Do not add merge commits into NEWS file doc: Fix a typo meson: Enable run-test.sh for non-Win32 test/wrapper-script.sh: don't add a path when executable already has a path name. meson: Add missing the unit testing with json-c test-conf: Fix compiler warnings Fix test case for reproducible builds ci: Use md5 if md5sum isn't available. ci: normalize path to avoid miscalculation of cache name ci: Add Fedora 40 and remove Fedora 38 More information when no writable cache directories Fix a memory leak in _get_real_paths_from_prefix Set FcTypeVoid if no valid types to convert Add FcConfigSetFontSetFilter Improve hinting detection for fonthashint object Accept integer for pixelsize Fix a memory leak in fc-list/fc-query/fc-scan Add got.orth for Gothic language Add cop.orth for Coptic language Add foreign automake option to avoid an error on autotools bootstrap ci: rebase ci-templates ci: Add Fedora 41 and drop 39 ci: run check-merge-request on merge request pipelines only ci: Add FreeBSD 14.1 and drop 13.2 ci: build mingw on f40 only meson: Add install_tag for install targets meson: Add docs into dist meson: Add autotools files into dist doc: generate fontconfig-devel.html as one big file ci: Fix a fail on pages deployment ci: Fix pages deployment again fc-case: Correct the license header of fccase.h Use proper postscriptname for named instance if any Replace hardcoded path in man pages to url link Allow comma as a delimiter in postscriptname and ignore it on matching Deal with glob string properly Another fix of glob string for Win32 ci: Enable meson dist Fix misleading-indentation warning Bump the libtool version Do not prefix cache_base with a "/". Doing so will lead to FcStrBuildFilename() composing paths that contain double slashes, e.g. in FcDirCacheProcess(). If FcDirCacheBasenameMD5() returns a cache_base that is prefixed with a "/", the call to FcStrBuildFilename() in FcDirCacheProcess() will compose a path that contains double slashes and this double-slashed path will then be passed to FcDirCacheOpenFile(). This won't cause any harm on Linux because Linux just ignores multiple slashes in paths but on other operating systems multiple slashes in paths are not allowed so FcDirCacheOpenFile() will fail on those platforms because of the double slash in the path. Fix qsort nullpointer issue Fix FcSerialize null pointer usage meson: fix config relocation on Windows Fix invalid escape character \s Remove redundant leaf assignment in fcfreetype.c Move Mac OS image to an up-to-date Mac OS 15 Sequoia image on ARM Update Windows image to gstreamer image from stable Allow building Rust targets in CI [Fontations] Build bindgen targets, basic Rust test Refactor exclusive language logic into separate file meson: added default font dirs for android Unlock on allocation failure in FcCacheInsert Ensure config is locked during retry in FcConfigReference Fix wording in README.md build: detect-and-use `-lm` for `fabs` in fcmatch fontconfig: mark _FcPatternIter as may_alias Meson: Fix build with clang-cl by using cc.preprocess() meson: Add missing dep on generated header

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/fontconfig | 4 +++- lfs/fontconfig | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig index 50d503ed8..713fda601 100644 --- a/config/rootfiles/common/fontconfig +++ b/config/rootfiles/common/fontconfig @@ -39,7 +39,7 @@ usr/bin/fc-validate #usr/lib/libfontconfig.la #usr/lib/libfontconfig.so usr/lib/libfontconfig.so.1 -usr/lib/libfontconfig.so.1.12.1 +usr/lib/libfontconfig.so.1.15.0 #usr/lib/pkgconfig/fontconfig.pc #usr/share/fontconfig #usr/share/fontconfig/conf.avail @@ -80,6 +80,8 @@ usr/lib/libfontconfig.so.1.12.1 #usr/share/fontconfig/conf.avail/65-khmer.conf #usr/share/fontconfig/conf.avail/65-nonlatin.conf #usr/share/fontconfig/conf.avail/69-unifont.conf +#usr/share/fontconfig/conf.avail/70-no-bitmaps-and-emoji.conf +#usr/share/fontconfig/conf.avail/70-no-bitmaps-except-emoji.conf #usr/share/fontconfig/conf.avail/70-no-bitmaps.conf #usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf #usr/share/fontconfig/conf.avail/80-delicious.conf diff --git a/lfs/fontconfig b/lfs/fontconfig index 318d643b0..6b7af145a 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 2.15.0 +VER = 2.16.0 SUMMARY = Library for configuring and customizing font access

THISAPP = fontconfig-$(VER) @@ -41,7 +41,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 +$(DL_FILE)_BLAKE2 = 48d6fcbfe83f0a4c026a4f90d864a4195805e04cc6dd486bd18d68caa8b55fd51fc37822781298152d363b70dc103c9f8b216f6dc0193b2b192eb35565482ec4

install : $(TARGET)

- Update from version 2.46.0 to 2.48.1 - Update of rootfile - Changelog 2.48.1 This release merges up the fix that appears in v2.40.4, v2.41.3, v2.42.4, v2.43.6, v2.44.3, v2.45.3, v2.46.3, and v2.47.2 to address the security issues CVE-2024-50349 and CVE-2024-52006; see the release notes for these versions for details. 2.48.0 UI, Workflows & Features * A new configuration variable remote.<name>.serverOption makes the transport layer act as if the --serverOption=<value> option is given from the command line. * "git rebase --rebase-merges" now uses branch names as labels when able. * Describe the policy to introduce breaking changes. * Teach 'git notes add' and 'git notes append' a new '-e' flag, instructing them to open the note in $GIT_EDITOR before saving. * Documentation for "git bundle" saw improvements to more prominently call out the use of '--all' when creating bundles. * Drop support for older libcURL and Perl. * End-user experience of "git mergetool" when the command errors out has been improved. * "git bundle --unbundle" and "git clone" running on a bundle file both learned to trigger fsck over the new objects with configurable fck check levels. * When "git fetch $remote" notices that refs/remotes/$remote/HEAD is missing and discovers what branch the other side points with its HEAD, refs/remotes/$remote/HEAD is updated to point to it. * "git fetch" honors "remote.<remote>.followRemoteHEAD" settings to tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD". * "git range-diff" learned to optionally show and compare merge commits in the ranges being compared, with the --diff-merges option. Performance, Internal Implementation, Development Support etc. * Document "amlog" notes. * The way AsciiDoc is used for SYNOPSIS part of the manual pages has been revamped. The sources, at least for the simple cases, got vastly more pleasant to work with. * The reftable library is now prepared to expect that the memory allocation function given to it may fail to allocate and to deal with such an error. * An extra worktree attached to a repository points at each other to allow finding the repository from the worktree (and vice versa) possible. Use relative paths for this linkage. * Enable Windows-based CI in GitLab. * Commands that can also work outside Git have learned to take the repository instance "repo" when we know we are in a repository, and NULL when we are not, in a parameter. The uses of the_repository variable in a few of them have been removed using the new calling convention. * The reftable sub-system grew a new reftable-specific strbuf replacement to reduce its dependency on Git-specific data structures. * The ref-filter machinery learns to recognize and avoid cases where sorting would be redundant. * Various platform compatibility fixes split out of the larger effort to use Meson as the primary build tool. * Treat ECONNABORTED the same as ECONNRESET in 'git credential-cache' to work around a possible Cygwin regression. This resolves a race condition caused by changes in Cygwin's handling of socket closures, allowing the client to exit cleanly when encountering ECONNABORTED. * Demonstrate an assertion failure in 'git mv'. * Documentation update to clarify that 'uploadpack.allowAnySHA1InWant' implies both 'allowTipSHA1InWant' and 'allowReachableSHA1InWant'. * Replace various calls to atoi() with strtol_i() and strtoul_ui(), and add improved error handling. * Documentation updates to 'git-update-ref(1)'. * Update the project's CodingGuidelines to discourage naming functions with a "_1()" suffix. * Update '.clang-format' to match project conventions. * Centralize documentation for repository extensions into a single place. * Buildfix and upgrade of Clar to a newer version. * Documentation mark-up updates. * Renaming a handful of variables and structure fields. * Fix for clar unit tests to support CMake build. * C23 compatibility updates. * GCC 15 compatibility updates. * We now ensure "index-pack" is used with the "--promisor" option only during a "git fetch". * The migration procedure between two ref backends has been optimized. * "git fsck" learned to issue warnings on "curiously formatted" ref contents that have always been treated as valid but that Git wouldn't have written itself (e.g., missing terminating end-of-line after the full object name). * Work around Coverity warning that would not trigger in practice. * Built-in Git subcommands are supplied the repository object to work with; they learned to do the same when they invoke sub-subcommands. * Drop support for ancient environments in various CI jobs. * Isolate the reftable subsystem from the rest of Git's codebase by using fewer pieces of Git's infrastructure. * Optimize reading random references out of the reftable backend by allowing reuse of iterator objects. * Backport oss-fuzz tests to our codebase. * Introduce a new repository extension to prevent older Git versions from mis-interpreting worktrees created with relative paths. * Yet another "pass the repository through the callchain" topic. * "git describe" learned to stop digging the history needlessly deeper. * Build procedure update plus introduction of Meson based builds. * Recent reftable updates mistook a NULL return from a request for 0-byte allocation as OOM and died unnecessarily, which has been corrected. * Reftable backend adds check for upper limit of log's update_index. * Start working to make the codebase buildable with -Wsign-compare. * Regression fix for 'show-index' when run outside of a repository. * The meson-build procedure is integrated into CI to catch and prevent bitrotting. * "git refs migrate" learned to also migrate the reflog data across backends. * The developer documentation has been updated to give the latest info on gitk and git-gui maintainer. * CI jobs that run threaded programs under LSan has been giving false positives from time to time, which has been worked around. * Doc update to clarify how periodical maintenance are scheduled, spread across time to avoid thundering herds. * Use after free and double freeing at the end in "git log -L... -p" had been identified and fixed. * On macOS, fsmonitor can fall into a race condition that results in a client waiting forever to be notified about an event that has already happened. This problem has been corrected. * "git maintenance start" crashed due to an uninitialized variable reference, which has been corrected. * Fail gracefully instead of crashing when attempting to write the contents of a corrupt in-core index as a tree object. * A "git fetch" from the superproject going down to a submodule used a wrong remote when the default remote names are set differently between them. * Fixes compile time warnings with 64-bit MSVC. * Teaches 'shortlog' to explicitly use SHA-1 when operating outside of a repository. * Fix 'git grep' regression on macOS by disabling lookahead when encountering invalid UTF-8 byte sequences. * The dumb-http code regressed when the result of re-indexing a pack yielded an *.idx file that differs in content from the *.idx file it downloaded from the remote. This has been corrected by no longer relying on the *.idx file we got from the remote. * When called with '--left-right' and '--use-bitmap-index', 'rev-list' will produce output without any left/right markers, which has been corrected. * More leakfixes. * Test modernization. * The "--shallow-exclude=<ref>" option to various history transfer commands takes a ref, not an arbitrary revision. * A regression where commit objects missing from a commit-graph can cause an infinite loop when doing a fetch in a partial clone has been fixed. * The MinGW compatibility layer has been taught to support POSIX semantics for atomic renames when other process(es) have a file opened at the destination path. * "git gc" discards any objects that are outside promisor packs that are referred to by an object in a promisor pack, and we do not refetch them from the promisor at runtime, resulting an unusable repository. Work around it by including these objects in the referring promisor pack at the receiving end of the fetch. * Avoid build/test breakage on a system without working malloc debug support dynamic library. (merge 72ad6dc368 jk/test-malloc-debug-check later to maint). * Double-free fix. (merge fe17a25905 jk/fetch-prefetch-double-free-fix later to maint). * Use of some uninitialized variables in "git difftool" has been corrected. * Object reuse code based on multi-pack-index sent an unwanted copy of object. (merge e199290592 tb/multi-pack-reuse-dupfix later to maint). * "git fast-import" can be tricked into a replace ref that maps an object to itself, which is a useless thing to do. (merge 5e904f1a4a en/fast-import-avoid-self-replace later to maint). * The ref-transaction hook triggered for reflog updates, which has been corrected. (merge b886db48c6 kn/ref-transaction-hook-with-reflog later to maint). * Give a bit of advice/hint message when "git maintenance" stops finding a lock file left by another instance that still is potentially running. (merge ba874d1dac ps/gc-stale-lock-warning later to maint). * Use the right helper program to measure file size in performance tests. (merge 3f97f1bce6 tb/use-test-file-size-more later to maint). * A double-free that may not trigger in practice by luck has been corrected in the reference resolution code. (merge b6318cf23a sj/refs-symref-referent-fix later to maint). * The sequencer failed to honor core.commentString in some places. * Describe a case where an option value needs to be spelled as a separate argument, i.e. "--opt val", not "--opt=val". (merge 1bc1e94091 jc/doc-opt-tilde-expand later to maint). * Loosen overly strict ownership check introduced in the recent past, to keep the promise "cloning a suspicious repository is a safe first step to inspect it". (merge 0ffb5a6bf1 bc/allow-upload-pack-from-other-people later to maint). * "git fast-import" learned to reject paths with ".." and "." as their components to avoid creating invalid tree objects. (merge 8cb4c6e62f en/fast-import-verify-path later to maint). * The --ancestry-path option is designed to be given a commit that is on the path, which was not documented, which has been corrected. (merge bc1a980759 kk/doc-ancestry-path later to maint). * "git tag" has been taught to refuse to create refs/tags/HEAD since such a tag will be confusing in the context of the UI provided by the Git Porcelain commands. (merge bbd445d5ef jc/forbid-head-as-tagname later to maint). * The advice messages now tell the newer 'git config set' command to set the advice.token configuration variable to squelch a message. (merge 6c397d0104 bf/explicit-config-set-in-advice-messages later to maint). * The syntax ":/<text>" to name the latest commit with the matching text was broken with a recent change, which has been corrected. (merge 0ff919e87a ps/commit-with-message-syntax-fix later to maint). * Fix performance regression of a recent "fatten promisor pack with local objects" protection against an unwanted gc. * "git log -p --remerge-diff --reverse" was completely broken. (merge f94bfa1516 js/log-remerge-keep-ancestry later to maint). * "git bundle create" with an annotated tag on the positive end of the revision range had a workaround code for older limitation in the revision walker, which has become unnecessary. (merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint). * GitLab CI updates. (merge c6b43f663e ps/ci-gitlab-update later to maint). * Code to reuse objects based on bitmap contents have been tightened to avoid race condition even when multiple packs are involved. (merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint). * An earlier "csum-file checksum does not have to be computed with sha1dc" topic had a few code paths that had initialized an implementation of a hash function to be used by an unmatching hash by mistake, which have been corrected. (merge 599a63409b ps/weak-sha1-for-tail-sum-fix later to maint). * Other code cleanup, docfix, build fix, etc. (merge 77af53f56f aa/t7300-modernize later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). (merge 68e3c69efa kh/trailer-in-glossary later to maint). (merge 91f88f76e6 tb/boundary-traversal-fix later to maint). (merge 168ebb7159 jc/doc-error-message-guidelines later to maint). (merge 18693d7d65 kh/doc-bundle-typofix later to maint). (merge e2f5d3b491 kh/doc-update-ref-grammofix later to maint). (merge 8525e92886 mh/doc-windows-home-env later to maint). 2.47.2 This release merges up the fix that appears in v2.40.4, v2.41.3, v2.42.4, v2.43.6, v2.44.3, v2.45.3 and v2.46.3 to address the security issues CVE-2024-50349 and CVE-2024-52006; see the release notes for these versions for details. 2.47.1 This is to flush accumulated fixes since 2.47.0 on the 'master' front down to the maintenance track. Fixes since Git 2.47 * Use after free and double freeing at the end in "git log -L... -p" had been identified and fixed. * On macOS, fsmonitor can fall into a race condition that results in a client waiting forever to be notified for an event that have already happened. This problem has been corrected. * "git maintenance start" crashed due to an uninitialized variable reference, which has been corrected. * Fail gracefully instead of crashing when attempting to write the contents of a corrupt in-core index as a tree object. * A "git fetch" from the superproject going down to a submodule used a wrong remote when the default remote names are set differently between them. * The "gitk" project tree has been synchronized again with its new maintainer, Johannes Sixt. Also contains minor documentation updates and code clean-ups. 2.47.0 UI, Workflows & Features * Many Porcelain commands that internally use the merge machinery were taught to consistently honor the diff.algorithm configuration. * A few descriptions in "git show-ref -h" have been clarified. * A 'P' command to "git add -p" that passes the patch hunk to the pager has been added. * "git grep -W" omits blank lines that follow the found function at the end of the file, just like it omits blank lines before the next function. * The value of http.proxy can have "path" at the end for a socks proxy that listens to a unix-domain socket, but we started to discard it when we taught proxy auth code path to use the credential helpers, which has been corrected. * The code paths to compact multiple reftable files have been updated to correctly deal with multiple compaction triggering at the same time. * Support to specify ref backend for submodules has been enhanced. * "git svn" has been taught about svn:global-ignores property recent versions of Subversion has. * The default object hash and ref backend format used to be settable only with explicit command line option to "git init" and environment variables, but now they can be configured in the user's global and system wide configuration. * "git send-email" learned "--translate-aliases" option that reads addresses from the standard input and emits the result of applying aliases on them to the standard output. * 'git for-each-ref' learned a new "--format" atom to find the branch that the history leading to a given commit "%(is-base:<commit>)" is likely based on. * The command line prompt support used to be littered with bash-isms, which has been corrected to work with more shells. * Support for the RUNTIME_PREFIX feature has been added to z/OS port. * "git send-email" learned "--mailmap" option to allow rewriting the recipient addresses. * "git mergetool" learned to use VSCode as a merge backend. * "git pack-redundant" has been marked for removal in Git 3.0. * One-line messages to "die" and other helper functions will get LF added by these helper functions, but many existing messages had an unnecessary LF at the end, which have been corrected. * The "scalar clone" command learned the "--no-tags" option. * The environment GIT_ADVICE has been intentionally kept undocumented to discourage its use by interactive users. Add documentation to help tool writers. * "git apply --3way" learned to take "--ours" and other options. Performance, Internal Implementation, Development Support etc. * A build tweak knob has been simplified by not setting the value that is already the default; another unused one has been removed. * A CI job that use clang-format to check coding style issues in new code has been added. * The reviewing guidelines document now explicitly encourages people to give positive reviews and how. * Test script linter has been updated to catch an attempt to use one-shot export construct "VAR=VAL func" for shell functions (which does not work for some shells) better. * Some project conventions have been added to CodingGuidelines. * In the refs subsystem, implicit reliance of the_repository has been eliminated; the repository associated with the ref store object is used instead. * Various tests in reftable library have been rewritten using the unit test framework. * A test that fails on an unusually slow machine was found, and made less likely to cause trouble by lengthening the expiry value it uses. * An existing test of hashmap API has been rewritten with the unit-test framework. * A policy document that describes platform support levels and expectation on platform stakeholders has been introduced. * The refs API has been taught to give symref target information to the users of ref iterators, allowing for-each-ref and friends to avoid an extra ref_resolve_* API call per a symbolic ref. * Unit-test framework has learned a simple control structure to allow embedding test statements in-line instead of having to create a new function to contain them. * Incremental updates of multi-pack index files is getting worked on. * Use of API functions that implicitly depend on the_repository object in the config subsystem has been rewritten to pass a repository object through the callchain. * Unused parameters have been either marked as UNUSED to squelch -Wunused warnings or dropped from many functions.. * The code in the reftable library has been cleaned up by discarding unused "generic" interface. * The underlying machinery for "git diff-index" has long been made to expand the sparse index as needed, but the command fully expanded the sparse index upfront, which now has been taught not to do. * More trace2 events at key points on push and fetch code paths have been added. * Make our codebase compilable with the -Werror=unused-parameter option. * "git cat-file" works well with the sparse-index, and gets marked as such. * CI started failing completely for linux32 jobs, as the step to upload failed test directory uses GitHub actions that is deprecated and is now disabled. * Import clar unit tests framework libgit2 folks invented for our use. * The error messages from the test script checker have been improved. * The convention to calling into built-in command implementation has been updated to pass the repository, if known, together with the prefix value. * "git apply" had custom buffer management code that predated before use of strbuf got widespread, which has been updated to use strbuf, which also plugged some memory leaks. * The reftable backend learned to more efficiently handle exclude patterns while enumerating the refs. * CI updates. FreeBSD image has been updated to 13.4. (merge 2eeb29702e cb/ci-freebsd-13-4 later to maint). * Give timeout to the locking code to write to reftable, instead of failing on the first failure without retrying. * The checksum at the tail of files are now computed without collision detection protection. This is safe as the consumer of the information to protect itself from replay attacks checks for hash collisions independently. 2.46.3 This release merges up the fix that appears in v2.40.4, v2.41.3, v2.42.4, v2.43.6, v2.44.3 and v2.45.3 to address the security issues CVE-2024-50349 and CVE-2024-52006; see the release notes for these versions for details. 2.46.2 This release is primarily to merge changes to unbreak the 32-bit GitHub actions jobs we use for CI testing, so that we can release real fixes for the 2.46.x track after they pass CI. It also reverts the "git patch-id" change that went into 2.46.1, as it seems to have got a regression reported (I haven't verified, but it is better to keep a known breakage than adding an unintended regression). Other than that, a handful of minor bugfixes are included. * In a few corner cases "git diff --exit-code" failed to report "changes" (e.g., renamed without any content change), which has been corrected. * Cygwin does have /dev/tty support that is needed by things like single-key input mode. * The interpret-trailers command failed to recognise the end of the message when the commit log ends in an incomplete line. 2.46.1 This release is primarily to merge fixes accumulated on the 'master' front to prepare for 2.47 release that are still relevant to 2.46.x maintenance track. * "git checkout --ours" (no other arguments) complained that the option is incompatible with branch switching, which is technically correct, but found confusing by some users. It now says that the user needs to give pathspec to specify what paths to checkout. * It has been documented that we avoid "VAR=VAL shell_func" and why. * "git add -p" by users with diff.suppressBlankEmpty set to true failed to parse the patch that represents an unmodified empty line with an empty line (not a line with a single space on it), which has been corrected. * "git rebase --help" referred to "offset" (the difference between the location a change was taken from and the change gets replaced) incorrectly and called it "fuzz", which has been corrected. * "git notes add -m '' --allow-empty" and friends that take prepared data to create notes should not invoke an editor, but it started doing so since Git 2.42, which has been corrected. * An expensive operation to prepare tracing was done in re-encoding code path even when the tracing was not requested, which has been corrected. * Perforce tests have been updated. * The credential helper to talk to OSX keychain sometimes sent garbage bytes after the username, which has been corrected. * A recent update broke "git ls-remote" used outside a repository, which has been corrected. * "git config --value=foo --fixed-value section.key newvalue" barfed when the existing value in the configuration file used the valueless true syntax, which has been corrected. * "git reflog expire" failed to honor annotated tags when computing reachable commits. * A flakey test and incorrect calls to strtoX() functions have been fixed. * Follow-up on 2.45.1 regression fix. * "git rev-list ... | git diff-tree -p --remerge-diff --stdin" should behave more or less like "git log -p --remerge-diff" but instead it crashed, forgetting to prepare a temporary object store needed. * The patch parser in "git patch-id" has been tightened to avoid getting confused by lines that look like a patch header in the log message. * "git bundle unbundle" outside a repository triggered a BUG() unnecessarily, which has been corrected. * The code forgot to discard unnecessary in-core commit buffer data for commits that "git log --skip=<number>" traversed but omitted from the output, which has been corrected. * "git verify-pack" and "git index-pack" started dying outside a repository, which has been corrected. * A corner case bug in "git stash" was fixed. Also contains minor documentation updates and code clean-ups.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/git | 2 +- lfs/git | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 4422f01ac..6dad7e0a8 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -203,12 +203,12 @@ usr/libexec/git-core/mergetools/smerge usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff +usr/libexec/git-core/mergetools/vscode usr/libexec/git-core/mergetools/winmerge usr/libexec/git-core/mergetools/xxdiff usr/libexec/git-core/scalar #usr/share/git-core #usr/share/git-core/templates -usr/share/git-core/templates/branches usr/share/git-core/templates/description #usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample diff --git a/lfs/git b/lfs/git index e209fb568..185029b17 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 2.46.0 +VER = 2.48.1 SUMMARY = Fast, scalable, distributed revision control system

THISAPP = git-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 35 +PAK_VER = 36

DEPS = perl-Authen-SASL perl-Net-SMTP-SSL

@@ -47,7 +47,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 11fd88faea8cca0982945320c0a1ff949d2abedca9ffde34d40a739349e2a7ae6ceb51a23e8c21f7985cd494d9d17abcec4769e766c3c5188162b906eb1b96bc +$(DL_FILE)_BLAKE2 = 092ed16fab3b3e56c81cb91db48e4db1f41b6d91d4855a7c73fb642f1fd0272823a92b8963644ef33517c61956bca89a95e4b4dc3e9237cb0520aa37c0770966

install : $(TARGET)

- Update from version 0.6.24 to 0.6.25 - Update of rootfile - Changelog 0.6.25 * REUSE compatibility (all files declare their license) * Translation updates: ro, de, es, ka, pl, sr, sv, uk, vi, zh_CN, * Disabled Apple Makernote support, as its not complete * various bugfixes * handle JPEG APP10 * EXIF_TAG_COMPOSITE_IMAGE, EXIF_TAG_STANDARD_OUTPUT_SENSITIVITY, EXIF_TAG_RECOMMENDED_EXPOSURE_INDEX, EXIF_TAG_ISO_SPEED, EXIF_TAG_ISO_SPEEDLatitudeYYY, EXIF_TAG_ISO_SPEEDLatitudeZZZ, EXIF_TAG_SOURCE_IMAGE_NUMBER_OF_COMPOSITE_IMAGE, EXIF_TAG_LENS_SPECIFICATION, EXIF_TAG_GAMMA, EXIF_TAG_OFFSET_TIME, EXIF_TAG_OFFSET_TIME_ORIGINAL, EXIF_TAG_OFFSET_TIME_DIGITIZED, EXIF_TAG_CAMERA_OWNER_NAME, EXIF_TAG_BODY_SERIAL_NUMBER, EXIF_TAG_LENS_MAKE, EXIF_TAG_LENS_MODEL, EXIF_TAG_LENS_SERIAL_NUMBER: better decoding

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/libexif | 6 ++---- lfs/libexif | 12 +++++++----- 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/rootfiles/packages/libexif b/config/rootfiles/packages/libexif index 985a7af74..ae0db7bad 100644 --- a/config/rootfiles/packages/libexif +++ b/config/rootfiles/packages/libexif @@ -27,8 +27,6 @@ usr/lib/libexif.so.12.3.4 #usr/share/doc/libexif/README #usr/share/doc/libexif/SECURITY.md #usr/share/locale/be/LC_MESSAGES/libexif-12.mo -#usr/share/locale/bs -#usr/share/locale/bs/LC_MESSAGES #usr/share/locale/bs/LC_MESSAGES/libexif-12.mo #usr/share/locale/cs/LC_MESSAGES/libexif-12.mo #usr/share/locale/da/LC_MESSAGES/libexif-12.mo @@ -36,19 +34,19 @@ usr/lib/libexif.so.12.3.4 #usr/share/locale/en_AU #usr/share/locale/en_AU/LC_MESSAGES #usr/share/locale/en_AU/LC_MESSAGES/libexif-12.mo -#usr/share/locale/en_CA -#usr/share/locale/en_CA/LC_MESSAGES #usr/share/locale/en_CA/LC_MESSAGES/libexif-12.mo #usr/share/locale/en_GB/LC_MESSAGES/libexif-12.mo #usr/share/locale/es/LC_MESSAGES/libexif-12.mo #usr/share/locale/fr/LC_MESSAGES/libexif-12.mo #usr/share/locale/it/LC_MESSAGES/libexif-12.mo #usr/share/locale/ja/LC_MESSAGES/libexif-12.mo +#usr/share/locale/ka/LC_MESSAGES/libexif-12.mo #usr/share/locale/ms/LC_MESSAGES/libexif-12.mo #usr/share/locale/nl/LC_MESSAGES/libexif-12.mo #usr/share/locale/pl/LC_MESSAGES/libexif-12.mo #usr/share/locale/pt/LC_MESSAGES/libexif-12.mo #usr/share/locale/pt_BR/LC_MESSAGES/libexif-12.mo +#usr/share/locale/ro/LC_MESSAGES/libexif-12.mo #usr/share/locale/ru/LC_MESSAGES/libexif-12.mo #usr/share/locale/sk/LC_MESSAGES/libexif-12.mo #usr/share/locale/sq/LC_MESSAGES/libexif-12.mo diff --git a/lfs/libexif b/lfs/libexif index c89232b1c..c9a6eb69b 100644 --- a/lfs/libexif +++ b/lfs/libexif @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config

SUMMARY = An EXIF Tag Parsing Library for Digital Cameras

-VER = 0.6.24 +VER = 0.6.25

THISAPP = libexif-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libexif -PAK_VER = 3 +PAK_VER = 4

DEPS =

@@ -48,7 +48,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 75d3a2b4fefd7b7706226e70d31250ef7e99eeb81a4839ddc36cc9e3180534542d8a02851f8e6fd5034bbc925a616ead8c4bfb0cce8bc5886c3ec54811914a6b +$(DL_FILE)_BLAKE2 = a0f8a80194694fab295dcd9c72088055b83534b281cb5bdac67a781dfb56fab0e354e32a520eb31d9f4dd604524355d69ba62012056f5706051e8382e4d898b8

install : $(TARGET)

@@ -82,7 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)

- Update from version 2.03.28 to 2.03.30 - Update of rootfile not required - Changelog 2.03.30 Lvresize reports origin vdo volume cannot be resized. Support setting reserved_memory|stack of --config cmdline. Fix support for disabling memory locking (2.03.27). Do not extend an LV if FS resize unsupported and '--fs resize' used. Prevent leftover temporary device when converting in use volume to a pool. lvconvert detects early volume in use when converting it to a pool. Handle NVMe with quirk changed WWID not matching WWID in devices file. 2.03.29 Configure --enable/disable-sd-notify to control lvmlockd build with sd-notify. Allow test mode when lvmlockd is built without dlm support. Add a note about RAID + integrity synchronization to lvmraid(7) man page. Add a function for running lvconvert --repair on RAID LVs to lvmdbusd. Improve option section of man pages for listing commands ({pv,lv,vg}{s,display}). Fix renaming of raid sub LVs when converting a volume to raid (2.03.28). Fix segfault/VG write error for raid LV lvextend -i|--stripes -I|--stripesize. Revert ignore -i|--stripes, -I|--stripesize for lvextend on raid0 LV (2.03.27).

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/lvm2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lfs/lvm2 b/lfs/lvm2 index 8992ecf16..355691a43 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 2.03.28 +VER = 2.03.30

THISAPP = LVM2.$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = c4c64975d39b9f5c8def0ec6a405b6aa158b6646fcc010724dc500cec7645a2f97b089665615c5fb0b03cd3c528c95f59122900b4f1d08d16364729c38acc10b +$(DL_FILE)_BLAKE2 = 4175f09235cb68064be2da073a499b6a022e98722bae47d63088d8ee8b8a3f644695cd7de636ffd93c5e66f9cdce33b2a43d29ea527f5015172c6516ecf94e4c

install : $(TARGET)

- Update from version 5.34.3 to 5.34.4 - Update of rootfile not required - Changelog 5.34.4 Fixed: If the Monit configuration file contains a string with unbalanced escape sequences, Monit may crash upon startup. Fixed: If the password in the set mmonit URL contains only binary characters, syntax check passed (-t), but Monit aborts after start and reports following error: AssertException: n >= 0 raised in Str_ndup at src/util/Str.c:315 Aborted Fixed: If the every <cron> statement contained a syntax error, syntax check passed (-t), but Monit aborts after start and reports following error: AssertException: n < 5 && n >= 0 raised in Time_incron at src/system/Time.c:1566 Aborted Fixed: If the timeout option value was set to 0, the syntax check was successful (-t), but Monit aborts after starting and reports the following error: AssertException: timeout > 0 raised in Socket_create at src/net/socket.c:319 Aborted Fixed: The set syslog statement's facility option did not permit the specification of the log_user. Thanks to Lutz Mader for report. Fixed: Double interpretation of format strings during RETHROW

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/monit | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lfs/monit b/lfs/monit index b31a6ad0e..82de4137b 100644 --- a/lfs/monit +++ b/lfs/monit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 5.34.3 +VER = 5.34.4 SUMMARY = Utility for monitoring services on a Unix system

THISAPP = monit-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 26 +PAK_VER = 27

DEPS =

@@ -47,7 +47,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 444bc0918fefc59214f9513fa134d4abea9cb0bbfc3e71fa4c3d76d9134821a54e1949bf89a4dc483593862a629a03ac347df9c12f07476c1fcbf2c2e2d4d507 +$(DL_FILE)_BLAKE2 = a61a63eab320cb39d9d90a877fa6d2f9c326e9629847c235cb44061ad69d9ae561d1c05c5ca0b50e263d3539ed39db64602741e88aa20697209c62bdb53f7516

install : $(TARGET)

@@ -81,10 +81,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install

- Update from version 1.54.0 to 1.56.1 - Update of rootfile - Changelog 1.56.1 - Avoid criticals when there are no fonts - fontconfig: Handle lack of FC_FONT_WRAPPER in font cache - fontconfig: Prefer application fonts even if they are older 1.56.0 - Support setting font features in font descriptions - serialization: Document the tab array format - serialization: Accept attributes without range - win32: Improve the pango_font_map_reload_implementation - win32: Take variations into account for caching - layout: Fix measuring ellipsis runs with shapes - build: Require C11 - build: Require GLib 2.80 - build: Require cairo 1.18 1.55 - Support Unicode 16 - Add pango_font_map_add_font_file - fontconfig: Reject patterns without FC_FILE - coretext: Actually use .AppleSystemUIFont - coretext: Keep track of variations - win32: Use font options for caching - win32: Keep variations in PangoWin32Font - build: Require harfbuzz 8.4.0 - build: Require fontconfig 2.15 - build: Require meson 1.2.0 - build: Require Window 10

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/pango | 7 +++---- lfs/pango | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango index 26f46eeea..54d838a77 100644 --- a/config/rootfiles/common/pango +++ b/config/rootfiles/common/pango @@ -41,16 +41,15 @@ usr/bin/pango-view #usr/include/pango-1.0/pango/pangoft2.h #usr/lib/libpango-1.0.so usr/lib/libpango-1.0.so.0 -usr/lib/libpango-1.0.so.0.5400.0 +usr/lib/libpango-1.0.so.0.5600.1 #usr/lib/libpangocairo-1.0.so usr/lib/libpangocairo-1.0.so.0 -usr/lib/libpangocairo-1.0.so.0.5400.0 +usr/lib/libpangocairo-1.0.so.0.5600.1 #usr/lib/libpangoft2-1.0.so usr/lib/libpangoft2-1.0.so.0 -usr/lib/libpangoft2-1.0.so.0.5400.0 +usr/lib/libpangoft2-1.0.so.0.5600.1 #usr/lib/pkgconfig/pango.pc #usr/lib/pkgconfig/pangocairo.pc #usr/lib/pkgconfig/pangofc.pc #usr/lib/pkgconfig/pangoft2.pc #usr/lib/pkgconfig/pangoot.pc -#usr/share/man/man1/pango-view.1 diff --git a/lfs/pango b/lfs/pango index cf0573515..7bf2a1026 100644 --- a/lfs/pango +++ b/lfs/pango @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 1.54.0 +VER = 1.56.1

# https://download.gnome.org/sources/pango/

@@ -42,7 +42,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 92c389ab3f21631c245575e30804ffee6fef7b60bc6acdf08159aa325d878cf335203267720aec9143ea2a4e590578424cd64011f73da22e1b0beca85e85a276 +$(DL_FILE)_BLAKE2 = a22d8113ecbe1f076ff15ea9fa231897bc1275c45c8c9ba74635ec0b030d7e59acbdd25d52ff9d5a9ef83e1e4d8a56cf84ae3fdc19b028ff6ef1017eb82924c3

install : $(TARGET)