- Pacman-dev - lists.archlinux.org

[PATCH] Diff color version strings
by David Gustavsson 10 Jan '22

10 Jan '22

In package table, with VerbosePkgLists and Color, color the part of package version strings that changes. Signed-off-by: David Gustavsson <david.e.gustavsson(a)gmail.com> --- src/pacman/conf.c | 4 ++++ src/pacman/conf.h | 2 ++ src/pacman/util.c | 35 +++++++++++++++++++++++++++++++---- src/pacman/util.h | 1 + 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..d5c598b9 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -80,6 +80,8 @@ void enable_colors(int colors) colstr->err = BOLDRED; colstr->faint = GREY46; colstr->nocolor = NOCOLOR; + colstr->diffrem = RED; + colstr->diffadd = GREEN; } else { colstr->colon = ":: "; colstr->title = ""; @@ -91,6 +93,8 @@ void enable_colors(int colors) colstr->err = ""; colstr->faint = ""; colstr->nocolor = ""; + colstr->diffrem = ""; + colstr->diffadd = ""; } } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f7916ca9..782b5758 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,6 +33,8 @@ typedef struct __colstr_t { const char *err; const char *faint; const char *nocolor; + const char *diffrem; + const char *diffadd; } colstr_t; typedef struct __config_repo_t { diff --git a/src/pacman/util.c b/src/pacman/util.c index c0d62826..e998fa98 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -840,8 +840,10 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) { char *str; off_t size = 0; + size_t i = 0; double human_size; const char *label; + const char *version; alpm_list_t *ret = NULL; /* a row consists of the package name, */ @@ -858,12 +860,28 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* old and new versions */ - pm_asprintf(&str, "%s", - target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); + version = alpm_pkg_get_version(target->remove); + char old_version[strlen(version) + strlen(config->colstr.diffrem) + strlen(config->colstr.nocolor) + 1]; + memcpy(old_version, (char *)version, strlen(version) + 1); + version = alpm_pkg_get_version(target->install); + char new_version[strlen(version) + strlen(config->colstr.diffadd) + strlen(config->colstr.nocolor) + 1]; + memcpy(new_version, (char *)version, strlen(version) + 1); + + i = 0; + while (old_version[i] != '\0' && new_version[i] != '\0' && old_version[i] == new_version[i]) { + i++; + } + insertstring(old_version, config->colstr.diffrem, i); + insertstring(new_version, config->colstr.diffadd, i); + snprintf(old_version + i + strlen(old_version + i), + strlen(config->colstr.nocolor) + 1, "%s", config->colstr.nocolor); + snprintf(new_version + i + strlen(new_version + i), + strlen(config->colstr.nocolor) + 1, "%s", config->colstr.nocolor); + + pm_asprintf(&str, "%s", old_version); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); - pm_asprintf(&str, "%s", - target->install != NULL ? alpm_pkg_get_version(target->install) : ""); + pm_asprintf(&str, "%s", new_version); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* and size */ @@ -1849,3 +1867,12 @@ void console_erase_line(void) { printf("\x1B[K"); } + +/* inserts string insert into string at index i, modifying string */ +void insertstring(char *string, const char *insert, size_t i) +{ + char temp[strlen(string) - i + 1]; + memcpy(temp, string + i, strlen(string + i) + 1); + memcpy(string + i, insert, strlen(insert) + 1); + memcpy(string + i + strlen(insert), temp, strlen(temp) + 1); +} diff --git a/src/pacman/util.h b/src/pacman/util.h index 52e79915..003961eb 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -88,6 +88,7 @@ void console_cursor_move_down(unsigned int lines); void console_cursor_move_end(void); /* Erases line from the current cursor position till the end of the line */ void console_erase_line(void); +void insertstring(char *string, const char *insert, size_t i); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.34.1

2 2

Re: [PATCH] Add semver coloring
by David Gustavsson 10 Jan '22

10 Jan '22

