November 2015 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-266-g34bbe4c
by allan＠archlinux.org 28 Nov '15

28 Nov '15

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 34bbe4cf7b8c70fda3475ee2e936db93c4fe427a (commit) via 5312e683fcc800e528c01d652aab30e862e44a0b (commit) via 8ad893732d44960d04cb476c436b7ea045626f07 (commit) via b42d0852f31ce7cef75da5ce51e6c09545ef8f2d (commit) via e0607f6ae28e85ab905cd10536055ff5b6cc4652 (commit) via e03fa67445f9d7bd6a45c0f4094b08d46496008b (commit) via 23f128ad5e2b26733376d16f5095d36085a97747 (commit) via 663c74150ab4ba6d3adc55b0e3f539557a16e352 (commit) via ef1fb0ef81f7ec78f1a9f45f0d7039cdb6be1f8c (commit) via c26e5b81e5c22e1316eb2f384cc175438772a8f2 (commit) via 947dfda515505f937eac5b388384dd6df0278e40 (commit) via 9e22e75fa195b17efb6ad911e0e9910330e8a30a (commit) via bf0e8e6b435f0ab28745d6f6d3279dc66ac3e9ef (commit) from 8fa02036c3175f4cb1e837b6da5281520524ccba (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 34bbe4cf7b8c70fda3475ee2e936db93c4fe427a Author: Evangelos Foutras <evangelos(a)foutrelis.com> Date: Wed Nov 25 12:58:39 2015 +0200 pacdiff: do not require DIFFPROG for -o/--output Signed-off-by: Evangelos Foutras <evangelos(a)foutrelis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5312e683fcc800e528c01d652aab30e862e44a0b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Nov 11 19:20:01 2015 -0500 hooks: pass matched targets to hooks Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ad893732d44960d04cb476c436b7ea045626f07 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Nov 11 19:20:00 2015 -0500 allow specifying input to scriptlets Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b42d0852f31ce7cef75da5ce51e6c09545ef8f2d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Nov 11 19:19:59 2015 -0500 allow arguments in hook Exec fields Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e0607f6ae28e85ab905cd10536055ff5b6cc4652 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Nov 11 19:19:58 2015 -0500 tap.py: replace newlines with escape sequence Newlines clutter tap output and can potentially confuse TAP parsers. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e03fa67445f9d7bd6a45c0f4094b08d46496008b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Nov 11 19:19:57 2015 -0500 pmrule.py: add FILE_CONTENTS rule Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23f128ad5e2b26733376d16f5095d36085a97747 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 13 13:48:30 2015 +1000 lint_pkgbuild/variable: increase robustness Approach the detection of variables of the wrong type using an approach similar to that used for construction of .SRCINFO files. While doing silly things in bash could still result in false negatives, this approach should be very robust to generatinf false positives results. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 663c74150ab4ba6d3adc55b0e3f539557a16e352 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 13 13:33:23 2015 +1000 makepkg: merge arch dependent variables after PKGBUILD linting Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ef1fb0ef81f7ec78f1a9f45f0d7039cdb6be1f8c Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 23 11:01:17 2015 +1000 makepkg: remove obsolete comment Behaviour changed in commit dce82f9d. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c26e5b81e5c22e1316eb2f384cc175438772a8f2 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 13 14:32:52 2015 +1000 lint_pkgbuild: explicitly return value Set the return value to be local and always explictly returns it. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 947dfda515505f937eac5b388384dd6df0278e40 Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Mon Nov 9 18:43:40 2015 +0100 Refactor strtrim function Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9e22e75fa195b17efb6ad911e0e9910330e8a30a Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Tue Nov 10 20:51:55 2015 +0100 Use correct format specifiers Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf0e8e6b435f0ab28745d6f6d3279dc66ac3e9ef Author: Aaron Campbell <aaron(a)monkey.org> Date: Wed Nov 4 15:43:12 2015 -0400 Refactor lint_source to work with earlier versions of Bash Negative subscripts to indexed arrays are not supported before 4.2. However, since substring expansion works on arrays, we can specify an offset of -1 to be taken relative to one greater than the maximum index of the specified array (see Parameter Expansion section of the bash man page). This works with both Bash 4.1 and 4.2, and 4.1 is already the oldest supported by pacman. Signed-off-by: Aaron Campbell <aaron(a)monkey.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacdiff.sh.in | 2 +- doc/alpm-hooks.5.txt | 10 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/hook.c | 254 +++++++++++++++++++-- lib/libalpm/remove.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 201 +++++++++++++--- lib/libalpm/util.h | 5 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 4 +- scripts/libmakepkg/lint_pkgbuild/install.sh.in | 4 +- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 4 + scripts/libmakepkg/lint_pkgbuild/source.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 66 +++++- scripts/makepkg.sh.in | 17 +- src/common/util-common.c | 14 +- src/pacman/callback.c | 12 +- src/pacman/conf.c | 4 +- src/pacman/util.c | 4 +- test/pacman/README | 1 + test/pacman/pmrule.py | 6 + test/pacman/tap.py | 2 +- test/pacman/tests/TESTS | 2 + ...rigger-match.py => hook-exec-with-arguments.py} | 5 +- test/pacman/tests/hook-target-list.py | 40 ++++ 27 files changed, 566 insertions(+), 105 deletions(-) copy test/pacman/tests/{hook-pkg-install-trigger-match.py => hook-exec-with-arguments.py} (72%) create mode 100644 test/pacman/tests/hook-target-list.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacdiff: do not require DIFFPROG for -o/--output
by Evangelos Foutras 25 Nov '15

