- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] restrict transaction package origins
by Andrew Gregory 09 Feb '14

09 Feb '14

This moves the "wrong args" error up from trans_commit to add_pkg when used with a local pkg and adds the error for remove_pkg when used with a sync pkg, which currently just removes the db entry. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 2 ++ lib/libalpm/remove.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f38afef..2aa5bae 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -57,6 +57,8 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) /* Sanity checks */ CHECK_HANDLE(handle, return -1); ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + ASSERT(pkg->origin != ALPM_PKG_FROM_LOCALDB, + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); ASSERT(handle == pkg->handle, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); trans = handle->trans; ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 6fb82ee..a1dd123 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -63,6 +63,8 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) /* Sanity checks */ CHECK_HANDLE(handle, return -1); ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + ASSERT(pkg->origin == ALPM_PKG_FROM_LOCALDB, + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); ASSERT(handle == pkg->handle, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); trans = handle->trans; ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); -- 1.8.5.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-293-ga7da2a4
by allan＠archlinux.org 08 Feb '14

08 Feb '14

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 a7da2a47c3f71f52ad1214b4ae78e716ee488a5a (commit) via 0deeb9991c0c93526a541c8757f611ba63690d55 (commit) via b9601b1e597c64df9d04678509c31f9bab538fd2 (commit) via 953808a9ee86fc5bcd63f4458662a5c73ccf37d1 (commit) via 4763341ea11c9e33f8d8f0f112659fae5bc74aa9 (commit) via 1601532a53b3b668b0946400bb2c68ca25f80c72 (commit) via 8014dc648f7a1f9b30200905b5e0cab776a6f0e4 (commit) via b449878feaf3ddf49557632bd52c987a3a3a782c (commit) via 236f1795e9f56674c330f6c04f2d164a37fd2682 (commit) via 47a4741a3cfb256ac0348c97d14ad79a0ff2618d (commit) from e4f6edf2374185c76a1f42a1aa6156d479bc6f40 (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 a7da2a47c3f71f52ad1214b4ae78e716ee488a5a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Feb 6 20:49:07 2014 -0500 _alpm_sync_prepare: fix unresolvable packages leak If the user opted not to remove the unresolvable packages from the transaction, the list was neither free'd nor saved to the transaction to be free'd in trans_release. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0deeb9991c0c93526a541c8757f611ba63690d55 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Mon Feb 3 12:53:10 2014 +0100 pactree: removed 'provision' from linear output Linear output is especially useful when piped to other commands, e.g. $ pactree -lu pacman | pacman -Qqkk - The above command would previously show errors on packages with provisions. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b9601b1e597c64df9d04678509c31f9bab538fd2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Feb 3 12:09:18 2014 -0500 alpm: export *_free functions Front-ends should be able to free memory that alpm hands them. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 953808a9ee86fc5bcd63f4458662a5c73ccf37d1 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Feb 3 12:05:48 2014 -0500 pmtest: add memory check to tests with valgrind Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4763341ea11c9e33f8d8f0f112659fae5bc74aa9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Feb 3 12:05:47 2014 -0500 pmrule: add FILE_EMPTY rule Succeeds if the specified path is a file and is empty. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1601532a53b3b668b0946400bb2c68ca25f80c72 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 4 08:57:31 2014 +1000 Give groups display text singular and plural forms Reported on transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8014dc648f7a1f9b30200905b5e0cab776a6f0e4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 2 17:37:58 2014 +1000 makepkg: remove unneeded "|| true" makepkg only aborts on errors during PKGBUILD functions so the remaining "|| true" statements are unneeded. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b449878feaf3ddf49557632bd52c987a3a3a782c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 2 17:30:06 2014 +1000 makepkg: Fix typo in variable name It turns out that you should refer to variables by their actual name... Introduced in commit a521cea9. FS#38414. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 236f1795e9f56674c330f6c04f2d164a37fd2682 Author: Rafael Ferreira <josephgbr(a)archlinux.info> Date: Sun Feb 2 16:32:55 2014 +1000 Do not remove source code references in PO/POT files FS#34240. This is useful for translators and has little cost to us since we moved to transifex for translations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 47a4741a3cfb256ac0348c97d14ad79a0ff2618d Author: Lars Gustäbel <lars(a)gustaebel.de> Date: Sun Feb 2 16:29:14 2014 +1000 Prevent makepkg creating armored signatures If the user has "armor" in thier gpg.conf, makepkg will create an ascii-armored signature. Use --no-armor in the gpg call to avoid. FS#38503. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 4 ++++ lib/libalpm/conflict.c | 6 +++--- lib/libalpm/conflict.h | 3 --- lib/libalpm/deps.c | 8 ++++---- lib/libalpm/deps.h | 1 - lib/libalpm/po/Makevars | 2 +- lib/libalpm/remove.c | 7 ++++--- lib/libalpm/sync.c | 17 ++++++++++------- scripts/makepkg.sh.in | 12 ++++++------ scripts/po/Makevars | 2 +- src/pacman/po/Makevars | 2 +- src/pacman/remove.c | 3 ++- src/pacman/sync.c | 18 +++++++++++------- src/util/pactree.c | 5 ++++- test/pacman/README | 6 ++++++ test/pacman/pmrule.py | 4 ++++ test/pacman/pmtest.py | 1 + 17 files changed, 62 insertions(+), 39 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/8] avoid double freeing unresolvable packages
by Andrew Gregory 07 Feb '14

07 Feb '14

If an unresolvable package was loaded from a file it would be free'd again when freeing trans->add. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/trans.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ada8100..4930e94 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -246,12 +246,19 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) void _alpm_trans_free(alpm_trans_t *trans) { + alpm_list_t *i; + if(trans == NULL) { return; } - alpm_list_free_inner(trans->unresolvable, - (alpm_list_fn_free)_alpm_pkg_free_trans); + /* only free packages not in trans->add to avoid + * double free'ing packages loaded from files. */ + for(i = trans->unresolvable; i; i = i->next) { + if(!alpm_list_find_ptr(trans->add, i->data)) { + _alpm_pkg_free_trans(i->data); + } + } alpm_list_free(trans->unresolvable); alpm_list_free_inner(trans->add, (alpm_list_fn_free)_alpm_pkg_free_trans); alpm_list_free(trans->add); -- 1.8.5.2

2 13

[pacman-dev] [PATCH] Put explicitly installed packages in bold during update/install/removal
by Guillaume Bouchard 05 Feb '14

05 Feb '14

Hello. A really small change in pacman which, I hope, improves the feedback about explicit packages on install/removal/update. Have a nice day. Output of git format-patch origin: >From bd5c3aa7826c3c073cca691f0e30b5363487cd6f Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard <guillaum.bouchard(a)gmail.com> Date: Fri, 24 Jan 2014 12:20:16 +0100 Subject: [PATCH] Put explicitly installed packages in bold during update/install/removal In extended table view, packages which are explicitly installed are displayed as CELL_TITLE (i.e. in bold). This helps understanding why packages are updated. This helps the package managment workflow. During update, we can quickly have a look at why packages are updated and easilly track and remove the explicit packages which are not longer required. During remove, it shows all the explicit packages which are also removed by a cascade removal. During install, it provides a feedback on how your action will affect the database. This only affects "VerbosePkgLists" output. Patching the un-verbose output appears more difficult and I think this information is only interesting during verbose output. Signed-off-by: Guillaume Bouchard <guillaum.bouchard(a)gmail.com> --- src/pacman/util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 58b0cec..a3ee5ee 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -808,7 +808,12 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) } else { pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); } - add_table_cell(&ret, str, CELL_NORMAL); + if(alpm_pkg_get_reason(target->remove ? target->remove : target->install) == ALPM_PKG_REASON_EXPLICIT) { + /* put emphasis on the package name if it is an explicitly installed package */ + add_table_cell(&ret, str, CELL_TITLE); + } else { + add_table_cell(&ret, str, CELL_NORMAL); + } /* old and new versions */ pm_asprintf(&str, "%s", -- 1.8.5.2 -- Guillaume

7 19

[pacman-dev] [PATCH] pactree: removed 'provision' from linear output
by Pierre Neidhardt 04 Feb '14

04 Feb '14

Linear output is especially useful when piped to other commands, e.g. $ pacman -Qi $(pactree -l pacman) >/dev/null The above command would previously show errors on packages with provisions. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- src/util/pactree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 4192999..6c620aa 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -363,10 +363,13 @@ static void print_text(const char *pkg, const char *provision, } /* print tip */ + /* If style->provides is empty (e.g. when using linear style), we do not + * want to print the provided package. This makes output easier to parse and + * to reuse. */ if(!pkg && provision) { printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, provision, color->branch1, color->off); - } else if(provision && strcmp(pkg, provision) != 0) { + } else if(provision && strcmp(pkg, provision) != 0 && *(style->provides) != '\0') { printf("%s%s%s%s%s %s%s%s\n", tip, color->leaf1, pkg, color->leaf2, style->provides, color->leaf1, provision, color->off); -- 1.8.5.3

2 1

[pacman-dev] [PATCH 1/5] valgrind.supp: add fakeroot/fakechroot errors
by Andrew Gregory 04 Feb '14

04 Feb '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Patch submitted upstream for the __lxstat error. valgrind.supp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/valgrind.supp b/valgrind.supp index 55effa9..ac54b74 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -109,3 +109,43 @@ ... fun:regexec } +{ + fakeroot-msgsnd + Memcheck:Param + msgsnd(msgp->mtext) + fun:__msgsnd_nocancel +} +{ + fakechroot-add-to-environ + Memcheck:Leak + fun:malloc + fun:__add_to_environ +} +{ + fakechroot-static-fakechroot-init-malloc + Memcheck:Leak + fun:malloc + ... + fun:fakechroot_init +} +{ + fakechroot-static-fakechroot-init-calloc + Memcheck:Leak + fun:calloc + ... + fun:fakechroot_init +} +{ + fakechroot-static-bindtextdomain + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so + obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so + fun:bindtextdomain +} +{ + fakechroot-uninitialized-var-lxstat + Memcheck:Cond + fun:__lxstat +} -- 1.8.5.2

3 10

[pacman-dev] [PATCH] Give groups display text singular and plural forms
by Allan McRae 03 Feb '14

03 Feb '14

Reported on transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I suppose we could go further and not display the selection dialog when there is only one package in the group, but I thought keeping consistency there was better. src/pacman/sync.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f6ee57a..3cb73bc 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -601,8 +601,9 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) } if(config->print == 0) { - colon_printf(_("There are %d members in group %s:\n"), count, - group); + colon_printf(_n("There is %d member in group %s:\n", + "There are %d members in group %s:\n", count), + count, group); select_display(pkgs); char *array = malloc(count); if(!array) { -- 1.8.5.3

1 0

[pacman-dev] [PATCH 1/6] pacsearch: removed useless comment
by Pierre Neidhardt 03 Feb '14

03 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 21043d4..71e0107 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -138,7 +138,6 @@ if ($#querypkgs >= 0) { foreach $_ (@querypkgs) { # we grab the following fields: repo, name, ver, group, installed, and desc my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; - # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; # check if the package was listed in the sync out -- 1.8.5.3

2 11

[pacman-dev] [PATCH] makepkg: remove unneeded "|| true"
by Allan McRae 02 Feb '14

02 Feb '14

makepkg only aborts on errors during PKGBUILD functions so the remaining "|| true" statements are unneeded. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ce6c9da..b69c071 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1094,16 +1094,16 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \ - <(printf '%s\n' "${original_pkglist[@]}") || true) ]]; then + <(printf '%s\n' "${original_pkglist[@]}")) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi local deplist deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}") || true)) + <(printf "%s\n" "${current_pkglist[@]}"))) if [[ -z $deplist ]]; then - return + return 0 fi msg "Removing installed dependencies..." @@ -2674,7 +2674,7 @@ fi # set pacman command if not already defined PACMAN=${PACMAN:-pacman} # save full path to command as PATH may change when sourcing /etc/profile -PACMAN_PATH=$(type -P $PACMAN) || true +PACMAN_PATH=$(type -P $PACMAN) # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW -- 1.8.5.3

