- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.2
by Andrew Gregory 25 Dec '18

25 Dec '18

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, release/5.1.x has been updated via 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 (commit) via f8c73464c9cf86d6b917542585d74514f150c67b (commit) via 48a6adee3e63d335ac431ff6a67351988e574b79 (commit) from cfa1e8b5e2b2fdf66fe41c72d04a8bbc23c28027 (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 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sun Dec 23 14:33:01 2018 -0800 Release v5.1.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> commit f8c73464c9cf86d6b917542585d74514f150c67b Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sun Dec 23 14:30:49 2018 -0800 update NEWS for v5.1.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> commit 48a6adee3e63d335ac431ff6a67351988e574b79 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:12 2018 -0800 always allow explicit empty siglevel for sync dbs An empty siglevel does not do any signature verification which is exactly what we want when compiled without gpg support. This is already allowed in other parts of the codebase and required for the test suite to pass when compiled without gpg support. Fixes: FS#60880 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 61fe73804305a8bbb434cdc245944df5284f1964) ----------------------------------------------------------------------- Summary of changes: NEWS | 15 +++++++++++++++ configure.ac | 4 ++-- doc/index.asciidoc | 1 + lib/libalpm/be_sync.c | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman/query: print ignored for updates in databases without usage upgrade
by Michael Straube 18 Dec '18

18 Dec '18

Updates in databases that are not "Usage = Upgrade" will be ignored in a -Su operation. Add [ignored] to the -Qu output for such updates. Fixes FS#59854 Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- src/pacman/query.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..405dc61a 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -325,10 +325,12 @@ static int display(alpm_pkg_t *pkg) colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { + int usage; alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); - if(alpm_pkg_should_ignore(config->handle, pkg)) { + alpm_db_get_usage(alpm_pkg_get_db(newpkg), &usage); + if(alpm_pkg_should_ignore(config->handle, pkg) || !(usage & ALPM_DB_USAGE_UPGRADE)) { printf(" %s", _("[ignored]")); } } -- 2.20.0

2 2

[pacman-dev] [PATCH] Move skipping of duplicate sync/remove targets into libalpm
by Michael Straube 13 Dec '18

13 Dec '18

sync: As pointed out by Andrew Gregory there could be an error when adding duplicates if they are two separate packages with the same name. Add a check in alpm_add_pkg() to test whether the duplicate is actually the same package, and if so, log a debug message and return success to skip the package. If the duplicate is a different package return ALPM_ERR_TRANS_DUP_TARGET and treat that error just like any other error in pacman. remove: Change alpm_remove_pkg() to just log a debug message and return success to skip duplicates. Remove the handling of ALPM_ERR_TRANS_DUP_TARGET in pacman. Also fixes FS#49377. Suggested-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- lib/libalpm/add.c | 9 ++++++++- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index e415bb17..f357c076 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -53,6 +53,7 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) const char *pkgname, *pkgver; alpm_trans_t *trans; alpm_pkg_t *local; + alpm_pkg_t *dup; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -70,7 +71,13 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_DEBUG, "adding package '%s'\n", pkgname); - if(alpm_pkg_find(trans->add, pkgname)) { + dup = alpm_pkg_find(trans->add, pkgname); + if(dup) { + if(dup == pkg) { + _alpm_log(handle, ALPM_LOG_DEBUG, _("skipping duplicate target: %s\n"), pkgname); + return 0; + } + /* error for separate packages with the same name */ RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 78ca5be7..ffdc0da5 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -74,7 +74,8 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) pkgname = pkg->name; if(alpm_pkg_find(trans->remove, pkgname)) { - RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); + _alpm_log(handle, ALPM_LOG_DEBUG, _("skipping duplicate target: %s\n"), pkgname); + return 0; } _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s to the transaction remove list\n", diff --git a/src/pacman/remove.c b/src/pacman/remove.c index a2269ed8..9d44cf53 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -44,14 +44,8 @@ static int remove_target(const char *target) if((pkg = alpm_db_get_pkg(db_local, target)) != NULL) { if(alpm_remove_pkg(config->handle, pkg) == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET) { - /* just skip duplicate targets */ - pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), target); - return 0; - } else { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); - return -1; - } + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); + return -1; } config->explicit_removes = alpm_list_add(config->explicit_removes, pkg); return 0; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 57677a42..2406fed5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -521,15 +521,8 @@ static int process_pkg(alpm_pkg_t *pkg) if(ret == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET) { - /* just skip duplicate targets */ - pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg)); - return 0; - } else { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), - alpm_strerror(err)); - return 1; - } + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), alpm_strerror(err)); + return 1; } config->explicit_adds = alpm_list_add(config->explicit_adds, pkg); return 0; -- 2.20.0

2 2

[pacman-dev] [PATCH] scripts/library: fix typo in README
by Michael Straube 12 Dec '18

12 Dec '18

Simply fix a typo: in written -> is written Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- scripts/library/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/library/README b/scripts/library/README index b99b0bc8..d20f117a 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -5,6 +5,6 @@ human_to_size.sh: A function to convert human readable sizes (such as "5.3 GiB") to raw byte equivalents. base10 and base2 suffixes are supported, case sensitively. If successful, the converted byte value is written to stdout and the function -returns 0. If an error occurs, nothing in written and the function returns 1. +returns 0. If an error occurs, nothing is written and the function returns 1. Results may be inaccurate when using a broken implementation of awk, such as mawk or busybox awk. -- 2.19.2

4 9

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.1-9-gcfa1e8b5
by Allan McRae 12 Dec '18

12 Dec '18

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, release/5.1.x has been updated via cfa1e8b5e2b2fdf66fe41c72d04a8bbc23c28027 (commit) from 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 (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 cfa1e8b5e2b2fdf66fe41c72d04a8bbc23c28027 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 12 11:11:12 2018 +1000 Pull updated translations from Transifex Mostly churn in string headers, but a few new or updated translations. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ar.po | 40 ++-- lib/libalpm/po/ast.po | 40 ++-- lib/libalpm/po/bg.po | 40 ++-- lib/libalpm/po/br.po | 88 ++++---- lib/libalpm/po/ca.po | 72 +++---- lib/libalpm/po/cs.po | 40 ++-- lib/libalpm/po/da.po | 40 ++-- lib/libalpm/po/de.po | 40 ++-- lib/libalpm/po/el.po | 40 ++-- lib/libalpm/po/en_GB.po | 40 ++-- lib/libalpm/po/eo.po | 40 ++-- lib/libalpm/po/es.po | 40 ++-- lib/libalpm/po/es_419.po | 40 ++-- lib/libalpm/po/eu.po | 40 ++-- lib/libalpm/po/eu_ES.po | 40 ++-- lib/libalpm/po/fi.po | 40 ++-- lib/libalpm/po/fr.po | 40 ++-- lib/libalpm/po/gl.po | 40 ++-- lib/libalpm/po/hr.po | 40 ++-- lib/libalpm/po/hu.po | 40 ++-- lib/libalpm/po/id.po | 40 ++-- lib/libalpm/po/it.po | 40 ++-- lib/libalpm/po/ja.po | 40 ++-- lib/libalpm/po/kk.po | 40 ++-- lib/libalpm/po/ko.po | 50 ++--- lib/libalpm/po/libalpm.pot | 40 ++-- lib/libalpm/po/lt.po | 40 ++-- lib/libalpm/po/nb.po | 66 +++--- lib/libalpm/po/nl.po | 53 ++--- lib/libalpm/po/pl.po | 40 ++-- lib/libalpm/po/pt.po | 40 ++-- lib/libalpm/po/pt_BR.po | 40 ++-- lib/libalpm/po/ro.po | 40 ++-- lib/libalpm/po/ru.po | 40 ++-- lib/libalpm/po/sk.po | 40 ++-- lib/libalpm/po/sl.po | 44 ++-- lib/libalpm/po/sr.po | 40 ++-- lib/libalpm/po/sr(a)latin.po | 40 ++-- lib/libalpm/po/sv.po | 40 ++-- lib/libalpm/po/tr.po | 44 ++-- lib/libalpm/po/uk.po | 40 ++-- lib/libalpm/po/zh_CN.po | 44 ++-- lib/libalpm/po/zh_TW.po | 40 ++-- scripts/po/bg.po | 218 ++++++++++---------- scripts/po/br.po | 212 +++++++++---------- scripts/po/ca.po | 458 +++++++++++++++++++++--------------------- scripts/po/cs.po | 212 +++++++++---------- scripts/po/da.po | 231 ++++++++++----------- scripts/po/de.po | 212 +++++++++---------- scripts/po/el.po | 212 +++++++++---------- scripts/po/en_GB.po | 212 +++++++++---------- scripts/po/eo.po | 222 ++++++++++---------- scripts/po/es.po | 218 ++++++++++---------- scripts/po/es_419.po | 212 +++++++++---------- scripts/po/eu.po | 212 +++++++++---------- scripts/po/eu_ES.po | 212 +++++++++---------- scripts/po/fi.po | 212 +++++++++---------- scripts/po/fr.po | 219 ++++++++++---------- scripts/po/gl.po | 212 +++++++++---------- scripts/po/hu.po | 212 +++++++++---------- scripts/po/id.po | 212 +++++++++---------- scripts/po/it.po | 212 +++++++++---------- scripts/po/ja.po | 218 ++++++++++---------- scripts/po/ko.po | 222 ++++++++++---------- scripts/po/lt.po | 225 +++++++++++---------- scripts/po/nb.po | 321 +++++++++++++++-------------- scripts/po/nl.po | 223 ++++++++++---------- scripts/po/pacman-scripts.pot | 212 +++++++++---------- scripts/po/pl.po | 212 +++++++++---------- scripts/po/pt.po | 218 ++++++++++---------- scripts/po/pt_BR.po | 212 +++++++++---------- scripts/po/ro.po | 212 +++++++++---------- scripts/po/ru.po | 212 +++++++++---------- scripts/po/sk.po | 242 +++++++++++----------- scripts/po/sr.po | 212 +++++++++---------- scripts/po/sr(a)latin.po | 212 +++++++++---------- scripts/po/sv.po | 214 ++++++++++---------- scripts/po/tr.po | 222 ++++++++++---------- scripts/po/uk.po | 212 +++++++++---------- scripts/po/zh_CN.po | 212 +++++++++---------- scripts/po/zh_TW.po | 212 +++++++++---------- src/pacman/po/ca.po | 208 +++++++++---------- src/pacman/po/da.po | 10 +- src/pacman/po/ko.po | 6 +- src/pacman/po/lt.po | 9 +- src/pacman/po/nb.po | 32 +-- src/pacman/po/pt.po | 4 +- src/pacman/po/sk.po | 60 +++--- src/pacman/po/sl.po | 4 +- src/pacman/po/sr.po | 2 +- src/pacman/po/sr(a)latin.po | 2 +- src/pacman/po/sv.po | 2 +- src/pacman/po/tr.po | 4 +- src/pacman/po/zh_CN.po | 40 ++-- src/pacman/po/zh_TW.po | 7 +- 95 files changed, 5422 insertions(+), 5376 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-84-gb109d709
by Allan McRae 12 Dec '18

12 Dec '18

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 b109d7096b3f3f3244b7bb3796be658393eff98a (commit) via 77b8ca70322a121a2efb5318042e664246d3ec0e (commit) via d73fed4e134a1912df7bbc6a50c2287023ea1c4a (commit) from b67ec905205d96ca6801626a65149724f47f36f0 (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 b109d7096b3f3f3244b7bb3796be658393eff98a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 10 23:47:58 2018 -0500 meson: add trailing slashes to directory components in configuration defines This matches what we currently do in the autotools build configuration, and ensures that the default pacman-conf definitions for unspecified values consistently end with the trailing directory slashes. This has ramifications for thirdparty tools that up to now, have relied on this slash being there. Those tools should be fixed to prevent breaking when custom locations are set, but this is no reason not to fix it on our end as well. An extra trailng slash should never cause harm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 77b8ca70322a121a2efb5318042e664246d3ec0e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 10 01:15:19 2018 -0500 meson: install the directories needed for successful pacman operation This was neglected in the initial meson port. We need these directories to exist in order to bootstrap a new installation. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d73fed4e134a1912df7bbc6a50c2287023ea1c4a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Dec 10 01:15:18 2018 -0500 meson: remove useless mkdir -p directories are created by install_dir within the subdir custom_target installation targets. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: meson.build | 15 ++++++++++++--- scripts/libmakepkg/meson.build | 7 ------- 2 files changed, 12 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] meson: add trailing slashes to directory components in configuration defines
by Eli Schwartz 11 Dec '18

11 Dec '18

This matches what we currently do in the autotools build configuration, and ensures that the default pacman-conf definitions for unspecified values consistently end with the trailing directory slashes. This has ramifications for thirdparty tools that up to now, have relied on this slash being there. Those tools should be fixed to prevent breaking when custom locations are set, but this is no reason not to fix it on our end as well. An extra trailng slash should never cause harm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 138a1934..0a710653 100644 --- a/meson.build +++ b/meson.build @@ -72,10 +72,10 @@ conf.set_quoted('LDCONFIG', LDCONFIG) conf.set_quoted('LIB_VERSION', meson.project_version()) conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) -conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman')) -conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg')) +conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/')) +conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg/')) conf.set_quoted('LOGFILE', join_paths(LOCALSTATEDIR, 'log/pacman.log')) -conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg')) +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) -- 2.20.0

