- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v2 1/2] libmakepkg: fix reporting of invalid archive extensions in compress.sh
by Eli Schwartz 06 Jun '19

06 Jun '19

In commit 1825bd6716c2a51c92642e8b96beac0101e83805 this was split out from makepkg, but the warning was not properly migrated; $ext did not ever exist. As a result, no matter what you did, the only possible warning was: ==> WARNING: '' is not a valid archive extension. Fix to filter based on the presence of .tar in the argument, and building the $ext variable for all checking and messaging purposes within the function. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/compress.sh.in | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in index 3d4d88fd..9e3150f7 100644 --- a/scripts/libmakepkg/util/compress.sh.in +++ b/scripts/libmakepkg/util/compress.sh.in @@ -29,21 +29,21 @@ source "$LIBRARY/util/message.sh" # Wrapper around many stream compression formats, for use in the middle of a # pipeline. A tar archive is passed on stdin and compressed to stdout. compress_as() { - # $1: final archive filename extension for compression type detection + # $1: final archive filename extension for compression type detection - local filename="$1" + local ext=".tar${1##*.tar}" - case "$filename" in - *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; - *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; - *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; - *tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; - *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; - *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; - *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; - *tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; - *tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;; - *tar) cat ;; + case "$ext" in + *.tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; + *.tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; + *.tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *.tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; + *.tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; + *.tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; + *.tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; + *.tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; + *.tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;; + *.tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$ext"; cat ;; esac -- 2.21.0

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-180-g39c20ad4
by Allan McRae 06 Jun '19

