February 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Set an environment variable to indicate hooks support
by Thomas Bächler 24 Feb '16

24 Feb '16

When replacing existing post_install and post_upgrade functionality with hooks, it is necessary to ensure that pacman has already been upgraded. To allow a smooth transition, export the ALPM_FEATURE_HOOKS variable with the value 1 in all processes spawned by pacman. An install scriptlet can fall back to old behaviour if this variable is not set, but rely on pacman hooks if it is not set. --- lib/libalpm/util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 001c042..86e3943 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -545,6 +545,11 @@ static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, return 0; } +void _alpm_setup_child_environment() +{ + setenv("ALPM_FEATURE_HOOKS", "1", 1); +} + /** Execute a command with arguments in a chroot. * @param handle the context handle * @param cmd command to execute @@ -618,6 +623,8 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], close(cwdfd); } + /* set up the child environment */ + _alpm_setup_child_environment(); /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(handle->root) != 0) { fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); -- 2.7.1

5 6

[pacman-dev] [PATCH] Update NEWS for pacman-5.0.1
by Allan McRae 24 Feb '16

24 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- There is always something that slips my mind... Time for a release checklist to be added. NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS b/NEWS index 07aa028..63ceba0 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,22 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +5.0.1 - fix alignment issues with wide character locales (FS#47980) + - fix removal of .pacnew files (FS#47993) + - fix triggering of Install hooks (FS#47996) + - fix handling of stdin scripts called by pacman + - hook activity is logged + - documentataion updates for alpm-hooks (FS#48080) + - makepkg: + - increase robustness of variable array checks + - makepkg -g does not perform current architecture checks + - do not run prepare() with --noextact + - all directories in the packaging directory are cleared + before each build + - fix translations issues (FS#48057, FS#48298) + - repo-add: + - fix checking for non-existent database + - contrib: + - zsh_completion: updated makepkg options 5.0.0 - pacman can run hooks pre- and post-transaction. See the alpm-hooks(5) man page for details and an example hook (FS#2985) - pacman can now sync and read .files databases (-Fy) and do basic -- 2.7.1

2 2

[pacman-dev] [PATCH] Add release instructions
by Allan McRae 23 Feb '16

23 Feb '16

This serves as a release checklist for anyone making a pacman release. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Dan: anything else you see that is needed here? RELEASE | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 RELEASE diff --git a/RELEASE b/RELEASE new file mode 100644 index 0000000..6f800e3 --- /dev/null +++ b/RELEASE @@ -0,0 +1,22 @@ +The following checklist should be used for making a pacman release. + +- Ensure "make distcheck" succeeds +- Call a freeze to development. +- Send translation updates to Transifex (see below). At this stage, strings can + only be changed for a major issue. Pull translation updates after ~2 weeks. +- Update NEWS and README files +- Pull translation updates from Transifex +- Update version in configure.ac as described in file +- Update doc/index.txt +- Create a signed git tag (git tag -x vX.Y.Z -m "commit message") +- Create and sign release tarballs (generate with "make distcheck") +- Update pacman website + +Transifex updates are handled using the transifex client. The basic process is: +- Pull updates from transifex ("tx pull -a -f") +- Update po files ("make update-po") +- Fix all translation errors found +- Add any new locales to the relevant LINGUAS file +- Optional: Make any manual changes needed (e.g. fixing spacing in a string) + and update po files again +- Push updated po files to transifex ("tx push -s -t --skip") -- 2.7.1

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.0.1, created. v5.0.1
by allan＠archlinux.org 23 Feb '16

23 Feb '16

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.0.1 has been created at fecec6a5ec41639162d127768cf6ac851db7c740 (tag) tagging f38de43eb68f1d9c577b4378310640c1eaa93338 (commit) replaces v5.0.0 tagged by Allan McRae on Tue Feb 23 13:47:57 2016 +1000 - Log ----------------------------------------------------------------- v5.0.1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJWy9ZtAAoJEPmf/g/q6Zm91a4H/iUY7jGw1e+kvKGL5JuRlyQ4 YRRaD0OnDqRI2ApZQgdczCDtGt0786aJ2wrOSW1d3rQi2kq7b8M2ON1bTIvO+j4a I1Jdm4mCBW1/NWk9HoRZ/3gw1+xZ51LGf+kgD07Ul3Bn2eWGNCtRTpHxhNk8DfnR 9hery5rewEbEqDcAH47+qFoV8zgghM+G7iTBZlLxYk1BTu0hnVHrMjXxyVi/oJ/C FIF5VylqdP37L0aFF1PU0gdC6tsKh5ecEfuLO1GtDzTrzAEmtjJUo8CwigFi9BXP kgCnwmT/mbQoVIkqkmIjvkgNr0oNWafPQ1RjS799Og+uqeQy00y+x9dxDV7l+Fc= =KaYG -----END PGP SIGNATURE----- Alastair Hughes (2): Add the missing limits.h include to hook.c Make "makepkg -g" ignore the current architecture. Allan McRae (10): repo-remove: fix checking for non-existent .db database libmakepkg: increase robustness of the detection of array variables doc/alpm-hooks: mention that hooks must have a ".hooks" suffix. Revert "makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD" makepkg: remove pkg from OPT_LONG array alpm-hooks.5: document hook running order Pull translation updates from Transifex Manually fix space before ellipses in translations Regenerate translations for 5.0.1 Release 5.0.1 Andrew Gregory (7): dump_pkg_info: fix wide character title alignment doc/index.txt: update for pacman 5.0 only remove pacnew file if it is new do not rely on localdb for hook matching ensure gpgdir has a trailing slash alpm_run_chroot: always connect parent2child pipe make alpm_unlock and trans_interrupt async safe Dominik Fischer (1): only include .SRCINFO comments in source tarball Doug Newgard (1): Bring makepkg zsh completions up to date Evangelos Foutras (1): makepkg: do not run prepare() with --noextract Olivier Brunel (1): Log to file when running hooks Stefan Tatschner (1): Fix inconsistent status messages ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.0-24-gf38de43
by allan＠archlinux.org 23 Feb '16

23 Feb '16

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 f38de43eb68f1d9c577b4378310640c1eaa93338 (commit) via 9375715ae410212ab674569806857056889cd388 (commit) via e2ca25623b983c34ad882a5d03aac2b562e4349d (commit) via cd4a3d03a014f0959b42b652051007e5a47fe6e2 (commit) via 5c136d85dbf42e56f2ef0e6a60288669bd806c38 (commit) from c034a3322b2a53fce51ffce144e36361892abeac (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 f38de43eb68f1d9c577b4378310640c1eaa93338 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 23 13:46:25 2016 +1000 Release 5.0.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9375715ae410212ab674569806857056889cd388 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 23 13:09:39 2016 +1000 Regenerate translations for 5.0.1 commit e2ca25623b983c34ad882a5d03aac2b562e4349d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 23 13:05:02 2016 +1000 Manually fix space before ellipses in translations Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd4a3d03a014f0959b42b652051007e5a47fe6e2 Author: Stefan Tatschner <rumpelsepp(a)sevenbyte.org> Date: Sat Jan 30 14:04:14 2016 +0100 Fix inconsistent status messages This patch fixes an inconsistency in the status messages. :: Proceed with installation? [Y/n] :: Retrieving packages ... <--- Space before "...". blas-3.6.0-4-x86_64 cblas-3.6.0-4-x86_64 lapack-3.6.0-4-x86_64 (3/3) checking keys in keyring (3/3) checking package integrity (3/3) loading package files (3/3) checking for file conflicts (3/3) checking available disk space :: Processing package changes... <--- No space before "..." (1/3) upgrading blas (2/3) upgrading cblas (3/3) upgrading lapack Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c136d85dbf42e56f2ef0e6a60288669bd806c38 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 23 12:56:40 2016 +1000 Pull translation updates from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +- doc/index.txt | 1 + lib/libalpm/po/ar.po | 62 +++--- lib/libalpm/po/br.po | 62 +++--- lib/libalpm/po/ca.po | 62 +++--- lib/libalpm/po/cs.po | 62 +++--- lib/libalpm/po/da.po | 82 ++++---- lib/libalpm/po/de.po | 62 +++--- lib/libalpm/po/el.po | 62 +++--- lib/libalpm/po/en_GB.po | 62 +++--- lib/libalpm/po/eo.po | 62 +++--- lib/libalpm/po/es.po | 62 +++--- lib/libalpm/po/es_419.po | 62 +++--- lib/libalpm/po/fi.po | 62 +++--- lib/libalpm/po/fr.po | 62 +++--- lib/libalpm/po/gl.po | 63 +++--- lib/libalpm/po/hr.po | 62 +++--- lib/libalpm/po/hu.po | 62 +++--- lib/libalpm/po/id.po | 62 +++--- lib/libalpm/po/is.po | 63 +++--- lib/libalpm/po/it.po | 62 +++--- lib/libalpm/po/ja.po | 64 +++---- lib/libalpm/po/ka.po | 62 +++--- lib/libalpm/po/kk.po | 62 +++--- lib/libalpm/po/ko.po | 62 +++--- lib/libalpm/po/libalpm.pot | 62 +++--- lib/libalpm/po/lt.po | 62 +++--- lib/libalpm/po/nb.po | 62 +++--- lib/libalpm/po/nl.po | 62 +++--- lib/libalpm/po/pl.po | 62 +++--- lib/libalpm/po/pt.po | 98 +++++----- lib/libalpm/po/pt_BR.po | 62 +++--- lib/libalpm/po/ro.po | 62 +++--- lib/libalpm/po/ru.po | 62 +++--- lib/libalpm/po/sk.po | 62 +++--- lib/libalpm/po/sl.po | 62 +++--- lib/libalpm/po/sr.po | 62 +++--- lib/libalpm/po/sr(a)latin.po | 62 +++--- lib/libalpm/po/sv.po | 62 +++--- lib/libalpm/po/tr.po | 81 ++++---- lib/libalpm/po/uk.po | 62 +++--- lib/libalpm/po/zh_CN.po | 62 +++--- lib/libalpm/po/zh_TW.po | 62 +++--- scripts/po/ar.po | 240 +++++++++++------------ scripts/po/ast.po | 12 +- scripts/po/az_AZ.po | 240 +++++++++++------------ scripts/po/bg.po | 12 +- scripts/po/br.po | 259 +++++++++++++------------ scripts/po/ca.po | 242 +++++++++++------------ scripts/po/cs.po | 240 +++++++++++------------ scripts/po/da.po | 305 +++++++++++++++-------------- scripts/po/de.po | 240 +++++++++++------------ scripts/po/el.po | 246 ++++++++++++------------ scripts/po/en_GB.po | 240 +++++++++++------------ scripts/po/eo.po | 240 +++++++++++------------ scripts/po/es.po | 240 +++++++++++------------ scripts/po/es_419.po | 259 +++++++++++++------------ scripts/po/eu.po | 12 +- scripts/po/fi.po | 240 +++++++++++------------ scripts/po/fr.po | 247 ++++++++++++------------ scripts/po/gl.po | 302 +++++++++++++++-------------- scripts/po/hr.po | 240 +++++++++++------------ scripts/po/hu.po | 240 +++++++++++------------ scripts/po/id.po | 242 +++++++++++------------ scripts/po/is.po | 241 +++++++++++------------ scripts/po/it.po | 240 +++++++++++------------ scripts/po/ja.po | 246 ++++++++++++------------ scripts/po/ka.po | 240 +++++++++++------------ scripts/po/kk.po | 240 +++++++++++------------ scripts/po/ko.po | 240 +++++++++++------------ scripts/po/lt.po | 240 +++++++++++------------ scripts/po/nb.po | 240 +++++++++++------------ scripts/po/nl.po | 244 +++++++++++------------ scripts/po/pacman-scripts.pot | 240 +++++++++++------------ scripts/po/pl.po | 261 +++++++++++++------------ scripts/po/pt.po | 435 +++++++++++++++++++++--------------------- scripts/po/pt_BR.po | 240 +++++++++++------------ scripts/po/ro.po | 240 +++++++++++------------ scripts/po/ru.po | 240 +++++++++++------------ scripts/po/sk.po | 240 +++++++++++------------ scripts/po/sl.po | 240 +++++++++++------------ scripts/po/sr.po | 240 +++++++++++------------ scripts/po/sr(a)latin.po | 240 +++++++++++------------ scripts/po/sv.po | 240 +++++++++++------------ scripts/po/tr.po | 247 ++++++++++++------------ scripts/po/uk.po | 240 +++++++++++------------ scripts/po/uz.po | 12 +- scripts/po/zh_CN.po | 248 ++++++++++++------------ scripts/po/zh_TW.po | 240 +++++++++++------------ src/pacman/callback.c | 2 +- src/pacman/po/ar.po | 86 ++++----- src/pacman/po/ast.po | 2 +- src/pacman/po/az_AZ.po | 86 ++++----- src/pacman/po/bg.po | 2 +- src/pacman/po/br.po | 86 ++++----- src/pacman/po/ca.po | 94 ++++----- src/pacman/po/cs.po | 90 ++++----- src/pacman/po/da.po | 94 ++++----- src/pacman/po/de.po | 87 ++++----- src/pacman/po/el.po | 130 ++++++------- src/pacman/po/en_GB.po | 88 ++++----- src/pacman/po/eo.po | 86 ++++----- src/pacman/po/es.po | 98 +++++----- src/pacman/po/es_419.po | 88 ++++----- src/pacman/po/eu.po | 2 +- src/pacman/po/fa.po | 88 ++++----- src/pacman/po/fi.po | 92 ++++----- src/pacman/po/fr.po | 86 ++++----- src/pacman/po/gl.po | 136 ++++++------- src/pacman/po/hr.po | 86 ++++----- src/pacman/po/hu.po | 86 ++++----- src/pacman/po/id.po | 88 ++++----- src/pacman/po/is.po | 89 ++++----- src/pacman/po/it.po | 86 ++++----- src/pacman/po/ja.po | 94 ++++----- src/pacman/po/ka.po | 102 +++++----- src/pacman/po/kk.po | 88 ++++----- src/pacman/po/ko.po | 119 ++++++------ src/pacman/po/lt.po | 86 ++++----- src/pacman/po/nb.po | 88 ++++----- src/pacman/po/nl.po | 86 ++++----- src/pacman/po/pacman.pot | 86 ++++----- src/pacman/po/pl.po | 153 ++++++++------- src/pacman/po/pt.po | 311 +++++++++++++++--------------- src/pacman/po/pt_BR.po | 88 ++++----- src/pacman/po/ro.po | 88 ++++----- src/pacman/po/ru.po | 88 ++++----- src/pacman/po/sk.po | 88 ++++----- src/pacman/po/sl.po | 134 ++++++------- src/pacman/po/sr.po | 86 ++++----- src/pacman/po/sr(a)latin.po | 86 ++++----- src/pacman/po/sv.po | 86 ++++----- src/pacman/po/th.po | 86 ++++----- src/pacman/po/tr.po | 172 +++++++++-------- src/pacman/po/uk.po | 122 ++++++------ src/pacman/po/ur.po | 2 +- src/pacman/po/uz.po | 2 +- src/pacman/po/vi.po | 86 ++++----- src/pacman/po/zh_CN.po | 88 ++++----- src/pacman/po/zh_TW.po | 88 ++++----- 140 files changed, 8922 insertions(+), 8817 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.0-19-gc034a33
by allan＠archlinux.org 23 Feb '16

23 Feb '16

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 c034a3322b2a53fce51ffce144e36361892abeac (commit) via a724235b6127f9655708614d1e44f9b5c661a506 (commit) via 1d6583a58da0904fb7feafd4a666391087955a7b (commit) via ce1f453b74c8fd0966e1d11d3deeb1a777055fc5 (commit) via 2ee7a8d89ad693617307260604e1d58757fd2978 (commit) from f63854fa96f658ca5bdf2c21a1cd33cf4e3fbdbd (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 c034a3322b2a53fce51ffce144e36361892abeac Author: Evangelos Foutras <evangelos(a)foutrelis.com> Date: Wed Feb 17 09:11:38 2016 +0200 makepkg: do not run prepare() with --noextract This is partial revert of 8454daa7feef (makepkg: run pkgver() and prepare() with --noextract). Reasoning for the reversion (copied from FS#43498): Running prepare() when --noextract is used no longer allows running 'makepkg -o && makepkg -e' with any PKGBUILD that applies patches in prepare(). [1] Sure there's --noprepare which restores the old behavior, but that's a lot of extra typing for what I believe is a much more common use of --noextract. For OP's use case of doing git bisects, you can specify the commit in the source array and thus skip --noextract since makepkg will checkout the correct commit each time. [1] I often extract the sources using 'makepkg -o', manually edit some source files, and then use 'makepkg -e' to package it (while possibly repeating the edit/package steps). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a724235b6127f9655708614d1e44f9b5c661a506 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Feb 22 14:07:57 2016 -0500 make alpm_unlock and trans_interrupt async safe RET_ERR calls _alpm_log which includes calls that are not safe for use in asynchronous signal handlers (see signal(7)). Replace it in functions called from our signal handlers with a new macro RET_ERR_ASYNC_SAFE which is identical except that it lacks the call to _alpm_log. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 1d6583a58da0904fb7feafd4a666391087955a7b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Feb 21 21:46:38 2016 -0500 alpm_run_chroot: always connect parent2child pipe Commit e374e6829cea3512f0b4a4069c5a6168f0f8d8a0 closed stdin before running scripts/hooks. This left the exec'd process with no file descriptor 0. If the process subsequently opened a file it would be assigned fd 0, and could potentially be confused for stdin. Connecting and immediately closing the parent2child pipe ensures that the child has an fd 0 and that it is empty. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce1f453b74c8fd0966e1d11d3deeb1a777055fc5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Feb 21 21:46:36 2016 -0500 ensure gpgdir has a trailing slash init_gpgme checks for various paths under gpgdir by concatenating them directly, giving warning messages incorrectly if gpgdir does not end with '/'. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2ee7a8d89ad693617307260604e1d58757fd2978 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Feb 21 21:46:35 2016 -0500 do not rely on localdb for hook matching Relying on localdb to determine which trigger operations should match is completely broken for PostTransaction hooks because the localdb has already been updated. Store a copy of the old version of any packages being updated to use instead. Fixes FS#47996 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 10 +++++----- lib/libalpm/add.c | 14 +++----------- lib/libalpm/handle.c | 14 ++++---------- lib/libalpm/hook.c | 4 ++-- lib/libalpm/package.c | 3 +++ lib/libalpm/package.h | 1 + lib/libalpm/sync.c | 8 ++++++++ lib/libalpm/trans.c | 8 +++++--- lib/libalpm/util.c | 13 ++++++------- lib/libalpm/util.h | 4 ++++ scripts/makepkg.sh.in | 6 +++--- test/pacman/tests/TESTS | 1 + ...gger-match.py => hook-pkg-postinstall-trigger-match.py} | 4 ++-- 13 files changed, 47 insertions(+), 43 deletions(-) copy test/pacman/tests/{hook-pkg-install-trigger-match.py => hook-pkg-postinstall-trigger-match.py} (78%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] do not rely on localdb for hook matching
by Andrew Gregory 23 Feb '16

23 Feb '16

Relying on localdb to determine which trigger operations should match is completely broken for PostTransaction hooks because the localdb has already been updated. Store a copy of the old version of any packages being updated to use instead. Fixes FS#47996 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 14 +++---------- lib/libalpm/hook.c | 4 ++-- lib/libalpm/package.c | 3 +++ lib/libalpm/package.h | 1 + lib/libalpm/sync.c | 8 ++++++++ test/pacman/tests/TESTS | 1 + .../tests/hook-pkg-postinstall-trigger-match.py | 23 ++++++++++++++++++++++ 7 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 test/pacman/tests/hook-pkg-postinstall-trigger-match.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 2639fa7..f5c9a95 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -409,9 +409,8 @@ 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 */ - alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); - if(local) { - int cmp = _alpm_pkg_compare_versions(newpkg, local); + if((oldpkg = newpkg->oldpkg)) { + int cmp = _alpm_pkg_compare_versions(newpkg, oldpkg); if(cmp < 0) { log_msg = "downgrading"; progress = ALPM_PROGRESS_DOWNGRADE_START; @@ -427,14 +426,8 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } is_upgrade = 1; - /* we'll need to save some record for backup checks later */ - if(_alpm_pkg_dup(local, &oldpkg) == -1) { - ret = -1; - goto cleanup; - } - /* copy over the install reason */ - newpkg->reason = alpm_pkg_get_reason(local); + newpkg->reason = alpm_pkg_get_reason(oldpkg); } else { event.operation = ALPM_PACKAGE_INSTALL; } @@ -630,7 +623,6 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, EVENT(handle, &event); cleanup: - _alpm_pkg_free(oldpkg); return ret; } diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 81c347e..6890a6e 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -374,7 +374,7 @@ static int _alpm_hook_trigger_match_file(alpm_handle_t *handle, /* check if file will be removed due to package upgrade */ for(i = handle->trans->add; i; i = i->next) { alpm_pkg_t *spkg = i->data; - alpm_pkg_t *pkg = alpm_db_get_pkg(handle->db_local, spkg->name); + alpm_pkg_t *pkg = spkg->oldpkg; if(pkg) { alpm_filelist_t filelist = pkg->files; size_t f; @@ -463,7 +463,7 @@ static int _alpm_hook_trigger_match_pkg(alpm_handle_t *handle, for(i = handle->trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; if(_alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { - if(alpm_db_get_pkg(handle->db_local, pkg->name)) { + if(pkg->oldpkg) { if(t->op & ALPM_HOOK_OP_UPGRADE) { if(hook->needs_targets) { upgrade = alpm_list_add(upgrade, pkg->name); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f8ddb3..f08df8b 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -682,6 +682,7 @@ void _alpm_pkg_free(alpm_pkg_t *pkg) alpm_list_free(pkg->deltas); alpm_list_free(pkg->delta_path); alpm_list_free(pkg->removes); + _alpm_pkg_free(pkg->oldpkg); if(pkg->origin == ALPM_PKG_FROM_FILE) { FREE(pkg->origin_data.file); @@ -707,6 +708,8 @@ void _alpm_pkg_free_trans(alpm_pkg_t *pkg) alpm_list_free(pkg->removes); pkg->removes = NULL; + _alpm_pkg_free(pkg->oldpkg); + pkg->oldpkg = NULL; } /* Is spkg an upgrade for localpkg? */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 65afaf7..9fea356 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -117,6 +117,7 @@ struct __alpm_pkg_t { alpm_list_t *deltas; alpm_list_t *delta_path; alpm_list_t *removes; /* in transaction targets only */ + alpm_pkg_t *oldpkg; /* in transaction targets only */ struct pkg_operations *ops; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3d3915c..00b68d0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -659,10 +659,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(i = trans->add; i; i = i->next) { /* update download size field */ alpm_pkg_t *spkg = i->data; + alpm_pkg_t *lpkg = alpm_db_get_pkg(handle->db_local, spkg->name); if(compute_download_size(spkg) < 0) { ret = -1; goto cleanup; } + if(lpkg && _alpm_pkg_dup(lpkg, &spkg->oldpkg) != 0) { + ret = -1; + goto cleanup; + } } cleanup: @@ -1260,6 +1265,9 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, pkgfile->reason = spkg->reason; /* copy over validation method */ pkgfile->validation = spkg->validation; + /* transfer oldpkg */ + pkgfile->oldpkg = spkg->oldpkg; + spkg->oldpkg = NULL; i->data = pkgfile; /* spkg has been removed from the target list, so we can free the * sync-specific fields */ diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index acdf769..9c33020 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -59,6 +59,7 @@ TESTS += test/pacman/tests/hook-file-remove-trigger-match.py TESTS += test/pacman/tests/hook-file-upgrade-nomatch.py TESTS += test/pacman/tests/hook-invalid-trigger.py TESTS += test/pacman/tests/hook-pkg-install-trigger-match.py +TESTS += test/pacman/tests/hook-pkg-postinstall-trigger-match.py TESTS += test/pacman/tests/hook-pkg-remove-trigger-match.py TESTS += test/pacman/tests/hook-pkg-upgrade-trigger-match.py TESTS += test/pacman/tests/hook-target-list.py diff --git a/test/pacman/tests/hook-pkg-postinstall-trigger-match.py b/test/pacman/tests/hook-pkg-postinstall-trigger-match.py new file mode 100644 index 0000000..b9b07cd --- /dev/null +++ b/test/pacman/tests/hook-pkg-postinstall-trigger-match.py @@ -0,0 +1,23 @@ +self.description = "Install a package matching a PostTransaction Install hook" + +self.add_script("hook-script", ": > hook-output") +self.add_hook("hook", + """ + [Trigger] + Type = Package + Operation = Install + Target = foo + + [Action] + When = PostTransaction + Exec = bin/hook-script + """); + +sp = pmpkg("foo") +self.addpkg2db("sync", sp) + +self.args = "-S foo" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=foo") +self.addrule("FILE_EXIST=hook-output") -- 2.7.1

2 1

[pacman-dev] [PATCH] make alpm_unlock and trans_interrupt async safe
by Andrew Gregory 22 Feb '16

22 Feb '16

RET_ERR calls _alpm_log which includes calls that are not safe for use in asynchronous signal handlers (see signal(7)). Replace it in functions called from our signal handlers with a new macro RET_ERR_ASYNC which is identical except that it lacks the call to _alpm_log. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 2 +- lib/libalpm/trans.c | 8 +++++--- lib/libalpm/util.h | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index e4bde1a..578647e 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -141,7 +141,7 @@ int SYMEXPORT alpm_unlock(alpm_handle_t *handle) handle->lockfd = -1; if(unlink(handle->lockfile) != 0) { - RET_ERR(handle, ALPM_ERR_SYSTEM, -1); + RET_ERR_ASYNC(handle, ALPM_ERR_SYSTEM, -1); } else { return 0; } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 239d6a1..30b288a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -233,7 +233,9 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) return 0; } -/** Interrupt a transaction. */ +/** Interrupt a transaction. + * @note Safe to call from inside signal handlers. + */ int SYMEXPORT alpm_trans_interrupt(alpm_handle_t *handle) { alpm_trans_t *trans; @@ -242,9 +244,9 @@ int SYMEXPORT alpm_trans_interrupt(alpm_handle_t *handle) CHECK_HANDLE(handle, return -1); trans = handle->trans; - ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); + ASSERT(trans != NULL, RET_ERR_ASYNC(handle, ALPM_ERR_TRANS_NULL, -1)); ASSERT(trans->state == STATE_COMMITING || trans->state == STATE_INTERRUPTED, - RET_ERR(handle, ALPM_ERR_TRANS_TYPE, -1)); + RET_ERR_ASYNC(handle, ALPM_ERR_TRANS_TYPE, -1)); trans->state = STATE_INTERRUPTED; diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9817939..f47c26e 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -71,6 +71,10 @@ void _alpm_alloc_fail(size_t size); (handle)->pm_errno = (err); \ return (ret); } while(0) +#define RET_ERR_ASYNC(handle, err, ret) do { \ + (handle)->pm_errno = (err); \ + return (ret); } while(0) + #define DOUBLE_EQ(x, y) (fabs((x) - (y)) < DBL_EPSILON) #define CHECK_HANDLE(handle, action) do { if(!(handle)) { action; } (handle)->pm_errno = 0; } while(0) -- 2.7.1

