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

[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 … [View More]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 [View Less]

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/… [View More]

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 … [View More] | 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 [View Less]

1 0