06 Jun '19

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 39c20ad4f1d5f6e915b5be8976b6a94885ca3b0c (commit) via 55a65aaf904a32bcf59c652cbc03fc510c265142 (commit) via ff1ae94c102cab487444bcdb0c76ee489c11dfe8 (commit) via eb92bcb089a19dd456ce244732415660cf393a89 (commit) from 27e80ca7f61d0eb9861d36c24520a3e081bcb2ec (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 39c20ad4f1d5f6e915b5be8976b6a94885ca3b0c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jun 3 00:32:36 2019 -0700 hooks: rename type File to Path Make it clearer that the targets are matched against both directories and regular files and free up File to potentially refer specifically to regular files in the future. File is retained as a deprecated alias for Path for the time being to avoid breaking existing hooks and will be removed in a future release. See FS#53136. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 55a65aaf904a32bcf59c652cbc03fc510c265142 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jun 3 00:32:35 2019 -0700 makepkg: restrict pkgname and pkgver to ascii pkgname and pkgver are used as directory names within database files. libarchive does not provide a reliable locale-independent method for reading archive file names, causing errors when archive paths include non-ascii characters. This is a first step toward dealing with FS#49342, by hopefully reducing the number of packages with non-ascii data in the wild before updating libalpm to reject them outright. See https://github.com/libarchive/libarchive/wiki/Filenames and https://github.com/libarchive/libarchive/issues/587 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ff1ae94c102cab487444bcdb0c76ee489c11dfe8 Author: morganamilo <morganamilo(a)gmail.com> Date: Wed May 29 23:36:34 2019 +0100 pacman: rework the UI of -F Reworks the UI of -F according to FS#47949 In short -F replaces both -Fs and -Fo. Searching for an exact path (target contains "/"), causes the output to switch to the old -Fo output. Otherwise the old -Fs output is used. Also strip the leading "/" from targets like how -Qo does. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb92bcb089a19dd456ce244732415660cf393a89 Author: morganamilo <morganamilo(a)gmail.com> Date: Tue May 28 22:30:07 2019 +0100 pacman: refactor file match printing to their own functions Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/alpm-hooks.5.asciidoc | 17 +- doc/pacman.8.asciidoc | 14 +- lib/libalpm/hook.c | 8 +- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 4 + scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 + src/pacman/files.c | 174 +++++++++------------ src/pacman/pacman.c | 19 +-- test/pacman/tests/hook-file-change-packages.py | 2 +- .../pacman/tests/hook-file-remove-trigger-match.py | 2 +- test/pacman/tests/hook-file-upgrade-nomatch.py | 2 +- test/pacman/tests/hook-target-list.py | 2 +- test/pacman/tests/hook-type-reused.py | 2 +- 12 files changed, 112 insertions(+), 139 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: restrict pkgname and pkgver to ascii
by Andrew Gregory 06 Jun '19

06 Jun '19

pkgname and pkgver are used as directory names within database files. libarchive does not provide a reliable locale-independent method for reading archive file names, causing errors when archive paths include non-ascii characters. This is a first step toward dealing with FS#49342, by hopefully reducing the number of packages with non-ascii data in the wild before updating libalpm to reject them outright. See https://github.com/libarchive/libarchive/wiki/Filenames and https://github.com/libarchive/libarchive/issues/587 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 4 ++++ scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in index 84666a29..51a25d2c 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in @@ -45,6 +45,10 @@ lint_one_pkgname() { error "$(gettext "%s is not allowed to start with a dot.")" "$type" ret=1 fi + if [[ $name = *[![:ascii:]]* ]]; then + error "$(gettext "%s may only contain ascii characters.")" "$type" + return 1 + fi if [[ $name = *[^[:alnum:]+_.@-]* ]]; then error "$(gettext "%s contains invalid characters: '%s'")" \ "$type" "${name//[[:alnum:]+_.@-]}" diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 8d5d04f1..b0f45027 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -41,6 +41,11 @@ check_pkgver() { error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver${type:+ in $type}" return 1 fi + + if [[ $ver = *[![:ascii:]]* ]]; then + error "$(gettext "%s may only contain ascii characters.")" "pkgver${type:+ in $type}" + return 1 + fi } lint_pkgver() { -- 2.21.0

2 1

[pacman-dev] [PATCH] hooks: rename type File to Path
by Andrew Gregory 03 Jun '19

03 Jun '19

Make it clearer that the targets are matched against both directories and regular files and free up File to potentially refer specifically to regular files in the future. File is retained as a deprecated alias for Path for the time being to avoid breaking existing hooks and will be removed in a future release. See FS#53136. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/alpm-hooks.5.asciidoc | 17 +++++++++-------- lib/libalpm/hook.c | 8 ++++++-- test/pacman/tests/hook-file-change-packages.py | 2 +- .../tests/hook-file-remove-trigger-match.py | 2 +- test/pacman/tests/hook-file-upgrade-nomatch.py | 2 +- test/pacman/tests/hook-target-list.py | 2 +- test/pacman/tests/hook-type-reused.py | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/doc/alpm-hooks.5.asciidoc b/doc/alpm-hooks.5.asciidoc index 0f6a1057..916d43bb 100644 --- a/doc/alpm-hooks.5.asciidoc +++ b/doc/alpm-hooks.5.asciidoc @@ -12,7 +12,7 @@ SYNOPSIS -------- [Trigger] (Required, Repeatable) Operation = Install|Upgrade|Remove (Required, Repeatable) -Type = File|Package (Required) +Type = Path|Package (Required) Target = <Path|PkgName> (Required, Repeatable) [Action] (Required) @@ -49,19 +49,20 @@ defined the hook will run if the transaction matches *any* of the triggers. Select the type of operation to match targets against. May be specified multiple times. Installations are considered an upgrade if the package or file is already present on the system regardless of whether the new package - version is actually greater than the currently installed version. For File + version is actually greater than the currently installed version. For Path triggers, this is true even if the file changes ownership from one package to another. Required. -*Type =* File|Package:: +*Type =* Path|Package:: Select whether targets are matched against transaction packages or files. - See CAVEATS for special notes regarding File triggers. Required. + See CAVEATS for special notes regarding Path triggers. 'File' is a deprecated + alias for 'Path' and will be removed in a future release. Required. *Target =* <path|package>:: - The file path or package name to match against the active transaction. - File paths refer to the files in the package archive; the installation root + The path or package name to match against the active transaction. + Paths refer to the files in the package archive; the installation root should *not* be included in the path. Shell-style glob patterns are - allowed. It is possible to invert matches by prepending a file with an + allowed. It is possible to invert matches by prepending a target with an exclamation mark. May be specified multiple times. Required. ACTIONS @@ -119,7 +120,7 @@ Exec = /usr/bin/sync CAVEATS ------- -There are situations when file triggers may act in unexpected ways. Hooks are +There are situations when path triggers may act in unexpected ways. Hooks are triggered using the file list of the installed, upgraded, or removed package. When installing or upgrading a file that is extracted with a '.pacnew' extension, the original file name is used in triggering the hook. When diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index d90ed2da..6143ea0f 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -38,7 +38,7 @@ enum _alpm_hook_op_t { enum _alpm_trigger_type_t { ALPM_HOOK_TYPE_PACKAGE = 1, - ALPM_HOOK_TYPE_FILE, + ALPM_HOOK_TYPE_PATH, }; struct _alpm_trigger_t { @@ -303,7 +303,11 @@ static int _alpm_hook_parse_cb(const char *file, int line, if(strcmp(value, "Package") == 0) { t->type = ALPM_HOOK_TYPE_PACKAGE; } else if(strcmp(value, "File") == 0) { - t->type = ALPM_HOOK_TYPE_FILE; + _alpm_log(handle, ALPM_LOG_DEBUG, + "File targets are deprecated, use Path instead\n"); + t->type = ALPM_HOOK_TYPE_PATH; + } else if(strcmp(value, "Path") == 0) { + t->type = ALPM_HOOK_TYPE_PATH; } else { error(_("hook %s line %d: invalid value %s\n"), file, line, value); } diff --git a/test/pacman/tests/hook-file-change-packages.py b/test/pacman/tests/hook-file-change-packages.py index ad96fc14..4671dbe8 100644 --- a/test/pacman/tests/hook-file-change-packages.py +++ b/test/pacman/tests/hook-file-change-packages.py @@ -4,7 +4,7 @@ self.add_hook("hook", """ [Trigger] - Type = File + Type = Path Operation = Upgrade Target = bin/foo diff --git a/test/pacman/tests/hook-file-remove-trigger-match.py b/test/pacman/tests/hook-file-remove-trigger-match.py index 6c9375c0..ac50014c 100644 --- a/test/pacman/tests/hook-file-remove-trigger-match.py +++ b/test/pacman/tests/hook-file-remove-trigger-match.py @@ -4,7 +4,7 @@ self.add_hook("hook", """ [Trigger] - Type = File + Type = Path Operation = Remove Target = bin/foo diff --git a/test/pacman/tests/hook-file-upgrade-nomatch.py b/test/pacman/tests/hook-file-upgrade-nomatch.py index e984d376..891b8164 100644 --- a/test/pacman/tests/hook-file-upgrade-nomatch.py +++ b/test/pacman/tests/hook-file-upgrade-nomatch.py @@ -4,7 +4,7 @@ self.add_hook("hook", """ [Trigger] - Type = File + Type = Path Operation = Upgrade Target = bin/?* diff --git a/test/pacman/tests/hook-target-list.py b/test/pacman/tests/hook-target-list.py index 6dd6c4d8..b932c491 100644 --- a/test/pacman/tests/hook-target-list.py +++ b/test/pacman/tests/hook-target-list.py @@ -14,7 +14,7 @@ Target = foo [Trigger] - Type = File + Type = Path Operation = Install # matches files in 'file/' but not 'file/' itself Target = file/?* diff --git a/test/pacman/tests/hook-type-reused.py b/test/pacman/tests/hook-type-reused.py index 472c8caf..0ea1c0ba 100644 --- a/test/pacman/tests/hook-type-reused.py +++ b/test/pacman/tests/hook-type-reused.py @@ -4,7 +4,7 @@ """ [Trigger] Type = Package - Type = File + Type = Path Operation = Install Target = foo -- 2.21.0

1 0

[pacman-dev] [PATCH 1/2] pacman: refactor file match printing to its own function
by morganamilo 29 May '19

29 May '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/files.c | 56 +++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index fa4170bd..3ebd9b9b 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -99,11 +99,39 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { return 0; } +static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg) +{ + alpm_db_t *db_local = alpm_get_localdb(config->handle); + const colstr_t *colstr = &config->colstr; + + if(config->op_f_machinereadable) { + alpm_list_t *ml; + for(ml = match; ml; ml = alpm_list_next(ml)) { + char *filename = ml->data; + print_line_machinereadable(repo, pkg, filename); + } + } else if(config->quiet) { + printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); + } else { + alpm_list_t *ml; + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo), + colstr->title, alpm_pkg_get_name(pkg), + colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + + print_groups(pkg); + print_installed(db_local, pkg); + printf("\n"); + + for(ml = match; ml; ml = alpm_list_next(ml)) { + char *filename = ml->data; + printf(" %s\n", filename); + } + } +} + static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; - alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *t; - const colstr_t *colstr = &config->colstr; for(t = targets; t; t = alpm_list_next(t)) { char *targ = t->data; @@ -148,29 +176,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { } if(match != NULL) { - if(config->op_f_machinereadable) { - alpm_list_t *ml; - for(ml = match; ml; ml = alpm_list_next(ml)) { - char *filename = ml->data; - print_line_machinereadable(repo, pkg, filename); - } - } else if(config->quiet) { - printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); - } else { - alpm_list_t *ml; - printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo), - colstr->title, alpm_pkg_get_name(pkg), - colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); - - print_groups(pkg); - print_installed(db_local, pkg); - printf("\n"); - - for(ml = match; ml; ml = alpm_list_next(ml)) { - c = ml->data; - printf(" %s\n", c); - } - } + print_match(match, repo, pkg); alpm_list_free(match); } } -- 2.20.1

4 14

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-176-g27e80ca7
by Allan McRae 28 May '19

28 May '19

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 27e80ca7f61d0eb9861d36c24520a3e081bcb2ec (commit) via a00615bfdad628299352b94e0f44d211a758fd17 (commit) via 5caf45cdbb267ee45c7b4a9c815e500efd350e6e (commit) via 4c38f4b991e7ff7119ac4d2a0ff11ad20f46086e (commit) via c8062d753c77a8de4a89fbd4a83e5c8602a883aa (commit) via 99c5809bbf01725829ce67458565b46bce32eaa9 (commit) from 0bc687e2e01f4e6e3f2a2f7ac10c7e1fdbaf5ba2 (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 27e80ca7f61d0eb9861d36c24520a3e081bcb2ec Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 22 10:44:27 2019 -0400 makepkg: also move restore_envvars handling into libmakepkg Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a00615bfdad628299352b94e0f44d211a758fd17 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 22 10:44:26 2019 -0400 makepkg: move config loading into libmakepkg When scripting/automating around makepkg, it is sometimes desirable to know how makepkg will be configured to operate. One example is the archlinux devtools, which must forward select makepkg.conf variables into a build chroot (for example PACKAGER) or use those variables itself (for example {SRC,PKG,LOG}DEST). The configuration file can be in up to 3 places, and should be capable of being overridden via environment variables. It is sufficiently complex to represent distinct functionality, and sufficiently useful to merit easy accessibility in other scripts, therefore, let us move it into a publicly exposed utility library. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5caf45cdbb267ee45c7b4a9c815e500efd350e6e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 22 10:39:44 2019 -0400 doc: update SRCEXT/PKGEXT to reduce needlessly scary warnings Currently this tells people that the settings should not be touched, but we should just rely on the description of what it should be set to, and leave it up to the user. With the previous patch, makepkg aborts if an invalid value is set, greatly reducing the danger of it being badly configured. Also make this clearer by indicating when it would be useful to change the settings -- i.e. disable compression -- and ensure their described defaults are based on the ones established during ./configure or meson setup. Reported-by: Jouke Witteveen <j.witteveen(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4c38f4b991e7ff7119ac4d2a0ff11ad20f46086e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 22 10:39:43 2019 -0400 libmakepkg: add lint_config to validate SRCEXT/PKGEXT These variables must begin with .src.tar / .pkg.tar respectively, so fail early if those expectations are not matched. This prevents makepkg from creating e.g. package files literally named "./pacman-5.1.3-1-x86_64" which are actually uncompressed tarballs. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c8062d753c77a8de4a89fbd4a83e5c8602a883aa Author: ekardnam <lucabertozzi.pub(a)gmail.com> Date: Tue May 21 09:17:59 2019 +0000 repo-add: Add --prevent-downgrade option Implements FS#17752 Signed-off-by: Luca Bertozzi <ekarndam(a)autistici.org> commit 99c5809bbf01725829ce67458565b46bce32eaa9 Author: Kevin Mihelich <kevin(a)archlinuxarm.org> Date: Mon May 20 21:21:27 2019 -0400 Support application/gzip MIME type in extraction file 5.37 changed the gzip MIME type from application/x-gzip to application/gzip, so support this when checking to extract source files. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 2 + doc/makepkg.conf.5.asciidoc | 9 +-- doc/meson.build | 2 + etc/makepkg.conf.in | 3 - scripts/Makefile.am | 2 + .../lint_config/{paths.sh.in => ext.sh.in} | 25 ++++--- scripts/libmakepkg/lint_config/meson.build | 1 + scripts/libmakepkg/source/file.sh.in | 2 +- scripts/libmakepkg/util/config.sh.in | 76 ++++++++++++++++++++++ scripts/libmakepkg/util/meson.build | 1 + scripts/libmakepkg/util/util.sh.in | 14 ++++ scripts/makepkg.sh.in | 37 +---------- scripts/repo-add.sh.in | 19 +++++- 13 files changed, 133 insertions(+), 60 deletions(-) copy scripts/libmakepkg/lint_config/{paths.sh.in => ext.sh.in} (58%) create mode 100644 scripts/libmakepkg/util/config.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: move config loading into libmakepkg
by Eli Schwartz 28 May '19

28 May '19

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- For some reason, parsing this does not seem to be intuitive to most thirdparty consumers. For example, devtools uses grep and eval! And for the longest time, it also did not support user makepkg.conf. Other issues seen in the wild by makepkg.conf parsers include ignoring ~/.makepkg.conf, *only* using ~/.makepkg.conf, etc. This is also sort of an uncomfortable amount of code to reimplement, so I figured it could benefit from being split out into a utility library. scripts/Makefile.am | 1 + scripts/libmakepkg/util/config.sh.in | 55 ++++++++++++++++++++++++++++ scripts/libmakepkg/util/meson.build | 1 + scripts/libmakepkg/util/util.sh.in | 16 ++++++++ scripts/makepkg.sh.in | 29 +-------------- 5 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 scripts/libmakepkg/util/config.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2c743e82..4e5876af 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -119,6 +119,7 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ libmakepkg/util/compress.sh \ + libmakepkg/util/config.sh \ libmakepkg/util/error.sh \ libmakepkg/util/message.sh \ libmakepkg/util/option.sh \ diff --git a/scripts/libmakepkg/util/config.sh.in b/scripts/libmakepkg/util/config.sh.in new file mode 100644 index 00000000..fdfeef89 --- /dev/null +++ b/scripts/libmakepkg/util/config.sh.in @@ -0,0 +1,55 @@ +#!/bin/bash +# +# config.sh - functions for handling makepkg config files +# +# Copyright (c) 2006-2019 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_UTIL_CONFIG_SH" ]] && return +LIBMAKEPKG_UTIL_CONFIG_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/error.sh" +source "$LIBRARY/util/util.sh" + +# correctly source makepkg.conf, respecting user precedence and the system conf +source_makepkg_config() { + # $1: override system config file + + local MAKEPKG_CONF=${1:-@sysconfdir@/makepkg.conf} + + # Source the config file; fail if it is not found + if [[ -r $MAKEPKG_CONF ]]; then + source_safe "$MAKEPKG_CONF" + else + error "$(gettext "%s not found.")" "$MAKEPKG_CONF" + plain "$(gettext "Aborting...")" + exit $E_CONFIG_ERROR + fi + + # Source user-specific makepkg.conf overrides, but only if no override config + # file was specified + XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman" + if [[ "$MAKEPKG_CONF" = "@sysconfdir@/makepkg.conf" ]]; then + if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then + source_safe "$XDG_PACMAN_DIR/makepkg.conf" + elif [[ -r "$HOME/.makepkg.conf" ]]; then + source_safe "$HOME/.makepkg.conf" + fi + fi +} diff --git a/scripts/libmakepkg/util/meson.build b/scripts/libmakepkg/util/meson.build index 229b004d..c29503b7 100644 --- a/scripts/libmakepkg/util/meson.build +++ b/scripts/libmakepkg/util/meson.build @@ -2,6 +2,7 @@ libmakepkg_module = 'util' sources = [ 'compress.sh.in', + 'config.sh.in', 'error.sh.in', 'message.sh.in', 'option.sh.in', diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index c2f5897e..8feb9178 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -22,6 +22,9 @@ [[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ]] && return LIBMAKEPKG_UTIL_UTIL_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/error.sh" ## # usage : in_array( $needle, $haystack ) @@ -95,3 +98,16 @@ ensure_writable_dir() { return 0 } + +# source a file and fail if it does not succeed +source_safe() { + local shellopts=$(shopt -p extglob) + shopt -u extglob + + if ! source "$@"; then + error "$(gettext "Failed to source %s")" "$1" + exit $E_MISSING_FILE + fi + + eval "$shellopts" +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28f3e3ef..08ec2a15 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -354,15 +354,6 @@ error_function() { exit $E_USER_FUNCTION_FAILED } -source_safe() { - shopt -u extglob - if ! source "$@"; then - error "$(gettext "Failed to source %s")" "$1" - exit $E_MISSING_FILE - fi - shopt -s extglob -} - merge_arch_attrs() { local attr supported_attrs=( provides conflicts depends replaces optdepends @@ -1113,25 +1104,7 @@ restore_envvars=$(declare -p PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR PKGEXT # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -# Source the config file; fail if it is not found -if [[ -r $MAKEPKG_CONF ]]; then - source_safe "$MAKEPKG_CONF" -else - error "$(gettext "%s not found.")" "$MAKEPKG_CONF" - plain "$(gettext "Aborting...")" - exit $E_CONFIG_ERROR -fi - -# Source user-specific makepkg.conf overrides, but only if no override config -# file was specified -XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman" -if [[ "$MAKEPKG_CONF" = "$confdir/makepkg.conf" ]]; then - if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then - source_safe "$XDG_PACMAN_DIR/makepkg.conf" - elif [[ -r "$HOME/.makepkg.conf" ]]; then - source_safe "$HOME/.makepkg.conf" - fi -fi +source_makepkg_config "$MAKEPKG_CONF" eval "$restore_envvars" -- 2.21.0

3 14

[pacman-dev] [PATCH] libmakepkg: add lint_config to validate SRCEXT/PKGEXT
by Eli Schwartz 28 May '19

28 May '19

These variables must begin with .src.tar / .pkg.tar respectively, so fail early if those expectations are not matched. This prevents makepkg from creating e.g. package files literally named "./pacman-5.1.3-1-x86_64" which are actually uncompressed tarballs. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_config/ext.sh.in | 45 ++++++++++++++++++++++ scripts/libmakepkg/lint_config/meson.build | 1 + 3 files changed, 47 insertions(+) create mode 100644 scripts/libmakepkg/lint_config/ext.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 00e0c038..0597a0e5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -72,6 +72,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_checksum.sh \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_config.sh \ + libmakepkg/lint_config/ext.sh \ libmakepkg/lint_config/paths.sh \ libmakepkg/lint_config/source_date_epoch.sh \ libmakepkg/lint_config/variable.sh \ diff --git a/scripts/libmakepkg/lint_config/ext.sh.in b/scripts/libmakepkg/lint_config/ext.sh.in new file mode 100644 index 00000000..20aaf6ab --- /dev/null +++ b/scripts/libmakepkg/lint_config/ext.sh.in @@ -0,0 +1,45 @@ +#!/bin/bash +# +# ext.sh - Check that source/package extensions have valid prefixes +# +# Copyright (c) 2019 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_LINT_CONFIG_EXT_SH" ]] && return +LIBMAKEPKG_LINT_CONFIG_EXT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_config_functions+=('lint_ext') + + +lint_ext() { + local i var val ret=0 + + for i in 'SRCEXT/.src.tar' 'PKGEXT/.pkg.tar'; do + IFS='/' read -r var val < <(printf '%s\n' "$i") + + if [[ ${!var} != ${val}* ]]; then + error "$(gettext "%s does not contain a valid prefix (needs '%s', got '%s')")" \ + "\$${var}" "${val}*" "${!var}" + ret=1 + fi + done + + return $ret +} diff --git a/scripts/libmakepkg/lint_config/meson.build b/scripts/libmakepkg/lint_config/meson.build index 144705f9..2262ad45 100644 --- a/scripts/libmakepkg/lint_config/meson.build +++ b/scripts/libmakepkg/lint_config/meson.build @@ -1,6 +1,7 @@ libmakepkg_module = 'lint_config' sources = [ + 'ext.sh.in', 'paths.sh.in', 'source_date_epoch.sh.in', 'variable.sh.in', -- 2.21.0

2 5

[pacman-dev] [PATCH] Support application/gzip MIME type in extraction
by Eli Schwartz 28 May '19

28 May '19

From: Kevin Mihelich <kevin(a)archlinuxarm.org> file 5.37 changed the gzip MIME type from application/x-gzip to application/gzip, so support this when checking to extract source files. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Sending on behalf of @leming who noticed this with gzipped patch files, and pinged me via IRC. scripts/libmakepkg/source/file.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 08b8bef8..8492ba11 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -102,7 +102,7 @@ extract_file() { case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) cmd="bsdtar" ;; - *application/x-gzip*) + *application/x-gzip*|*application/gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; *) return;; -- 2.21.0

2 2

[pacman-dev] [PATCH] Added flag --prevent-downgrade to repo-add to prevent adding packages to a database if a newer one is already present.
by ekarndam＠autistici.org 22 May '19

22 May '19

From: ekardnam <lucabertozzi.pub(a)gmail.com> Reference bug in the bug tracker is at #FS17752 Signed-off-by: Luca Bertozzi <ekarndam(a)autistici.org> --- scripts/repo-add.sh.in | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 57413df5..e2eb06e3 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ REPO_DB_SUFFIX= LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' +PREVENT_DOWNGRADE=0 # Import libmakepkg source "$LIBRARY"/util/message.sh @@ -63,6 +64,8 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -R, --remove remove old package file from disk after updating database\n")" + printf -- "$(gettext " -p, --prevent-downgrade do not add package to database if a newer version is already present\n")" + printf -- "$(gettext " --no-timestamp do not add a timestamp to the repository")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename> ...\n")" printf -- "\n" @@ -248,9 +251,17 @@ db_write_entry() { return 0 fi else - if (( RMEXISTING )); then - pkgentry=$(find_pkgentry "$pkgname") - if [[ -n $pkgentry ]]; then + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + + local version=$(sed -n '/^%VERSION%$/ {n;p;q}' "$pkgentry/desc") + if (( $(vercmp "$version" "$pkgver") > 0 )); then + warning "$(gettext "A newer version for '%s' is already present in database")" "$pkgname" + if (( PREVENT_DOWNGRADE )); then + return 0 + fi + fi + if (( RMEXISTING )); then local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")" local oldfile="$(dirname "$1")/$oldfilename" fi @@ -464,7 +475,7 @@ remove() { error "$(gettext "Package matching '%s' not found.")" "$pkgname" return 1 fi - + return 0 } @@ -618,6 +629,9 @@ while (( $# )); do -v|--verify) VERIFY=1 ;; + -p|--prevent-downgrade) + PREVENT_DOWNGRADE=1 + ;; *) args+=("$1") ;; -- 2.21.0

4 3