1 0

[pacman-dev] [PATCH 1/2] meson: remove useless mkdir -p
by Eli Schwartz 10 Dec '18

10 Dec '18

directories are created by install_dir within the subdir custom_target installation targets. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index bfba56a5..b0697f78 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -11,8 +11,6 @@ libmakepkg_modules = [ { 'name' : 'util', 'has_subdir' : true }, ] -mkdir_p = 'mkdir -p $DESTDIR/@0@' - foreach module : libmakepkg_modules custom_target( 'libmakepkg_@0@'.format(module['name']), @@ -24,10 +22,5 @@ foreach module : libmakepkg_modules if module.get('has_subdir', false) subdir(module['name']) - path = join_paths(get_option('prefix'), - get_option('datadir'), - 'makepkg', - module['name']) - meson.add_install_script('sh', '-c', mkdir_p.format(path)) endif endforeach -- 2.20.0

1 1

[pacman-dev] (no subject)
by miguel herrera 10 Dec '18

10 Dec '18

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-81-gb67ec905
by Allan McRae 10 Dec '18

10 Dec '18

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 b67ec905205d96ca6801626a65149724f47f36f0 (commit) via 36a5069a599f2f7d10eb8ad1a2074581f33ff040 (commit) via f28ddd9d93ba5e16848cc2ed85a38cec4d2f2b65 (commit) via 9f1b735d76d04665d6324e723e163a52ca27567c (commit) via 65e09705d3ad781fd41cf1996f2b60e2e2c1975b (commit) via f615f7bd5ae2764bd58e2947e0f33e75fa182078 (commit) from 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 (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 b67ec905205d96ca6801626a65149724f47f36f0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 3 09:36:36 2018 -0500 Enable additional debug flags/logging with debugoptimized builds This lets developers run a local build with optimizations but also the added debug logging that comes with PACMAN_DEBUG being defined. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36a5069a599f2f7d10eb8ad1a2074581f33ff040 Author: Michael Straube <michael.straube(a)posteo.de> Date: Sun Dec 9 18:31:50 2018 +0100 scripts/library: fix typo in README Simply fix a typo: in written -> is written Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f28ddd9d93ba5e16848cc2ed85a38cec4d2f2b65 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:30 2018 -0800 check localdb before upgrading package Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#55534 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9f1b735d76d04665d6324e723e163a52ca27567c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 27 23:00:36 2018 -0500 libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 65e09705d3ad781fd41cf1996f2b60e2e2c1975b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Dec 2 20:44:24 2018 -0500 Make `make distcheck` work when bash-completion is installed. bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f615f7bd5ae2764bd58e2947e0f33e75fa182078 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 3 15:00:40 2018 +1000 configure.ac: use $datarootdir instead of $prefix/share Even worse, makepkg-template ignored $prefix completely. ----------------------------------------------------------------------- Summary of changes: Makefile.am | 3 ++- configure.ac | 4 ++-- lib/libalpm/add.c | 2 +- meson.build | 2 +- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------ scripts/library/README | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + test/pacman/tests/replace-and-upgrade-package.py | 27 ++++++++++++++++++++++++ 17 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Enable additional debug flags/logging with debugoptimized builds
by Dave Reisner 10 Dec '18

10 Dec '18

This lets developers run a local build with optimizations but also the added debug logging that comes with PACMAN_DEBUG being defined. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8837816f..394bd1f5 100644 --- a/meson.build +++ b/meson.build @@ -211,7 +211,7 @@ elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') endif -if get_option('buildtype') == 'debug' +if get_option('buildtype').startswith('debug') extra_cflags = [ '-Wcast-align', '-Wclobbered', -- 2.19.2

4 6

[pacman-dev] (no subject)
by miguel herrera 10 Dec '18

10 Dec '18

Para Aser finanzas chentepancho5(a)gmail.com

1 0

[pacman-dev] [PATCH] check localdb before upgrading package
by Andrew Gregory 04 Dec '18

04 Dec '18

Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#5554 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + .../tests/replace-and-upgrade-package.py | 27 +++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5a3e06b8..e415bb17 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -427,7 +427,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, ASSERT(trans != NULL, return -1); /* see if this is an upgrade. if so, remove the old package first */ - if((oldpkg = newpkg->oldpkg)) { + if(_alpm_db_get_pkgfromcache(db, newpkg->name) && (oldpkg = newpkg->oldpkg)) { int cmp = _alpm_pkg_compare_versions(newpkg, oldpkg); if(cmp < 0) { log_msg = "downgrading"; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index dbdb429e..90885015 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -148,6 +148,7 @@ pacman_tests = [ { 'name': 'tests/remove060.py' }, { 'name': 'tests/remove070.py' }, { 'name': 'tests/remove071.py' }, + { 'name': 'tests/replace-and-upgrade-package.py' }, { 'name': 'tests/replace100.py' }, { 'name': 'tests/replace101.py' }, { 'name': 'tests/replace102.py' }, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index dc0b4ec3..74c8f674 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -144,6 +144,7 @@ TESTS += test/pacman/tests/remove052.py TESTS += test/pacman/tests/remove060.py TESTS += test/pacman/tests/remove070.py TESTS += test/pacman/tests/remove071.py +TESTS += test/pacman/tests/replace-and-upgrade-package.py TESTS += test/pacman/tests/replace100.py TESTS += test/pacman/tests/replace101.py TESTS += test/pacman/tests/replace102.py diff --git a/test/pacman/tests/replace-and-upgrade-package.py b/test/pacman/tests/replace-and-upgrade-package.py new file mode 100644 index 00000000..ef2152a7 --- /dev/null +++ b/test/pacman/tests/replace-and-upgrade-package.py @@ -0,0 +1,27 @@ +self.description = 'Simultaneously replace and upgrade a package' + +# replacement package +sp1 = pmpkg('foo1', '1-2') +sp1.replaces = ['foo=1-1'] +sp1.conflicts = ['foo=1-1'] +self.addpkg2db('sync', sp1) + +# upgrade package +sp2 = pmpkg('foo', '2-1') +self.addpkg2db('sync', sp2) + +# depend on upgraded package to pull it into transaction +sp3 = pmpkg('bar', '1-1') +sp3.depends = [ 'foo=2-1' ] +self.addpkg2db('sync', sp3) + +lp = pmpkg('foo', '1-1') +self.addpkg2db('local', lp) + +self.args = "-Su bar" + +self.addrule('PACMAN_RETCODE=0') +self.addrule('PKG_VERSION=foo1|1-2') +self.addrule('PKG_VERSION=foo|2-1') +self.addrule('PKG_VERSION=bar|1-1') +self.addrule('!PACMAN_OUTPUT=error') -- 2.19.1

3 4

[pacman-dev] [PATCH] libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes
by Eli Schwartz 04 Dec '18

04 Dec '18

Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in index 68c48038..92031d43 100644 --- a/scripts/libmakepkg/executable.sh.in +++ b/scripts/libmakepkg/executable.sh.in @@ -38,7 +38,7 @@ check_software() { local ret=0 for func in ${executable_functions[@]}; do - $func + $func || ret=1 done return $ret diff --git a/scripts/libmakepkg/executable/ccache.sh.in b/scripts/libmakepkg/executable/ccache.sh.in index dafde076..6143fee2 100644 --- a/scripts/libmakepkg/executable/ccache.sh.in +++ b/scripts/libmakepkg/executable/ccache.sh.in @@ -31,7 +31,7 @@ executable_ccache() { if check_buildoption "ccache" "y"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/distcc.sh.in b/scripts/libmakepkg/executable/distcc.sh.in index b9883f6b..d3a8cc25 100644 --- a/scripts/libmakepkg/executable/distcc.sh.in +++ b/scripts/libmakepkg/executable/distcc.sh.in @@ -31,7 +31,7 @@ executable_distcc() { if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/fakeroot.sh.in b/scripts/libmakepkg/executable/fakeroot.sh.in index e22d9a96..56c1b3fd 100644 --- a/scripts/libmakepkg/executable/fakeroot.sh.in +++ b/scripts/libmakepkg/executable/fakeroot.sh.in @@ -31,7 +31,7 @@ executable_fakeroot() { if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then error "$(gettext "Cannot find the %s binary.")" "fakeroot" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/gpg.sh.in b/scripts/libmakepkg/executable/gpg.sh.in index c0f57013..139773ef 100644 --- a/scripts/libmakepkg/executable/gpg.sh.in +++ b/scripts/libmakepkg/executable/gpg.sh.in @@ -28,6 +28,8 @@ source "$LIBRARY/util/option.sh" executable_functions+=('executable_gpg') executable_gpg() { + local ret=0 + if [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; then if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" @@ -41,4 +43,6 @@ executable_gpg() { ret=1 fi fi + + return $ret } diff --git a/scripts/libmakepkg/executable/gzip.sh.in b/scripts/libmakepkg/executable/gzip.sh.in index 66748320..bb1626bc 100644 --- a/scripts/libmakepkg/executable/gzip.sh.in +++ b/scripts/libmakepkg/executable/gzip.sh.in @@ -31,7 +31,7 @@ executable_gzip() { if check_option "zipman" "y"; then if ! type -p gzip >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/pacman.sh.in b/scripts/libmakepkg/executable/pacman.sh.in index d9967f45..d1433ffd 100644 --- a/scripts/libmakepkg/executable/pacman.sh.in +++ b/scripts/libmakepkg/executable/pacman.sh.in @@ -31,7 +31,7 @@ executable_pacman() { if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then if [[ -z $PACMAN_PATH ]]; then error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index a6b81db6..867dc928 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -31,7 +31,7 @@ executable_strip() { if check_option "strip" "y"; then if ! type -p strip >/dev/null; then error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/vcs.sh.in b/scripts/libmakepkg/executable/vcs.sh.in index 527d6f22..46631f39 100644 --- a/scripts/libmakepkg/executable/vcs.sh.in +++ b/scripts/libmakepkg/executable/vcs.sh.in @@ -49,7 +49,7 @@ get_vcsclient() { printf "%s\n" "$client" } -check_vcs_software() { +executable_vcs() { local netfile all_sources all_deps deps ret=0 if (( SOURCEONLY == 1 )); then @@ -101,9 +101,3 @@ check_vcs_software() { return $ret } - -executable_vcs() { - if ! check_vcs_software; then - ret=1 - fi -} -- 2.19.2

2 1

[pacman-dev] [PATCH] configure.ac: use $datarootdir instead of $prefix/share
by Allan McRae 03 Dec '18

03 Dec '18

Even worse, makepkg-template ignored $prefix completely. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c369ca74..ba54c2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ AC_ARG_WITH(buildscript, # Help line for buildscript filename AC_ARG_WITH(makepkg-template-dir, AS_HELP_STRING([--with-makepkg-template-dir=name], [set the template dir used by makepkg-template]), - [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=/usr/share/makepkg-template]) + [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=${datarootdir}/makepkg-template]) # Help line for debug package suffix AC_ARG_WITH(debug-suffix, @@ -216,7 +216,7 @@ AC_CHECK_LIB([m], [fabs], , AC_MSG_ERROR([libm is needed to compile pacman!])) PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , - bashcompdir="${prefix}/share/bash-completion/completions") + bashcompdir="${datarootdir}/bash-completion/completions") # Check for libarchive PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , -- 2.19.1

1 0

[pacman-dev] [PATCH] Make `make distcheck` work again.
by Eli Schwartz 03 Dec '18

03 Dec '18

bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 85be82b4..1e9ee152 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ ACLOCAL_AMFLAGS = -I m4 --install AM_MAKEFLAGS = --no-print-directory # Make sure we test and build manpages when doing distcheck -DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version +DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version \ + bashcompdir='$${prefix}/share/bash-completion/completions' # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README -- 2.19.2

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-75-g5fc3056e
by Allan McRae 28 Nov '18

28 Nov '18

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 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 (commit) via e1b9dc6bea9585701637e0ed14f24cb5b20cf341 (commit) via 71f837e45ea56eb7457759fbb31164f62c10a112 (commit) via 83a16d30416cd853898e3cbb9dd57d700a85ddb4 (commit) via 363664e47dd99e8f9593ecf98d73544617fb72fd (commit) via fbc6d8b42811d6d0507ec9dcc33e729cdcc54029 (commit) via 6e819c819a319b47a35c598200ea4a0cf35b517a (commit) via b95ba13df15217f4cad40fcde8f6b5fe7ff1118a (commit) from 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 (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 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 23:14:31 2018 -0500 scripts: make repo-add utilize a wrapper as well Now that repo-add uses libmakepkg, it needs to have $LIBRARY set before testing it in-tree. [Allan: fix "make distcheck"] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e1b9dc6bea9585701637e0ed14f24cb5b20cf341 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 21:28:21 2018 -0500 autotools: be more accurate in comments when generating processed scripts Instead of assuming all scripts are .sh.in and leaving a comment to that effect, just take the input file directly. This depends on the first dependency for the target being the source of the script. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71f837e45ea56eb7457759fbb31164f62c10a112 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Nov 3 20:46:42 2018 -0400 scripts: fix some inaccurate Makefile targets, and be more templated All of our scripts depend on the same pattern .sh.in, and since commit b5d62d2c91a2caf5c18945921cdf12af6f36b2d4, they also all (not just makepkg itself) depend on libmakepkg. There's no real reason to include separate targets for them just to establish dependency rules. While we are at it, fix a longstanding bug where generated wrapper scripts did not depend on wrapper.sh.in (which due to moving to .lib, requires we regenerate the script too), by making the shared target pattern depend on it. All our generated scripts now require the wrapper, even repo-add which now uses libmakepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 83a16d30416cd853898e3cbb9dd57d700a85ddb4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 22:46:36 2018 -0500 scripts: fix repo-remove/elephant Makefile targets repo-remove and repo-elephant don't care whether repo-add.sh.in is updated... but they do require the repo-add target to be up to date, so use that instead. As a bonus, use the same rule for both of them. commit 363664e47dd99e8f9593ecf98d73544617fb72fd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 4 23:24:39 2018 -0500 meson: be more accurate in comments when generating processed scripts Instead of assuming all scripts are .sh.in and leaving a comment to that effect, just take the input file directly. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fbc6d8b42811d6d0507ec9dcc33e729cdcc54029 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 21 17:36:53 2018 -0400 build-aux: rm annoying and useless file tap-driver.sh is added to the build tree by autoreconf, and contains upstream modifications as such. This results in dirty working trees. It was originally added in commit 403c175dbc84a8198b92bbe76f66eade613cff48 which made the testsuite use automake, but as far as I can tell, never served any purpose. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6e819c819a319b47a35c598200ea4a0cf35b517a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:31 2018 -0800 add missing tests to meson.build Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b95ba13df15217f4cad40fcde8f6b5fe7ff1118a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:32 2018 -0800 common/ini: remove unnecessary alpm include Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: build-aux/edit-script.sh.in | 2 +- build-aux/tap-driver.sh | 652 -------------------------------------------- scripts/Makefile.am | 36 +-- src/common/ini.c | 3 +- test/pacman/meson.build | 2 + 5 files changed, 13 insertions(+), 682 deletions(-) delete mode 100755 build-aux/tap-driver.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/1] Split prepare_buildenv() to libmakepkg scripts
by Que Quotion 27 Nov '18

27 Nov '18

From: Que Quotion <quequotion(a)gmail.com> As Eli Schwartz has pointed out: https://lists.archlinux.org/pipermail/pacman-dev/2018-May/022501.html It would be beneficial to makepkg to have this function ported to libmakepkg and split into individual scripts. Supersedes: https://patchwork.archlinux.org/patch/540/ Signed-off-by: Que Quotion <quequotion(a)gmail.com> --- scripts/Makefile.am | 6 ++ scripts/libmakepkg/buildenv.sh.in | 55 ++++++++++++++++++ scripts/libmakepkg/buildenv/buildflags.sh.in | 34 +++++++++++ scripts/libmakepkg/buildenv/ccache.sh.in | 45 +++++++++++++++ scripts/libmakepkg/buildenv/distcc.sh.in | 47 +++++++++++++++ scripts/libmakepkg/buildenv/makeflags.sh.in | 34 +++++++++++ scripts/libmakepkg/buildenv/meson.build | 20 +++++++ scripts/libmakepkg/meson.build | 1 + scripts/makepkg.sh.in | 60 +------------------- 9 files changed, 243 insertions(+), 59 deletions(-) create mode 100644 scripts/libmakepkg/buildenv.sh.in create mode 100644 scripts/libmakepkg/buildenv/buildflags.sh.in create mode 100644 scripts/libmakepkg/buildenv/ccache.sh.in create mode 100644 scripts/libmakepkg/buildenv/distcc.sh.in create mode 100644 scripts/libmakepkg/buildenv/makeflags.sh.in create mode 100644 scripts/libmakepkg/buildenv/meson.build diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c6b6220e..8e669f71 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ LIBRARY = \ libmakepkgdir = $(datarootdir)/makepkg LIBMAKEPKGDIRS = \ + buildenv \ integrity \ lint_config \ lint_package \ @@ -50,6 +51,11 @@ LIBMAKEPKGDIRS = \ util LIBMAKEPKG_IN = \ + libmakepkg/buildenv.sh \ + libmakepkg/buildenv/buildflags.sh \ + libmakepkg/buildenv/ccache.sh \ + libmakepkg/buildenv/distcc.sh \ + libmakepkg/buildenv/makeflags.sh \ libmakepkg/integrity.sh \ libmakepkg/integrity/generate_checksum.sh \ libmakepkg/integrity/generate_signature.sh \ diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in new file mode 100644 index 00000000..a14a3a9a --- /dev/null +++ b/scripts/libmakepkg/buildenv.sh.in @@ -0,0 +1,55 @@ +#!/bin/bash +# +# buildenv.sh - functions for altering the build environment before +# compiliation +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)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_BUILDENV_SH" ]] && return +LIBMAKEPKG_BUILDENV_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + + +declare -a build_options + +for lib in "$LIBRARY/buildenv/"*.sh; do + source "$lib" +done + +readonly -a build_options + +prepare_buildenv() { + msg "$(gettext "Preparing build environment...")" + + for func in ${build_options[@]}; do + $func + done + + if check_option "debug" "y"; then + DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + CFLAGS+=" $DEBUG_CFLAGS" + CXXFLAGS+=" $DEBUG_CXXFLAGS" + fi + + # ensure all necessary build variables are exported + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST +} diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in new file mode 100644 index 00000000..fb49a85c --- /dev/null +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# buildflags.sh - Clear user-specified buildflags if requested +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)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_BUILDENV_BUILDFLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +build_options+=('buildflags') + +buildflags() { + if check_option "buildflags" "n"; then + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS + fi +} diff --git a/scripts/libmakepkg/buildenv/ccache.sh.in b/scripts/libmakepkg/buildenv/ccache.sh.in new file mode 100644 index 00000000..122033a9 --- /dev/null +++ b/scripts/libmakepkg/buildenv/ccache.sh.in @@ -0,0 +1,45 @@ +#!/usr/bin/bash +# +# ccache.sh - Cache compiliations and recycle them to save time on repititions +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)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_BUILDENV_CCACHE_SH" ]] && return +LIBMAKEPKG_BUILDENV_CCACHE_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +build_options+=('ccache') + +local ccache=0 + +ccache() { + if check_buildoption "ccache" "y"; then + if ! type -p ccache >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" + return 1 + fi + + if [ -d /usr/lib/ccache/bin ]; then + export PATH="/usr/lib/ccache/bin:$PATH" + ccache=1 + fi + fi +} diff --git a/scripts/libmakepkg/buildenv/distcc.sh.in b/scripts/libmakepkg/buildenv/distcc.sh.in new file mode 100644 index 00000000..f7580705 --- /dev/null +++ b/scripts/libmakepkg/buildenv/distcc.sh.in @@ -0,0 +1,47 @@ +#!/usr/bin/bash +# +# distcc.sh - Distribute compliation to reduce compilation time +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)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_BUILDENV_DISTCC_SH" ]] && return +LIBMAKEPKG_BUILDENV_DISTCC_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +build_options+=('distcc') + +distcc() { + if check_buildoption "distcc" "y"; then + if ! type -p distcc >/dev/null; then + error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" + return 1 + fi + + if (( ccache )); then + export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + export CCACHE_BASEDIR="$srcdir" + elif [[ -d /usr/lib/distcc/bin ]]; then + export PATH="/usr/lib/distcc/bin:$PATH" + fi + + export DISTCC_HOSTS + fi +} diff --git a/scripts/libmakepkg/buildenv/makeflags.sh.in b/scripts/libmakepkg/buildenv/makeflags.sh.in new file mode 100644 index 00000000..53ac1e4c --- /dev/null +++ b/scripts/libmakepkg/buildenv/makeflags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# makeflags.sh - Clear user-specified makeflags if requested +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)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_BUILDENV_MAKEFLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +build_options+=('makeflags') + +makeflags() { + if check_option "makeflags" "n"; then + unset MAKEFLAGS + fi +} diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build new file mode 100644 index 00000000..e0d07287 --- /dev/null +++ b/scripts/libmakepkg/buildenv/meson.build @@ -0,0 +1,20 @@ +libmakepkg_module = 'buildenv' + +sources = [ + 'buildflags.sh.in', + 'ccache.sh.in', + 'distcc.sh.in', + 'makeflags.sh.in', +] + +foreach src : sources + output_dir = join_paths(get_option('datadir'), 'makepkg', libmakepkg_module) + + custom_target( + libmakepkg_module + '_' + src.underscorify(), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : src, + output : '@BASENAME@', + install : true, + install_dir : output_dir) +endforeach diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index 07475b4d..3a487f0d 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -1,4 +1,5 @@ libmakepkg_modules = [ + { 'name' : 'buildenv', 'has_subdir' : true }, { 'name' : 'integrity', 'has_subdir' : true }, { 'name' : 'lint_config', 'has_subdir' : true }, { 'name' : 'lint_package', 'has_subdir' : true }, diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3ac03d11..8ce006fb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -48,11 +48,10 @@ declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -build_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') -readonly -a build_options splitpkg_overrides +readonly -a splitpkg_overrides known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') @@ -380,47 +379,6 @@ source_buildfile() { source_safe "$@" } -prepare_buildenv() { - # clear user-specified buildflags if requested - if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS - fi - - if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - CFLAGS+=" $DEBUG_CFLAGS" - CXXFLAGS+=" $DEBUG_CXXFLAGS" - fi - - # clear user-specified makeflags if requested - if check_option "makeflags" "n"; then - unset MAKEFLAGS - fi - - # ensure all necessary build variables are exported - export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST - - local ccache=0 - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if check_buildoption "ccache" "y" && [[ -d /usr/lib/ccache/bin ]]; then - export PATH="/usr/lib/ccache/bin:$PATH" - ccache=1 - fi - - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if check_buildoption "distcc" "y"; then - if (( ccache )); then - export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" - export CCACHE_BASEDIR="$srcdir" - elif [[ -d /usr/lib/distcc/bin ]]; then - export PATH="/usr/lib/distcc/bin:$PATH" - fi - export DISTCC_HOSTS - fi -} - run_function_safe() { local restoretrap restoreshopt @@ -1029,22 +987,6 @@ check_software() { done fi - # distcc - compilation with distcc - if check_buildoption "distcc" "y"; then - if ! type -p distcc >/dev/null; then - error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 - fi - fi - - # ccache - compilation with ccache - if check_buildoption "ccache" "y"; then - if ! type -p ccache >/dev/null; then - error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 - fi - fi - # strip - strip symbols from binaries/libraries if check_option "strip" "y"; then if ! type -p strip >/dev/null; then -- 2.19.1

3 23

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-67-g44cfc095
by Allan McRae 27 Nov '18

27 Nov '18

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 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 (commit) via 61fe73804305a8bbb434cdc245944df5284f1964 (commit) via 3726693612a7ab34a1cd27916a6d65314299812c (commit) via 508b4e3ec0cb3e365942f4dc0626edda4789932b (commit) via 0bb04fa16a82db133dd010478c1256bc8500c5e7 (commit) via d81b5cc2a5193a344fc6f9cbf72d406d5597d85b (commit) via 1aaf95089a971730b1c7bcdf6fd98c0534459b01 (commit) via 926eb345c26690ca93b6483ac949612c9b53e9db (commit) via c41222837d76d550921a70dd95c509537031102c (commit) via 0dd14924424478564321fc681e3f344b53fb7b54 (commit) from de915c4f145d6e985c3c0fdf8fe121b5066d711c (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 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:13 2018 -0800 require actual siglevel for default ALPM_SIG_USE_DEFAULT does not refer to an actual siglevel, rather it indicates that the global default should be used in place of the operation-specific one. Setting this value for the global default itself makes no sense. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 61fe73804305a8bbb434cdc245944df5284f1964 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:12 2018 -0800 always allow explicit empty siglevel for sync dbs An empty siglevel does not do any signature verification which is exactly what we want when compiled without gpg support. This is already allowed in other parts of the codebase and required for the test suite to pass when compiled without gpg support. Fixes: FS#60880 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3726693612a7ab34a1cd27916a6d65314299812c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:11 2018 -0800 add specific error for missing gpg support "wrong or NULL argument passed" is a useless error for end users. Fixes FS#60880. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 508b4e3ec0cb3e365942f4dc0626edda4789932b Author: Que Quotion <quequotion(a)gmail.com> Date: Tue Nov 27 18:23:02 2018 +0900 Split prepare_buildenv() to libmakepkg This opens the door for third parties to provide libmakepkg extentions for the purpose of altering the build environment. Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0bb04fa16a82db133dd010478c1256bc8500c5e7 Author: Que Quotion <quequotion(a)gmail.com> Date: Tue Nov 27 18:23:00 2018 +0900 Split check_software() to libmakepkg This opens the door for third parties who provide extensions to libmakepkg to supply scripts that confirm the presence of their dependant executables. Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d81b5cc2a5193a344fc6f9cbf72d406d5597d85b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 13 23:17:02 2018 -0500 scripts/meson: ensure wrapper scripts are executable commit 1aaf95089a971730b1c7bcdf6fd98c0534459b01 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 4 18:27:22 2018 -0500 makepkg: if "!buildflags" and "debug" coincide, unset the debug buildflags too If a user has a makepkg.conf policy to enable debug builds, but a PKGBUILD has disabled buildflags, we would unset the *FLAGS but then later append the debug *FLAGS anyway, which would result in some *FLAGS being used, against the wishes of the PKGBUILD author. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 926eb345c26690ca93b6483ac949612c9b53e9db Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 3 20:00:07 2018 -0400 buildsys: remove size_to_human This was only ever used by paccache, and paccache has since been moved to pacman-contrib. commit c41222837d76d550921a70dd95c509537031102c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 3 19:58:31 2018 -0400 meson: separate out wrapped from non-wrapped scripts makepkg-template is a perl script and doesn't get wrapped by our shell wrapper. It (wrongly) reads from the host machine rather than the build root, but this is working as implemented. commit 0dd14924424478564321fc681e3f344b53fb7b54 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 27 22:42:13 2018 +1000 Remove Doxyfile from EXTRA_DIST We generate this now, so no need to distribute. Fixes "make dist". Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 1 - lib/libalpm/alpm.h | 4 +- lib/libalpm/be_sync.c | 4 +- lib/libalpm/error.c | 3 + lib/libalpm/handle.c | 11 +- scripts/Makefile.am | 21 +- .../{lint_pkgbuild.sh.in => buildenv.sh.in} | 25 ++- .../{tidy/docs.sh.in => buildenv/buildflags.sh.in} | 22 +-- scripts/libmakepkg/buildenv/compiler.sh.in | 55 ++++++ .../{tidy/docs.sh.in => buildenv/debugflags.sh.in} | 25 +-- .../{tidy/docs.sh.in => buildenv/makeflags.sh.in} | 22 +-- .../{lint_config => buildenv}/meson.build | 8 +- .../{lint_config.sh.in => executable.sh.in} | 25 ++- .../{tidy/docs.sh.in => executable/ccache.sh.in} | 24 +-- .../file_names.sh.in => executable/checksum.sh.in} | 32 +-- .../{tidy/docs.sh.in => executable/distcc.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/fakeroot.sh.in} | 24 +-- .../{integrity.sh.in => executable/gpg.sh.in} | 39 ++-- .../{tidy/docs.sh.in => executable/gzip.sh.in} | 24 +-- .../libmakepkg/{tidy => executable}/meson.build | 17 +- .../{tidy/docs.sh.in => executable/pacman.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/strip.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/sudo.sh.in} | 25 ++- scripts/libmakepkg/executable/vcs.sh.in | 109 +++++++++++ scripts/libmakepkg/meson.build | 2 + scripts/library/README | 4 - scripts/library/size_to_human.sh | 22 --- scripts/makepkg.sh.in | 216 +-------------------- scripts/meson.build | 42 ++-- scripts/po/POTFILES.in | 1 - 30 files changed, 419 insertions(+), 460 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild.sh.in => buildenv.sh.in} (64%) copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/buildflags.sh.in} (63%) create mode 100644 scripts/libmakepkg/buildenv/compiler.sh.in copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/debugflags.sh.in} (57%) copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/makeflags.sh.in} (63%) copy scripts/libmakepkg/{lint_config => buildenv}/meson.build (74%) copy scripts/libmakepkg/{lint_config.sh.in => executable.sh.in} (66%) mode change 100755 => 100644 copy scripts/libmakepkg/{tidy/docs.sh.in => executable/ccache.sh.in} (61%) copy scripts/libmakepkg/{lint_package/file_names.sh.in => executable/checksum.sh.in} (56%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/distcc.sh.in} (61%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/fakeroot.sh.in} (61%) copy scripts/libmakepkg/{integrity.sh.in => executable/gpg.sh.in} (53%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/gzip.sh.in} (62%) copy scripts/libmakepkg/{tidy => executable}/meson.build (65%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/pacman.sh.in} (60%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/strip.sh.in} (62%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/sudo.sh.in} (60%) create mode 100644 scripts/libmakepkg/executable/vcs.sh.in delete mode 100644 scripts/library/size_to_human.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove Doxyfile from EXTRA_DIST
by Allan McRae 27 Nov '18

27 Nov '18

We generate this now, so no need to distribute. Fixes "make dist". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 711921fd..4bb0f01b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -65,7 +65,6 @@ EXTRA_DIST = \ index.asciidoc \ submitting-patches.asciidoc \ translation-help.asciidoc \ - Doxyfile \ $(MANPAGES) \ $(DOXYGEN_MANS) -- 2.19.1

1 0

[pacman-dev] [PATCH 1/3] add specific error for missing gpg support
by Andrew Gregory 27 Nov '18

27 Nov '18

"wrong or NULL argument passed" is a useless error for end users. Fixes FS#60880. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/be_sync.c | 2 +- lib/libalpm/error.c | 3 +++ lib/libalpm/handle.c | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d3d198a..597e11bd 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -118,7 +118,9 @@ typedef enum _alpm_errno_t { ALPM_ERR_LIBARCHIVE, ALPM_ERR_LIBCURL, ALPM_ERR_EXTERNAL_DOWNLOAD, - ALPM_ERR_GPGME + ALPM_ERR_GPGME, + /* Missing compile-time features */ + ALPM_ERR_MISSING_CAPABILITY_SIGNATURES } alpm_errno_t; /** Returns the current error code from the handle. */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5009a7da..6adf1cd9 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -788,7 +788,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, #ifndef HAVE_LIBGPGME if(level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, NULL); } #endif diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index b4fc99ae..95be9d7b 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -159,6 +159,9 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("gpgme error"); case ALPM_ERR_EXTERNAL_DOWNLOAD: return _("error invoking external downloader"); + /* Missing compile-time features */ + case ALPM_ERR_MISSING_CAPABILITY_SIGNATURES: + return _("compiled without signature support"); /* Unknown error! */ default: return _("unexpected error"); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2213ce53..be5666dc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -807,7 +807,7 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, handle->siglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1); } #endif return 0; @@ -827,7 +827,7 @@ int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, handle->localfilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1); } #endif return 0; @@ -851,7 +851,7 @@ int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, handle->remotefilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1); } #endif return 0; -- 2.19.1

2 3

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.1-8-g3a88fcb1
by Andrew Gregory 19 Nov '18

19 Nov '18

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, release/5.1.x has been updated via 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 (commit) via 2a7bdd3e3aabbf9fa3cc31379cadad909e6c1da3 (commit) via b39a62f57551a2e23ceaa37b3fbc71a2273545e6 (commit) via cad8fe2fbfc3a63554a2537ea7b5627a71453075 (commit) via 0dbb94538770d2ffce3709b5854d1e5e44cfc183 (commit) via 519685e4b1cff3df9bc389550fa6e19ee4ba8794 (commit) via 4fc7c1d41efcce7f85def270c0ce8edca1062fc4 (commit) via 5e81518ecb4ba9c8b7231e9b627f45d3abb19ce3 (commit) from 7e081d2adf8321f25165255fd21fab61d4055a53 (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 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 12 19:16:53 2018 -0700 handle EINTR while polling scripts/hooks If poll() is interrupted by a signal, alpm was closing the socket it uses for listening to script/hook output. This would drop script output at the least and kill the script at the worst. Fixes FS#60396 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit ac959bb9c6ce549047a954109ae825158855e386) commit 2a7bdd3e3aabbf9fa3cc31379cadad909e6c1da3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 3 00:42:38 2018 -0700 reset signal handlers before running scripts/hooks Front-ends or libraries may set signals to be ignored, which gets inherited across fork and exec. This can cause scripts to malfunction if they expect the signal. To make matters worse, scripts written in bash can't reset signals that were ignored when bash was started. Fixes FS#56756 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 9886566abb375043740167ce5066f1a186c71176) commit b39a62f57551a2e23ceaa37b3fbc71a2273545e6 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Wed Oct 17 17:11:01 2018 +0200 alpm: Fix SIGINT handling re: aborting download Upon receiving SIGINT a flag is set to abort the (curl) download. However, since it was never reset/initialized, if a front-end doesn't actually exit on SIGINT, and later tries any operation that needs to perform a new download, said download would always get aborted right away due to the flag not having been reset. (cherry picked from commit ffde85aadfe0e08fb710102d0a547335e9d1a200) commit cad8fe2fbfc3a63554a2537ea7b5627a71453075 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Tue Oct 9 18:29:05 2018 +0200 alpm: Do not raise SIGINT when filesize goes over limit Variable dload_interrupted is used both to abort a download because SIGINT was caught, and when a file limit is reached. But raising SIGINT is only meant to happen in the first case. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> (cherry picked from commit d96d0ffe7c88d9521a9e6cdd65939e9a20733cdf) commit 0dbb94538770d2ffce3709b5854d1e5e44cfc183 Author: Michael Straube <straubem(a)gmx.de> Date: Sun Jun 10 18:58:34 2018 +0200 libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST Add a case for curl error 'Could not resolve host'. An attempt to fix FS#48285. Signed-off-by: Michael Straube <straubem(a)gmx.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 9e960d9d5a735bbc7d418f2ad81d3f3e92d99968) commit 519685e4b1cff3df9bc389550fa6e19ee4ba8794 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 4 15:17:54 2018 -0400 libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 2bec380e108536f5e5f728ef66223ed3fabf5ab1) commit 4fc7c1d41efcce7f85def270c0ce8edca1062fc4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 18 10:08:37 2018 -0400 pacman: check versioned optdepends in -Qi operation Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 3318039e3b1530396b0e3ced49ea6fe5b6ea00c5) commit 5e81518ecb4ba9c8b7231e9b627f45d3abb19ce3 Author: morganamilo <morganamilo(a)gmail.com> Date: Mon Sep 10 22:41:07 2018 +0100 pacman-conf: add missing DisableDownloadTimeout Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 62eef5bbdb025d9557a1609760b42d7fbac16ad2) ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 10 ++++++++- lib/libalpm/util.c | 30 +++++++++++++++++++++++++- scripts/libmakepkg/lint_config/variable.sh.in | 4 ++-- src/pacman/package.c | 2 +- src/pacman/pacman-conf.c | 3 +++ test/pacman/tests/TESTS | 2 ++ test/pacman/tests/scriptlet-signal-handling.py | 15 +++++++++++++ test/pacman/tests/scriptlet-signal-reset.py | 11 ++++++++++ 8 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 test/pacman/tests/scriptlet-signal-handling.py create mode 100644 test/pacman/tests/scriptlet-signal-reset.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] common/ini: remove unnecessary alpm include
by Andrew Gregory 17 Nov '18

17 Nov '18

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/common/ini.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 8e646528..30f1fac8 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -19,10 +19,9 @@ #include <errno.h> #include <limits.h> +#include <stdlib.h> #include <string.h> /* strdup */ -#include <alpm.h> - #include "ini.h" #include "util-common.h" -- 2.19.1

1 0

[pacman-dev] [PATCH] add missing tests to meson.build
by Andrew Gregory 17 Nov '18

17 Nov '18

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 90885015..3ad1fcd0 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -158,6 +158,8 @@ pacman_tests = [ 'should_fail': true }, { 'name': 'tests/scriptlet001.py' }, { 'name': 'tests/scriptlet002.py' }, + { 'name': 'tests/scriptlet-signal-handling.py' }, + { 'name': 'tests/scriptlet-signal-reset.py' }, { 'name': 'tests/sign001.py' }, { 'name': 'tests/sign002.py' }, { 'name': 'tests/skip-remove-with-glob-chars.py' }, -- 2.19.1

1 0

[pacman-dev] [PATCH] scripts/meson: ensure wrapper scripts are executable
by Dave Reisner 14 Nov '18

14 Nov '18

--- This is on top of my fixup branch scripts/meson.build | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/meson.build b/scripts/meson.build index aece7a22..344333be 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -52,21 +52,18 @@ foreach script : wrapped_scripts depend_files : library_files, build_by_default : true) + cdata = configuration_data() + cdata.set_quoted('BASH', BASH.path()) + cdata.set_quoted('BUILDDIR', meson.current_build_dir()) + cdata.set_quoted('REAL_PROGPATH', internal_script.full_path()) + # Create a wrapper script that bootstraps the real script within the build - # directory. - custom_target( - 'wrap_@0@'.format(script_shortname), + # directory. Use configure_file instead of a custom_target to ensure that + # permissions on the input script wrapper are preserved. + configure_file( input : join_paths(meson.source_root(), 'build-aux', 'script-wrapper.sh.in'), output : script_shortname, - build_by_default : true, - command : [ - SED, - '-e', 's,@BASH@,"@0@",'.format(BASH.path()), - '-e', 's,@BUILDDIR@,"@0@",'.format(meson.current_build_dir()), - '-e', 's,@REAL_PROGPATH@,"@0@",'.format(internal_script.full_path()), - '@INPUT@', - ], - capture : true) + configuration : cdata) # Install the real script meson.add_install_script(MESON_INSTALL_SCRIPT, -- 2.19.1

1 0