- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] hooks: warn if reassignment overwrites previous setting
by Stefan Klinger 14 Mar '18

14 Mar '18

In hook definition files, repeated assignment to Description, Exec, Type, and When silently overwrote previous settings. This yields a warning now. Signed-off-by: Stefan Klinger <git(a)stefan-klinger.de> --- lib/libalpm/hook.c | 15 ++++++++++++++- test/pacman/tests/TESTS | 4 ++++ test/pacman/tests/hook-description-reused.py | 23 +++++++++++++++++++++++ test/pacman/tests/hook-exec-reused.py | 22 ++++++++++++++++++++++ test/pacman/tests/hook-type-reused.py | 22 ++++++++++++++++++++++ test/pacman/tests/hook-when-reused.py | 22 ++++++++++++++++++++++ 6 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/hook-description-reused.py create mode 100644 test/pacman/tests/hook-exec-reused.py create mode 100644 test/pacman/tests/hook-type-reused.py create mode 100644 test/pacman/tests/hook-when-reused.py diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index ccde225e..51e74484 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -267,6 +267,7 @@ static int _alpm_hook_parse_cb(const char *file, int line, struct _alpm_hook_t *hook = ctx->hook; #define error(...) _alpm_log(handle, ALPM_LOG_ERROR, __VA_ARGS__); return 1; +#define warning(...) _alpm_log(handle, ALPM_LOG_WARNING, __VA_ARGS__); if(!section && !key) { error(_("error while reading hook %s: %s\n"), file, strerror(errno)); @@ -296,6 +297,9 @@ static int _alpm_hook_parse_cb(const char *file, int line, error(_("hook %s line %d: invalid value %s\n"), file, line, value); } } else if(strcmp(key, "Type") == 0) { + if(t->type != 0) { + warning(_("hook %s line %d: overwriting previous definition of Type\n"), file, line); + } if(strcmp(value, "Package") == 0) { t->type = ALPM_HOOK_TYPE_PACKAGE; } else if(strcmp(value, "File") == 0) { @@ -312,6 +316,9 @@ static int _alpm_hook_parse_cb(const char *file, int line, } } else if(strcmp(section, "Action") == 0) { if(strcmp(key, "When") == 0) { + if(hook->when != 0) { + warning(_("hook %s line %d: overwriting previous definition of When\n"), file, line); + } if(strcmp(value, "PreTransaction") == 0) { hook->when = ALPM_HOOK_PRE_TRANSACTION; } else if(strcmp(value, "PostTransaction") == 0) { @@ -320,6 +327,9 @@ static int _alpm_hook_parse_cb(const char *file, int line, error(_("hook %s line %d: invalid value %s\n"), file, line, value); } } else if(strcmp(key, "Description") == 0) { + if(hook->desc != NULL) { + warning(_("hook %s line %d: overwriting previous definition of Description\n"), file, line); + } STRDUP(hook->desc, value, return 1); } else if(strcmp(key, "Depends") == 0) { char *val; @@ -330,7 +340,10 @@ static int _alpm_hook_parse_cb(const char *file, int line, } else if(strcmp(key, "NeedsTargets") == 0) { hook->needs_targets = 1; } else if(strcmp(key, "Exec") == 0) { - if((hook->cmd = _alpm_wordsplit(value)) == NULL) { + if(hook->cmd != NULL) { + warning(_("hook %s line %d: overwriting previous definition of Exec\n"), file, line); + } + if((hook->cmd = _alpm_wordsplit(value)) == NULL) { if(errno == EINVAL) { error(_("hook %s line %d: invalid value %s\n"), file, line, value); } else { diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 2d877962..4329ca90 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -53,6 +53,8 @@ TESTS += test/pacman/tests/fileconflict030.py TESTS += test/pacman/tests/fileconflict031.py TESTS += test/pacman/tests/fileconflict032.py TESTS += test/pacman/tests/hook-abortonfail.py +TESTS += test/pacman/tests/hook-description-reused.py +TESTS += test/pacman/tests/hook-exec-reused.py TESTS += test/pacman/tests/hook-exec-with-arguments.py TESTS += test/pacman/tests/hook-file-change-packages.py TESTS += test/pacman/tests/hook-file-remove-trigger-match.py @@ -63,7 +65,9 @@ TESTS += test/pacman/tests/hook-pkg-postinstall-trigger-match.py TESTS += test/pacman/tests/hook-pkg-remove-trigger-match.py TESTS += test/pacman/tests/hook-pkg-upgrade-trigger-match.py TESTS += test/pacman/tests/hook-target-list.py +TESTS += test/pacman/tests/hook-type-reused.py TESTS += test/pacman/tests/hook-upgrade-trigger-no-match.py +TESTS += test/pacman/tests/hook-when-reused.py TESTS += test/pacman/tests/ignore001.py TESTS += test/pacman/tests/ignore002.py TESTS += test/pacman/tests/ignore003.py diff --git a/test/pacman/tests/hook-description-reused.py b/test/pacman/tests/hook-description-reused.py new file mode 100644 index 00000000..5826a30e --- /dev/null +++ b/test/pacman/tests/hook-description-reused.py @@ -0,0 +1,23 @@ +self.description = "Hook using multiple Description's" + +self.add_hook("hook", + """ + [Trigger] + Type = Package + Operation = Install + Target = foo + + [Action] + Description = lala + Description = foobar + When = PreTransaction + Exec = /bin/date + """); + +sp = pmpkg("foo") +self.addpkg2db("sync", sp) + +self.args = "-S foo" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=warning.*overwriting previous definition of Description") diff --git a/test/pacman/tests/hook-exec-reused.py b/test/pacman/tests/hook-exec-reused.py new file mode 100644 index 00000000..6fe53151 --- /dev/null +++ b/test/pacman/tests/hook-exec-reused.py @@ -0,0 +1,22 @@ +self.description = "Hook using multiple Exec's" + +self.add_hook("hook", + """ + [Trigger] + Type = Package + Operation = Install + Target = foo + + [Action] + When = PostTransaction + Exec = /bin/date + Exec = /bin/date + """); + +sp = pmpkg("foo") +self.addpkg2db("sync", sp) + +self.args = "-S foo" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=warning.*overwriting previous definition of Exec") diff --git a/test/pacman/tests/hook-type-reused.py b/test/pacman/tests/hook-type-reused.py new file mode 100644 index 00000000..8c4dfd0f --- /dev/null +++ b/test/pacman/tests/hook-type-reused.py @@ -0,0 +1,22 @@ +self.description = "Hook using multiple Type's" + +self.add_hook("hook", + """ + [Trigger] + Type = Package + Type = File + Operation = Install + Target = foo + + [Action] + When = PostTransaction + Exec = /bin/date + """); + +sp = pmpkg("foo") +self.addpkg2db("sync", sp) + +self.args = "-S foo" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=warning.*overwriting previous definition of Type") diff --git a/test/pacman/tests/hook-when-reused.py b/test/pacman/tests/hook-when-reused.py new file mode 100644 index 00000000..07c3bc5e --- /dev/null +++ b/test/pacman/tests/hook-when-reused.py @@ -0,0 +1,22 @@ +self.description = "Hook using multiple When's" + +self.add_hook("hook", + """ + [Trigger] + Type = Package + Operation = Install + Target = foo + + [Action] + When = PreTransaction + Exec = /bin/date + When = PostTransaction + """); + +sp = pmpkg("foo") +self.addpkg2db("sync", sp) + +self.args = "-S foo" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=warning.*overwriting previous definition of When") -- 2.11.0

7 20

[pacman-dev] [PATCH 1/1] makepkg: set umask 0022 again after syncing deps
by neindochoh.kraut+archmail＠mailbox.org 14 Mar '18

14 Mar '18

From: Felix Glaser <neindochoh.kraut(a)mailbox.org> makepkg configures the umask 0022 as a sane default for building packages. After installing dependencies, it sources `/etc/profile` again. If the user configured a umask other than Arch's default of 0022 (or 022) in `/etc/profile`, this sane default is now gone and needs to be set again. --- scripts/makepkg.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 63b6c3e1..3bd018f2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -279,6 +279,10 @@ handle_deps() { shopt -u extglob source /etc/profile &>/dev/null eval "$shellopts" + + # umask might have been changed in /etc/profile + # ensure that sane default is set again + umask 0022 return $R_DEPS_SATISFIED } -- 2.16.2

2 1

[pacman-dev] [PATCH 0/3] Make documentation and PKGBUILD linting more consistent
by Rikard Falkeborn 14 Mar '18

14 Mar '18

Make the documentation a little more explicit about allowed characters for arch and pkgver. Also fix linting of pkgver which was broken if pkgver contained whitespace. Rikard Falkeborn (3): PKGBUILD.5: Mention valid characters for arch PKGBUILD.5: Mention that pkgver can't contain whitespace Fix linting of whitespace in pkgver doc/PKGBUILD.5.txt | 6 ++++-- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.16.2

2 5

[pacman-dev] [PATCH] makepkg: use localized date strings
by Chih-Hsuan Yen 14 Mar '18

14 Mar '18

From: Yen Chi Hsuan <yan12125(a)gmail.com> Before this change, LC_TIME=zh_TW.UTF-8 makepkg has the following line: ==> Making package: foobar 1-1 (日 2月 11 01:13:42 CST 2018) With this patch, this line becomes: ==> Making package: foobar 1-1 (西元2018年02月11日 (週日) 01時13分57秒) The latter is more natural for a Chinese native speaker. Signed-off-by: Chih-Hsuan Yen <yan12125(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 63b6c3e1..5e3af337 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1569,7 +1569,7 @@ if (( INFAKEROOT )); then exit $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgbase $basever ($(date))" +msg "$(gettext "Making package: %s")" "$pkgbase $basever ($(date +%c))" # if we are creating a source-only package, go no further if (( SOURCEONLY )); then @@ -1597,7 +1597,7 @@ if (( SOURCEONLY )); then msg "$(gettext "Signing package...")" create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" - msg "$(gettext "Source package created: %s")" "$pkgbase ($(date))" + msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))" exit $E_OK fi @@ -1703,7 +1703,7 @@ if (( NOARCHIVE )); then exit $E_OK fi -msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date +%c))" install_package && exit $E_OK || exit $E_INSTALL_FAILED -- 2.16.1

