- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: correctly handle missing download clients
by Eli Schwartz 11 Jun '20

11 Jun '20

This was broken in commit 882e707e40bbade0111cf3bdedbdac4d4b70453b, which changed 'plain()' messages to go to stdout, which was then captured as the download client in question: cmdline=("Aborting..."). The result was a very confusing error message e.g. /usr/share/makepkg/source/file.sh: line 72: $'\E[1m': command not found or with makepkg --nocolor: /usr/share/makepkg/source/file.sh: line 72: Aborting...: command not found Solve this on two levels: - redirect this error() continuation to stderr so the user sees it. - catch erroring returns in get_downloadclient and propagate them bash 4.4 can use wait $! to retrieve the return value of an asynchronous subshell such as <(...), which means, now we target that as our minimum, we can sanely handle errors in such functions. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Actually, maybe every use of plain() needs to do this. Or else make plain() do this by default. But it's technically used to "continue the previous message", and there's no guarantee it merits going to stderr, even though every time we use plain(), it does. What to do... scripts/libmakepkg/source/file.sh.in | 1 + scripts/libmakepkg/util/source.sh.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 819320c2..28f373fb 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -42,6 +42,7 @@ download_file() { # find the client we should use for this URL local -a cmdline IFS=' ' read -a cmdline < <(get_downloadclient "$proto") + wait $! || exit (( ${#cmdline[@]} )) || exit local filename=$(get_filename "$netfile") diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index e0490661..1bf5b814 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -165,7 +165,7 @@ get_downloadclient() { if [[ ! -x $program ]]; then local baseprog="${program##*/}" error "$(gettext "The download program %s is not installed.")" "$baseprog" - plain "$(gettext "Aborting...")" + plain "$(gettext "Aborting...")" >&2 exit 1 # $E_MISSING_PROGRAM fi -- 2.26.2

2 4

[pacman-dev] [PATCH] build: add libintl dependency to meson and the .pc file
by Eli Schwartz 11 Jun '20

11 Jun '20

In order to use gettext on systems where it is not part of libc, the correct linker flags are needed in libalpm.pc (for static compilation). This has never been the case. The new meson build system currently only checks for ngettext in libc, but does not fall back to searching for the existence of -lintl; add it to the libalpm dependencies. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Fixes build on MSYS2, and possibly others. Part of https://github.com/msys2/MSYS2-packages/pull/1951 lib/libalpm/libalpm.pc.in | 2 +- meson.build | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/libalpm.pc.in b/lib/libalpm/libalpm.pc.in index 126a6e6a..da7f96aa 100644 --- a/lib/libalpm/libalpm.pc.in +++ b/lib/libalpm/libalpm.pc.in @@ -10,4 +10,4 @@ Version: @LIB_VERSION@ Requires.private: libarchive @pc_crypto@ @pc_libcurl@ @pc_gpgme@ Cflags: -I${includedir} @LFS_CFLAGS@ Libs: -L${libdir} -lalpm -Libs.private: @LIBS@ @pc_gpgme_libs@ +Libs.private: @LIBS@ @pc_gpgme_libs@ @LIBINTL@ diff --git a/meson.build b/meson.build index 331f02b8..aa3bd4d9 100644 --- a/meson.build +++ b/meson.build @@ -77,9 +77,13 @@ conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) +libintl = dependency('', required: false) if get_option('i18n') if not cc.has_function('ngettext') - error('ngettext not found but NLS support requested') + libintl = cc.find_library('intl', required : false, static: get_option('buildstatic')) + if not libintl.found() + error('ngettext not found but NLS support requested') + endif endif conf.set('ENABLE_NLS', 1) endif @@ -301,7 +305,7 @@ libcommon = static_library( include_directories : includes, install : false) -alpm_deps = [crypto_provider, libarchive, libcurl, gpgme] +alpm_deps = [crypto_provider, libarchive, libcurl, libintl, gpgme] libalpm_a = static_library( 'alpm_objlib', -- 2.26.2

2 1

[pacman-dev] [PATCH] ci: cache packages
by Filipe Laíns 11 Jun '20

11 Jun '20

Results in ~40s saved in each job. Signed-off-by: Filipe Laíns <lains(a)archlinux.org> --- .gitlab-ci.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4961352eb..46da925cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,19 @@ variables: MAKEFLAGS: "-j10" VERBOSE: 1 + PACMAN_OPTS: --needed --noconfirm --cachedir .pkg-cache + +cache: + key: pkgs-v1 + paths: + # For some reason Gitlab CI only supports storing cache/artifacts in a path relative to the build directory + - .pkg-cache .arch-test: image: archlinux/base before_script: - > - pacman -Syu --needed --noconfirm + pacman -Syu $PACMAN_OPTS base-devel git gpgme libarchive curl python @@ -30,14 +37,14 @@ arch-debug: arch-docs: extends: .arch-test script: - - pacman -Syu --needed --noconfirm asciidoc + - pacman -Syu $PACMAN_OPTS asciidoc - meson -Ddoc=enabled build - ninja -C build arch-autoconf: extends: .arch-test script: - - pacman -Syu --needed --noconfirm autoconf-archive + - pacman -Syu $PACMAN_OPTS autoconf-archive - autoreconf -i - ./configure --enable-warningflags --disable-doc - make @@ -46,7 +53,7 @@ arch-autoconf: arch-distcheck: extends: .arch-test script: - - pacman -Syu --needed --noconfirm autoconf-archive asciidoc + - pacman -Syu $PACMAN_OPTS autoconf-archive asciidoc - autoreconf -i - ./configure --enable-warningflags - fakechroot make distcheck @@ -54,7 +61,7 @@ arch-distcheck: arch-clang: extends: .arch-test script: - - pacman -Syu --needed --noconfirm clang + - pacman -Syu $PACMAN_OPTS clang - CC=clang meson build - ninja -C build - fakechroot meson test -C build @@ -62,7 +69,7 @@ arch-clang: arch-valgrind: extends: .arch-test script: - - pacman -Syu --needed --noconfirm autoconf-archive valgrind + - pacman -Syu $PACMAN_OPTS autoconf-archive valgrind - autoreconf -i - ./configure --enable-warningflags --disable-doc - make @@ -98,6 +105,7 @@ arch-no-nls: debian: image: debian:bullseye + cache: {} before_script: - apt update - > @@ -113,6 +121,7 @@ debian: fedora: image: fedora + cache: {} before_script: - > dnf -y install -- 2.26.2

2 1

[pacman-dev] [PATCH] makepkg/repo-add: do not accept public-only keys for signing
by Eli Schwartz 09 Jun '20

09 Jun '20

If it's not listed by --list-secret-key we don't care if it has been imported into your keyring, it's unusable. And you might not have a private key at all in the no-keyid-specified case. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Overlaps previous patch to fix GPGKEY handling. scripts/makepkg.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc8de5aa..9e75ef17 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1293,7 +1293,7 @@ fi # check if gpg signature is to be created and if signing key is valid if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; then SIGNPKG='y' - if ! gpg --list-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then + if ! gpg --list-secret-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then if [[ ! -z $GPGKEY ]]; then error "$(gettext "The key %s does not exist in your keyring.")" "${GPGKEY}" else diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 272d8d22..160fd93a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -137,7 +137,7 @@ check_gpg() { fi if (( ! VERIFY )); then - if ! gpg --list-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then + if ! gpg --list-secret-key ${GPGKEY:+"$GPGKEY"} &>/dev/null; then if [[ ! -z $GPGKEY ]]; then error "$(gettext "The key ${GPGKEY} does not exist in your keyring.")" elif (( ! KEY )); then -- 2.27.0

1 0

[pacman-dev] makepkg: package_...() can export variables to each other
by Erich Eckner 05 Jun '20

05 Jun '20

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I stumbled upon the fact, that variables set in one package_...() function of a split package are accessible by following package_...() functions. Is this by design or may I try to provide a patch to restore env after the call to package_...()? Note: packaging-relevant variables (e.g. depends_x86_64) are cleaned across function calls. Simple example: - ------8<------8<------8<------ arch=(any) pkgbase=test pkgname=(ta tb) pkgver=0 pkgrel=1 package_ta() { _test='hi, there!' } package_tb() { echo "$_test" } - ------>8------>8------>8------ regards, Erich -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAl7Z9qsACgkQCu7JB1Xa e1pc+xAAtKJyAv0JgX0skAmVmMEit+q456ZwKJAL0Kxe8059RNrwzwHvpcvso183 Pc3eqSbxMIRbTGrA2dyweWX42uO8DJuq39LTYNyHQR6KPY7rtaoAMEq/ypF6prc9 EKfD8wq+E5P3i3Ti4YyS8kKfEYfPLvA6O99r/U4GI8GZiFwNoq8LwvKvMnXYxqS2 6oEviKxYFw8wXlYjcCOOTb6WzgNZVyXbpos3B1kx0yuDRW6qhqicVa0levnWUp+M wh8Cx4LXIwCJKLawaA3VzmGXnsbHQq6UatMKeT4z+OcFFHq80q19KJlR8mfP41mc 1Wt+PYwQm+6zyekzcuzz/b6CX0RHK/hEHJJgXGu1awxpzADAWAt3l0HvjGJ+zKiK qhpnbWykGVAwBCE6EwrQsOFAfL9vqzwz9c1tIycKEmbIUs+aFPMbSQVOynnolXGj m1wpbs58+HOHVMcA/ozzkOT1Of+rlLZQHfc87QQuCaJp419sXEPTzFVdNg7d/ok2 m/Z3KmARycCeEu9TpNLYCcR1/OeayBlHnbjhGaESsgiqenqap27CKRiy2TextYt6 56kiGxIj3EbZz7tE3oJE0eQbAeefFctU42O1nbiPpmUZMHdobJqzNtBxB45pKmYm 3YRQqgd+WzMdY583ifqK7dlooUeLkc61eX+AppJrAZ2UNaHAoP4= =q2Yz -----END PGP SIGNATURE-----

3 2

[pacman-dev] [PATCH v4] Fallback to detached signatures during keyring check
by Anatol Pomozov 04 Jun '20

04 Jun '20

Pacman has a 'key in keyring' verification step that makes sure the signatures have a valid keyid. Currently pacman parses embedded package signatures only. Add a fallback to detached signatures. If embedded signature is missing then it tries to read corresponding *.sig file and get keyid from there. Verification: debug: found cached pkg: /var/cache/pacman/pkg/glib-networking-2.64.3-1-x86_64.pkg.tar.zst debug: found detached signature /var/cache/pacman/pkg/glib-networking-2.64.3-1-x86_64.pkg.tar.zst.sig with size 310 debug: found signature key: A5E9288C4FA415FA debug: looking up key A5E9288C4FA415FA locally debug: key lookup success, key exists Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 11 +++++++++++ lib/libalpm/package.c | 40 ++++++++++++++++++++++++++++++++++++++++ lib/libalpm/sync.c | 18 +++++++++--------- lib/libalpm/util.c | 37 +++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 5 files changed, 98 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c6a13273..0ba57109 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1403,6 +1403,17 @@ alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg); +/** Extracts package signature either from embedded package signature + * or if it is absent then reads data from detached signature file. + * @param pkg a pointer to package. + * @param sig output parameter for signature data. Callee function allocates + * a buffer needed for the signature data. Caller is responsible for + * freeing this buffer. + * @param sig_len output parameter for the signature data length. + * @return 0 on success, negative number on error. + */ +int alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len); + /** Returns the method used to validate a package during install. * @param pkg a pointer to package * @return an enum member giving the validation method diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 5c5fa073..0885b27b 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -268,6 +268,46 @@ const char SYMEXPORT *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg) return pkg->base64_sig; } +int SYMEXPORT alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len) +{ + if(pkg != NULL) { + RET_ERR(pkg->handle, ALPM_ERR_WRONG_ARGS, -1); + } + + if(pkg->base64_sig) { + int ret = alpm_decode_signature(pkg->base64_sig, sig, sig_len); + if(ret != 0) { + RET_ERR(pkg->handle, ALPM_ERR_SIG_INVALID, -1); + } + return 0; + } else { + char *pkgpath = NULL, *sigpath = NULL; + alpm_errno_t err; + int ret = -1; + + pkgpath = _alpm_filecache_find(pkg->handle, pkg->filename); + if(!pkgpath) { + GOTO_ERR(pkg->handle, ALPM_ERR_PKG_NOT_FOUND, cleanup); + } + sigpath = _alpm_sigpath(pkg->handle, pkgpath); + if(!sigpath || _alpm_access(pkg->handle, NULL, sigpath, R_OK)) { + GOTO_ERR(pkg->handle, ALPM_ERR_SIG_MISSING, cleanup); + } + err = _alpm_read_file(sigpath, sig, sig_len); + if(err == ALPM_ERR_OK) { + _alpm_log(pkg->handle, ALPM_LOG_DEBUG, "found detached signature %s with size %ld\n", + sigpath, *sig_len); + } else { + GOTO_ERR(pkg->handle, err, cleanup); + } + ret = 0; +cleanup: + FREE(pkgpath); + FREE(sigpath); + return ret; + } +} + const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8c01ad95..9350793a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -880,18 +880,18 @@ static int check_keyring(alpm_handle_t *handle) } level = alpm_db_get_siglevel(alpm_pkg_get_db(pkg)); - if((level & ALPM_SIG_PACKAGE) && pkg->base64_sig) { - unsigned char *decoded_sigdata = NULL; - size_t data_len; - int decode_ret = alpm_decode_signature(pkg->base64_sig, - &decoded_sigdata, &data_len); - if(decode_ret == 0) { + if((level & ALPM_SIG_PACKAGE)) { + unsigned char *sig = NULL; + size_t sig_len; + int ret = alpm_pkg_get_sig(pkg, &sig, &sig_len); + if(ret == 0) { alpm_list_t *keys = NULL; - if(alpm_extract_keyid(handle, pkg->name, decoded_sigdata, - data_len, &keys) == 0) { + if(alpm_extract_keyid(handle, pkg->name, sig, + sig_len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "found signature key: %s\n", key); if(!alpm_list_find(errors, key, key_cmp) && _alpm_key_in_keychain(handle, key) == 0) { keyinfo = malloc(sizeof(struct keyinfo_t)); @@ -905,8 +905,8 @@ static int check_keyring(alpm_handle_t *handle) } FREELIST(keys); } - free(decoded_sigdata); } + free(sig); } } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 76728eb4..b70a8192 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1489,3 +1489,40 @@ void _alpm_alloc_fail(size_t size) { fprintf(stderr, "alloc failure: could not allocate %zu bytes\n", size); } + +/** This functions reads file content. + * + * Memory buffer is allocated by the callee function. It is responsibility + * of the caller to free the buffer. + * + * @param filepath filepath to read + * @param data pointer to output buffer + * @param data_len size of the output buffer + * @return error code for the operation + */ +alpm_errno_t _alpm_read_file(const char *filepath, unsigned char **data, size_t *data_len) +{ + struct stat st; + FILE *fp; + + if((fp = fopen(filepath, "rb")) == NULL) { + return ALPM_ERR_NOT_A_FILE; + } + + if(fstat(fileno(fp), &st) != 0) { + fclose(fp); + return ALPM_ERR_NOT_A_FILE; + } + *data_len = st.st_size; + + MALLOC(*data, *data_len, fclose(fp); return ALPM_ERR_MEMORY); + + if(fread(*data, *data_len, 1, fp) != 1) { + FREE(*data); + fclose(fp); + return ALPM_ERR_SYSTEM; + } + + fclose(fp); + return ALPM_ERR_OK; +} diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 4fc6e718..03c8ed44 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -155,6 +155,7 @@ int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); void *_alpm_realloc(void **data, size_t *current, const size_t required); void *_alpm_greedy_grow(void **data, size_t *current, const size_t required); +alpm_errno_t _alpm_read_file(const char *filepath, unsigned char **data, size_t *data_len); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 2.27.0

