- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] set bash env variables before running scripts
by Allan McRae (＠allan) 16 Oct '22

16 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: da68447e by Andrew Gregory at 2022-10-15T10:40:59-07:00 set bash env variables before running scripts Bash sources user configuration files under a number of conditions that can cause issues with scripts when bash is used as the scriptlet shell. Bash assumes it's being run under rsh/ssh if stdin is connected to a socket and sources the user bashrc unless the environment variable $SHLVL is >= 2. Commit 6a4c6a02de9b45abe4c0f78c4f5d14d92d3359d6 switched from pipes to sockets when communicating with child processes to work around SIGPIPE issues. Normally $SHLVL would be inherited from the shell running pacman, but operations involving scriptlets are generally run with sudo which does not let the $SHLVL variable through unless specifically configured to. Similarly $BASH_ENV can cause bash to source user-specified configuration files if set. https://lists.gnu.org/archive/html/help-bash/2022-02/msg00082.html Note: the list discussion and bash source all reference SHLVL >= 2, this is the SHLVL value *after* bash has incremented it on startup. Setting it to 1 in pacman is sufficient to disable the unwanted behavior. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - 1 changed file: - lib/libalpm/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/da68447ec6325f3ee0c87db… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/da68447ec6325f3ee0c87db… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Fix missing if
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 86981383 by Allan McRae at 2022-10-09T13:43:31+10:00 Fix missing if Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/tidy/strip.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] strip: Include `.o` files in strip operation
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: de118245 by Frederik Schwan at 2022-10-09T11:01:12+10:00 strip: Include `.o` files in strip operation `.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 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/tidy/strip.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161a… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161a… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] strip: fix unique source paths
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 478af273 by Morten Linderud at 2022-10-09T10:57:26+10:00 strip: fix unique source paths `${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> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/tidy/strip.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Always create directories outputted from debugedit in debug packages
by Allan McRae (＠allan) 09 Oct '22

09 Oct '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: efd0c24c by Allan McRae at 2022-10-08T21:07:45+10:00 Always create directories outputted from debugedit in debug packages 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> - - - - - 1 changed file: - scripts/libmakepkg/tidy/strip.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

Fixes for building on macOS
by daniel.nachun＠gmail.com 09 Oct '22

09 Oct '22

1 0

[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