- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Create a single-package packaging function
by Allan McRae 04 Jan '19

04 Jan '19

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> Merge the similar code handling unsplit PKGBUILDs and individual packages in a split PKGBUILD and make it a new function. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- FYI: rebase of https://patchwork.archlinux.org/patch/639/ .FYI Changed run_solo_packaging -> run_single_packaging because it seemed right. scripts/makepkg.sh.in | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 33b3a70e..e3a392d4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -922,20 +922,25 @@ restore_package_variables() { done } +run_single_packaging() { + pkgdir="$pkgdirbase/$pkgname" + mkdir "$pkgdir" + if [[ -n $1 ]] || (( PKGFUNC )); then + run_package $1 + fi + tidy_install + lint_package || exit $E_PACKAGE_FAILED + create_package +} + run_split_packaging() { local pkgname_backup=("${pkgname[@]}") backup_package_variables for pkgname in ${pkgname_backup[@]}; do - pkgdir="$pkgdirbase/$pkgname" - mkdir "$pkgdir" - run_package $pkgname - tidy_install - lint_package || exit $E_PACKAGE_FAILED - create_package + run_single_packaging $pkgname restore_package_variables done pkgname=("${pkgname_backup[@]}") - create_debug_package } usage() { @@ -1337,18 +1342,12 @@ if (( INFAKEROOT )); then chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then - pkgdir="$pkgdirbase/$pkgname" - mkdir "$pkgdir" - if (( PKGFUNC )); then - run_package - fi - tidy_install - lint_package || exit $E_PACKAGE_FAILED - create_package - create_debug_package + run_single_packaging else run_split_packaging fi + + create_debug_package msg "$(gettext "Leaving %s environment.")" "fakeroot" exit $E_OK -- 2.20.0

1 0

[pacman-dev] [PATCH v2] makepkg: Only backup package variables once
by Allan McRae 04 Jan '19

04 Jan '19

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> We don't need to re-backup the variables we restored on the previous iteration. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Rebase of https://patchwork.archlinux.org/patch/638/ . Posting here as a FYI. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4449ccf7..33b3a70e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -924,10 +924,10 @@ restore_package_variables() { run_split_packaging() { local pkgname_backup=("${pkgname[@]}") + backup_package_variables for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" - backup_package_variables run_package $pkgname tidy_install lint_package || exit $E_PACKAGE_FAILED -- 2.20.0

1 0

[pacman-dev] [PATCH] repo-remove: fix removing packages with deltas
by Eli Schwartz 04 Jan '19

04 Jan '19

We have code in order to remove deltas when removing a package, but it is never run, since we try to remove the wrong file. This was broken in commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a which modified the internal layout we use to modify the db, changing "tree" to "db", but did not update all locations where it was used. This worked swimmingly well as long as only repo-add updates were handling the backup and restoral of the delta file, as the delta file therefore got backed up to the correct location (db) in the shared db_remove_entry() function. But later on in the repo-remove logic, we tried removing a different file that will never exist (tree). Fixes FS#53041 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index bccf2f37..1c7fb2f6 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -611,7 +611,7 @@ remove() { msg "$(gettext "Searching for package '%s'...")" "$pkgname" if db_remove_entry "$pkgname"; then - rm -f "$tmpdir/tree/$pkgname.deltas" + rm -f "$tmpdir/db/$pkgname.deltas" return 0 else error "$(gettext "Package matching '%s' not found.")" "$pkgname" -- 2.20.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-94-ge1fc2f90
by Allan McRae 04 Jan '19