1 0

[pacman-dev] [PATCH v3] Fallback to detached signatures during keyring check
by Anatol Pomozov 04 Jun '20

04 Jun '20

Pacman has a 'key in keyring' verification step that makes sure the signatures have a valid keyid. Currently pacman parses embedded package signatures only. Add a fallback to detached signatures. If embedded signature is missing then it tries to read corresponding *.sig file and get keyid from there. Verification: debug: found cached pkg: /var/cache/pacman/pkg/glib-networking-2.64.3-1-x86_64.pkg.tar.zst debug: found detached signature /var/cache/pacman/pkg/glib-networking-2.64.3-1-x86_64.pkg.tar.zst.sig with size 310 debug: found signature key: A5E9288C4FA415FA debug: looking up key A5E9288C4FA415FA locally debug: key lookup success, key exists Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 11 +++++++++++ lib/libalpm/package.c | 34 ++++++++++++++++++++++++++++++++++ lib/libalpm/sync.c | 18 +++++++++--------- lib/libalpm/util.c | 37 +++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 5 files changed, 92 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c6a13273..0ba57109 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1403,6 +1403,17 @@ alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg); +/** Extracts package signature either from embedded package signature + * or if it is absent then reads data from detached signature file. + * @param pkg a pointer to package. + * @param sig output parameter for signature data. Callee function allocates + * a buffer needed for the signature data. Caller is responsible for + * freeing this buffer. + * @param sig_len output parameter for the signature data length. + * @return 0 on success, negative number on error. + */ +int alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len); + /** Returns the method used to validate a package during install. * @param pkg a pointer to package * @return an enum member giving the validation method diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 5c5fa073..1335b70e 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -268,6 +268,40 @@ const char SYMEXPORT *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg) return pkg->base64_sig; } +int SYMEXPORT alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig, size_t *sig_len) +{ + ASSERT(pkg != NULL, return -1); + + if(pkg->base64_sig) { + return alpm_decode_signature(pkg->base64_sig, sig, sig_len); + } else { + char *pkgpath, *sigpath; + alpm_errno_t err; + int ret = -1; + + pkgpath = _alpm_filecache_find(pkg->handle, pkg->filename); + if(!pkgpath) { + RET_ERR(pkg->handle, ALPM_ERR_PKG_NOT_FOUND, -1); + } + sigpath = _alpm_sigpath(pkg->handle, pkgpath); + if(!sigpath || _alpm_access(pkg->handle, NULL, sigpath, R_OK)) { + GOTO_ERR(pkg->handle, ALPM_ERR_SIG_MISSING, exit); + } + err = _alpm_read_file(sigpath, sig, sig_len); + if(err == ALPM_ERR_OK) { + _alpm_log(pkg->handle, ALPM_LOG_DEBUG, "found detached signature %s with size %ld\n", + sigpath, *sig_len); + } else { + GOTO_ERR(pkg->handle, err, exit); + } + ret = 0; +exit: + FREE(pkgpath); + FREE(sigpath); + return ret; + } +} + const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8c01ad95..9350793a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -880,18 +880,18 @@ static int check_keyring(alpm_handle_t *handle) } level = alpm_db_get_siglevel(alpm_pkg_get_db(pkg)); - if((level & ALPM_SIG_PACKAGE) && pkg->base64_sig) { - unsigned char *decoded_sigdata = NULL; - size_t data_len; - int decode_ret = alpm_decode_signature(pkg->base64_sig, - &decoded_sigdata, &data_len); - if(decode_ret == 0) { + if((level & ALPM_SIG_PACKAGE)) { + unsigned char *sig = NULL; + size_t sig_len; + int ret = alpm_pkg_get_sig(pkg, &sig, &sig_len); + if(ret == 0) { alpm_list_t *keys = NULL; - if(alpm_extract_keyid(handle, pkg->name, decoded_sigdata, - data_len, &keys) == 0) { + if(alpm_extract_keyid(handle, pkg->name, sig, + sig_len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "found signature key: %s\n", key); if(!alpm_list_find(errors, key, key_cmp) && _alpm_key_in_keychain(handle, key) == 0) { keyinfo = malloc(sizeof(struct keyinfo_t)); @@ -905,8 +905,8 @@ static int check_keyring(alpm_handle_t *handle) } FREELIST(keys); } - free(decoded_sigdata); } + free(sig); } } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 76728eb4..65a6f3df 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1489,3 +1489,40 @@ void _alpm_alloc_fail(size_t size) { fprintf(stderr, "alloc failure: could not allocate %zu bytes\n", size); } + +/** This functions reads file content. + * + * Memory buffer is allocated by the callee function. It is responsibility + * of the caller to free the buffer. + * + * @param filepath filepath to read + * @param data pointer to output buffer + * @param data_len size of the output buffer + * @return error code for the operation + */ +alpm_errno_t _alpm_read_file(const char *filepath, unsigned char **data, size_t *data_len) +{ + struct stat st; + FILE *fp; + + if((fp = fopen(filepath, "rb")) == NULL) { + return -1; + } + + if(fstat(fileno(fp), &st) != 0) { + fclose(fp); + return ALPM_ERR_NOT_A_FILE; + } + *data_len = st.st_size; + + MALLOC(*data, *data_len, fclose(fp); return ALPM_ERR_MEMORY); + + if(fread(*data, *data_len, 1, fp) != 1) { + FREE(*data); + fclose(fp); + return ALPM_ERR_SYSTEM; + } + + fclose(fp); + return ALPM_ERR_OK; +} diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 4fc6e718..03c8ed44 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -155,6 +155,7 @@ int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); void *_alpm_realloc(void **data, size_t *current, const size_t required); void *_alpm_greedy_grow(void **data, size_t *current, const size_t required); +alpm_errno_t _alpm_read_file(const char *filepath, unsigned char **data, size_t *data_len); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 2.27.0

