December 2020 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: --source should download repos with PGP signatures
by Eli Schwartz 08 Apr '21

08 Apr '21

We optimize this out for sourceballs since VCS sources don't get their checksums verified. But this logic is broken ever since we implemented PGP signature checking for git sources -- if the git source is signed, we still check it, but we don't make sure to download it first. makepkg then fails to generate a sourceball unless you previously ran --verifysource or attempted to build. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/source.sh.in | 5 ++++- scripts/libmakepkg/source/git.sh.in | 9 ++++++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index a0c6b662..b95e6be8 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -35,7 +35,7 @@ done download_sources() { local netfile all_sources - local get_source_fn=get_all_sources_for_arch get_vcs=1 + local get_source_fn=get_all_sources_for_arch get_vcs=1 get_pgp=0 msg "$(gettext "Retrieving sources...")" @@ -47,6 +47,9 @@ download_sources() { novcs) get_vcs=0 ;; + getpgp) + (( SKIPPGPCHECK )) || get_pgp=1 + ;; *) break ;; diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 7d191b8d..d090f14e 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -29,13 +29,16 @@ source "$LIBRARY/util/pkgbuild.sh" download_git() { + local netfile=$1 + local query=$(get_uri_query "$netfile") + # abort early if parent says not to fetch if declare -p get_vcs > /dev/null 2>&1; then - (( get_vcs )) || return + if (( ! get_pgp )) || [[ $query != signed ]]; then + (( get_vcs )) || return + fi fi - local netfile=$1 - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7e8d6805..c9940f0a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1416,7 +1416,7 @@ if (( SOURCEONLY )); then download_sources allarch elif ( (( ! SKIPCHECKSUMS )) || \ ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ); then - download_sources allarch novcs + download_sources allarch novcs getpgp fi check_source_integrity all cd_safe "$startdir" -- 2.28.0

2 1

[pacman-dev] [PATCH] makepkg: Don't double-layer distcc on ccache
by Matti Niemenmaa 08 Feb '21

08 Feb '21

From: Matti Niemenmaa <matti.niemenmaa+git(a)iki.fi> buildenv is set once for build() and a second time for package(). When using both distcc and ccache, this lead to CCACHE_PREFIX="distcc distcc" in package(), which breaks PKGBUILDs that execute the compiler in package() because distcc complains: distcc[383041] (main) CRITICAL! distcc seems to have invoked itself recursively! Avoid causing this error by only adding "distcc" to CCACHE_PREFIX if it's not yet there. Signed-off-by: Matti Niemenmaa <matti.niemenmaa+git(a)iki.fi> --- scripts/libmakepkg/buildenv/compiler.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ncurses is an example of a package that runs into this problem. Setting buildenv twice was done on purpose in commit 02a0bf550a22e199f48537b7eee87361b112e8a0, but at a glance I'm not sure whether it provides any benefit. All the meaningful changes are to environment variables that are exported from the parent process anyway, so all the changes are either repeated or even duplicated (like in PATH, or this CCACHE_PREFIX issue). Maybe it would be better to simply remove the prepare_buildenv call from the INFAKEROOT case in makepkg.sh.in? diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in index 69f58a29..c93c77b4 100644 --- a/scripts/libmakepkg/buildenv/compiler.sh.in +++ b/scripts/libmakepkg/buildenv/compiler.sh.in @@ -44,7 +44,9 @@ buildenv_ccache() { buildenv_distcc() { if check_buildoption "distcc" "y"; then if (( using_ccache )); then - export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + if ! [[ "$CCACHE_PREFIX" =~ (^| )distcc($| ) ]]; then + export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + fi export CCACHE_BASEDIR="$srcdir" elif [[ -d /usr/lib/distcc/bin ]]; then export PATH="/usr/lib/distcc/bin:$PATH" -- 2.24.1

3 6

[pacman-dev] [PATCH] Reopen stdin before chrooting
by morganamilo 09 Jan '21

09 Jan '21

Fixes FS#68630 diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7b19162c..4fb7fe3c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1135,12 +1135,6 @@ int main(int argc, char *argv[]) cleanup(EXIT_FAILURE); } - if(config->sysroot && (chroot(config->sysroot) != 0 || chdir("/") != 0)) { - pm_printf(ALPM_LOG_ERROR, - _("chroot to '%s' failed: (%s)\n"), config->sysroot, strerror(errno)); - cleanup(EXIT_FAILURE); - } - /* we support reading targets from stdin if a cmdline parameter is '-' */ if(alpm_list_find_str(pm_targets, "-")) { if(!isatty(fileno(stdin))) { @@ -1191,6 +1185,12 @@ int main(int argc, char *argv[]) } } + if(config->sysroot && (chroot(config->sysroot) != 0 || chdir("/") != 0)) { + pm_printf(ALPM_LOG_ERROR, + _("chroot to '%s' failed: (%s)\n"), config->sysroot, strerror(errno)); + cleanup(EXIT_FAILURE); + } + pm_printf(ALPM_LOG_DEBUG, "pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); /* parse the config file */ -- 2.30.0

2 1

[pacman-dev] [PATCH 1/3] Remove pre libarchive 3.0 code
by Emil Velikov 04 Jan '21

04 Jan '21

Pacman has required libarchive 3.0 or later for quite some time mow. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- lib/libalpm/libarchive-compat.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h index 0ff005ae..596fd664 100644 --- a/lib/libalpm/libarchive-compat.h +++ b/lib/libalpm/libarchive-compat.h @@ -24,48 +24,28 @@ static inline int _alpm_archive_read_free(struct archive *archive) { -#if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_read_free(archive); -#else - return archive_read_finish(archive); -#endif } static inline int64_t _alpm_archive_compressed_ftell(struct archive *archive) { -#if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_filter_bytes(archive, -1); -#else - return archive_position_compressed(archive); -#endif } static inline int _alpm_archive_read_open_file(struct archive *archive, const char *filename, size_t block_size) { -#if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_read_open_filename(archive, filename, block_size); -#else - return archive_read_open_file(archive, filename, block_size); -#endif } static inline int _alpm_archive_filter_code(struct archive *archive) { -#if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_filter_code(archive, 0); -#else - return archive_compression(archive); -#endif } static inline int _alpm_archive_read_support_filter_all(struct archive *archive) { -#if ARCHIVE_VERSION_NUMBER >= 3000000 return archive_read_support_filter_all(archive); -#else - return archive_read_support_compression_all(archive); -#endif } #endif /* LIBARCHIVE_COMPAT_H */ -- 2.29.2

2 6

[pacman-dev] [PATCH 1/3] meson: replace objects with link_whole
by Emil Velikov 04 Jan '21

04 Jan '21

Instead extracting/listing objects from existing static libraries, simply add those to the link list. Note that link_whole is needed otherwise, unused code will be pruned. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 264c6501..fd573826 100644 --- a/meson.build +++ b/meson.build @@ -310,15 +310,14 @@ alpm_deps = [crypto_provider, libarchive, libcurl, libintl, gpgme] libalpm_a = static_library( 'alpm_objlib', libalpm_sources, - # https://github.com/mesonbuild/meson/issues/3937 - objects : libcommon.extract_all_objects(), + link_whole: libcommon, include_directories : includes, dependencies : alpm_deps) libalpm = library( 'alpm', version : libalpm_version, - objects: libalpm_a.extract_all_objects(recursive: true), + link_whole: libalpm_a, dependencies : alpm_deps, install : true) -- 2.29.2

3 10

[pacman-dev] [PATCH] doc: fix typos
by morganamilo 30 Dec '20

30 Dec '20

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 72c4fb24..63d885b8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -78,7 +78,7 @@ typedef struct __alpm_handle_t alpm_handle_t; * A database can be located on the local filesystem or on a remote server. * * To use a database, it must first be registered via \link alpm_register_syncdb \endlink. - * If the database is already preasant in dbpath then it will be usable. Otherwise, + * If the database is already present in dbpath then it will be usable. Otherwise, * the database needs to be downloaded using \link alpm_db_update \endlink. Even if the * source of the database is the local filesystem. * @@ -373,7 +373,7 @@ typedef enum _alpm_siglevel_t { ALPM_SIG_PACKAGE_OPTIONAL = (1 << 1), /* Allow packages with signatures that are marginal trust */ ALPM_SIG_PACKAGE_MARGINAL_OK = (1 << 2), - /** Allow packages with signatues that are unknown trust */ + /** Allow packages with signatures that are unknown trust */ ALPM_SIG_PACKAGE_UNKNOWN_OK = (1 << 3), /** Databases require a signature */ @@ -383,7 +383,7 @@ typedef enum _alpm_siglevel_t { ALPM_SIG_DATABASE_OPTIONAL = (1 << 11), /** Allow databases with signatures that are marginal trust */ ALPM_SIG_DATABASE_MARGINAL_OK = (1 << 12), - /** Allow databases with signatues that are unknown trust */ + /** Allow databases with signatures that are unknown trust */ ALPM_SIG_DATABASE_UNKNOWN_OK = (1 << 13), /** The Default siglevel */ @@ -633,7 +633,7 @@ alpm_list_t *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglist, /** Find a package satisfying a specified dependency. * The dependency can include versions with depmod operators. - * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfier will be searched + * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfyer will be searched * @param depstring package or provision name, versioned or not * @return a alpm_pkg_t* satisfying depstring */ @@ -641,13 +641,13 @@ alpm_pkg_t *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstring); /** Find a package satisfying a specified dependency. * First look for a literal, going through each db one by one. Then look for - * providers. The first satisfier that belongs to an installed package is + * providers. The first satisfyer that belongs to an installed package is * returned. If no providers belong to an installed package then an * alpm_question_select_provider_t is created to select the provider. * The dependency can include versions with depmod operators. * * @param handle the context handle - * @param dbs an alpm_list_t* of alpm_db_t where the satisfier will be searched + * @param dbs an alpm_list_t* of alpm_db_t where the satisfyer will be searched * @param depstring package or provision name, versioned or not * @return a alpm_pkg_t* satisfying depstring */ @@ -793,7 +793,7 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_HOOK_RUN_DONE } alpm_event_type_t; -/** An event that may reprisent any event. */ +/** An event that may represent any event. */ typedef struct _alpm_event_any_t { /** Type of event */ alpm_event_type_t type; @@ -1978,7 +1978,7 @@ int alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *grp); * These functions modify the list of dependencies that * should be ignored by a sysupgrade. * - * This is effectivley a list of virtual providers that + * This is effectively a list of virtual providers that * packages can use to satisfy their dependencies. * @{ */ @@ -1996,7 +1996,7 @@ alpm_list_t *alpm_option_get_assumeinstalled(alpm_handle_t *handle); */ int alpm_option_add_assumeinstalled(alpm_handle_t *handle, const alpm_depend_t *dep); -/** Sets the list of dependnecies that are assumed to be met +/** Sets the list of dependencies that are assumed to be met * @param handle the context handle * @param deps a list of *alpm_depend_t * The list will be duped and the original will still need to be freed by the caller. -- 2.29.2

2 1

[pacman-dev] [PATCH] pacman-key: warn about time take for master key generation
by Allan McRae 29 Dec '20

29 Dec '20

Generating the pacman master key can take some time on systems without enough entropy. Warn the user that the generation may take some time. Fixes FS#30286. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ccfd1b96..59162840 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -145,6 +145,8 @@ key_lookup_from_name() { generate_master_key() { # Generate the master key, which will be in both pubring and secring + msg "$(gettext "Generating pacman master key. This may take some time.") + "${GPG_PACMAN[@]}" --gen-key --batch <<EOF %echo Generating pacman keyring master key... Key-Type: RSA -- 2.29.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-26-ga023565e
by Allan McRae 29 Dec '20

29 Dec '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 a023565ed370851fd5bf61298460fe0adb0b4189 (commit) via ccdd1e3fd92591755e2b94bf63416c7b30cd217a (commit) via 831fc568fc87a75bb6e05575b93a7541b49e7aba (commit) from 95ffdd68b250af1d37067fe6dd70fc6a6094bc62 (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 a023565ed370851fd5bf61298460fe0adb0b4189 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 28 21:36:35 2020 -0500 doc: make doxygen build from any directory In the autotools build, it only built in-tree, from cwd = doc/ and resolving doc/../lib/libalpm In the meson build, this accidentally worked if cwd = pacman/builddir/ and resolved to builddir/../lib/libalpm/ But... this should always have been configured with the actual path to the inputs. So, we will now proceed to do so. Fixes building man3 if your out of tree builddir doesn't happen to be a direct subdirectory of the source root. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ccdd1e3fd92591755e2b94bf63416c7b30cd217a Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Wed Dec 23 22:43:57 2020 +0000 Move hex_representation() to src/common We'll reuse the function in pacman with a later commit. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 831fc568fc87a75bb6e05575b93a7541b49e7aba Author: Emil Velikov <emil.l.velikov(a)gmail.com> Date: Wed Dec 23 22:43:56 2020 +0000 Remove pre libarchive 3.0 code Pacman has required libarchive 3.0 or later for quite some time mow. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Doxyfile.in | 4 ++-- doc/meson.build | 1 + lib/libalpm/libarchive-compat.h | 20 -------------------- lib/libalpm/util.c | 24 ------------------------ src/common/util-common.c | 26 ++++++++++++++++++++++++++ src/common/util-common.h | 1 + 6 files changed, 30 insertions(+), 46 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] doc: make doxygen build from any directory
by Eli Schwartz 29 Dec '20

29 Dec '20

In the autotools build, it only built in-tree, from cwd = doc/ and resolving doc/../lib/libalpm In the meson build, this accidentally worked if cwd = pacman/builddir/ and resolved to builddir/../lib/libalpm/ But... this should always have been configured with the actual path to the inputs. So, we will now proceed to do so. Fixes building man3 if your out of tree builddir doesn't happen to be a direct subdirectory of the source root. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/Doxyfile.in | 4 ++-- doc/meson.build | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 776318da7..6744e7659 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -117,8 +117,8 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../lib/libalpm/alpm.h \ - ../lib/libalpm/alpm_list.h +INPUT = @INPUT_DIRECTORY@/../lib/libalpm/alpm.h \ + @INPUT_DIRECTORY@/../lib/libalpm/alpm_list.h INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = NO diff --git a/doc/meson.build b/doc/meson.build index 570dc7654..4aaac5540 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -135,6 +135,7 @@ meson.add_install_script(MESON_MAKE_SYMLINK, doxygen = find_program('doxygen', required : get_option('doxygen')) if doxygen.found() and not get_option('doxygen').disabled() doxyconf = configuration_data() + doxyconf.set('INPUT_DIRECTORY', meson.current_source_dir()) doxyconf.set('OUTPUT_DIRECTORY', meson.current_build_dir()) doxyfile = configure_file( input : 'Doxyfile.in', -- 2.29.2

1 0

[pacman-dev] [PATCH 1/2] libalpm: const annotate struct pkg_operations
by Emil Velikov 23 Dec '20

23 Dec '20

Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 20 ++++++++++++++++++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 4 ++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index e73a97bb..9c3c8bb3 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -326,7 +326,7 @@ static int _cache_force_load(alpm_pkg_t *pkg) * lazy accessor methods that handle any backend loading and caching * logic. */ -static struct pkg_operations local_pkg_ops = { +static const struct pkg_operations local_pkg_ops = { .get_base = _cache_get_base, .get_desc = _cache_get_desc, .get_url = _cache_get_url, diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4dde7167..f855003a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -138,7 +138,7 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) * majority of the default_pkg_ops struct and add only a few operations of * our own on top. */ -static struct pkg_operations *get_file_pkg_ops(void) +static const struct pkg_operations *get_file_pkg_ops(void) { static struct pkg_operations file_pkg_ops; static int file_pkg_ops_initialized = 0; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 225df76d..5356b544 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -281,6 +281,23 @@ static int _sync_get_validation(alpm_pkg_t *pkg) return pkg->validation; } +/** Package sync operations struct accessor. We implement this as a method + * rather than a static struct as in be_files because we want to reuse the + * majority of the default_pkg_ops struct and add only a few operations of + * our own on top. + */ +static const struct pkg_operations *get_sync_pkg_ops(void) +{ + static struct pkg_operations sync_pkg_ops; + static int sync_pkg_ops_initalized = 0; + if(!sync_pkg_ops_initalized) { + sync_pkg_ops = default_pkg_ops; + sync_pkg_ops.get_validation = _sync_get_validation; + sync_pkg_ops_initalized = 1; + } + return &sync_pkg_ops; +} + static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, const char **entry_filename, alpm_pkg_t *likely_pkg) { @@ -321,8 +338,7 @@ static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, pkg->origin = ALPM_PKG_FROM_SYNCDB; pkg->origin_data.db = db; - pkg->ops = &default_pkg_ops; - pkg->ops->get_validation = _sync_get_validation; + pkg->ops = get_sync_pkg_ops(); pkg->handle = db->handle; /* add to the collection */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index a4356518..5766c600 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -138,7 +138,7 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } /** The standard package operations struct. Get fields directly from the * struct itself with no abstraction layer or any type of lazy loading. */ -struct pkg_operations default_pkg_ops = { +const struct pkg_operations default_pkg_ops = { .get_base = _pkg_get_base, .get_desc = _pkg_get_desc, .get_url = _pkg_get_url, diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c37bd11e..b134ad5a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -83,7 +83,7 @@ struct pkg_operations { * The actual definition is in package.c so it can have access to the * default accessor functions which are defined there. */ -extern struct pkg_operations default_pkg_ops; +extern const struct pkg_operations default_pkg_ops; struct __alpm_pkg_t { unsigned long name_hash; @@ -121,7 +121,7 @@ struct __alpm_pkg_t { alpm_list_t *removes; /* in transaction targets only */ alpm_pkg_t *oldpkg; /* in transaction targets only */ - struct pkg_operations *ops; + const struct pkg_operations *ops; alpm_filelist_t files; -- 2.29.2

2 2