4 9

[pacman-dev] [PATCH 0/1] bump AC_PREREQ to 2.64 on configure.ac
by Huáng Jùnliàng 14 Mar '18

14 Mar '18

*** BLURB HERE *** Huáng Jùnliàng (1): autoconf: bump AC_PREREQ to 2.64 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.1

2 2

[pacman-dev] [PATCH 0/1] Fix libarchive 2 compatibility
by Huáng Jùnliàng 14 Mar '18

14 Mar '18

*** BLURB HERE *** Huáng Jùnliàng (1): libalpm: use archive_write_finish for 2.x compat lib/libalpm/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.1

2 4

[pacman-dev] [PATCH] doc/.gitignore: ignore all manpages
by iff＠escondida.tk 14 Mar '18

14 Mar '18

From: Ivy Foster <iff(a)escondida.tk> They're all generated during make. --- I was going to add BUILDINFO.5 to the list, but this way covers future additions. doc/.gitignore | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/.gitignore b/doc/.gitignore index 186f45e4..a9736555 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,16 +1,4 @@ -alpm-hooks.5 -PKGBUILD.5 -libalpm.3 -makepkg.8 -makepkg-template.1 -makepkg.conf.5 -pacman.8 -pacman-key.8 -pacman.conf.5 -pkgdelta.8 -repo-add.8 -repo-remove.8 -vercmp.8 +*.[1-8] asciidoc-manpage.css asciidoc.css asciidoc.js -- 2.16.1

