- Pacman-dev - lists.archlinux.org

[PATCH v2] makepkg: Implement pkgtype in .PKGINFO
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> This implements pkgtype into .PKGINFO. This is useful to ensure tools parsing packages do not miss important context on the creation of the package. For instance discovering if a given .pkg.tar is a debug package, one would have to do heuristics on the pkgdesc and "${pkgbase}-debug". However both of these values are controlled by the packager. Similarly, the heuristic for discovering split packages is if pkgbase and pkgname differ, which can happen in any package as both values are packager controlled. This should ensure we don't need to rely on heuristics and instead include the context of how the package was created. Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- lib/libalpm/be_package.c | 2 ++ scripts/makepkg.sh.in | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 5ca2865c..55f02289 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -248,6 +248,8 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * /* deprecated, skip it */ } else if(strcmp(key, "makepkgopt") == 0) { /* not used atm */ + } else if(strcmp(key, "pkgtype") == 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); diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3c7977db..18c5c24f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -601,6 +601,7 @@ write_pkginfo() { write_kv_pair "pkgname" "$pkgname" write_kv_pair "pkgbase" "$pkgbase" + write_kv_pair "pkgtype" "$pkgtype" local fullver=$(get_full_version) write_kv_pair "pkgver" "$fullver" @@ -681,6 +682,8 @@ list_package_files() { create_package() { (( NOARCHIVE )) && return 0 + pkgtype=${pkgtype:-pkg} + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "\$pkgdir/" plainerr "$(gettext "Aborting...")" @@ -765,6 +768,7 @@ create_debug_package() { pkgdesc="Detached debugging symbols for $pkgname" pkgname=$pkgbase-@DEBUGSUFFIX@ + pkgtype=debug create_package } @@ -775,6 +779,8 @@ create_srcpackage() { local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" mkdir "${srclinks}"/${pkgbase} + pkgtype=src + msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" @@ -950,6 +956,9 @@ run_single_packaging() { run_split_packaging() { local pkgname_backup=("${pkgname[@]}") + # We might run this function when we only have package_pkgname + # and we don't want that marked as a split package + (( ${#pkgname[@]} > 1 )) && pkgtype=split backup_package_variables for pkgname in ${pkgname_backup[@]}; do run_single_packaging $pkgname -- 2.34.1

1 0

[pacman-dev] [PATCH] Print the package arch using the %a format specifier.
by Jonathan Sköld 02 Jan '22

02 Jan '22

Adds the %a format specifier to allow printing of the package arch when using --print-format. Signed-off-by: Jonathan Sköld <arch(a)skold.dev> --- src/pacman/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index 5486e7a5..bb57e950 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1146,6 +1146,12 @@ void print_packages(const alpm_list_t *packages) alpm_pkg_t *pkg = i->data; char *string = strdup(config->print_format); char *temp = string; + /* %a : pkgarch */ + if(strstr(temp, "%a")) { + string = strreplace(temp, "%a", alpm_pkg_get_arch(pkg)); + free(temp); + temp = string; + } /* %n : pkgname */ if(strstr(temp, "%n")) { string = strreplace(temp, "%n", alpm_pkg_get_name(pkg)); -- 2.33.0

2 2

[PATCH 1/2] pacman: support multiple chomps at the same time
by Sefa Eyeoglu 02 Jan '22

02 Jan '22

When two progressbars are present, one of them always had c while the other always had C as the mouth --- src/pacman/callback.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 2579b98a..cb8f4302 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -156,12 +156,11 @@ static void fill_progress(const int bar_percent, const int disp_percent, /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ const int hashlen = proglen > 8 ? proglen - 8 : 0; const int hash = bar_percent * hashlen / 100; - static int lasthash = 0, mouth = 0; + static int lasthash = 0; int i; if(bar_percent == 0) { lasthash = 0; - mouth = 0; } if(hashlen > 0) { @@ -173,15 +172,14 @@ static void fill_progress(const int bar_percent, const int disp_percent, putchar('-'); } else if(i == hashlen - hash) { if(lasthash == hash) { - if(mouth) { + if(i % 2 == 0) { fputs("\033[1;33mC\033[m", stdout); } else { fputs("\033[1;33mc\033[m", stdout); } } else { lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { + if(i % 2 == 0) { fputs("\033[1;33mC\033[m", stdout); } else { fputs("\033[1;33mc\033[m", stdout); @@ -252,7 +250,7 @@ void cb_event(void *ctx, alpm_event_t *event) alpm_event_hook_run_t *e = &event->hook_run; int digits = number_length(e->total); printf("(%*zu/%*zu) %s\n", digits, e->position, - digits, e->total, + digits, e->total, e->desc ? e->desc : e->name); } break; -- 2.33.1

2 3

[PATCH] makepkg: Use pkgbase in pkgdesc for debug packages
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> When trying to identify debug packages among other packages we discovered that it's pkgname used in pkgdesc. Since pkgname can sometimes be an array when building debug packages for a split package, this could potentially include a pkgname that might not make sense depending on the order of the array. This patch simply uses pkgbase as it seems more correct. Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9f5fd401..27d3373d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -766,7 +766,7 @@ create_debug_package() { fi done - pkgdesc="Detached debugging symbols for $pkgname" + pkgdesc="Detached debugging symbols for $pkgbase" pkgname=$pkgbase-@DEBUGSUFFIX@ pkgtype=debug -- 2.34.1

2 1

[PATCH] makepkg: Implement pkgtype in .PKGINFO
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> This implements pkgtype into .PKGINFO. This is useful to ensure tools parsing packages do not miss important context on the creation of the package. For instance discovering if a given .pkg.tar is a debug package, one would have to do heuristics on the pkgdesc and "${pkgbase}-debug". However both of these values are controlled by the packager. Similarly, the heuristic for discovering split packages is if pkgbase and pkgname differ, which can happen in any package as both values are packager controlled. This should ensure we don't need to rely on heuristics and instead include the context of how the package was created. Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/makepkg.sh.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3c7977db..9f5fd401 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -601,6 +601,7 @@ write_pkginfo() { write_kv_pair "pkgname" "$pkgname" write_kv_pair "pkgbase" "$pkgbase" + write_kv_pair "pkgtype" "$pkgtype" local fullver=$(get_full_version) write_kv_pair "pkgver" "$fullver" @@ -681,6 +682,8 @@ list_package_files() { create_package() { (( NOARCHIVE )) && return 0 + pkgtype=${pkgtype:-pkg} + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "\$pkgdir/" plainerr "$(gettext "Aborting...")" @@ -765,6 +768,7 @@ create_debug_package() { pkgdesc="Detached debugging symbols for $pkgname" pkgname=$pkgbase-@DEBUGSUFFIX@ + pkgtype=debug create_package } @@ -775,6 +779,8 @@ create_srcpackage() { local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" mkdir "${srclinks}"/${pkgbase} + pkgtype=src + msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" @@ -950,6 +956,7 @@ run_single_packaging() { run_split_packaging() { local pkgname_backup=("${pkgname[@]}") + pkgtype=split backup_package_variables for pkgname in ${pkgname_backup[@]}; do run_single_packaging $pkgname -- 2.34.1

2 1

[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

[Git][pacman/pacman][master] 9 commits: Fix file permissions
by Allan McRae (＠allan) 29 Dec '21

29 Dec '21

Allan McRae pushed to branch master at Pacman / Pacman Commits: 37109600 by Allan McRae at 2021-12-12T14:34:53+10:00 Fix file permissions - - - - - 26ee6ff6 by Allan McRae at 2021-12-24T17:59:32+10:00 LTO: Add -flto to LDFLAGS for clang GCC automatically detects when it is linking LTO objects, but clang does not. Add -flto to LDFLAGS to make this work for clang too. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 354a300c by Allan McRae at 2021-12-29T15:20:05+10:00 makepkg: remove libdepends and libprovides This will be replaced by a better system Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 060ab4a2 by Allan McRae at 2021-12-29T15:20:05+10:00 libmakepkg: add framework for autodeps Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - b2342800 by Allan McRae at 2021-12-29T15:20:05+10:00 libmakepkg: automatically add library sonames to provides When the option "autodeps" is enabled, makepkg will add provides entries for libraries found in the directories specified in LIB_DIRS in makepkg.conf. The entries LIB_DIRS array have the format "prefix:directory". For example, the entry "lib:usr/lib" will search $pkgdir/usr/lib for library sonames and add "lib:libfoo.so.1" to the provides array. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 9b766bad by Allan McRae at 2021-12-29T15:20:05+10:00 libmakepkg: automatically add library dependencies Add linked libraries to a packages dependency list. This is the partner to automatically generated library provides, and thus depends take the same format. To help with bootstrapping, library dependencies are only added if the relevant provide exists. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 3a112668 by morganamilo at 2021-12-29T15:49:35+10:00 pacman: improve backup printing The current backup printing does not fit in with the rest of the info at all. Change to be more consistant. Old: Backup Files : MODIFIED /etc/pacman.conf UNMODIFIED /etc/makepkg.conf New: Backup Files : /etc/pacman.conf [modified] /etc/makepkg.conf [unmodified] Signed-off-by: morganamilo <morganamilo(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 58c81fa2 by morganamilo at 2021-12-29T16:16:18+10:00 alpm: return -1 for error in find_dl_candidates This is the error value generally used and the calling function explicitly checks for -1, later causing the error to be missed and the transaction to continue. > pacman -S xterm warning: xterm-369-1 is up to date -- reinstalling resolving dependencies... looking for conflicting packages... Package (1) Old Version New Version Net Change Download Size extra/xterm 369-1 369-1 0.00 MiB 0.42 MiB Total Download Size: 0.42 MiB Total Installed Size: 1.05 MiB Net Upgrade Size: 0.00 MiB :: Proceed with installation? [Y/n] error: no servers configured for repository: extra (1/1) checking keys in keyring [--------------------------------------------------------] 100% (1/1) checking package integrity [--------------------------------------------------------] 100% error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. - - - - - 9f236547 by Oskar Roesler (bionade24) via pacman-dev at 2021-12-29T17:53:51+10:00 pacman: print additional error information to stderr Prints extra information provided by file conflict or corrupt package messages to stderr instead of stdout Signed-off-by: Oskar Roesler (bionade24) <o.roesler(a)oscloud.info> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 15 changed files: - doc/PKGBUILD.5.asciidoc - doc/makepkg.conf.5.asciidoc - etc/makepkg.conf.in - lib/libalpm/sync.c - + scripts/libmakepkg/autodep.sh.in - + scripts/libmakepkg/autodep/library_depends.sh.in - + scripts/libmakepkg/autodep/library_provides.sh.in - + scripts/libmakepkg/autodep/meson.build - scripts/libmakepkg/buildenv/lto.sh.in - scripts/libmakepkg/lint_config.sh.in - scripts/libmakepkg/meson.build - scripts/makepkg.sh.in - src/pacman/package.c - src/pacman/package.h - src/pacman/sync.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d21fb58da30a2bed405f96… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d21fb58da30a2bed405f96… You're receiving this email because of your account on gitlab.archlinux.org.

1 0