2 1

[pacman-dev] [PATCH] alpm_run_chroot: always connect parent2child pipe
by Andrew Gregory 22 Feb '16

22 Feb '16

Commit e374e6829cea3512f0b4a4069c5a6168f0f8d8a0 closed stdin before running scripts/hooks. This left the exec'd process with no file descriptor 0. If the process subsequently opened a file it would be assigned fd 0, and could potentially be confused for stdin. Connecting and immediately closing the parent2child pipe ensures that the child has an fd 0 and that it is empty. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- See https://bbs.archlinux.org/viewtopic.php?id=209151 Missing fd 0 has also caused bash to start sourcing ~/.basrc (see https://lists.archlinux.org/pipermail/pacman-dev/2016-February/020870.html) but that is due to a bug in bash that has been reported and should get fixed. lib/libalpm/util.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 001c042..4a4847d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -586,7 +586,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], goto cleanup; } - if(stdin_cb && pipe(parent2child_pipefd) == -1) { + if(pipe(parent2child_pipefd) == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); retval = 1; goto cleanup; @@ -607,11 +607,9 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], close(2); while(dup2(child2parent_pipefd[1], 1) == -1 && errno == EINTR); while(dup2(child2parent_pipefd[1], 2) == -1 && errno == EINTR); - if(stdin_cb) { - while(dup2(parent2child_pipefd[0], 0) == -1 && errno == EINTR); - close(parent2child_pipefd[0]); - close(parent2child_pipefd[1]); - } + while(dup2(parent2child_pipefd[0], 0) == -1 && errno == EINTR); + close(parent2child_pipefd[0]); + close(parent2child_pipefd[1]); close(child2parent_pipefd[0]); close(child2parent_pipefd[1]); if(cwdfd >= 0) { @@ -646,15 +644,16 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], child2parent->events = POLLIN; fcntl(child2parent->fd, F_SETFL, O_NONBLOCK); close(child2parent_pipefd[1]); + close(parent2child_pipefd[0]); if(stdin_cb) { parent2child->fd = parent2child_pipefd[1]; parent2child->events = POLLOUT; fcntl(parent2child->fd, F_SETFL, O_NONBLOCK); - close(parent2child_pipefd[0]); } else { parent2child->fd = -1; parent2child->events = 0; + close(parent2child_pipefd[1]); } #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) -- 2.7.1

1 0

[pacman-dev] [PATCH] ensure gpgdir has a trailing slash
by Andrew Gregory 22 Feb '16

22 Feb '16

init_gpgme checks for various paths under gpgdir by concatenating them directly, giving warning messages incorrectly if gpgdir does not end with '/'. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 37c0bbf..e4bde1a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -542,17 +542,11 @@ int SYMEXPORT alpm_option_set_logfile(alpm_handle_t *handle, const char *logfile int SYMEXPORT alpm_option_set_gpgdir(alpm_handle_t *handle, const char *gpgdir) { + int err; CHECK_HANDLE(handle, return -1); - if(!gpgdir) { - handle->pm_errno = ALPM_ERR_WRONG_ARGS; - return -1; + if((err = _alpm_set_directory_option(gpgdir, &(handle->gpgdir), 0))) { + RET_ERR(handle, err, -1); } - - if(handle->gpgdir) { - FREE(handle->gpgdir); - } - STRDUP(handle->gpgdir, gpgdir, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - _alpm_log(handle, ALPM_LOG_DEBUG, "option 'gpgdir' = %s\n", handle->gpgdir); return 0; } -- 2.7.1

1 0