- Pacman-dev - lists.archlinux.org

[PATCH] Always create directories outputted from debugedit in debug packages
by Allan McRae 09 Oct '22

09 Oct '22

The debugedit call to list all source files may include things like build/<...>. We have been filtering out these <> files, but they can point to the build directory which is important to be available for relative source paths stored in the .debug files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 91c66f13..17526a34 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -72,8 +72,8 @@ strip_file() { while IFS= read -r t; do file="${srcdir}/${t}" dest="${dbgsrc}/${t}" - if [[ -f "$file" ]] && ! [[ -f $dest ]]; then - mkdir -p "${dest%/*}" + mkdir -p "${dest%/*}" + [[ -f "$file" ]]; then cp -- "$file" "$dest" fi done < <(source_files "$binary") -- 2.37.3

1 0

[PATCH] strip: fix unique source paths
by Morten Linderud 06 Oct '22

06 Oct '22

From: Morten Linderud <morten(a)linderud.pw> `${pkgbase}` was added to the wrong invocation. This ensures we are producing correct debug packages. Example from the package: /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.h /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.h Fixes: 776b7c1e75f2 ("debugflags: Ensure we have unique source paths") Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/libmakepkg/tidy/strip.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 91c66f13..01af6e03 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -47,7 +47,7 @@ source_files() { LANG=C debugedit --no-recompute-build-id \ --base-dir "${srcdir}" \ - --dest-dir "${dbgsrcdir}/${pkgbase}" \ + --dest-dir "${dbgsrcdir}" \ --list-file /dev/stdout "$1" \ | sort -zu | tr '\0' '\n' } @@ -141,7 +141,7 @@ tidy_strip() { if check_option "debug" "y"; then dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug" - dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}" + dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" dbgsrc="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@$dbgsrcdir" mkdir -p "$dbgdir" "$dbgsrc" fi -- 2.38.0

1 0

[PATCH] strip: Include `.o` files in strip operation
by Frederik Schwan 05 Oct '22

05 Oct '22

`.o` objects used to be omitted by strip.sh due to a missing match in the `Relocatable file` section. This patch fixes the issue by handling `.o` objects similar to kernel modules. fixes FS#74941 --- scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 688bcf1b..71fe8e88 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -155,7 +155,7 @@ tidy_strip() { if ar t "$binary" &>/dev/null; then # Libraries (.a) strip_flags="$STRIP_STATIC" STRIPLTO=1 - elif [[ $binary = *'.ko' ]]; then # Kernel module + elif [[ $binary = *'.ko' || $binary = *'.o' ]]; then # Kernel module or object strip_flags="$STRIP_SHARED" else continue -- 2.36.1

1 1

[Git][pacman/pacman] Pushed new tag v6.0.2
by Allan McRae (＠allan) 03 Oct '22

03 Oct '22

Allan McRae pushed new tag v6.0.2 at Pacman / Pacman -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/tree/v6.0.2 You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][release/6.0.x] 2 commits: Remove move translations with mismatching arguments
by Allan McRae (＠allan) 03 Oct '22

03 Oct '22

Allan McRae pushed to branch release/6.0.x at Pacman / Pacman Commits: 8c61170c by Allan McRae at 2022-10-03T12:49:34+10:00 Remove move translations with mismatching arguments Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - c2d4568d by Allan McRae at 2022-10-03T12:52:04+10:00 Release v6.0.2 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 17 changed files: - doc/index.asciidoc - meson.build - scripts/po/de.po - scripts/po/el.po - scripts/po/eo.po - scripts/po/es.po - scripts/po/es_419.po - scripts/po/hi.po - scripts/po/pl.po - scripts/po/ru.po - scripts/po/sl.po - scripts/po/zh_TW.po - src/pacman/po/az_AZ.po - src/pacman/po/es_419.po - src/pacman/po/hi.po - src/pacman/po/sl.po - src/pacman/po/tr.po View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/69eae8644576c63b20200a… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/69eae8644576c63b20200a… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

pacman-6.0.2 release in 24 hours
by Allan McRae 02 Oct '22

02 Oct '22

Hi all, I have pulled a bunch of patches to the release branch. Mostly to do with improved WKD support and better debug packages, but also a couple of fixes that fix what are probably low risk security issues. Note, these changes add debugedit as a dependency for makepkg. Normally I would avoid such a change in a minor release, but debug packages are rather bad without this change... I will do the final release in 24 hours. Let me know if there are any more patches that should be included. Allan

1 0

[Git][pacman/pacman][release/6.0.x] 2 commits: libmakepkg: fix compatibility with bash-5.2 globskipdots
by Allan McRae (＠allan) 02 Oct '22

02 Oct '22

Allan McRae pushed to branch release/6.0.x at Pacman / Pacman Commits: 5c10680f by Allan McRae at 2022-10-02T11:45:43+10:00 libmakepkg: fix compatibility with bash-5.2 globskipdots Bash 5.2 has a new globskipdots option, which is enabled by default. The check_dotfiles lint fails with globskipdots due to the assumption that at least the "." and ".." paths will match. Disabling globskipdots would be the usual solution, but that fails on bash<5.2. Instead, enable nullglob for this check. Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit a6b06a5b17e19db8700597ee06bae42b2cfe7b5a) - - - - - 69eae864 by Allan McRae at 2022-10-02T11:54:34+10:00 Update NEWS for pacman-6.0.2 release Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - NEWS - scripts/libmakepkg/lint_package/dotfiles.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/1daabff0fb9948fb260ce3… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/1daabff0fb9948fb260ce3… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] Update NEWS for pacman-6.0.2 release
by Allan McRae 02 Oct '22

