May 2021 - Pacman-contrib - lists.archlinux.org

[PATCH 0/4] Fixes for (M)erge mode and --sudo
by Denton Liu 28 Jul '21

28 Jul '21

The first two patches are just mailmap changes for incorrect authorship. The third patch is some documentation update. The final patch are some fixes to a bad interaction between (M)erge mode and --sudo. Denton Liu (4): .mailmap: Map Daniel Parks .mailmap: Map Denton Liu pacdiff: update --sudo usages pacdiff: Don't use $SUDO on temporary files .mailmap | 2 ++ doc/pacdiff.8.txt | 3 +++ src/pacdiff.sh.in | 18 +++++++----------- 3 files changed, 12 insertions(+), 11 deletions(-) -- 2.31.0.208.g409f899ff0

2 8

[pacman-contrib] [PATCH] updpkgsums: don't try to add nonexistent checksums
by Eli Schwartz 28 Jul '21

28 Jul '21

In the event there are no sources, there won't be sums either. awk won't find any to remove and replace inline, so it tries to print "" at the end of the file, and merely adds superfluous newlines. Abort early instead, since updpkgsums cannot be expected to process such a file. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/updpkgsums.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/updpkgsums.sh.in b/src/updpkgsums.sh.in index 41965f5..e5dbd2b 100644 --- a/src/updpkgsums.sh.in +++ b/src/updpkgsums.sh.in @@ -99,6 +99,11 @@ newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT sumtypes=$(IFS='|'; echo "${known_hash_algos[*]}") newsums=$(makepkg -g -p "$buildfile" "${MAKEPKG_OPTS[@]}") || die 'Failed to generate new checksums' + +if [[ -z $newsums ]]; then + die "$buildfile does not contain sources to update" +fi + awk -v sumtypes="$sumtypes" -v newsums="$newsums" ' $0 ~"^[[:blank:]]*(" sumtypes ")sums(_[^=]+)?=", $0 ~ "\\)[[:blank:]]*(#.*)?$" { if (!w) { -- 2.31.1

2 1

[GIT] branch master updated (62190b1 -> fd21ee2)
by Daniel M. Capella 21 May '21

21 May '21

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from 62190b1 pacdiff: update --sudo usages new fd21ee2 pactree: fix compilation with pacman 6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * fd21ee2 (HEAD -> master) pactree: fix compilation with pacman 6 Detailed log of new commits: commit fd21ee241c85856be941e41942d6c179ca713c41 Author: Eli Schwartz via pacman-contrib <pacman-contrib(a)lists.archlinux.org> Date: Fri May 21 00:30:07 2021 -0400 pactree: fix compilation with pacman 6 In "add front-end provided context to callbacks", libalpm gained a new argument to callbacks which we don't use and is only needed by some frontends wishing to do stuff with the callback state. NULL it and move on with life, just like pacman itself did. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Summary of changes: src/pactree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] pactree: fix compilation with pacman 6
by Eli Schwartz 21 May '21

21 May '21

In "add front-end provided context to callbacks", libalpm gained a new argument to callbacks which we don't use and is only needed by some frontends wishing to do stuff with the callback state. NULL it and move on with life, just like pacman itself did. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/pactree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index e8f5086..9e6ac1b 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -135,8 +135,10 @@ static const char *dbpath = DBPATH; static const char *configfile = CONFFILE; static const char *gpgdir = GPGDIR; -void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) +void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args) { + (void)ctx; + switch(level) { case ALPM_LOG_ERROR: fprintf(stderr, "%s%s%s", color->error, "error: ", @@ -621,7 +623,7 @@ int main(int argc, char *argv[]) } if(debug) { - alpm_option_set_logcb(handle, cb_log); + alpm_option_set_logcb(handle, cb_log, NULL); } /* no need to fail on error here */ -- 2.31.1

1 0