2 2

[pacman-dev] [PATCH v2] Fallback to detached signatures during keyring check
by Anatol Pomozov 02 Jun '20

02 Jun '20

Pacman has a 'key in keyring' verification step that makes sure the signatures have a valid keyid. Currently pacman parses embedded package signatures only. Add a fallback to detached signatures. If embedded signature is missing then it tries to read corresponding *.sig file and get keyid from there. Verification: debug: found cached pkg: /var/cache/pacman/pkg/glib-networking-2.64.3-1-x86_64.pkg.tar.zst debug: found detached signature /var/cache/pacman/pkg/glib-networking-2.64.3-1-x86_64.pkg.tar.zst.sig with size 310 debug: found signature key: A5E9288C4FA415FA debug: looking up key A5E9288C4FA415FA locally debug: key lookup success, key exists Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 10 ++++++++++ lib/libalpm/package.c | 31 +++++++++++++++++++++++++++++++ lib/libalpm/sync.c | 17 ++++++++--------- lib/libalpm/util.c | 35 +++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 5 files changed, 85 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c6a13273..9c5fff73 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1403,6 +1403,16 @@ alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg); +/** Extracts package signature either from embedded package signature + * or if it is absent then reads data from detached signature file. + * @param pkg a pointer to package + * @param sig output parameter for signature data. Callee function allocates + * buffer needed for the signature data. Caller is responsible for + * freeing this buffer. + * @return size of a signature or negative number if error. + */ +int alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig); + /** Returns the method used to validate a package during install. * @param pkg a pointer to package * @return an enum member giving the validation method diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 5c5fa073..e0e4d987 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -268,6 +268,37 @@ const char SYMEXPORT *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg) return pkg->base64_sig; } +int SYMEXPORT alpm_pkg_get_sig(alpm_pkg_t *pkg, unsigned char **sig) +{ + ASSERT(pkg != NULL, return -1); + pkg->handle->pm_errno = ALPM_ERR_OK; + + if(pkg->base64_sig) { + size_t sig_len; + int ret = alpm_decode_signature(pkg->base64_sig, sig, &sig_len); + return ret == 0 ? (int)sig_len : -1; + } else { + char *pkgpath, *sigpath; + int len; + + pkgpath = _alpm_filecache_find(pkg->handle, pkg->filename); + if(!pkgpath) { + RET_ERR(pkg->handle, ALPM_ERR_PKG_NOT_FOUND, -1); + } + sigpath = _alpm_sigpath(pkg->handle, pkgpath); + if(!sigpath || _alpm_access(pkg->handle, NULL, sigpath, R_OK)) { + FREE(pkgpath); + FREE(sigpath); + RET_ERR(pkg->handle, ALPM_ERR_SIG_MISSING, -1); + } + len = _alpm_read_file(sigpath, sig); + _alpm_log(pkg->handle, ALPM_LOG_DEBUG, "found detached signature %s with size %d\n", sigpath, len); + FREE(pkgpath); + FREE(sigpath); + return len; + } +} + const char SYMEXPORT *alpm_pkg_get_arch(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8c01ad95..0ab0fe26 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -880,18 +880,17 @@ static int check_keyring(alpm_handle_t *handle) } level = alpm_db_get_siglevel(alpm_pkg_get_db(pkg)); - if((level & ALPM_SIG_PACKAGE) && pkg->base64_sig) { - unsigned char *decoded_sigdata = NULL; - size_t data_len; - int decode_ret = alpm_decode_signature(pkg->base64_sig, - &decoded_sigdata, &data_len); - if(decode_ret == 0) { + if((level & ALPM_SIG_PACKAGE)) { + unsigned char *signature = NULL; + int sig_len = alpm_pkg_get_sig(pkg, &signature); + if(sig_len > 0) { alpm_list_t *keys = NULL; - if(alpm_extract_keyid(handle, pkg->name, decoded_sigdata, - data_len, &keys) == 0) { + if(alpm_extract_keyid(handle, pkg->name, signature, + sig_len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "found signature key: %s\n", key); if(!alpm_list_find(errors, key, key_cmp) && _alpm_key_in_keychain(handle, key) == 0) { keyinfo = malloc(sizeof(struct keyinfo_t)); @@ -905,8 +904,8 @@ static int check_keyring(alpm_handle_t *handle) } FREELIST(keys); } - free(decoded_sigdata); } + free(signature); } } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 76728eb4..3d57817b 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1489,3 +1489,38 @@ void _alpm_alloc_fail(size_t size) { fprintf(stderr, "alloc failure: could not allocate %zu bytes\n", size); } + +/** This functions reads file content. + * + * Memory buffer is allocated by the callee function. It is responsibility + * of the caller to free the buffer + * + * @param filepath filepath to read + * @param data pointer to output buffer + * @return size of the data read or negative number in case of error + */ +int _alpm_read_file(const char *filepath, unsigned char **data) +{ + struct stat st; + FILE *fp; + + if((fp = fopen(filepath, "rb")) == NULL) { + return -1; + } + + if(fstat(fileno(fp), &st) != 0) { + fclose(fp); + return -1; + } + + MALLOC(*data, st.st_size, fclose(fp); return -1); + + if(fread(*data, st.st_size, 1, fp) != 1) { + FREE(*data); + fclose(fp); + return -1; + } + + fclose(fp); + return st.st_size; +} diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 4fc6e718..50a94489 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -155,6 +155,7 @@ int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); void *_alpm_realloc(void **data, size_t *current, const size_t required); void *_alpm_greedy_grow(void **data, size_t *current, const size_t required); +int _alpm_read_file(const char *filepath, unsigned char **data); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 2.26.2

