- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libmakepkg: increase robustness of the detection of array variables
by Allan McRae 07 Feb '16

07 Feb '16

Extract array detection into its own utility function that ensures extglob is enabled. Suggested-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 6 +++--- scripts/libmakepkg/util/util.sh | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 183e740..30c9909 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -43,7 +43,7 @@ lint_variable() { for i in ${array[@]} ${arch_array[@]}; do eval "keys=(\"\${!$i[@]}\")" if (( ${#keys[*]} > 0 )); then - if [[ "$(declare -p $i)" != "declare -a "* ]]; then + if ! is_array $i; then error "$(gettext "%s should be an array")" "$i" ret=1 fi @@ -57,7 +57,7 @@ lint_variable() { v="${i}_${a}" eval "keys=(\"\${!${v}[@]}\")" if (( ${#keys[*]} > 0 )); then - if [[ "$(declare -p $v)" != "declare -a "* ]]; then + if ! is_array $v; then error "$(gettext "%s_%s should be an array")" "$i" "$a" ret=1 fi @@ -68,7 +68,7 @@ lint_variable() { for i in ${string[@]}; do eval "keys=(\"\${!$i[@]}\")" if (( ${#keys[*]} > 0 )); then - if [[ "$(declare -p $i)" == "declare -a "* ]]; then + if is_array $i; then error "$(gettext "%s should not be an array")" "$i" ret=1 fi diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh index 3c996da..675e75d 100644 --- a/scripts/libmakepkg/util/util.sh +++ b/scripts/libmakepkg/util/util.sh @@ -37,6 +37,23 @@ in_array() { return 1 # Not Found } +# tests if a variable is an array +is_array() { + local v=$1 + local ret=1 + + # this function requires extglob - save current options to restore later + local shellopts=$(shopt -p) + shopt -s extglob + + if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then + ret=0 + fi + + eval "$shellopts" + return $ret +} + # Canonicalize a directory path if it exists canonicalize_path() { local path="$1"; -- 2.7.0

1 0

[pacman-dev] [PATCH] Fix French translation files
by Allan McRae 07 Feb '16

07 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is now done in transifex... I post the patch as a reminder. scripts/po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/po/fr.po b/scripts/po/fr.po index 2870c0b..7db50e4 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -138,7 +138,7 @@ msgstr "ÉCHEC" #: scripts/makepkg.sh.in:478 msgid "Validating %s files with %s..." -msgstr "Validation des fichiers % avec %s..." +msgstr "Validation des fichiers %s avec %s..." #: scripts/makepkg.sh.in:485 msgid "One or more files did not pass the validity check!" -- 2.7.0

1 0

[pacman-dev] unexpected no-op when repo-remove
by Johannes Ernst 07 Feb '16

07 Feb '16

Fragment starting line 576 in repo-add/remove, pacman 5.0.0-1 case $cmd in repo-remove) # only a missing "db" database is currently an error # TODO: remove if statement if [[ $repo == "db" ]]; then error "$(gettext "Repository file '%s' was not found.")" "$dbfile" fi exit 1 ;; I believe you mean for the “exit 1” to be inside the “then” section, not outside. When invoking “repo-remove”, this produced exit 1, no error message, and no visible action. Turns out it works as expected if I comment out exit 1. Cheers, Johannes. Johannes Ernst upon2020.com @Johannes_Ernst GPG: http://upon2020.com/public/pubkey.txt Check out UBOS, the Linux distro for personal servers I work on: http://ubos.net/

1 0

[pacman-dev] [PATCH] Add the missing limits.h include to hook.c
by Alastair Hughes 04 Feb '16

04 Feb '16

Currently, pacman will not build against musl libc (and presumably some other libc implementations?) because PATH_MAX is undefined in hook.c. Fix that by including <limits.h>.

2 2

[pacman-dev] brittle matching in lint_pkgbuild
by Dave Reisner 02 Feb '16

02 Feb '16

Hi, 23f128ad5e2b causes problems when the environment isn't wholly sanitized. Specifically, pattern matching such as: if [[ "$(declare -p $i)" != "declare -a "* ]]; then Is too brittle. You can easily "break" makepkg by doing something like: export arch=; makepkg And makepkg will error out with: ==> ERROR: arch should be an array It *is* an array, but the decl looks like: declare -ax arch='([0]="i686" [1]="x86_64")' And the originally stated pattern matching fails. If we want to continue to match arrays based on this sort of introspection, we should make the pattern a bit more robust -- something like: if [[ $(declare -p "$i") != declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then And this would be immune to other attributes which might show up in the output of 'declare -p'. Cheers, dR

1 0

[pacman-dev] Handling of "maint" branches
by Allan McRae 02 Feb '16

02 Feb '16

Hi all, If there are no objections, I plan to change the way we deal with maint branches. I dislike the land patches on maint then merge in to master thing that has always been done. Instead of a single maint branch that just follows the latest release, I will create "pacman-x.y" branches. Patches from master will be cherry-picked to that branch (git cherry-pick -x) after landing on master. The only patches to land on the release branches directly will be those that do not apply to master any more. Given there is no demand for ongoing support for old releases (or at least no demand has be made apparent to me), there is no real advantage to this beyond it being my preferred workflow. I am also happy to hand a release branch over to a *regular contributor* to maintain while I focus on the developmental release (volunteers welcome!). Allan

1 0

[pacman-dev] [PATCH] doc/index.txt: update for pacman 5.0
by Andrew Gregory 01 Feb '16

01 Feb '16

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/index.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/index.txt b/doc/index.txt index c7845b2..1216524 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -31,6 +31,9 @@ alternative front ends. Version 4.0 added package signing and verification capabilities to the entire makepkg/repo-add/pacman toolchain via GnuPG and GPGME. +Version 5.0 added support for pre/post-transaction hooks and sync database file +list operations. + Documentation ------------- @@ -39,6 +42,7 @@ Man Pages There are several man pages available for the programs, utilities, and configuration files dealing with pacman. +* linkman:alpm-hooks[5] * linkman:PKGBUILD[5] * linkman:libalpm[3] * linkman:makepkg[8] @@ -71,6 +75,7 @@ Releases [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date +!5.0.0 !2016-01-30 !4.2.1 !2015-02-20 !4.2.0 !2014-12-19 !4.1.2 !2013-06-18 @@ -100,14 +105,14 @@ Releases !3.2.1 !2008-08-26 !3.2.0 !2008-07-30 !3.1.4 !2008-04-01 -!3.1.3 !2008-03-06 -!3.1.2 !2008-02-20 -!3.1.1 !2008-01-20 !====== | [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date +!3.1.3 !2008-03-06 +!3.1.2 !2008-02-20 +!3.1.1 !2008-01-20 !3.1.0 !2008-01-09 !3.0.6 !2007-09-16 !3.0.5 !2007-06-17 @@ -135,12 +140,12 @@ Releases !2.8 !2004-07-03 !2.7.9 !2004-04-30 !2.7.8 !2004-04-29 -!2.7.7 !2004-04-15 !====== | [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date +!2.7.7 !2004-04-15 !2.7.6 !2004-04-04 !2.7.5 !2004-03-02 !2.7.4 !2004-02-18 -- 2.7.0

1 0

[pacman-dev] [PATCH] dump_pkg_info: fix wide character title alignment
by Andrew Gregory 01 Feb '16

01 Feb '16

The padding added to the end of the title was based on the return value of mbstowcs which is the number of characters. This caused alignment issues for languages with characters that span multiple columns. Instead, base the padding on the number of columns needed by the translated string as returned by wcswidth. Fixes #47980 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- It might make more sense to eventually rewrite this to use string_length from util.c and do all of the padding using the original char string, but I went the more direct route for maint. src/pacman/package.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index ac47493..3ab9abc 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -89,10 +89,12 @@ static char titles[_T_MAX][TITLE_MAXLEN * sizeof(wchar_t)]; static void make_aligned_titles(void) { unsigned int i; - size_t max = 0; + size_t maxlen = 0; + int maxcol = 0; static const wchar_t title_suffix[] = L" :"; wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + ARRAYSIZE(title_suffix)]; size_t wlen[ARRAYSIZE(wbuf)]; + int wcol[ARRAYSIZE(wbuf)]; char *buf[ARRAYSIZE(wbuf)]; buf[T_ARCHITECTURE] = _("Architecture"); buf[T_BACKUP_FILES] = _("Backup Files"); @@ -125,14 +127,19 @@ static void make_aligned_titles(void) for(i = 0; i < ARRAYSIZE(wbuf); i++) { wlen[i] = mbstowcs(wbuf[i], buf[i], strlen(buf[i]) + 1); - if(wlen[i] > max) { - max = wlen[i]; + wcol[i] = wcswidth(wbuf[i], wlen[i]); + if(wcol[i] > maxcol) { + maxcol = wcol[i]; + } + if(wlen[i] > maxlen) { + maxlen = wlen[i]; } } for(i = 0; i < ARRAYSIZE(wbuf); i++) { - wmemset(wbuf[i] + wlen[i], L' ', max - wlen[i]); - wmemcpy(wbuf[i] + max, title_suffix, ARRAYSIZE(title_suffix)); + size_t padlen = maxcol - wcol[i]; + wmemset(wbuf[i] + wlen[i], L' ', padlen); + wmemcpy(wbuf[i] + wlen[i] + padlen, title_suffix, ARRAYSIZE(title_suffix)); wcstombs(titles[i], wbuf[i], sizeof(wbuf[i])); } } -- 2.7.0

1 0

[pacman-dev] alpm-hooks documentation
by yanchenko.igor＠gmail.com 01 Feb '16

01 Feb '16

Hi, I think documentation should mention that hook should have suffix ".hook", I figured that out only looking into sources. Thanks.

1 0

[pacman-dev] [PATCH] Bring makepkg zsh completions up to date
by Doug Newgard 31 Jan '16

31 Jan '16

Signed-off-by: Doug Newgard <scimmia(a)archlinux.info> --- contrib/zsh_completion.in | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index af3f8fc..3ef4b8d 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -604,8 +604,9 @@ _makepkg_shortopts=( '-i[Install package after successful build]' '-A[Ignore incomplete arch field in PKGBUILD]' '-c[Clean up work files after build]' + '-C[Remove $srcdir/ dir before building the package]' '-d[Skip all dependency checks]' - '-e[Do not extract source files (use existing src/ dir)]' + '-e[Do not extract source files (use existing $srcdir/ dir)]' '-f[Overwrite existing package]' '-g[Generate integrity checks for source files]' '-h[Show help message and exit]' @@ -616,6 +617,7 @@ _makepkg_shortopts=( '-r[Remove installed dependencies after a successful build]' '-R[Repackage contents of the package without rebuilding]' '-S[Generate a source-only tarball without downloading sources]' + '-V[Show version information and exit]' ) _makepkg_action_none(){ @@ -626,8 +628,9 @@ _makepkg_action_none(){ _makepkg_longopts=( '--ignorearch[Ignore incomplete arch field in PKGBUILD]' '--clean[Clean up work files after build]' + '--cleanbuild[Remove $srcdir/ dir before building the package]' '--nodeps[Skip all dependency checks]' - '--noextract[Do not extract source files (use existing src/ dir)]' + '--noextract[Do not extract source files (use existing $srcdir/ dir)]' '--force[Overwrite existing package]' '--geninteg[Generate integrity checks for source files]' '--help[Show help message and exit]' @@ -639,25 +642,27 @@ _makepkg_longopts=( '--repackage[Repackage contents of the package without rebuilding]' '--syncdeps[Install missing dependencies with pacman]' '--source[Generate a source-only tarball without downloading sources]' + '--version[Show version information and exit]' '--allsource[Generate a source-only tarball including downloaded source]' '--check[Run check() function in the PKGBUILD]' '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' - '--holdver[Prevent automatic version bumping for development PKGBUILDs]' + '--holdver[Do not update VCS sources]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' - '--noarchive[Do not create the archive at the end of the build process]' + '--noarchive[Do not create package archive]' '--nocheck[Do not run the check() function in the PKGBUILD]' '--noprepare[Do not run the prepare() function in the PKGBUILD]' '--nosign[Do not create a signature for the package]' - '--pkg[Only build listed packages from a split package]' + '--packagelist[Only list packages that would be produced, without PKGEXT]' + '--printsrcinfo[Print the generated SRCINFO and exit]' '--sign[Sign the resulting package with gpg]' '--skipchecksums[Do not verify checksums of the source files]' '--skipinteg[do not perform any verification checks on source files]' '--skippgpcheck[Do not verify source files with PGP signatures]' - '--noconfirm[do not ask for confirmation when resolving dependencies]' + '--noconfirm[Do not ask for confirmation when resolving dependencies]' '--asdeps[Install packages as non-explicitly installed]' '--noprogressbar[Do not show a progress bar when downloading files]' - '--needed[Do not reinstall up-to-date packages]' - '--verifysource[Only download sources and verify checksums]' + '--needed[Do not reinstall the targets that are already up to date]' + '--verifysource[Download source files (if needed) and perform integrity checks]' ) _makepkg(){ case $words[CURRENT] in -- 2.7.0

1 0