> > > Message: 1 > Date: Sun, 9 Jan 2022 16:41:26 +0000 > From: Morgan Adamiec <morganamilo(a)archlinux.org> > To: pacman-dev(a)lists.archlinux.org > Subject: Re: [PATCH] Add semver coloring > Message-ID: <6a5cf863-81e5-c663-a807-43b63f599ee6(a)archlinux.org> > Content-Type: text/plain; charset=UTF-8 > > > > On 07/01/2022 19:57, David Gustavsson wrote: > > When both 'verbose' and 'color' is set, the (dot-separated) parts of the > > version strings where a change has occured will be highlighted in bold > > face -- if there are two or more levels. > > > > Signed-off-by: David Gustavsson <david.e.gustavsson(a)gmail.com> > > --- > > src/pacman/conf.c | 2 ++ > > src/pacman/conf.h | 1 + > > src/pacman/util.c | 64 ++++++++++++++++++++++++++++++++++++++++++----- > > src/pacman/util.h | 1 + > > 4 files changed, 62 insertions(+), 6 deletions(-) > > > > diff --git a/src/pacman/conf.c b/src/pacman/conf.c > > index f9edf75b..707bd421 100644 > > --- a/src/pacman/conf.c > > +++ b/src/pacman/conf.c > > @@ -80,6 +80,7 @@ void enable_colors(int colors) > > colstr->err = BOLDRED; > > colstr->faint = GREY46; > > colstr->nocolor = NOCOLOR; > > + colstr->changed = BOLD; > > } else { > > colstr->colon = ":: "; > > colstr->title = ""; > > @@ -91,6 +92,7 @@ void enable_colors(int colors) > > colstr->err = ""; > > colstr->faint = ""; > > colstr->nocolor = ""; > > + colstr->changed = ""; > > } > > } > > > > diff --git a/src/pacman/conf.h b/src/pacman/conf.h > > index f7916ca9..82a958a9 100644 > > --- a/src/pacman/conf.h > > +++ b/src/pacman/conf.h > > @@ -33,6 +33,7 @@ typedef struct __colstr_t { > > const char *err; > > const char *faint; > > const char *nocolor; > > + const char *changed; > > } colstr_t; > > > > typedef struct __config_repo_t { > > diff --git a/src/pacman/util.c b/src/pacman/util.c > > index c0d62826..e8bfdd09 100644 > > --- a/src/pacman/util.c > > +++ b/src/pacman/util.c > > @@ -858,13 +858,52 @@ static alpm_list_t *create_verbose_row(pm_target_t > *target) > > add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > > > /* old and new versions */ > > - pm_asprintf(&str, "%s", > > - target->remove != NULL ? > alpm_pkg_get_version(target->remove) : ""); > > - add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + const char *old_version = target->remove != NULL ? > alpm_pkg_get_version(target->remove) : ""; > > + char old_version_copy[strlen(old_version)+1]; > > + strcpy(old_version_copy, (char *)old_version); > > + const char *new_version = target->install != NULL ? > alpm_pkg_get_version(target->install) : ""; > > + char new_version_copy[strlen(new_version)+1]; > > + strcpy(new_version_copy, (char *)new_version); > > + > > + char *old_semver[10]; > > + char *new_semver[10]; > > + int old_semver_num = semver(old_semver, old_version_copy); > > + int new_semver_num = semver(new_semver, new_version_copy); > > + > > + if (old_semver_num > 1 && new_semver_num == old_semver_num) { > > + char oldstring[100]; > > + char newstring[100]; > > + int oldoffset = 0; > > + int newoffset = 0; > > + for (int i = 0; i < old_semver_num; i++) { > > + if (i>0) { > > + oldoffset += snprintf(oldstring + > oldoffset, 2, "."); > > + newoffset += snprintf(newstring + > newoffset, 2, "."); > > + } > > > > - pm_asprintf(&str, "%s", > > - target->install != NULL ? > alpm_pkg_get_version(target->install) : ""); > > - add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + if (strcmp(old_semver[i], new_semver[i]) != 0) { > > + /* This level changed, color in */ > > + oldoffset += sprintf(oldstring + > oldoffset, "%s", config->colstr.changed); > > + newoffset += sprintf(newstring + > newoffset, "%s", config->colstr.changed); > > + } > > + oldoffset += sprintf(oldstring + oldoffset, "%s", > old_semver[i]); > > + newoffset += sprintf(newstring + newoffset, "%s", > new_semver[i]); > > + > > + oldoffset += sprintf(oldstring + oldoffset, "%s", > config->colstr.nocolor); > > + newoffset += sprintf(newstring + newoffset, "%s", > config->colstr.nocolor); > > + } > > + pm_asprintf(&str, "%s", oldstring); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + pm_asprintf(&str, "%s", newstring); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + } else { > > + > > + pm_asprintf(&str, "%s", old_version); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + > > + pm_asprintf(&str, "%s", new_version); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + } > > > > /* and size */ > > size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; > > @@ -1849,3 +1888,16 @@ void console_erase_line(void) > > { > > printf("\x1B[K"); > > } > > + > > +/* Splits version string into semver parts (major.minor.patch). Returns > number of found elements. */ > > +int semver(char **out, char *version) > > +{ > > + int i = 0; > > + char *token = strtok(version, "."); > > + while (token != NULL) { > > + out[i] = token; > > + token = strtok(NULL, "."); > > + i++; > > + } > > + return i; > > +} > > diff --git a/src/pacman/util.h b/src/pacman/util.h > > index 52e79915..a119a2f6 100644 > > --- a/src/pacman/util.h > > +++ b/src/pacman/util.h > > @@ -88,6 +88,7 @@ void console_cursor_move_down(unsigned int lines); > > void console_cursor_move_end(void); > > /* Erases line from the current cursor position till the end of the > line */ > > void console_erase_line(void); > > +int semver(char **out, char *version); > > > > int pm_printf(alpm_loglevel_t level, const char *format, ...) > __attribute__((format(printf,2,3))); > > int pm_asprintf(char **string, const char *format, ...) > __attribute__((format(printf,2,3))); > > > Package versioning does not follow semver so this patch doesn't really > make sense. However I've implemented version diffing before in a way > that matches how package versions are compared. This is implemented in > both yay and paru so you'll have to adapt the code to c. > > I figured in the cases where semver is not followed, the text is left unaffected, and a lot of packages do follow some kind of dot-separated versioning (Here's how the patch looked when I ran the other day: https://imgur.com/Zc1CeXz) But thinking about it, it *would* be much simpler to just compare letter by letter and color everything beyond the first differing letter in. I'll try it out some time this week.

1 0

Initial support for asignify signatures
by jeremy＠merelinux.org 10 Jan '22

10 Jan '22

From: Jeremy Huntwork <jeremy(a)merelinux.org> This is a proof of concept that shows how asignify can be used instead of gpgme to validate packages signed with the asignify tool. Signed-off-by: Jeremy Huntwork <jeremy(a)merelinux.org> --- lib/libalpm/alpm.c | 2 +- lib/libalpm/be_package.c | 10 ++++++ lib/libalpm/be_sync.c | 2 +- lib/libalpm/handle.c | 6 ++-- lib/libalpm/signing.c | 67 ++++++++++++++++++++++++++++++++++++++++ lib/libalpm/signing.h | 11 ++++--- meson.build | 11 ++++++- meson_options.txt | 3 ++ 8 files changed, 101 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 5b326ab0..d1261660 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -137,7 +137,7 @@ int SYMEXPORT alpm_capabilities(void) #ifdef HAVE_LIBCURL | ALPM_CAPABILITY_DOWNLOADER #endif -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) | ALPM_CAPABILITY_SIGNATURES #endif | 0; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 5ca2865c..1b6887ce 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -342,12 +342,20 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, handle->pm_errno = ALPM_ERR_PKG_MISSING_SIG; return -1; } +#ifdef HAVE_LIBGPGME if(_alpm_check_pgp_helper(handle, pkgfile, sig, level & ALPM_SIG_PACKAGE_OPTIONAL, level & ALPM_SIG_PACKAGE_MARGINAL_OK, level & ALPM_SIG_PACKAGE_UNKNOWN_OK, sigdata)) { handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; return -1; } +#endif +#ifdef HAVE_LIBASIGNIFY + if(_alpm_check_asignify_helper(handle, pkgfile, sigdata)) { + handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; + return -1; + } +#endif if(validation && has_sig) { *validation |= ALPM_PKG_VALIDATION_SIGNATURE; } @@ -743,6 +751,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return -1; } +#ifndef HAVE_LIBASIGNIFY if(alpm_extract_keyid(handle, filename, sig, len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { @@ -771,6 +780,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful free(sigpath); return -1; } +#endif } } free(sigpath); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ede25985..81654902 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -697,7 +697,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); -#ifndef HAVE_LIBGPGME +#if !defined(HAVE_LIBGPGME) || !defined(HAVE_LIBASIGNIFY) if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, NULL); } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 101d4a78..78c7d7bd 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -829,7 +829,7 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, if(level == ALPM_SIG_USE_DEFAULT) { RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); } -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) handle->siglevel = level; #else if(level != 0) { @@ -849,7 +849,7 @@ int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, int level) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) handle->localfilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { @@ -873,7 +873,7 @@ int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) handle->remotefilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 66cc3923..cf778f9d 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -26,6 +26,12 @@ #include <gpgme.h> #endif +#ifdef HAVE_LIBASIGNIFY +/* libasignify */ +#include <asignify.h> +#include <dirent.h> +#endif + /* libalpm */ #include "signing.h" #include "package.h" @@ -810,6 +816,67 @@ char *_alpm_sigpath(alpm_handle_t *handle, const char *path) return sigpath; } +/** + * Helper for checking the asignify signature for the given file path. + * @param handle the context handle + * @param path the full path to a file + * @param sigdata a pointer to storage for signature results + * @return 0 on success, -1 on error (consult pm_errno or sigdata) + */ +int _alpm_check_asignify_helper(alpm_handle_t *handle, const char *path, + alpm_siglist_t **sigdata) +{ + int ret = 0; + struct dirent *entry; + struct stat statbuf; + const char *pubkeydir = "/etc/pacman.d/trustedkeys"; /* Add config for this */ + + char *sigpath = _alpm_sigpath(handle, path); + asignify_verify_t *vrf = asignify_verify_init(); + + DIR *pkd = opendir(pubkeydir); + if(pkd == NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, "cannot open directory: %s\n", pubkeydir); + return -1; + } + + while((entry = readdir(pkd)) != NULL) { + char *fullpath = malloc(strlen(pubkeydir) + strlen(entry->d_name) + 2); + if (fullpath == NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, "malloc error\n"); + return -1; + } + sprintf(fullpath, "%s/%s", pubkeydir, entry->d_name); + stat(fullpath, &statbuf); + if (S_ISREG(statbuf.st_mode)) { + if (!asignify_verify_load_pubkey(vrf, fullpath)) { + /* Don't return here because there may be multiple public keys to load. */ + _alpm_log(handle, ALPM_LOG_DEBUG, "cannot load public key file: %s\n", fullpath); + } + } + free(fullpath); + } + + if (!asignify_verify_load_signature(vrf, sigpath)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "cannot load signature\n"); + ret = -1; + goto asignify_cleanup; + } + + if (!asignify_verify_file(vrf, path)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is not valid\n"); + ret = -1; + goto asignify_cleanup; + } + + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is valid\n"); + +asignify_cleanup: + free(sigpath); + asignify_verify_free(vrf); + return ret; +} + /** * Helper for checking the PGP signature for the given file path. * This wraps #_alpm_gpgme_checksig in a slightly friendlier manner to simplify diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 112b2a1f..ce859373 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -23,13 +23,14 @@ char *_alpm_sigpath(alpm_handle_t *handle, const char *path); int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, - const char *base64_sig, alpm_siglist_t *result); - + const char *base64_sig, alpm_siglist_t *result); +int _alpm_check_asignify_helper(alpm_handle_t *handle, const char *path, + alpm_siglist_t **sigdata); int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, - const char *base64_sig, int optional, int marginal, int unknown, - alpm_siglist_t **sigdata); + const char *base64_sig, int optional, int marginal, int unknown, + alpm_siglist_t **sigdata); int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, - alpm_siglist_t *siglist, int optional, int marginal, int unknown); + alpm_siglist_t *siglist, int optional, int marginal, int unknown); int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr); diff --git a/meson.build b/meson.build index 76b9d2aa..fc9a6f1c 100644 --- a/meson.build +++ b/meson.build @@ -105,6 +105,14 @@ gpgme = dependency('gpgme', not_found_message : 'gpgme @0@ is needed for GPG signature support'.format(needed_gpgme_version)) conf.set('HAVE_LIBGPGME', gpgme.found()) +needed_libasignify_version = '>=1.0' +libasignify = dependency('libasignify', + version : needed_libasignify_version, + required : get_option('asignify'), + static : get_option('buildstatic'), + not_found_message : 'libasignify @0@ is needed for asignify signature support'.format(needed_libasignify_version)) +conf.set('HAVE_LIBASIGNIFY', libasignify.found()) + want_crypto = get_option('crypto') if want_crypto == 'openssl' libcrypto = dependency('libcrypto', static : get_option('buildstatic'), @@ -305,7 +313,7 @@ libcommon = static_library( gnu_symbol_visibility : 'hidden', install : false) -alpm_deps = [crypto_provider, libarchive, libcurl, libintl, gpgme] +alpm_deps = [crypto_provider, libarchive, libasignify, libcurl, libintl, gpgme] libalpm_a = static_library( 'alpm_objlib', @@ -453,6 +461,7 @@ message('\n '.join([ ' i18n support : @0@'.format(get_option('i18n')), ' Build docs : @0@'.format(build_doc), ' debug build : @0@'.format(get_option('buildtype') == 'debug'), + ' Use libasignify : @0@'.format(conf.get('HAVE_LIBASIGNIFY')), ' Use libcurl : @0@'.format(conf.get('HAVE_LIBCURL')), ' Use GPGME : @0@'.format(conf.get('HAVE_LIBGPGME')), ' Use OpenSSL : @0@'.format(conf.has('HAVE_LIBSSL') and diff --git a/meson_options.txt b/meson_options.txt index 4d8cc300..a254a5d4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -48,6 +48,9 @@ option('crypto', type : 'combo', choices : ['openssl', 'nettle'], option('gpgme', type : 'feature', value : 'auto', description : 'use GPGME for PGP signature verification') +option('asignify', type : 'feature', value : 'auto', + description : 'use asignify for signature verification') + option('i18n', type : 'boolean', value : true, description : 'enable localization of pacman, libalpm and scripts') -- 2.34.1

4 4

[PATCH] libalpm: don't download files from local servers
by morganamilo 10 Jan '22

10 Jan '22

This causes file:// servers to be treated as if they were cache dirs when checking if a package needs to be downloaded/read. This stops packages being duplicated any time pacman "downloads" a package from a local repository. --- lib/libalpm/package.c | 4 ++-- lib/libalpm/sync.c | 20 ++++++-------------- lib/libalpm/util.c | 35 +++++++++++++++++++++++++++++++++-- lib/libalpm/util.h | 3 ++- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index f837f84a..f805edfa 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -57,7 +57,7 @@ int SYMEXPORT alpm_pkg_checkmd5sum(alpm_pkg_t *pkg) ASSERT(pkg->origin == ALPM_PKG_FROM_SYNCDB, RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1)); - fpath = _alpm_filecache_find(pkg->handle, pkg->filename); + fpath = _alpm_cache_find_pkg(pkg, 0); retval = _alpm_test_checksum(fpath, pkg->md5sum, ALPM_PKG_VALIDATION_MD5SUM); @@ -283,7 +283,7 @@ int SYMEXPORT alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig alpm_errno_t err; int ret = -1; - pkgpath = _alpm_filecache_find(pkg->handle, pkg->filename); + pkgpath = _alpm_cache_find_pkg(pkg, 0); if(!pkgpath) { GOTO_ERR(pkg->handle, ALPM_ERR_PKG_NOT_FOUND, cleanup); } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 36ad6242..f89d5c0d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -323,7 +323,7 @@ static int compute_download_size(alpm_pkg_t *newpkg) ASSERT(newpkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); fname = newpkg->filename; - fpath = _alpm_filecache_find(handle, fname); + fpath = _alpm_cache_find_pkg(newpkg, 0); /* downloaded file exists, so there's nothing to grab */ if(fpath) { @@ -333,7 +333,7 @@ static int compute_download_size(alpm_pkg_t *newpkg) CALLOC(fnamepart, strlen(fname) + 6, sizeof(char), return -1); sprintf(fnamepart, "%s.part", fname); - fpath = _alpm_filecache_find(handle, fnamepart); + fpath = _alpm_cache_find_pkg(newpkg, 1); if(fpath) { struct stat st; if(stat(fpath, &st) == 0) { @@ -737,21 +737,13 @@ static int find_dl_candidates(alpm_handle_t *handle, alpm_list_t **files) ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); - need_download = spkg->download_size != 0 || !_alpm_filecache_exists(handle, spkg->filename); + need_download = spkg->download_size != 0 || !_alpm_cache_pkg_exists(spkg, 0); /* even if the package file in the cache we need to check for * accompanion *.sig file as well. * If *.sig is not cached then force download the package + its signature file. */ if(!need_download && (siglevel & ALPM_SIG_PACKAGE)) { - char *sig_filename = NULL; - int len = strlen(spkg->filename) + 5; - - MALLOC(sig_filename, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(sig_filename, len, "%s.sig", spkg->filename); - - need_download = !_alpm_filecache_exists(handle, sig_filename); - - FREE(sig_filename); + need_download = !_alpm_cache_pkg_exists(spkg, 1); } if(need_download) { @@ -990,7 +982,7 @@ static int check_validity(alpm_handle_t *handle, } current_bytes += v.pkg->size; - v.path = _alpm_filecache_find(handle, v.pkg->filename); + v.path = _alpm_cache_find_pkg(v.pkg, 0); v.siglevel = alpm_db_get_siglevel(alpm_pkg_get_db(v.pkg)); if(_alpm_pkg_validate_internal(handle, v.path, v.pkg, @@ -1080,7 +1072,7 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, } current_bytes += spkg->size; - filepath = _alpm_filecache_find(handle, spkg->filename); + filepath = _alpm_cache_find_pkg(spkg, 0); /* load the package file and replace pkgcache entry with it in the target list */ /* TODO: alpm_pkg_get_db() will not work on this target anymore */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 299d287e..f871dce0 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -815,6 +815,37 @@ int _alpm_str_cmp(const void *s1, const void *s2) return strcmp(s1, s2); } +char *_alpm_cache_find_pkg(alpm_pkg_t *pkg, int sig) { + alpm_handle_t *handle = pkg->handle; + struct stat buf; + alpm_list_t *servers = pkg->origin_data.db->servers; + char *retpath; + char filepath[PATH_MAX]; + + for(alpm_list_t *j = servers; j; j = j->next) { + char *server = j->data; + + if(strncmp("file://", server, strlen("file://")) == 0) { + int len = strlen(server) - strlen("file://") + 1 + strlen(pkg->filename) + 1; + + if(sig) { + len += strlen(".sig"); + snprintf(filepath, len, "%s/%s", server + strlen("file://"), pkg->filename); + } else { + snprintf(filepath, len, "%s/%s.sig", server + strlen("file://"), pkg->filename); + } + + if(stat(filepath, &buf) == 0 && S_ISREG(buf.st_mode)) { + STRDUP(retpath, filepath, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + _alpm_log(handle, ALPM_LOG_DEBUG, "found pkg in repo cache: %s\n", retpath); + return retpath; + } + } + } + + return _alpm_filecache_find(handle, pkg->filename); +} + /** Find a filename in a registered alpm cachedir. * @param handle the context handle * @param filename name of file to find @@ -846,10 +877,10 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) * @param filename name of file to find * @return 0 if the filename was not found, 1 otherwise */ -int _alpm_filecache_exists(alpm_handle_t *handle, const char *filename) +int _alpm_cache_pkg_exists(alpm_pkg_t *pkg, int sig) { int res; - char *fpath = _alpm_filecache_find(handle, filename); + char *fpath = _alpm_cache_find_pkg(pkg, sig); res = (fpath != NULL); FREE(fpath); return res; diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index b7297f81..5c1febef 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -133,9 +133,10 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], _alpm_cb_io in_cb, void *in_ctx); int _alpm_ldconfig(alpm_handle_t *handle); int _alpm_str_cmp(const void *s1, const void *s2); +char *_alpm_cache_find_pkg(alpm_pkg_t *pkg, int sig); char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename); /* Checks whether a file exists in cache */ -int _alpm_filecache_exists(alpm_handle_t *handle, const char *filename); +int _alpm_cache_pkg_exists(alpm_pkg_t *pkg, int sig); const char *_alpm_filecache_setup(alpm_handle_t *handle); /* Unlike many uses of alpm_pkgvalidation_t, _alpm_test_checksum expects * an enum value rather than a bitfield. */ -- 2.34.1

5 4

[PATCH] Add semver coloring
by David Gustavsson 09 Jan '22

09 Jan '22

When both 'verbose' and 'color' is set, the (dot-separated) parts of the version strings where a change has occured will be highlighted in bold face -- if there are two or more levels. Signed-off-by: David Gustavsson <david.e.gustavsson(a)gmail.com> --- src/pacman/conf.c | 2 ++ src/pacman/conf.h | 1 + src/pacman/util.c | 64 ++++++++++++++++++++++++++++++++++++++++++----- src/pacman/util.h | 1 + 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..707bd421 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -80,6 +80,7 @@ void enable_colors(int colors) colstr->err = BOLDRED; colstr->faint = GREY46; colstr->nocolor = NOCOLOR; + colstr->changed = BOLD; } else { colstr->colon = ":: "; colstr->title = ""; @@ -91,6 +92,7 @@ void enable_colors(int colors) colstr->err = ""; colstr->faint = ""; colstr->nocolor = ""; + colstr->changed = ""; } } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f7916ca9..82a958a9 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,6 +33,7 @@ typedef struct __colstr_t { const char *err; const char *faint; const char *nocolor; + const char *changed; } colstr_t; typedef struct __config_repo_t { diff --git a/src/pacman/util.c b/src/pacman/util.c index c0d62826..e8bfdd09 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -858,13 +858,52 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* old and new versions */ - pm_asprintf(&str, "%s", - target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); - add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + const char *old_version = target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""; + char old_version_copy[strlen(old_version)+1]; + strcpy(old_version_copy, (char *)old_version); + const char *new_version = target->install != NULL ? alpm_pkg_get_version(target->install) : ""; + char new_version_copy[strlen(new_version)+1]; + strcpy(new_version_copy, (char *)new_version); + + char *old_semver[10]; + char *new_semver[10]; + int old_semver_num = semver(old_semver, old_version_copy); + int new_semver_num = semver(new_semver, new_version_copy); + + if (old_semver_num > 1 && new_semver_num == old_semver_num) { + char oldstring[100]; + char newstring[100]; + int oldoffset = 0; + int newoffset = 0; + for (int i = 0; i < old_semver_num; i++) { + if (i>0) { + oldoffset += snprintf(oldstring + oldoffset, 2, "."); + newoffset += snprintf(newstring + newoffset, 2, "."); + } - pm_asprintf(&str, "%s", - target->install != NULL ? alpm_pkg_get_version(target->install) : ""); - add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + if (strcmp(old_semver[i], new_semver[i]) != 0) { + /* This level changed, color in */ + oldoffset += sprintf(oldstring + oldoffset, "%s", config->colstr.changed); + newoffset += sprintf(newstring + newoffset, "%s", config->colstr.changed); + } + oldoffset += sprintf(oldstring + oldoffset, "%s", old_semver[i]); + newoffset += sprintf(newstring + newoffset, "%s", new_semver[i]); + + oldoffset += sprintf(oldstring + oldoffset, "%s", config->colstr.nocolor); + newoffset += sprintf(newstring + newoffset, "%s", config->colstr.nocolor); + } + pm_asprintf(&str, "%s", oldstring); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + pm_asprintf(&str, "%s", newstring); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + } else { + + pm_asprintf(&str, "%s", old_version); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + + pm_asprintf(&str, "%s", new_version); + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + } /* and size */ size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; @@ -1849,3 +1888,16 @@ void console_erase_line(void) { printf("\x1B[K"); } + +/* Splits version string into semver parts (major.minor.patch). Returns number of found elements. */ +int semver(char **out, char *version) +{ + int i = 0; + char *token = strtok(version, "."); + while (token != NULL) { + out[i] = token; + token = strtok(NULL, "."); + i++; + } + return i; +} diff --git a/src/pacman/util.h b/src/pacman/util.h index 52e79915..a119a2f6 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -88,6 +88,7 @@ void console_cursor_move_down(unsigned int lines); void console_cursor_move_end(void); /* Erases line from the current cursor position till the end of the line */ void console_erase_line(void); +int semver(char **out, char *version); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.34.1

2 1

[PATCH] libmakepkg: add extra buildflags only when buildflags is not disabled
by Allan McRae 09 Jan '22

09 Jan '22

This means options=('!buildflags') will disable the addition of CFLAG etc for LTO and debug building. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Question... There seems to be a strong opinion that LTO should be disabled by !buildflags as it is expected that option removes all buildflags. Should that apply to debug flags too? scripts/libmakepkg/buildenv/debugflags.sh.in | 2 +- scripts/libmakepkg/buildenv/lto.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 84ca7b71..1cb58613 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -29,7 +29,7 @@ source "$LIBRARY/util/option.sh" buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { - if check_option "debug" "y"; then + if check_option "debug" "y" && ! check_option "buildflags" "n"; then 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}" diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in index 081d5648..6e500eab 100644 --- a/scripts/libmakepkg/buildenv/lto.sh.in +++ b/scripts/libmakepkg/buildenv/lto.sh.in @@ -30,7 +30,7 @@ build_options+=('lto') buildenv_functions+=('buildenv_lto') buildenv_lto() { - if check_option "lto" "y"; then + if check_option "lto" "y" && ! check_option "buildflags" "n"; then CFLAGS+=" -flto" CXXFLAGS+=" -flto" LDFLAGS+=" -flto" -- 2.34.1

1 0

[PATCH v2] strip: Use debugedit instead of AWK to parse source files
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> This moves us from the fairly ugly AWK parsing line to debugedit which originally comes out of the rpm project. The original code has issues parsing anything that was not straight C/C++ and languages like Rust or Go would return invalid source code files. debugedit handles all these cases better. Fixes FS#66755 Fixes FS#66888 Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/libmakepkg/executable/debugedit.sh.in | 38 +++++++++++++++++++ scripts/libmakepkg/tidy/strip.sh.in | 25 +++++++++--- 2 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 scripts/libmakepkg/executable/debugedit.sh.in diff --git a/scripts/libmakepkg/executable/debugedit.sh.in b/scripts/libmakepkg/executable/debugedit.sh.in new file mode 100644 index 00000000..ec0ab814 --- /dev/null +++ b/scripts/libmakepkg/executable/debugedit.sh.in @@ -0,0 +1,38 @@ +#!/usr/bin/bash +# +# debugedit.sh - Confirm presence of debugedit binary +# +# Copyright (c) 2011-2022 Pacman Development Team <pacman-dev(a)lists.archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_EXECUTABLE_DEBUGEDIT_SH" ]] && return +LIBMAKEPKG_EXECUTABLE_DEBUGEDIT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +executable_functions+=('executable_debugedit') + +executable_debugedit() { + if check_option "debug" "y"; then + if ! type -p debugedit >/dev/null; then + error "$(gettext "Cannot find the %s binary required for source files in debug packages.")" "debugedit" + return 1 + fi + fi +} diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 92a6fb15..84732c6f 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -36,8 +36,23 @@ build_id() { } source_files() { - LANG=C readelf "$1" --debug-dump 2>/dev/null | \ - awk '/DW_AT_name +:/{name=$NF}/DW_AT_comp_dir +:/{{if (name == "<artificial>") next}{if (name !~ /^[<\/]/) {printf "%s/", $NF}}{print name}}' + # debugedit rewrites the binary. In most cases this is handled by the gcc + # prefix-map switches which rewrites $srcdir to $dbgsrcdir. debugedit will + # not do anything in those cases. However for binaries that does not have a + # prefix-map debugedit is going to modify the binary correcting the paths. + # + # From the mailing list discussion: + # * Without -b/-d: it just lists all source files. + # * With -b, it prints all source files rooted in the specified directory, but strips the + # prefix from the output. + # * With both -b and -d, it replaces any base-dir prefixes with dest-dir + # (modifying the binary), then prints all paths rooted in the dest-dir + # (again, stripping the dest-dir prefix in the output). + LANG=C debugedit --no-recompute-build-id \ + --base-dir "${srcdir}" \ + --dest-dir "${dbgsrcdir}" \ + --list-file /dev/stdout "$1" \ + | sort -zu | tr '\0' '\n' } strip_file() { @@ -58,9 +73,9 @@ strip_file() { # copy source files to debug directory local file dest t while IFS= read -r t; do - file=${t/${dbgsrcdir}/"$srcdir"} - dest="${dbgsrc/"$dbgsrcdir"/}$t" - if ! [[ -f $dest ]]; then + file="${srcdir}/${t}" + dest="${dbgsrc}/${t}" + if [[ -f "$file" ]] && ! [[ -f $dest ]]; then mkdir -p "${dest%/*}" cp -- "$file" "$dest" fi -- 2.34.1

2 1

[PATCH 0/1] Use debugedit instead of AWK to parse source files
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> This utilizes the debugedit project which was split out from RPM fairly recently. It's been used in things like portage and hopefully gives us better support for debug packages in other languages then just C/C++ https://sourceware.org/debugedit/ I have tested this one a Go project and compared with the previously generated pacman debug packages. Everything seems fine and gdb works for C, and delve works for the Go project. Preferaly some more testing would be needed. Morten Linderud (1): strip: Use debugedit instead of AWK to parse source files scripts/libmakepkg/tidy/strip.sh.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.34.1

3 15

[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