2 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-87-g5f6ef895
by Allan McRae 01 Jun '20

01 Jun '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 5f6ef895b1dac04c7fb1b63acab2d42c19f91922 (commit) via 23b50d60e34e324cf6f420c05293f7fa8a909623 (commit) via 3674144a74cfe897ec3ff46c18681df293290caa (commit) via 454ea024383eab60295e4c4fdf2c329475887b2c (commit) from 8ce142a2552418f64a74e773f659d92b065d6209 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5f6ef895b1dac04c7fb1b63acab2d42c19f91922 Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 20 14:17:11 2020 +1000 libalpm/signing.c: Fix calculation of packet size in parse_subpacket Given RFC 4880 provides the code to do this calculation, I am not sure how I managed to stuff that up! This bug was only exposed when a signature made with "include-key-block" was added to the Arch repos, which provided a subpacket with the required size to hit this issue. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23b50d60e34e324cf6f420c05293f7fa8a909623 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed May 13 14:43:53 2020 -0400 Avoid depending on side effects in assert(...) expressions When building with -DNDEBUG, assert statements are compiled out to no-ops. Thus, we can't depend on assignments or other computations occurring inside the assert(). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3674144a74cfe897ec3ff46c18681df293290caa Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon May 11 00:16:30 2020 -0400 libmakepkg/strip: don't re-add the same debug source multiple times It's either a waste of work, or triggers edge cases in some packages (like coreutils-8.31) where the source file is readonly and cp gets a permission denied error trying to overwrite it with an identical copy of itself. Also while we are at it, make the variable names be something readable, because I could barely tell what this was doing while editing it. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 454ea024383eab60295e4c4fdf2c329475887b2c Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 11 12:59:51 2020 +1000 Remove autotools support This removes support for autotools in favour of meson. ----------------------------------------------------------------------- Summary of changes: .gitignore | 21 -- .gitlab-ci.yml | 17 -- HACKING | 13 - INSTALL | 370 ---------------------- Makefile.am | 78 ----- RELEASE | 9 +- configure.ac | 594 ------------------------------------ doc/Makefile.am | 162 ---------- doc/index.asciidoc | 8 +- etc/Makefile.am | 27 -- lib/libalpm/Makefile.am | 78 ----- lib/libalpm/signing.c | 2 +- scripts/Makefile.am | 287 ----------------- scripts/libmakepkg/tidy/strip.sh.in | 11 +- src/common/Makefile.am | 3 - src/pacman/Makefile.am | 69 ----- src/pacman/callback.c | 8 +- src/util/Makefile.am | 27 -- test/pacman/Makefile.am | 22 -- test/pacman/tests/Makefile.am | 5 - test/scripts/Makefile.am | 10 - test/util/Makefile.am | 8 - 22 files changed, 22 insertions(+), 1807 deletions(-) delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100644 configure.ac delete mode 100644 doc/Makefile.am delete mode 100644 etc/Makefile.am delete mode 100644 lib/libalpm/Makefile.am delete mode 100644 scripts/Makefile.am delete mode 100644 src/common/Makefile.am delete mode 100644 src/pacman/Makefile.am delete mode 100644 src/util/Makefile.am delete mode 100644 test/pacman/Makefile.am delete mode 100644 test/pacman/tests/Makefile.am delete mode 100644 test/scripts/Makefile.am delete mode 100644 test/util/Makefile.am hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm/signing.c: Fix calculation of packet size in parse_subpacket
by Allan McRae 31 May '20

31 May '20

Given RFC 4880 provides the code to do this calculation, I am not sure how I managed to stuff that up! This bug was only exposed when a signature made with "include-key-block" was added to the Arch repos, which provided a subpacket with the required size to hit this issue. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Also appropriate for 5.2.2 lib/libalpm/signing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index c8eaaca2..422523b6 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -1058,7 +1058,7 @@ static int parse_subpacket(alpm_handle_t *handle, const char *identifier, if(length_check(len, spos, 2, handle, identifier) != 0){ return -1; } - slen = (sig[spos] << 8) | sig[spos + 1]; + slen = (((sig[spos] - 192) << 8) | sig[spos + 1]) + 192; spos = spos + 2; } else { if(length_check(len, spos, 5, handle, identifier) != 0) { -- 2.26.2

2 2