2 1

[pacman-dev] [PATCH] checkupdates: Add package download mode with "-d"
by Chris Down 02 Feb '14

02 Feb '14

This new mode, which must be run as root, allows for the precaching of packages which can then subsequently be updated by calling "pacman -Syu" as normal. This can then be integrated with a cron script (for example, checkupdates-cron[0]) for automated, safe downloading of packages alongside getting the list of packages to update, or run manually on the command line to download new packages, but avoid updating the main package database. As a side effect of adding the -d option, argument handling (which was previously not present) is now done using "getopts". This seems like a reasonable way to do it instead of just hacking in a check for "-d" as $1 now, but I'm not particularly averse to either. "getopts" would just allow for better future flexibility in this area. It is possible to do this as another script, say, downloadupdates, but we would encounter pretty heavy code duplication with "checkupdates", so it seems more sensible to do it here. Due to the use of --noconfirm, this has some limitations when we encounter more complex upgrade scenarios, for example when a new package conflict occurs, an upgrade path cannot be correctly/automatically determined, a package was replaced, etc. This is not a major problem -- in the worst case, we just don't get the packages that we wanted downloaded and an error message is displayed to the user. The choice to hide both STDOUT and STDERR of "pacman -Syuw" is potentially up for debate. It makes it more difficult to determine where the problem was if the command fails -- we still display a message saying that that was the case, and set the exit code accordingly, but the actual cause needs to be determined by the user elsewhere. For this reason, "-p" exists to force the package download to output as normal. It seems desirable that "-p" also affects the silence of the database update, but this is also up for discussion if people feel it should not be within the remit of the (( silent )) checks. [0]: https://github.com/cdown/checkupdates-cron --- contrib/checkupdates.sh.in | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 413b78a..02acb67 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -21,16 +21,43 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' -if (( $# > 0 )); then +download=0 +silent=1 + +usage() { echo "${myname} (pacman) v${myver}" echo echo "Safely print a list of pending updates" echo echo "Usage: ${myname}" echo + echo "Options:" + echo " -d Download upgradeable packages to pacman package cache." + echo " -p Print pacman output from the database upgrade and package download." + echo echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 -fi +} + +run_silent() ( + (( silent )) && exec &>/dev/null + "$@" +) + +while getopts ':dp' opt; do + case $opt in + d) + if (( UID )); then + echo "Download mode can only be run as root." >&2 + exit 2 + fi + + download=1 + ;; + p) silent=0 ;; + \?) usage ;; + esac +done if [[ -z $CHECKUPDATES_DB ]]; then CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" @@ -43,9 +70,17 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.con mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null -fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null +run_silent fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null +if (( download )); then + if ! run_silent pacman -Suw --noconfirm --dbpath "$CHECKUPDATES_DB"; then + ret=$? + (( silent )) && echo "Failed to download packages." >&2 + exit "$ret" + fi +fi + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.5.3

2 1