- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Prevent wrapping of enum items
by Allan McRae 04 May '16

04 May '16

GCC-6 points out that the value we use for the sentinal in enums is actually too large for the integer type. Reduce the bitshift by one to fix this. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 2 +- lib/libalpm/db.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9b8166f..168d71b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -203,7 +203,7 @@ typedef enum _alpm_siglevel_t { ALPM_SIG_DATABASE_MARGINAL_OK = (1 << 12), ALPM_SIG_DATABASE_UNKNOWN_OK = (1 << 13), - ALPM_SIG_USE_DEFAULT = (1 << 31) + ALPM_SIG_USE_DEFAULT = (1 << 30) } alpm_siglevel_t; /** PGP signature verification status return codes */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 9673c7b..05ef43e 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -40,7 +40,7 @@ typedef enum _alpm_dbinfrq_t { /* ALL should be info stored in the package or database */ INFRQ_ALL = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES | INFRQ_SCRIPTLET | INFRQ_DSIZE, - INFRQ_ERROR = (1 << 31) + INFRQ_ERROR = (1 << 30) } alpm_dbinfrq_t; /** Database status. Bitflags. */ -- 2.8.2

2 3

[pacman-dev] [PATCH] Added -m/--nocolor options to updpkgsums
by Ashley Whetter 04 May '16

04 May '16

Fixes FS#43346 Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> --- contrib/updpkgsums.sh.in | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index aaed700..c571d29 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -29,10 +29,13 @@ usage() { echo "path specified by [build file], defaulting to PKGBUILD in the current" echo "working directory." echo - printf "Usage: %s [build file]\n" "${myname}" + printf "Usage: %s [options] [build file]\n" "${myname}" echo echo " -h, --help display this help message and exit" echo " -V, --version display version information and exit" + echo + echo "These options can be passed to makepkg:" + echo " -m, --nocolor disable colorized output messages" } version() { @@ -45,12 +48,18 @@ die() { exit 1 } -case $1 in - -h|--help) usage; exit ;; - -V|--version) version; exit ;; -esac +MAKEPKG_OPTS=() +buildfile='PKGBUILD' + +while (( "$#" )); do + case "$1" in + -h|--help) usage; exit ;; + -m|--nocolor) MAKEPKG_OPTS+=("$1"); shift ;; + -V|--version) version; exit ;; + *) buildfile="$1"; break 2 ;; + esac +done -buildfile=${1:-PKGBUILD} if [[ ! -f $buildfile ]]; then die "%s not found or is not a file" "$buildfile" fi @@ -83,7 +92,7 @@ export BUILDDIR=$(mktemp -d "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT -newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' +newsums=$(makepkg -g -p "$buildfile" "${MAKEPKG_OPTS[@]}") || die 'Failed to generate new checksums' awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { -- 2.8.0

2 1

[pacman-dev] [PATCH] pacsort help clearly states that files contain inputs to be sorted
by Ashley Whetter 04 May '16

04 May '16

Fixes FS#44121 Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> --- src/util/pacsort.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index c69ae2f..662b250 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -427,7 +427,10 @@ static void usage(void) " -k, --key <index> sort input starting on specified column\n" " -r, --reverse sort in reverse order (default: oldest to newest)\n" " -t, --separator <sep> specify field separator (default: space)\n" - " -z, --null lines end with null bytes, not newlines\n\n"); + " -z, --null lines end with null bytes, not newlines\n\n" + "pacsort writes the sorted concatenation of all files, to standard output.\n" + "Files should contain a list of inputs to sort.\n\n" + "Standard input is read when no files are given.\n\n"); } static int parse_options(int argc, char **argv) -- 2.8.0

2 1

[pacman-dev] Git repo location change
by Allan McRae 04 May '16

04 May '16

Due to some maintenance at the Arch Linux end, the git repo has changed locations: Old url = git://projects.archlinux.org/pacman.git New url = git://git.archlinux.org/pacman.git A

1 0

[pacman-dev] [PATCH libmakepkg 1/2] git: perform a shallow clone
by Eric Engestrom 01 May '16

01 May '16

This can considerably speed up the cloning process, as makepkg won't have to download the whole history. Signed-off-by: Eric Engestrom <eric(a)engestrom.ch> --- scripts/libmakepkg/source/git.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index cc27663..ad31c34 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -42,7 +42,7 @@ download_git() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone --depth 1 --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.8.0

4 6

[pacman-dev] [PATCH libalpm] fix spelling mistakes
by Eric Engestrom 29 Apr '16

29 Apr '16

