From 294fea20b110e2485aeb5e12b41b1e9e0f4af648 Mon Sep 17 00:00:00 2001 From: merakor Date: Sun, 5 Feb 2023 17:17:18 +0000 Subject: _tmp_create(): Truncate file if it exists FossilOrigin-Name: b6658318625d91b21a8ddb20ec0300dce260374b4ac6d86e7c6f4cec113412f5 --- src/cpt-lib.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cpt-lib.in b/src/cpt-lib.in index 8b6cd13..9166374 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -2323,9 +2323,8 @@ _tmp_create() { # Create given file to the temporary directory and return its name create_tmp _ret=$(_tmp_name "$1") - # False positive, we are not reading from the file. - # shellcheck disable=2094 - out "$_ret" 3>> "$_ret" + :> "$_ret" || return 1 + out "$_ret" } create_tmp() { -- cgit v1.2.3 From 74b5020d4588bb5a6feb8b0c0774052d54ad6cbf Mon Sep 17 00:00:00 2001 From: merakor Date: Sun, 5 Feb 2023 17:17:47 +0000 Subject: _tmp_cp(): preserve file attributes FossilOrigin-Name: a9e12474744707b290d0a74dba5494c175bc3ce453fad796f72722e791f44f22 --- src/cpt-lib.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpt-lib.in b/src/cpt-lib.in index 9166374..1896920 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -2315,7 +2315,7 @@ _tmp_cp() { # second argument is not given, use the basename of the copied file. _ret=${2:-${1##*/}} _ret=$(_tmp_name "$_ret") - cp "$1" "$_ret" + cp -p "$1" "$_ret" out "$_ret" } -- cgit v1.2.3 From f690bec61c361ddd0a6c60bb1551f3ca424591e6 Mon Sep 17 00:00:00 2001 From: merakor Date: Sun, 5 Feb 2023 17:23:37 +0000 Subject: CHANGELOG: update FossilOrigin-Name: 8af416e9782011623aee70948ab3fabe64ec49601645d7710379b553467ef48a --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a4182c..e7ee439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,16 @@ this project _somewhat_ adheres to [Semantic Versioning]. [Semantic Versioning]: https://semver.org/spec/v2.0.0.html +[7.0.2] - 2023-02-05 +-------------------------------------------------------------------------------- + +### Fixed +- Fixed a bug that caused extra dependencies being added to the later packages + during multi-package build operations. +- Fixed file attribute issue with the `_tmp_cp()` function causing modified + dependency files to receive `600` permission bits. + + [7.0.1] - 2023-02-05 -------------------------------------------------------------------------------- -- cgit v1.2.3 From 90c38101ad480af1a60defca0ffede0071a647ba Mon Sep 17 00:00:00 2001 From: merakor Date: Sun, 5 Feb 2023 17:24:18 +0000 Subject: bump to version 7.0.2 FossilOrigin-Name: 93d0f8e494ec3659ee51c35f0632cabe562c5726adf6a999e0a202945961f1e5 --- configure | 2 +- docs/cpt.texi | 2 +- docs/cpt.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2105975..0ad16e8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/sh -e -version=7.0.1 +version=7.0.2 die() { printf '%s: %s\n' "${0##*/}" "$*" >&2 diff --git a/docs/cpt.texi b/docs/cpt.texi index e18eed6..5f187ff 100644 --- a/docs/cpt.texi +++ b/docs/cpt.texi @@ -41,7 +41,7 @@ the section entitled "GNU Free Documentation License." @top Carbs Packaging Tools This is a reference document containing both the user-guide and the development -manual for @strong{Carbs Packaging Tools} version 7.0.1. For development logs +manual for @strong{Carbs Packaging Tools} version 7.0.2. For development logs see @uref{https://fossil.carbslinux.org/cpt, the fossil repository}. @end ifnottex diff --git a/docs/cpt.txt b/docs/cpt.txt index 911e9e5..f54ed51 100644 --- a/docs/cpt.txt +++ b/docs/cpt.txt @@ -77,7 +77,7 @@ _________________ This is a reference document containing both the user-guide and the -development manual for *Carbs Packaging Tools* version 7.0.1. For +development manual for *Carbs Packaging Tools* version 7.0.2. For development logs see [the fossil repository]. -- cgit v1.2.3