02 Oct '22

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/NEWS b/NEWS index b01bf8bc..58088c32 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,19 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +6.0.2 - Fix potential content injection during PGP import (FS#73703) + - Fix potential segfault during PGP key import (FS#73534) + - Fix potential information leak while parsing badly formed + download header (FS#73704) + - Translation fixes to avoid segfault (FS#75680) + - makepkg: + - Fix compatability with bash 5.2 (FS#76035) + - Fix behaviour while attempting stripping of readonly files + (FS#74486) + - Use debugedit instead of awk for identifying source files + for debug packages + - Use -ffile-prefix-map instead of -fdebug-prefix-map to + capture all source files in debug packages + - Add -flto to LDFLAGS for clang 6.0.1 - Prevent download error pages ending up in package files (FS#71083) - Give -U downloads a random .part file name if needed -- 2.37.3

1 0

[Git][pacman/pacman][master] libmakepkg: fix compatibility with bash-5.2 globskipdots
by Allan McRae (＠allan) 02 Oct '22

02 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: a6b06a5b by Allan McRae at 2022-10-02T11:40:52+10:00 libmakepkg: fix compatibility with bash-5.2 globskipdots Bash 5.2 has a new globskipdots option, which is enabled by default. The check_dotfiles lint fails with globskipdots due to the assumption that at least the "." and ".." paths will match. Disabling globskipdots would be the usual solution, but that fails on bash<5.2. Instead, enable nullglob for this check. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/lint_package/dotfiles.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/a6b06a5b17e19db8700597e… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/a6b06a5b17e19db8700597e… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] libmakepkg: fix compatibility with bash-5.2 globskipdots
by Allan McRae 02 Oct '22

02 Oct '22

Bash 5.2 has a new globskipdots option, which is enabled by default. The check_dotfiles lint fails with globskipdots due to the assumption that at least the "." and ".." paths will match. Disabling globskipdots would be the usual solution, but that fails on bash<5.2. Instead, enable nullglob for this check. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_package/dotfiles.sh.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/libmakepkg/lint_package/dotfiles.sh.in b/scripts/libmakepkg/lint_package/dotfiles.sh.in index 243fb31c..0b993dd4 100644 --- a/scripts/libmakepkg/lint_package/dotfiles.sh.in +++ b/scripts/libmakepkg/lint_package/dotfiles.sh.in @@ -29,10 +29,17 @@ lint_package_functions+=('check_dotfiles') check_dotfiles() { local ret=0 + + local shellopts=$(shopt -p nullglob) + shopt -s nullglob + for f in "$pkgdir"/.*; do [[ ${f##*/} == . || ${f##*/} == .. ]] && continue error "$(gettext "Dotfile found in package root '%s'")" "$f" ret=1 done + + eval "$shellopts" + return $ret } -- 2.37.3

1 0