Signed-off-by: Eric Engestrom <eric(a)engestrom.ch> --- contrib/zsh_completion.in | 6 +++--- lib/libalpm/alpm.h | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/package.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 3ef4b8d..f74fa29 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -103,7 +103,7 @@ _pacman_opts_files=( {-l,--list}'[List the files owned by the queried package]:package:_pacman_completions_all_packages' {-o,--owns}'[Query the package that owns]:files:_files' {-s,--search}'[Search package file names for matching strings]:files:_files' - {-x,--regex}'[Enable searching using regluar expressions]:regex:' + {-x,--regex}'[Enable searching using regular expressions]:regex:' {-y,--refresh}'[Download fresh files databases from the server]' '--machinereadable[Produce machine-readable output]' {-q,--quiet}'[Show less information for query and search]' @@ -505,7 +505,7 @@ _key_shortopts=( '-a[Add the specified keys (empty for stdin)]: :_files' '-d[Remove the Specified keyids]:*: :_keys' '-e[Export the specified or all keyids]:*: :_keys' - '-f[List fingreprint for specidied or all keyids]:*: :_keys' + '-f[List fingerprint for specified or all keyids]:*: :_keys' '-l[List the specified or all keys]:*: :_keys' '-r[Fetch the specified keyids]:*: :_keys' '-u[Update the trustdb of pacman]' @@ -518,7 +518,7 @@ _key_longopts=( '--add[Add the specified keys (empty for stdin)]: :_files' '--delete[Remove the Specified keyids]:*: :_keys' '--export[Export the specified or all keyids]:*: :_keys' - '--finger[List fingreprint for specidied or all keyids]:*: :_keys' + '--finger[List fingerprint for specified or all keyids]:*: :_keys' '--list-keys[List the specified or all keys]:*: :_keys' '--recv-keys[Fetch the specified keyids]:*: :_keys' '--updatedb[Update the trustdb of pacman]' diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index aa57d51..9b8166f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -464,7 +464,7 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_HOOK_DONE, /** A hook is starting */ ALPM_EVENT_HOOK_RUN_START, - /** A hook has finnished runnning */ + /** A hook has finished running */ ALPM_EVENT_HOOK_RUN_DONE } alpm_event_type_t; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 247715e..c9ed770 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -356,7 +356,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, } /** - * Handle the existance of simple paths for _alpm_load_pkg_internal() + * Handle the existence of simple paths for _alpm_load_pkg_internal() * @param pkg package to change * @param path path to examine * @return 0 if path doesn't match any rule, 1 if it has been handled diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 1fe7cd9..c35a275 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -432,7 +432,7 @@ int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep) } /** - * @param dep dependency to check agains the provision list + * @param dep dependency to check against the provision list * @param provisions provision list * @return 1 if provider is found, 0 otherwise */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 9fea356..31add9a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -37,7 +37,7 @@ /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such - * as lazy package intialization (such as used by the file backend). Each + * as lazy package initialization (such as used by the file backend). Each * backend is free to define a stuct containing pointers to a specific * implementation of these methods. Some backends may find using the * defined default_pkg_ops struct to work just fine for their needs. -- 2.8.0

1 0

[pacman-dev] Fwd: What is passed to a hook's Action?
by Eric Schultz 29 Apr '16

29 Apr '16

I've looked at the docs for alpm-hooks. I even tried looking at the code but I'm not a C programmer so a lot didn't make sense to me. What I'm wondering is what gets passed to the command in Exec of a hook? And how is it passed? Are there variables we can put on the command line to be passed as parameters? Does everything come through stdin? Or nothing at all? Looking at andrewgregory's pachooks github repository, info-install.hook in particular, I get the impression things are passed via stdin. But I'm looking for some official docs or word from the developers to go on. Thanks, -- Headed for the second star to the right and straight on 'til morning... Eric Schultz

2 1

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

Re: [pacman-dev] [arch-dev-public] Hooks rebuild #1
by Bruno Pagani 27 Apr '16

27 Apr '16

Le 27/04/2016 à 14:36, Allan McRae a écrit : > We are ready to start the first hooks rebuild. This rebuild covers > packages using these hooks: > > update-desktop-database > update-mime-database > install-info > glib-compile-schemes > gtk-update-icon-cacne/xdg-icon-resource > gconf > gio-querymodules > > Each rebuild requires the install file updated to remove these commands. > > No need to use staging/testing for this rebuild (except [core] packages). > > GO! I’m not sure whether there has been anything done in that direction, but this probably means namcap should be updated to detect dependencies to this based on something else than call in .install. Maybe just use the same things than hook (i.e. files detection). Bruno

2 2

[pacman-dev] [PATCH] pacman_query: move error messages into relevant if statements
by Allan McRae 19 Apr '16

19 Apr '16

This ensures any additions to these test do not have to rely on the correct error condition being set by libalpm. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0cc12e6..1d102a9 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -460,27 +460,27 @@ int pacman_query(alpm_list_t *targets) if(config->op_q_isfile) { alpm_pkg_load(config->handle, strname, 1, 0, &pkg); + + if(pkg == NULL) { + pm_printf(ALPM_LOG_ERROR, + _("could not load package '%s': %s\n"), strname, + alpm_strerror(alpm_errno(config->handle))); + } } else { pkg = alpm_db_get_pkg(db_local, strname); + + if(pkg == NULL) { + pm_printf(ALPM_LOG_ERROR, + _("package '%s' was not found\n"), strname); + if(!config->op_q_isfile && access(strname, R_OK) == 0) { + pm_printf(ALPM_LOG_WARNING, + _("'%s' is a file, you might want to use %s.\n"), + strname, "-p/--file"); + } + } } if(pkg == NULL) { - switch(alpm_errno(config->handle)) { - case ALPM_ERR_PKG_NOT_FOUND: - pm_printf(ALPM_LOG_ERROR, - _("package '%s' was not found\n"), strname); - if(!config->op_q_isfile && access(strname, R_OK) == 0) { - pm_printf(ALPM_LOG_WARNING, - _("'%s' is a file, you might want to use %s.\n"), - strname, "-p/--file"); - } - break; - default: - pm_printf(ALPM_LOG_ERROR, - _("could not load package '%s': %s\n"), strname, - alpm_strerror(alpm_errno(config->handle))); - break; - } ret = 1; continue; } -- 2.7.4

2 3