January 2022 - Pacman-dev - lists.archlinux.org

[PATCH] Remove parsing of long removed files in .PKGINFO
by Allan McRae 02 Jan '22

02 Jan '22

These fields have not existed for many years. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index eeecb491..99826e15 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -244,10 +244,6 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * CALLOC(backup, 1, sizeof(alpm_backup_t), return -1); STRDUP(backup->name, ptr, FREE(backup); return -1); newpkg->backup = alpm_list_add(newpkg->backup, backup); - } else if(strcmp(key, "force") == 0) { - /* deprecated, skip it */ - } else if(strcmp(key, "makepkgopt") == 0) { - /* not used atm */ } else { _alpm_log(handle, ALPM_LOG_DEBUG, "%s: unknown key '%s' in description file line %d\n", newpkg->name ? newpkg->name : "error", key, linenum); -- 2.34.1

1 0

[PATCH] makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map
by xiretza+archml＠xiretza.xyz 02 Jan '22

02 Jan '22

From: Xiretza <xiretza(a)xiretza.xyz> >From gcc(1): -ffile-prefix-map=old=new [...] Specifying this option is equivalent to specifying all the individual -f*-prefix-map options. This can be used to make reproducible builds that are location independent. Specifically, this additionally enables -fmacro-prefix-map=, which causes prefix mapping to be applied to expansions of __FILE__ and similar macros. Without this option, if source files are compiled by passing the absolute file path to the compiler (as done by e.g. cmake), any expansions of __FILE__ (e.g. from uses of assert()) will contain $srcdir. --- scripts/libmakepkg/buildenv/debugflags.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 90ddeca0..2efd543a 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -30,8 +30,8 @@ buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" -- 2.34.1

2 1

[Git][pacman/pacman][master] Update copyright years
by Allan McRae (＠allan) 02 Jan '22

02 Jan '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 90df85e9 by Allan McRae at 2022-01-02T13:34:52+10:00 Update copyright years ./build-aux/update-copyright 2021 2022 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 30 changed files: - doc/index.asciidoc - lib/libalpm/add.c - lib/libalpm/add.h - lib/libalpm/alpm.c - lib/libalpm/alpm.h - lib/libalpm/alpm_list.c - lib/libalpm/alpm_list.h - lib/libalpm/backup.c - lib/libalpm/backup.h - lib/libalpm/be_local.c - lib/libalpm/be_package.c - lib/libalpm/be_sync.c - lib/libalpm/conflict.c - lib/libalpm/conflict.h - lib/libalpm/db.c - lib/libalpm/db.h - lib/libalpm/deps.c - lib/libalpm/deps.h - lib/libalpm/diskspace.c - lib/libalpm/diskspace.h - lib/libalpm/dload.c - lib/libalpm/dload.h - lib/libalpm/error.c - lib/libalpm/filelist.c - lib/libalpm/filelist.h - lib/libalpm/graph.c - lib/libalpm/graph.h - lib/libalpm/group.c - lib/libalpm/group.h - lib/libalpm/handle.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/90df85e9cf2fef38442345e… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/90df85e9cf2fef38442345e… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] makepkg: Handle invalid files in strip
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> makepkg does a fairly naive pass on the DWARF files to generate source files. If this is done on things like Golang it will give strip a list of files that are truncated paths or completely invalid virtual paths for the runtime to interpret. We also explicitly only allow source files that contains the given debug source directory. We depend on this for file lookup and it would produce invalid packages with weird paths if they are not present. 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 92a6fb15..d9eb8a95 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -60,11 +60,11 @@ strip_file() { while IFS= read -r t; do file=${t/${dbgsrcdir}/"$srcdir"} dest="${dbgsrc/"$dbgsrcdir"/}$t" - if ! [[ -f $dest ]]; then + if [[ -f "$file" ]] && ! [[ -f $dest ]]; then mkdir -p "${dest%/*}" cp -- "$file" "$dest" fi - done < <(source_files "$binary") + done < <(source_files "$binary" | grep "$dbgsrcdir") # copy debug symbols to debug directory mkdir -p "$dbgdir/${binary%/*}" -- 2.34.1

2 2