June 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Treat pkgrel more similarly to pkgver
by Luke Shumaker 04 Jun '18

04 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> This is perfectly fine with libalpm; it was only makepkg that was more strict with pkgrel than pkgver. Further, the former error message about invalid pkgrel formats claimed that pkgrel was a "decimal", which would mean that `1.1 == 1.10`. This is not the case; alpm parses pkgrel as a version, not as a decimal. Signed-off-by: Luke Shumaker <lukeshu(a)parabola.nu> --- This is a patch from Parabola, that we've been maintaining and applying to our pacman package for a while. I originally wrote it against version 4.1.2, and have submitted upstream before: https://lists.archlinux.org/pipermail/pacman-dev/2014-August/019340.html Dan McGee and Allan McRae weren't fans of it then. https://lists.archlinux.org/pipermail/pacman-dev/2014-August/019340.html https://lists.archlinux.org/pipermail/pacman-dev/2014-September/019351.html Allan was "of the opinion that the pkgrel should be a positive integer and nothing else." Dan thought it shouldn't be complicated, as "we're not trying to copy or match an upstream value." Well, in Arch, you're not trying to copy an upstream value, but in Parabola and in Arch Linux 32, we are. Currently in Arch Linux 32 they take advantage of makepkg's current behavior: when modifying a PKGBUILD from Arch, they append ".$N to the pkgrel from Arch, and don't modify the existing number, so that it is easy to tell that "foo-X-Y.Z" is based on "foo-X-Y" from Arch (and Z is the Arch 32-specific pkgrel); they are matching an upstream value. Prior to applying this patch, Parabola did the same thing. Since applying this patch, we've transitioned to "foo-X-Y.parabolaZ". This is even more relevant now, since we also import packages from Arch 32, which may already have a ".Z". When building foo-static, we might use "foo-static-X-Y.staticZ" to clearly indicate that it is based on the PKGBUILD for "foo-X-Y". Allan had said that he would consider "Inclusion of a 'dist' keyword in PKGBUILDs. If present, this gets added onto the end of the pkgrel." I think that's introducing new weird semantics where we don't need any. Normal versioning semantics do fine; pkgrel is a version number of the packaging metadata, and "Y.distZ" says "version Y, and then Z patches", same as any other patchlevel; similar to ".gitZ" in a pkgver. doc/PKGBUILD.5.asciidoc | 3 ++- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 4 ++-- test/util/vercmptest.sh | 23 ++++++++++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index 9634bd15..a75b40fe 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -60,7 +60,8 @@ systems (see below). allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The - variable is not allowed to contain hyphens. + variable is not allowed to contain colons, forward slashes, hyphens or + whitespace. *epoch*:: Used to force the package to be seen as newer than any previous versions diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in index f294a3bf..07292613 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in @@ -35,8 +35,8 @@ lint_pkgrel() { return 1 fi - if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then - error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" + if [[ $pkgrel = *[[:space:]/:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgrel" "$pkgrel" return 1 fi } diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 1541e7ae..f41a0d1e 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -39,7 +39,7 @@ tap_runtest() { tap_is_str "$($bin "$ver2" "$ver1")" "$exp" "$ver2 $ver1" } -tap_plan 92 +tap_plan 124 # all similar length, no pkgrel tap_runtest 1.5.0 1.5.0 0 @@ -113,4 +113,25 @@ tap_runtest 1:1.0 1.0 1 tap_runtest 1:1.0 1.1 1 tap_runtest 1:1.1 1.1 1 +# complex pkgrel values +tap_runtest 1-1.5.0 1-1.5.0 0 +tap_runtest 1-1.5.1 1-1.5.0 1 +tap_runtest 1-1.5.1 1-1.5 1 +tap_runtest 1-1.5b 1-1.5 -1 +tap_runtest 1-1.5b 1-1.5.1 -1 +# based on "from the manpage" +tap_runtest 1-1.0a 1-1.0alpha -1 +tap_runtest 1-1.0alpha 1-1.0b -1 +tap_runtest 1-1.0b 1-1.0beta -1 +tap_runtest 1-1.0beta 1-1.0rc -1 +tap_runtest 1-1.0rc 1-1.0 -1 +# based on "going crazy? alpha-dotted versions" +tap_runtest 1-1.5.a 1-1.5 1 +tap_runtest 1-1.5.b 1-1.5.a 1 +tap_runtest 1-1.5.1 1-1.5.b 1 +# based on Parabola usage +tap_runtest 1-1 1-2.par1 -1 +tap_runtest 1-2 1-2.par1 -1 +tap_runtest 1-3 1-2.par1 1 + tap_finish -- 2.17.1