2 1

[pacman-dev] [PATCH] pacman-conf.c: exit if cannot set rootdir or parse config file
by iff＠escondida.tk 14 Mar '18

14 Mar '18

From: Ivy Foster <iff(a)escondida.tk> --- src/pacman/pacman-conf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 4ffa24a3..aa0cdf22 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -77,7 +77,11 @@ static void parse_opts(int argc, char **argv) config_file = optarg; break; case 'R': - config->rootdir = strdup(optarg); + if ((config->rootdir = strdup(optarg)) == NULL) { + fprintf(stderr, "error setting rootdir '%s': out of memory\n", optarg); + cleanup(); + exit(1); + } break; case 'l': repo_list = 1; @@ -105,6 +109,8 @@ static void parse_opts(int argc, char **argv) if(parseconfigfile(config_file) != 0 || setdefaults(config) != 0) { fprintf(stderr, "error parsing '%s'\n", config_file); + cleanup(); + exit(1); } } -- 2.16.1

2 1

[pacman-dev] [PATCH v4 1/2] pacman-conf.c: add short options
by iff＠escondida.tk 14 Mar '18

14 Mar '18

From: Ivy Foster <iff(a)escondida.tk> --- src/pacman/pacman-conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..ab73d896 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -42,13 +42,13 @@ static void usage(int ret) hputs("usage: pacman-conf [options] [<directive>...]"); hputs(" pacman-conf (--repo-list|--help|--version)"); hputs("options:"); - hputs(" --config=<path> set an alternate configuration file"); - hputs(" --rootdir=<path> set an alternate installation root"); - hputs(" --repo=<remote> query options for a specific repo"); - hputs(" --verbose always show directive names"); - hputs(" --repo-list list configured repositories"); - hputs(" --help display this help information"); - hputs(" --version display version information"); + hputs(" -c, --config=<path> set an alternate configuration file"); + hputs(" -R, --rootdir=<path> set an alternate installation root"); + hputs(" -r, --repo=<remote> query options for a specific repo"); + hputs(" -v, --verbose always show directive names"); + hputs(" -l, --repo-list list configured repositories"); + hputs(" -h, --help display this help information"); + hputs(" -V, --version display version information"); #undef hputs cleanup(); exit(ret); @@ -59,7 +59,7 @@ static void parse_opts(int argc, char **argv) int c; config_file = CONFFILE; - const char *short_opts = ""; + const char *short_opts = "c:hlR:r:Vv"; struct option long_opts[] = { { "config" , required_argument , NULL , 'c' }, { "rootdir" , required_argument , NULL , 'R' }, -- 2.16.1

3 3

[pacman-dev] Parallel download patch
by lesto fante 14 Mar '18

14 Mar '18

Hello, I prepared a couple of alternative method to invoke parallel download but ONLY for external tool (xfer) and not for internal curl. I would like to have a feedback so I can eventually fix them. You can find patch file and explanation of the methodology used here; https://bugs.archlinux.org/task/20056?project=3

2 1