25 Nov '15

Signed-off-by: Evangelos Foutras <evangelos(a)foutrelis.com> --- contrib/pacdiff.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 90eb3cc..a4faba2 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -118,7 +118,7 @@ done m4_include(../scripts/library/term_colors.sh) -if ! type -p ${diffprog%% *} >/dev/null; then +if ! type -p ${diffprog%% *} >/dev/null && (( ! OUTPUTONLY )); then error "Cannot find the $diffprog binary required for viewing differences." exit 1 fi -- 2.6.2

1 0

[pacman-dev] [PATCH 2/2] lint_pkgbuild: increase robustness
by Allan McRae 22 Nov '15

22 Nov '15

Approach the detection of variables of the wrong type using an approach similar to that used for construction of .SRCINFO files. While doing silly things in bash could still result in false negatives, this approach should be very robust to generatinf false positives results. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 67 ++++++++++++++++++++----- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 1daac26..80ef895 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -24,7 +24,7 @@ LIBMAKEPKG_LINT_PKGBUILD_VARIABLE_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" - +source "$LIBRARY/util/pkgbuild.sh" lint_pkgbuild_functions+=('lint_variable') @@ -37,11 +37,16 @@ lint_variable() { replaces sha1sums sha256sums sha384sums sha512sums source) local string=(changelog epoch install pkgdesc pkgrel pkgver url) - local i - for i in ${array[@]}; do - if grep -w -q -e "$i=[^(]" -e "$i+=[^(]" "$BUILDSCRIPT"; then - error "$(gettext "%s should be an array")" "$i" - ret=1 + local i keys out bad + + # global variables + for i in ${array[@]} ${arch_array[@]}; do + eval "keys=(\"\${!$i[@]}\")" + if (( ${#keys[*]} > 0 )); then + if ! declare -p $i | grep -q "declare -a"; then + error "$(gettext "%s should be an array")" "$i" + ret=1 + fi fi done @@ -49,17 +54,55 @@ lint_variable() { [[ $a == "any" ]] && continue for i in ${arch_array[@]}; do - if grep -w -q -e "$i_$a=[^(]" -e "$i_$a+=[^(]" "$BUILDSCRIPT"; then - error "$(gettext "%s_%s should be an array")" "$i" "$a" - ret=1 + v="${i}_${a}" + eval "keys=(\"\${!${v}[@]}\")" + if (( ${#keys[*]} > 0 )); then + if ! declare -p ${v} | grep -q "declare -a"; then + error "$(gettext "%s_%s should be an array")" "$i" "$a" + ret=1 + fi fi done done for i in ${string[@]}; do - if grep -w -q -e "$i=(" -e "$i+=(" "$BUILDSCRIPT"; then - error "$(gettext "%s should not be an array")" "$i" - ret=1 + eval "keys=(\"\${!$i[@]}\")" + if (( ${#keys[*]} > 0 )); then + if declare -p $i | grep -q "declare -a"; then + error "$(gettext "%s should not be an array")" "$i" + ret=1 + fi fi done + + # package function variables + for pkg in ${pkgname[@]}; do + for i in ${array[@]} ${arch_array[@]}; do + if extract_function_variable "package_$pkg" $i 0 out; then + error "$(gettext "%s should be an array")" "$i" + ret=1 + fi + done + + for a in ${arch[@]}; do + [[ $a == "any" ]] && continue + + for i in ${arch_array[@]}; do + if extract_function_variable "package_$pkg" "${i}_${a}" 0 out; then + error "$(gettext "%s_%s should be an array")" "$i" "$a" + ret=1 + fi + done + done + + for i in ${string[@]}; do + if extract_function_variable "package_$pkg" $i 1 out; then + error "$(gettext "%s should not be an array")" "$i" + ret=1 + fi + done + done + + + } -- 2.6.2

2 3

[pacman-dev] [feature request] Ring terminal bell on prompt
by Eric Toombs 19 Nov '15

19 Nov '15

(copied from here: https://bugs.archlinux.org/task/41188 The attachment is there too. I made it a while ago, so that's why I called 4.1.2 current.) I have implemented a boolean option '--bell' that when enabled, causes pacman to ring the terminal bell when there is user input required. I find this tremendously helpful when there are long delays between user input and I am busy doing other things at the same time. Let me know what you think. The patch is attached. It applies to the src/pacman folder of the current (4.1.2) release.

2 4

[pacman-dev] [PATCH] lint_pkgbuild: explicitly return value
by Allan McRae 13 Nov '15

13 Nov '15

Set the return value to be local and always explictly returns it. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- WHO WROTE THIS?! scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 4 +++- scripts/libmakepkg/lint_pkgbuild/install.sh.in | 4 +++- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 4 ++++ scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in index b8a8c30..f217515 100644 --- a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in @@ -31,7 +31,7 @@ lint_pkgbuild_functions+=('lint_arch') lint_arch() { - local a name list + local a name list ret=0 if [[ $arch == 'any' ]]; then return 0 diff --git a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in index 72300a4..70959d0 100644 --- a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in @@ -41,5 +41,7 @@ lint_changelog() { fi done - check_files_exist 'changelog' "${changelog_list[@]}" + check_files_exist 'changelog' "${changelog_list[@]}" || ret=1 + + return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/install.sh.in b/scripts/libmakepkg/lint_pkgbuild/install.sh.in index 21e0bfb..8e5c115 100644 --- a/scripts/libmakepkg/lint_pkgbuild/install.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/install.sh.in @@ -40,5 +40,7 @@ lint_install() { install_list+=("$file") done - check_files_exist 'install' "${install_list[@]}" + check_files_exist 'install' "${install_list[@]}" || ret=1 + + return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in index 0d4361c..53f89ce 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in @@ -30,6 +30,8 @@ lint_pkgbuild_functions+=('lint_pkgbase') lint_pkgbase() { + local ret=0 + if [[ ${pkgbase:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" return 1 @@ -43,4 +45,6 @@ lint_pkgbase() { 'pkgbase' "${i//[[:alnum:]+_.@-]}" ret=1 fi + + return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/util.sh.in b/scripts/libmakepkg/lint_pkgbuild/util.sh.in index 448abc8..8760eb6 100644 --- a/scripts/libmakepkg/lint_pkgbuild/util.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/util.sh.in @@ -27,7 +27,7 @@ source "$LIBRARY/util/message.sh" check_files_exist() { - local kind=$1 files=("${@:2}") file ret + local kind=$1 files=("${@:2}") file ret=0 for file in "${files[@]}"; do if [[ $file && ! -f $file ]]; then -- 2.6.2

1 0

[pacman-dev] [PATCH] Fix the implementation of lint_variable.
by David Grayson 13 Nov '15

13 Nov '15

The old implementation had both false negatives and false positives. Because of the -w option to grep, it didn't detect lines like: license=bad Additionally, it did detect irrelevant lines like this: --with-arch=${_arch} The latter is a false positive which made it difficult to build valid packages. Signed-off-by: David Grayson <davidegrayson(a)gmail.com> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 26 ++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 1daac26..eee6b54 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -28,6 +28,25 @@ source "$LIBRARY/util/message.sh" lint_pkgbuild_functions+=('lint_variable') +lint_var_defined_as_non_array() { + if [[ "${!1+x}" == "" ]]; then + return 1 # not defined + fi + if [[ "$(declare -p $1)" == "declare -a "* ]]; then + return 1 # defined as an array + fi + return 0 +} + +lint_var_defined_as_array() { + if [[ "${!1+x}" == "" ]]; then + return 1 # not defined + fi + if [[ "$(declare -p $1)" == "declare -a "* ]]; then + return 0 # defined as an array + fi + return 1 +} lint_variable() { # TODO: refactor - similar arrays are used elsewhere @@ -39,17 +58,18 @@ lint_variable() { local i for i in ${array[@]}; do - if grep -w -q -e "$i=[^(]" -e "$i+=[^(]" "$BUILDSCRIPT"; then + if lint_var_defined_as_non_array $i; then error "$(gettext "%s should be an array")" "$i" ret=1 fi done + local a for a in ${arch[@]}; do [[ $a == "any" ]] && continue for i in ${arch_array[@]}; do - if grep -w -q -e "$i_$a=[^(]" -e "$i_$a+=[^(]" "$BUILDSCRIPT"; then + if lint_var_defined_as_non_array $i; then error "$(gettext "%s_%s should be an array")" "$i" "$a" ret=1 fi @@ -57,7 +77,7 @@ lint_variable() { done for i in ${string[@]}; do - if grep -w -q -e "$i=(" -e "$i+=(" "$BUILDSCRIPT"; then + if lint_var_defined_as_array $i; then error "$(gettext "%s should not be an array")" "$i" ret=1 fi -- 2.6.2

2 5

[pacman-dev] [PATCH 1/2] makepkg: merge arch dependent variables after PKGBUILD linting
by Allan McRae 13 Nov '15

13 Nov '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 22679f7..42bc228 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -761,10 +761,6 @@ merge_arch_attrs() { source_buildfile() { source_safe "$@" - - if (( !SOURCEONLY )); then - merge_arch_attrs - fi } run_function_safe() { @@ -2004,6 +2000,13 @@ else source_buildfile "$BUILDFILE" fi +# check the PKGBUILD for some basic requirements +lint_pkgbuild || exit 1 + +if (( !SOURCEONLY )); then + merge_arch_attrs +fi + # set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} basever=$(get_full_version) @@ -2033,9 +2036,6 @@ if have_function pkgver; then PKGVERFUNC=1 fi -# check the PKGBUILD for some basic requirements -lint_pkgbuild || exit 1 - # check we have the software required to process the PKGBUILD check_software || exit 1 -- 2.6.2

1 0

[pacman-dev] [PATCH 1/5] pmrule.py: add FILE_CONTENTS rule
by Andrew Gregory 12 Nov '15

12 Nov '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- To be used in NeedsTargets test. test/pacman/README | 1 + test/pacman/pmrule.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/test/pacman/README b/test/pacman/README index 6c601b2..a5fdeaa 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -303,6 +303,7 @@ its DEPENDS field. . FILE rules + FILE_CONTENTS=path/to/file|contents FILE_EXIST=path/to/file FILE_EMPTY=path/to/file FILE_MODIFIED=path/to/file diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 3bcac86..f8991fd 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -120,6 +120,12 @@ def check(self, test): if not (os.path.isfile(filename) and os.path.getsize(filename) == 0): success = 0 + elif case == "CONTENTS": + try: + with open(filename, 'r') as f: + success = f.read() == value + except: + success = 0 elif case == "MODIFIED": for f in test.files: if f.name == key: -- 2.6.2

1 4

[pacman-dev] [PATCH 1/6] order hooks by file name
by Andrew Gregory 11 Nov '15

11 Nov '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/hook.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index fe4b204..c7b4ee8 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -363,6 +363,11 @@ static int _alpm_hook_triggered(alpm_handle_t *handle, struct _alpm_hook_t *hook return 0; } +static int _alpm_hook_cmp(struct _alpm_hook_t *h1, struct _alpm_hook_t *h2) +{ + return strcmp(h1->name, h2->name); +} + static alpm_list_t *find_hook(alpm_list_t *haystack, const void *needle) { while(haystack) { @@ -478,6 +483,9 @@ int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when) closedir(d); } + hooks = alpm_list_msort(hooks, alpm_list_count(hooks), + (alpm_list_fn_cmp)_alpm_hook_cmp); + for(i = hooks; i; i = i->next) { struct _alpm_hook_t *hook = i->data; if(hook && hook->when == when && _alpm_hook_triggered(handle, hook)) { -- 2.6.2

2 11

[pacman-dev] [PATCH] Use correct format specifiers
by Rikard Falkeborn 11 Nov '15

11 Nov '15

--- lib/libalpm/diskspace.c | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/util.c | 2 +- src/pacman/callback.c | 12 ++++++------ src/pacman/conf.c | 4 ++-- src/pacman/util.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index aaa0036..5bb2173 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -349,7 +349,7 @@ static int check_mountpoint(alpm_handle_t *handle, alpm_mountpoint_t *mp) (uintmax_t)cushion, (uintmax_t)mp->fsp.f_bfree); if(needed >= 0 && (fsblkcnt_t)needed > mp->fsp.f_bfree) { _alpm_log(handle, ALPM_LOG_ERROR, - _("Partition %s too full: %jd blocks needed, %jd blocks free\n"), + _("Partition %s too full: %jd blocks needed, %ju blocks free\n"), mp->mount_dir, (intmax_t)needed, (uintmax_t)mp->fsp.f_bfree); return 1; } diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 63523aa..f3df9cd 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -323,7 +323,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); _alpm_log(handle, ALPM_LOG_DEBUG, - "using time condition: %lu\n", (long)st.st_mtime); + "using time condition: %ld\n", (long)st.st_mtime); } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index bc5713a..2fb7993 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -599,7 +599,7 @@ static int remove_package_files(alpm_handle_t *handle, } } - _alpm_log(handle, ALPM_LOG_DEBUG, "removing %zd files\n", filelist->count); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing %zu files\n", filelist->count); if(!newpkg) { /* init progress bar, but only on true remove transactions */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 66a2742..955bf6f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1290,7 +1290,7 @@ void *_alpm_greedy_grow(void **data, size_t *current, const size_t required) void _alpm_alloc_fail(size_t size) { - fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size); + fprintf(stderr, "alloc failure: could not allocate %zu bytes\n", size); } /* vim: set noet: */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 9260ece..7a21b22 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -418,8 +418,8 @@ void cb_question(alpm_question_t *question) alpm_question_select_provider_t *q = &question->select_provider; size_t count = alpm_list_count(q->providers); char *depstring = alpm_dep_compute_string(q->depend); - colon_printf(_n("There is %zd provider available for %s\n", - "There are %zd providers available for %s:\n", count), + colon_printf(_n("There is %zu provider available for %s\n", + "There are %zu providers available for %s:\n", count), count, depstring); free(depstring); select_display(q->providers); @@ -443,10 +443,10 @@ void cb_question(alpm_question_t *question) strftime(created, 12, "%Y-%m-%d", localtime(&time)); if(q->key->revoked) { - q->import = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s (revoked)?"), + q->import = yesno(_("Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"), q->key->length, q->key->pubkey_algo, q->key->fingerprint, q->key->uid, created); } else { - q->import = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s?"), + q->import = yesno(_("Import PGP key %u%c/%s, \"%s\", created: %s?"), q->key->length, q->key->pubkey_algo, q->key->fingerprint, q->key->uid, created); } } @@ -590,8 +590,8 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, } - printf("(%*ld/%*ld) %ls%-*s", digits, (unsigned long)current, - digits, (unsigned long)howmany, wcstr, padwid, ""); + printf("(%*zu/%*zu) %ls%-*s", digits, current, + digits, howmany, wcstr, padwid, ""); free(wcstr); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f02e361..a2ee9b4 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -95,8 +95,8 @@ config_t *config_new(void) config_t *newconfig = calloc(1, sizeof(config_t)); if(!newconfig) { pm_printf(ALPM_LOG_ERROR, - _n("malloc failure: could not allocate %zd byte\n", - "malloc failure: could not allocate %zd bytes\n", sizeof(config_t)), + _n("malloc failure: could not allocate %zu byte\n", + "malloc failure: could not allocate %zu bytes\n", sizeof(config_t)), sizeof(config_t)); return NULL; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f331e8..3ab71cf 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -812,7 +812,7 @@ static alpm_list_t *create_verbose_header(size_t count) alpm_list_t *ret = NULL; char *header; - pm_asprintf(&header, "%s (%zd)", _("Package"), count); + pm_asprintf(&header, "%s (%zu)", _("Package"), count); add_table_cell(&ret, header, CELL_TITLE | CELL_FREE); add_table_cell(&ret, _("Old Version"), CELL_TITLE); @@ -921,7 +921,7 @@ static void _display_targets(alpm_list_t *targets, int verbose) } /* print to screen */ - pm_asprintf(&str, "%s (%zd)", _("Packages"), alpm_list_count(targets)); + pm_asprintf(&str, "%s (%zu)", _("Packages"), alpm_list_count(targets)); printf("\n"); cols = getcols(); -- 2.6.2

2 1