2 1

[pacman-dev] [PATCH] PKGBUILD.5: document restriction on pkgrel
by Allan McRae 04 Jun '18

04 Jun '18

The format of pkgrel was much more retrictive than described in the man page. Update the documentation to reflect this. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Is this explanation clear? We also need to update the error message from lint_pkgrel to be more accurate. doc/PKGBUILD.5.asciidoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index ac26f3fe..b7e07165 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -56,11 +56,13 @@ new `pkgver`. This is most useful when used with sources from version control systems (see below). *pkgrel*:: - This is the release number specific to the Arch Linux release. This + This is the release number specific to the distribution. This allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The - variable is not allowed to contain hyphens. + variable is a postive integer, with an optional subrelease level + specified by adding another postive integer separated by a period + (i.e. in the form x.y). *epoch*:: Used to force the package to be seen as newer than any previous versions -- 2.17.0

1 0

[pacman-dev] [PATCH] makepkg: fix regression which broke split pkgbase-debug package metadata
by Eli Schwartz 04 Jun '18

04 Jun '18

In commit 9e52a36794552b77ecf26f7f34b226d096978f1e the split package metadata backup/restore was refactored to use declare, which actually declares variables in a local scope when in a function. This did not play nicely with debug packages, which unset most metadata variables, thereby reverting to the global scope rather than resulting in unset metadata. Fix by explicitly marking the variables as global. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 21737af8..fe3891ce 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1124,7 +1124,12 @@ check_build_status() { backup_package_variables() { local var for var in ${splitpkg_overrides[@]}; do - declare -p $var 2>/dev/null || printf '%s\n' "unset $var" + if [[ ${!var} ]]; then + printf '%s\n' "declare -g $var" + declare -p $var + else + printf '%s\n' "unset $var" + fi done } -- 2.17.1

2 1

[pacman-dev] [PATCH] pacman.conf: Fixup the XferCommand example for curl
by Luke Shumaker 04 Jun '18

04 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> 1. Without `-L`, curl doesn't follow redirects. This is different than both the default behavior of pacman, and from the wget example. So add `-L`. 2. It uses `-C -` to supposedly allow resuming partial downloads; but that doesn't work if we use `> %o` to direct the output to the file. Instead, use `-o %o` so that `-C -` actually works. Signed-off-by: Luke Shumaker <lukeshu(a)parabola.nu> --- etc/pacman.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 53071e52..8e967fbb 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -16,7 +16,7 @@ #GPGDir = @sysconfdir@/pacman.d/gnupg/ #HookDir = @sysconfdir@/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled #UseDelta = 0.7 -- 2.17.1

2 1

[pacman-dev] [PATCH] Apparently we live in the future!
by Allan McRae 04 Jun '18

04 Jun '18

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/index.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.asciidoc b/doc/index.asciidoc index 7d30e11d..415027df 100644 --- a/doc/index.asciidoc +++ b/doc/index.asciidoc @@ -75,7 +75,7 @@ Releases [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date -!5.1.0 !2017-05-28 +!5.1.0 !2018-05-28 !5.0.1 !2016-02-23 !5.0.0 !2016-01-30 !4.2.1 !2015-02-20 -- 2.17.0

3 10

[pacman-dev] [PATCH] Add lz4 compression support to makepkg
by Alex Butler 04 Jun '18

04 Jun '18

Adds opt-in lz4 compression of *pkg.tar files with makepkg. This is nice to have as an option for very fast compression and is already installed with libarchive. Signed-off-by: Alex Butler<alexheretic(a)gmail.com> --- doc/makepkg.conf.5.asciidoc | 3 ++- etc/makepkg.conf.in | 1 + scripts/libmakepkg/util/compress.sh.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 3b596a91..7fd75a1d 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -251,6 +251,7 @@ Options **COMPRESSXZ=**"(xz -c -z -)":: **COMPRESSLZO**"(lzop -q)":: **COMPRESSLRZ=**"(lrzip -q)":: +**COMPRESSLZ4=**"(lz4 -q)":: **COMPRESSZ=**"(compress -c -f)":: Sets the command and options used when compressing compiled or source packages in the named format. @@ -258,7 +259,7 @@ Options **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. Valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, - `.tar.lzo`, `.tar.lrz`, and `.tar.Z`. + `.tar.lzo`, `.tar.lrz`, `.tar.lz4`, and `.tar.Z`. Do not touch these unless you know what you are doing. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1cf79664..01f8df2c 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -133,6 +133,7 @@ COMPRESSXZ=(xz -c -z -) COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) +COMPRESSLZ4=(lz4 -q) ######################################################################### # EXTENSION DEFAULTS diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in index 3a332817..4d8cd46a 100644 --- a/scripts/libmakepkg/util/compress.sh.in +++ b/scripts/libmakepkg/util/compress.sh.in @@ -40,6 +40,7 @@ compress_as() { *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; + *tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; *tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$ext"; cat ;; -- 2.17.1

2 2

[pacman-dev] [PATCH] makepkg: fix the --nocolor option being broken when passed to pacman -U
by Eli Schwartz 03 Jun '18

03 Jun '18

In commit 8ff03868a37b1f9c447784ae2fd639a49e426399 PACMAN_OPTS was turned into an array. Unfortunately, that array was generated by treating the "--color never" option as one string, instead of an array of two strings... Fixes FS#58820 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fe3891ce..2ed8561f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1270,7 +1270,7 @@ while true; do -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=("--color never") ;; + -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=("--color" "never") ;; --noarchive) NOARCHIVE=1 ;; --nocheck) RUN_CHECK='n' ;; --noprepare) RUN_PREPARE='n' ;; -- 2.17.1

1 0

[pacman-dev] [PATCH] src/pacman: strip any leading / in --overwrite arguments
by Joey Pabalinas 01 Jun '18

01 Jun '18

Allow both `pacman -S foo --overwrite /usr/lib/foo.sh` and `pacman -S foo --overwrite usr/lib/foo.sh` (with any number of leading / ignored) to semantically mean the same thing. Update the documentation to reflect this change. Signed-off-by: Joey Pabalinas <joeypabalinas(a)gmail.com> 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index b6f4dd76e1249fd0ec..1bafe3c3c1aedb0051 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -263,12 +263,13 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] overwritten. Using '\--overwrite' will not allow overwriting a directory with a file or installing packages with conflicting files and directories. Multiple patterns can be specified by separating them with a comma. May be specified multiple times. Patterns can be negated, such that files matching them will not be overwritten, by prefixing them with an - exclamation mark. Subsequent matches will override previous ones. A leading - literal exclamation mark or backslash needs to be escaped. + exclamation mark. Subsequent matches will override previous ones. Any + leading slashes in the pattern are ignored. A leading literal exclamation + mark or backslash needs to be escaped. Query Options (apply to '-Q')[[QO]] ----------------------------------- *-c, \--changelog*:: diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe54793ea775c03915..f757b4141601587105 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -317,10 +317,12 @@ static void invalid_opt(int used, const char *opt1, const char *opt2) static int parsearg_util_addlist(alpm_list_t **list) { char *i, *save = NULL; for(i = strtok_r(optarg, ",", &save); i; i = strtok_r(NULL, ",", &save)) { + /* strip any leading slashes */ + i += strspn(i, "/"); *list = alpm_list_add(*list, strdup(i)); } return 0; } -- 2.17.0.rc1.35.g90bbd502d54fe92035.dirty

2 1

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: squelch syntax error when a pkgname is empty
by Eli Schwartz 01 Jun '18

01 Jun '18

We fail with an error, but then we also fail with: ==> ERROR: depends is not allowed to be empty. /usr/share/makepkg/lint_pkgbuild/pkgname.sh: line 39: continue: only meaningful in a `for', `while', or `until' loop During the refactor to provide enhanced pkgname=pkgver linting, this was moved out of the ${pkgname[@]} loop to a distinct function, at which time it should have been modified to return rather than continue. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in index d51c6313..84666a29 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in @@ -35,8 +35,7 @@ lint_one_pkgname() { if [[ -z $name ]]; then error "$(gettext "%s is not allowed to be empty.")" "$type" - ret=1 - continue + return 1 fi if [[ ${name:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "$type" -- 2.17.1

1 0