04 Jan '19

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 e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e (commit) via 3a5a0d53bced32b42fd553952c2f74d52981d9ef (commit) from 984492b92f1b35534adddc24c2439fcdcb9885af (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 e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e Author: Michael Straube <michael.straube(a)posteo.de> Date: Fri Dec 14 21:44:25 2018 +0100 libalpm/add.c: move assignment into conditional in alpm_add_pkg While at it and for consistency move the assignment of the variable 'local' into the subsequent conditional. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a5a0d53bced32b42fd553952c2f74d52981d9ef Author: Michael Straube <michael.straube(a)posteo.de> Date: Fri Dec 14 21:44:24 2018 +0100 Move skipping of duplicate sync/remove targets into libalpm 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 11 ++++++++--- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 14 insertions(+), 21 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2 1/2] Move skipping of duplicate sync/remove targets into libalpm
by Michael Straube 04 Jan '19

04 Jan '19

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> --- v1 -> v2 debug messages not translated moved assigments into conditionals lib/libalpm/add.c | 8 +++++++- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index e415bb17..c39f9ecf 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,12 @@ 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)) { + if((dup = alpm_pkg_find(trans->add, pkgname))) { + 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..50de4649 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] [GIT] The official pacman repository branch, master, updated. v5.1.1-92-g984492b9
by Allan McRae 04 Jan '19

04 Jan '19

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 984492b92f1b35534adddc24c2439fcdcb9885af (commit) via 4778f1318853ac9fc1f838d836dbe017fb6cbddc (commit) via 2d403709d97cca381873a9d56cd37f51c0f3eade (commit) via ecac357c1a20f3e09ae979397e5efd225b03f895 (commit) via d150b9719000ccafb39e8560120bb4f690ba8b50 (commit) via 33a8ced334f01c94086a5e7e77d11a9361264781 (commit) from 6b541404cc691b2aea3d373e663d9628fda15a2b (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 984492b92f1b35534adddc24c2439fcdcb9885af Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Dec 27 18:15:48 2018 -0500 repo-add: don't break if delta package sources contain epoch Our sed parser for xdelta3 headers will greedily match on ":" which coincidentally is also the character we use to define a version with an epoch. While we are at it, simply use sed for the whole pipeline, rather than using both grep and sed. Fixes FS#61195 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4778f1318853ac9fc1f838d836dbe017fb6cbddc Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Dec 26 22:58:26 2018 -0500 repo-remove: fix removing packages with deltas We have code in order to remove deltas when removing a package, but it is never run, since we try to remove the wrong file. This was broken in commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a which modified the internal layout we use to modify the db, changing "tree" to "db", but did not update all locations where it was used. This worked swimmingly well as long as only repo-add updates were handling the backup and restore of the delta file, as the delta file therefore got backed up to the correct location (db) in the shared db_remove_entry() function. But later on in the repo-remove logic, we tried removing a different file that will never exist (tree). Fixes FS#53041 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d403709d97cca381873a9d56cd37f51c0f3eade Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:41 2018 -0800 allow tests for disabled features to be skipped Previously, pacman's test suite would fail when compiled without signature support. Adds a require_capability method to pmtest objects. Currently recognized values are 'gpg', 'curl', and 'nls'; although only gpg is used presently. Missing features are indicated by running pactest with one of the --without-<feature> options. This modifies pmenv to run each case as independent tests. Previously, a single pmenv could run multiple tests, combining there output into a single TAP stream but making it impossible to properly skip an entire test case. This change does not affect running pactest.py with a single test (as both autotools and meson do), but will affect anybody manually running pactest.py with multiple tests at once. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ecac357c1a20f3e09ae979397e5efd225b03f895 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:40 2018 -0800 tap.py: add skip_all function Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d150b9719000ccafb39e8560120bb4f690ba8b50 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:39 2018 -0800 remove unused test summary code Unused since 12e00af5315135a29a66c9aaa01e141a32d4634b Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 33a8ced334f01c94086a5e7e77d11a9361264781 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:38 2018 -0800 silence warning when built without curl Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 ++++++ lib/libalpm/handle.c | 2 ++ scripts/repo-add.sh.in | 6 +++--- test/pacman/meson.build | 25 ++++++++++++++++--------- test/pacman/pactest.py | 15 ++++++++++++--- test/pacman/pmenv.py | 31 +++++++++++++++++-------------- test/pacman/pmtest.py | 8 +++++++- test/pacman/tap.py | 5 +++++ test/pacman/tests/sign001.py | 1 + 9 files changed, 69 insertions(+), 30 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] silence warning when built without curl
by Andrew Gregory 04 Jan '19

04 Jan '19

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index f912d2f5..c491d87c 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -876,6 +876,8 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, CHECK_HANDLE(handle, return -1); #ifdef HAVE_LIBCURL handle->disable_dl_timeout = disable_dl_timeout; +#else + (void)disable_dl_timeout; /* silence unused variable warnings */ #endif return 0; } -- 2.19.2

2 4

[pacman-dev] [PATCH] repo-add: Fix parsing xdelta output with epoch in version
by Nigel Kukard 27 Dec '18

27 Dec '18

Parsing using sed 's/.*: *//' cuts off the filename before the epoch causing invalid filenames in the $pkg/deltas file. Patch attached fixing the issue. -N

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.1.2, created. 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 annotated tag, v5.1.2 has been created at ad1baa4100a996a8c957fb42299ed194385114f7 (tag) tagging 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 (commit) replaces v5.1.1 tagged by Andrew Gregory on Tue Dec 25 01:57:46 2018 -0800 - Log ----------------------------------------------------------------- v5.1.2 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEuBUbEXA3eBCVUUynu9/8kjBrESEFAlwh/xoACgkQu9/8kjBr ESE+Twf/eRh/JmqTEhHuU296Kc1w9YcwBUgJE1cYVDm3rAaKsCxD8vQzExS6PP6f MkNWymbx7YjUb8CdHv47W3YONfDmbw55Io46D4jOLA0yrUZhP7HfY+L/jcHCAVi6 vsPG98QHWxWfSJOaXqEZSWw7Kjfgj8+MAyrDlm718mq2TBibcUHz2ElH2i78m/y1 rH1MVL/LAwONtQHYLXHxmepQ92eaoUbdKJ3I5aRP3im+uFFwrkRbHFxYolFFFMKt gMOdgDoJlu9YrmiQWfy0slfNCT3oGVJdoSULhtHmTq/fKs451xc7KN0egZnBOm5d WOKTY2fBq9G4IxcqMk/TVqmvYIkSVw== =IvGY -----END PGP SIGNATURE----- Allan McRae (1): Pull updated translations from Transifex Andrew Gregory (5): reset signal handlers before running scripts/hooks handle EINTR while polling scripts/hooks always allow explicit empty siglevel for sync dbs update NEWS for v5.1.2 Release v5.1.2 Eli Schwartz (2): pacman: check versioned optdepends in -Qi operation libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Michael Straube (1): libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST Olivier Brunel (2): alpm: Do not raise SIGINT when filesize goes over limit alpm: Fix SIGINT handling re: aborting download morganamilo (1): pacman-conf: add missing DisableDownloadTimeout ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-86-g6b541404
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, master has been updated via 6b541404cc691b2aea3d373e663d9628fda15a2b (commit) via 281cdb2e1c5b706177beba4a932a75322c1c2351 (commit) from b109d7096b3f3f3244b7bb3796be658393eff98a (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 6b541404cc691b2aea3d373e663d9628fda15a2b 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> (cherry picked from commit f8c73464c9cf86d6b917542585d74514f150c67b) commit 281cdb2e1c5b706177beba4a932a75322c1c2351 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sat Jun 3 22:15:22 2017 -0400 update NEWS for v5.0.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> (cherry picked from commit fdf53393bc996a514bbfc9fcd6ea19a8bb2f02ed) ----------------------------------------------------------------------- Summary of changes: NEWS | 33 +++++++++++++++++++++++++++++++++ doc/index.asciidoc | 2 ++ 2 files changed, 35 insertions(+) hooks/post-receive -- The official pacman repository

1 0