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

[pacman-dev] [PATCH 1/2] meson: fix website target
by Eli Schwartz 16 Jan '19

16 Jan '19

A number of pages don't actually exist as html inside the source tree, and need to be generated even though they are manpages. This caused the website.tar.gz target to only work inside a dirty tree initially created by autotools. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/meson.build | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 7c9631cb..4d796492 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -14,6 +14,13 @@ manpages = [ { 'name': 'BUILDINFO.5' }, ] +sitepages = [ + { 'name': 'submitting-patches' }, + { 'name': 'translation-help' }, + { 'name': 'HACKING', 'source': join_paths(meson.current_source_dir(), '../HACKING') }, + { 'name': 'index' }, +] + asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ @@ -58,6 +65,12 @@ foreach page : manpages install : true, install_dir : mandirn, ) +endforeach + +foreach page: manpages + sitepages + manpage = page['name'] + htmlpage = '@0@.html'.format(manpage) + input = page.get('source', '@0@.asciidoc'.format(manpage)) html = custom_target( htmlpage, @@ -85,6 +98,8 @@ foreach page : manpages html_files += [htmlpage] endforeach + + run_target('html', command : ['/bin/true'], depends : html_targets) @@ -96,10 +111,6 @@ custom_target( '-C', meson.current_build_dir(), ] + html_files + [ '-C', meson.current_source_dir(), - 'submitting-patches.html', - 'translation-help.html', - 'HACKING.html', - 'index.html', 'asciidoc-override.css', '-C', '/etc/asciidoc/stylesheets/', 'asciidoc.css', -- 2.20.1

3 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-115-g10bcf66d
by Allan McRae 14 Jan '19

14 Jan '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 10bcf66db8dffbadd6f051acba3b543693819eff (commit) via 02598521b1e6a2bffd0dc0917052a40b4a247f0e (commit) via a769fbfd402b149e4fee5ce65b26bae8c56b5d43 (commit) via b76dbb1159fb5d55bc0fd085bae0b5d3bc8dd1d8 (commit) from ce040514c4ed79f3053a104242cde90af471041a (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 10bcf66db8dffbadd6f051acba3b543693819eff Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 22:29:23 2019 -0500 update a bunch of links for https and to adapt to changing domains projects.archlinux.org and mailman.archlinux.org are both migrated to new domains. Transifex supports https, so encourage its use by default. Take advantage of the opportunity when updating these links, to also delist some projects that are dead. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 02598521b1e6a2bffd0dc0917052a40b4a247f0e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 11:57:44 2019 -0500 doc: add a couple missing manpages from the html index The index embeds the names of all doc subpages, and these were never updated. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a769fbfd402b149e4fee5ce65b26bae8c56b5d43 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Jan 12 20:22:27 2019 -0500 doc: keep manpages and html pages in sync We forgot to add BUILDINFO to the list of html docs. Instead of always updating things in two places, just derive the one from the other. meson did not have this problem as it already derives both lists from one template. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b76dbb1159fb5d55bc0fd085bae0b5d3bc8dd1d8 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 21:18:40 2019 -0500 meson: fix regression that broke building libmakepkg In commit f7efa6a93d5361af610827d41045d87c7a72f2b5 we added a new file, and also wired it up to the build systems, but it got added under the wrong name in meson.build Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 14 +------------- doc/index.asciidoc | 24 ++++++++++++------------ doc/submitting-patches.asciidoc | 2 +- doc/translation-help.asciidoc | 8 ++++---- scripts/libmakepkg/lint_pkgbuild/meson.build | 2 +- 5 files changed, 19 insertions(+), 31 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] update a bunch of links for https and to adapt to changing domains
by Eli Schwartz 14 Jan '19

14 Jan '19

projects.archlinux.org and mailman.archlinux.org are both migrated to new domains. Transifex supports https, so encourage its use by default. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/index.asciidoc | 24 ++++++++++++------------ doc/submitting-patches.asciidoc | 2 +- doc/translation-help.asciidoc | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/index.asciidoc b/doc/index.asciidoc index fa7444db..6d3273ed 100644 --- a/doc/index.asciidoc +++ b/doc/index.asciidoc @@ -59,11 +59,11 @@ configuration files dealing with pacman. Changelog ~~~~~~~~~ For a good idea of what is going on in pacman development, take a look at the -link:https://projects.archlinux.org/pacman.git/[Git summary page] for the +link:https://git.archlinux.org/pacman.git/[Git summary page] for the project. See the most recent -link:https://projects.archlinux.org/pacman.git/tree/NEWS[NEWS] +link:https://git.archlinux.org/pacman.git/tree/NEWS[NEWS] file for a not-as-frequently-updated list of changes. However, this should contain the biggest changes in a format more concise than the commit log. @@ -203,8 +203,8 @@ Development Mailing List ~~~~~~~~~~~~ There is a mailing list devoted to pacman development, hosted by Arch Linux. -link:https://mailman.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or -link:https://mailman.archlinux.org/pipermail/pacman-dev/[view the archives]. +link:https://lists.archlinux.org/listinfo/pacman-dev/[Subscribe] or +link:https://lists.archlinux.org/pipermail/pacman-dev/[view the archives]. Source Code ~~~~~~~~~~~ @@ -215,11 +215,11 @@ these trees). The current development tree can be fetched with the following command: - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://git.archlinux.org/pacman.git pacman which will fetch the full development history into a directory named pacman. You can browse the source as well using -link:https://projects.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also +link:https://git.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also available for cloning purposes; these URLs are listed at the above page. If you are interested in hacking on pacman, it is highly recommended you join @@ -238,15 +238,15 @@ Although the package manager itself is quite simple, many scripts have been developed that help automate building and installing packages. These are used extensively in link:https://www.archlinux.org/[Arch Linux]. Most of these utilities are available in the Arch Linux projects -link:https://projects.archlinux.org/[code browser]. +link:https://git.archlinux.org/[code browser]. Utilities available: -* link:https://projects.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download & use the Arch Linux PKGBUILD tree -* link:https://projects.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories -* link:https://projects.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking -* link:https://projects.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python -* link:https://projects.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper +* link:https://git.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download & use the Arch Linux PKGBUILD tree +* link:https://git.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories +* link:https://git.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking +* link:https://git.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python +* link:https://git.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper Bugs ---- diff --git a/doc/submitting-patches.asciidoc b/doc/submitting-patches.asciidoc index 9cf8dc64..88b58ca5 100644 --- a/doc/submitting-patches.asciidoc +++ b/doc/submitting-patches.asciidoc @@ -20,7 +20,7 @@ started with GIT if you have not worked with it before. The pacman code can be fetched using the following command: - git clone git://projects.archlinux.org/pacman.git + git clone git://git.archlinux.org/pacman.git Creating your patch diff --git a/doc/translation-help.asciidoc b/doc/translation-help.asciidoc index 67117bcc..5a67a2d6 100644 --- a/doc/translation-help.asciidoc +++ b/doc/translation-help.asciidoc @@ -4,10 +4,10 @@ Pacman - Translating This document is here to guide you in helping translate pacman messages, libalpm messages, and the manual pages for the entire pacman package. -We are currently using http://www.transifex.com/[Transifex] as the translation +We are currently using https://www.transifex.com/[Transifex] as the translation platform for pacman and libalpm. You will need to sign up for an account there and then register with a translation team on the -http://www.transifex.com/projects/p/archlinux-pacman/[pacman project page]. +https://www.transifex.com/projects/p/archlinux-pacman/[pacman project page]. NOTE: This may be old information due to our switch to Transifex, but the gettext website is a very useful guide to read before embarking on translation @@ -31,7 +31,7 @@ either be hand-edited, or modified with a tool such as poedit, gtranslator or kbabel. Using a translation tool tends to make the job easier. Please read up on Transifex usage using the -http://docs.transifex.com/[Transifex Help] if you are not familiar. +https://docs.transifex.com/[Transifex Help] if you are not familiar. Transifex provides a command-line client to help with translations. Here is an example set of commands if you have a source code checkout and are not @@ -78,7 +78,7 @@ Incremental Updates If you have more advanced needs you will have to get a copy of the pacman repository. - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://git.archlinux.org/pacman.git pacman Next, you will need to run `./autogen.sh` and `./configure` in the base directory to generate the correct Makefiles. At this point, all necessary -- 2.20.1

2 3

[pacman-dev] [PATCH] meson: fix regression that broke building libmakepkg
by Eli Schwartz 14 Jan '19

14 Jan '19

In commit f7efa6a93d5361af610827d41045d87c7a72f2b5 we added a new file, and also wired it up to the build systems, but it got added under the wrong name in meson.build Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- allanbrokeit when updating the pre-meson patch for meson. :p scripts/libmakepkg/lint_pkgbuild/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/meson.build b/scripts/libmakepkg/lint_pkgbuild/meson.build index 220f6a25..4ca414e4 100644 --- a/scripts/libmakepkg/lint_pkgbuild/meson.build +++ b/scripts/libmakepkg/lint_pkgbuild/meson.build @@ -8,7 +8,7 @@ sources = [ 'conflicts.sh.in', 'depends.sh.in', 'epoch.sh.in', - 'fullversion.sh.in', + 'fullpkgver.sh.in', 'install.sh.in', 'makedepends.sh.in', 'optdepends.sh.in', -- 2.20.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-111-gce040514
by Allan McRae 14 Jan '19

14 Jan '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 ce040514c4ed79f3053a104242cde90af471041a (commit) via 5d2f7ee6c376e59ccbd8b6f9a5355cac358f0e84 (commit) via 031611ff40bb85e493453913ae808116fa92c3cc (commit) via 10fe71e5f3ed5cff52166e78ca063baf8d1c1b83 (commit) via aa284c97f1fdef7d43a523387533ad3981627504 (commit) via f7efa6a93d5361af610827d41045d87c7a72f2b5 (commit) via 30e3e21e873b01b98ab91dc1252d4112d6a9fd2a (commit) via 03d85763e08cbe7c5ef1f9863cf25e026ee2756f (commit) via e9d91a688d1a2ebe58e8a895853debf745a529cf (commit) via 9b2a90cfb1910b5092ffec3375177229101323e4 (commit) from 9b637cc27aba561e5270862a1a3eb515e4f3f744 (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 ce040514c4ed79f3053a104242cde90af471041a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:58:44 2019 -0500 makepkg: return E_PKGBUILD_ERROR for nonexistent PKGBUILD This is not really an error with a "user function". Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d2f7ee6c376e59ccbd8b6f9a5355cac358f0e84 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:58:42 2019 -0500 libmakepkg: simplify splitting command output into array Use mapfile instead of hacking around read -a with the $IFS. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 031611ff40bb85e493453913ae808116fa92c3cc Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:58:41 2019 -0500 libmakepkg: add routine for linting $SOURCE_DATE_EPOCH This can only ever be an int, and the specification states that a malformed timestamp should be considered a fatal error. https://reproducible-builds.org/specs/source-date-epoch/ Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 10fe71e5f3ed5cff52166e78ca063baf8d1c1b83 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:54:33 2019 -0500 makepkg: fix unguarded use of printf paths can contain printf-unsafe chars, and printf -v is not somehow immune to this Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa284c97f1fdef7d43a523387533ad3981627504 Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Thu Aug 9 13:41:13 2018 -0400 makepkg: check_pkgrel: Don't say "decimal" in the error message If you have a malformed pkgrel, the error message says that it must be a "decimal". That isn't quite true, as that would mean that `1.1 == 1.10`. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f7efa6a93d5361af610827d41045d87c7a72f2b5 Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Thu Aug 9 13:41:12 2018 -0400 makepkg: Better error messages for versions in (check, make, opt)depends/provides/conflicts Given the depends depends=('foo>=1.2-1.par2') and the error message ==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace. One would be lead to believe that the problem is that they gave a pkgrel in depends at all, not that the pkgrel contains letters. Each of the (check,make,opt)depends, conflicts, and provides linters use a glob to trim off properly formed epoch an rel from the full version string, and pass the remainder to check_pkgver(). This does a good job of accepting/rejecting full versions, but doesn't do a good job of generating good error messages when rejecting if it's because of the epoch or rel. 1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and lint_pkgrel(), similarly to check_pkgver(). 2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and splits it in to epoch/ver/rel, and calls the appropriate check_ function on each. 3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and provides linters. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 30e3e21e873b01b98ab91dc1252d4112d6a9fd2a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 21:17:17 2018 -0400 libmakepkg/lint_pkgbuild: check for invalid variables even if they're empty Checking the length of the variable to be non-zero before considering it an error is inconsistent; license=() and depends='' and `declare arch` should be considered just as wrong. In fact the current check detects depends='' as non-zero and returns an error, but happily considers the others to be perfectly okay. A more reliable check is to simply see if the name has been declared (whether it is set or not), and then enforce that it's been declared to the right type. As an added benefit, avoiding the creation of proxy-evaled variables to count the number of indexes results in simpler code. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03d85763e08cbe7c5ef1f9863cf25e026ee2756f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 13:52:58 2019 +1000 Add [ignored] to -Qu output for packages in repos that are not Usage = Upgrade List all available updates in -Qu output, but include [ignored] beside those that will not be updated in a -Su operation due to thier repo Usage value (in addition to those that are Ignored). Fixes FS#59854. The following people provided initial patches to print [ignored] on -Qu operations, which highlighted a larger problem to be fixed first: With-thanks-to: morganamilo <morganamilo(a)gmail.com> With-thanks-to: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9d91a688d1a2ebe58e8a895853debf745a529cf Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 13:44:32 2019 +1000 libalpm/sync.c: change alpm_sync_newversion() to alpm_sync_get_new_version() The behaviour of "pacman -Qu" was very strange... It would only consider packages from repos with Usage = Search (or All), and ignore those with Usage = Sync, Install or Upgrade. This is because the function alpm_sync_newversion() used ALPM_DB_USAGE_SEARCH for its filtering. Given this function is documented (at least in the source) to "Check for new version of pkg in sync repos", I would expect that to look at all repos. However, just changing this parameter, would result in a fairly silent change in behaviour of this function. Instead, rename the function and remove this filtering altogether. Users of this function can filter the dbs passed to this function to achieve their desired output. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9b2a90cfb1910b5092ffec3375177229101323e4 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 12:47:01 2019 +1000 Add -fstack-clash-protection to CFLAGS in debug builds if available Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 6 +-- m4/acinclude.m4 | 19 +++++++ scripts/Makefile.am | 2 + scripts/libmakepkg/executable/checksum.sh.in | 2 +- scripts/libmakepkg/lint_config/meson.build | 1 + .../source_date_epoch.sh.in} | 28 ++++------- .../libmakepkg/lint_pkgbuild/checkdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 14 +++--- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 10 +++- scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 58 ++++++++++++++++++++++ scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/meson.build | 1 + scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 15 ++++-- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 16 +++--- scripts/makepkg.sh.in | 4 +- src/pacman/query.c | 10 ++-- 21 files changed, 156 insertions(+), 83 deletions(-) copy scripts/libmakepkg/{executable.sh.in => lint_config/source_date_epoch.sh.in} (64%) mode change 100644 => 100755 create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] doc: add a couple missing manpages from the html index
by Eli Schwartz 13 Jan '19

13 Jan '19

The index embeds the names of all doc subpages, and these were never updated. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/index.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/index.asciidoc b/doc/index.asciidoc index c9e5bcc1..fa7444db 100644 --- a/doc/index.asciidoc +++ b/doc/index.asciidoc @@ -43,9 +43,11 @@ There are several man pages available for the programs, utilities, and configuration files dealing with pacman. * linkman:alpm-hooks[5] +* linkman:BUILDINFO[5] * linkman:PKGBUILD[5] * linkman:libalpm[3] * linkman:makepkg[8] +* linkman:makepkg-template[1] * linkman:makepkg.conf[5] * linkman:pacman[8] * linkman:pacman-key[8] -- 2.20.1

1 0

[pacman-dev] [PATCH] doc: keep manpages and html pages in sync
by Eli Schwartz 13 Jan '19

13 Jan '19

We forgot to add BUILDINFO to the list of html docs. Instead of always updating things in two places, just derive the one from the other. meson did not have this problem as it already derives both lists from one template. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/Makefile.am | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 4bb0f01b..de87c409 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -20,19 +20,7 @@ MANPAGES = \ DOXYGEN_MANS = $(wildcard man3/*.3) -HTML_MANPAGES = \ - alpm-hooks.5.html \ - pacman.8.html \ - makepkg.8.html \ - makepkg-template.1.html \ - repo-add.8.html \ - vercmp.8.html \ - pkgdelta.8.html \ - pacman-key.8.html \ - PKGBUILD.5.html \ - makepkg.conf.5.html \ - pacman.conf.5.html \ - libalpm.3.html +HTML_MANPAGES = $(addsuffix .html,$(MANPAGES)) HTML_OTHER = \ index.html \ -- 2.20.1

1 0

[pacman-dev] [PATCH v2 0/3] makepkg: Improve lint_pkgbuild error messages for epoch/ver/rel
by Luke Shumaker 10 Jan '19

10 Jan '19

From: Luke Shumaker <lukeshu(a)parabola.nu> The error messages that makepkg prints when encountering a bad epoch/pkgver/pkgrel are often somewhat misleading. These patchset tries to improve that. The behavior is intended to be unchanged, other than what the messages say. v2: - Don't skip lint_pkgrel if (( PKGVERFUNC )), I should have never included that bit in v1. - check_fullpkgver: Don't let rel strip ver down to nothing Luke Shumaker (3): makepkg: Better error messages for versions in (check,make,opt)depends/provides/conflicts makepkg: check_pkgrel: Don't say "decimal" in the error message makepkg: check_pkgver: Report what the bad pkgver is scripts/Makefile.am | 1 + .../lint_pkgbuild/checkdepends.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/depends.sh.in | 14 ++--- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 10 +++- .../libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 58 +++++++++++++++++++ .../lint_pkgbuild/makedepends.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 15 +++-- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- .../libmakepkg/lint_pkgbuild/provides.sh.in | 10 ++-- 11 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in -- Happy hacking, ~ Luke Shumaker 2.18.0

2 6

[pacman-dev] [PATCH] makepkg: fix unguarded use of printf
by Eli Schwartz 10 Jan '19

10 Jan '19

paths can contain printf-unsafe chars, and printf -v is not somehow immune to this 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 56642b11..a040d384 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1142,7 +1142,7 @@ fi # canonicalize paths and provide defaults if anything is still undefined for var in PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR; do - printf -v "$var" "$(canonicalize_path "${!var:-$startdir}")" + printf -v "$var" '%s' "$(canonicalize_path "${!var:-$startdir}")" done unset var PACKAGER=${PACKAGER:-"Unknown Packager"} -- 2.20.1

1 0

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: check for invalid variables even if they're empty
by Eli Schwartz 10 Jan '19

10 Jan '19

Checking the length of the variable to be non-zero before considering it an error is inconsistent; license=() and depends='' and `declare arch` should be considered just as wrong. In fact the current check detects depends='' as non-zero and returns an error, but happily considers the others to be perfectly okay. A more reliable check is to simply see if the name has been declared (whether it is set or not), and then enforce that it's been declared to the right type. As an added benefit, avoiding the creation of proxy-evaled variables to count the number of indexes results in simpler code. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 3266cb5e..52bb61a9 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -37,12 +37,11 @@ lint_variable() { replaces sha1sums sha256sums sha384sums sha512sums source) local string=(changelog epoch install pkgdesc pkgrel pkgver url) - local i a v pkg keys out bad ret=0 + local i a pkg out bad ret=0 # global variables for i in ${array[@]} ${arch_array[@]}; do - eval "keys=(\"\${!$i[@]}\")" - if (( ${#keys[*]} > 0 )); then + if declare -p $i > /dev/null 2>&1; then if ! is_array $i; then error "$(gettext "%s should be an array")" "$i" ret=1 @@ -54,11 +53,9 @@ lint_variable() { [[ $a == "any" ]] && continue for i in ${arch_array[@]}; do - v="${i}_${a}" - eval "keys=(\"\${!${v}[@]}\")" - if (( ${#keys[*]} > 0 )); then - if ! is_array $v; then - error "$(gettext "%s_%s should be an array")" "$i" "$a" + if declare -p "${i}_${a}" > /dev/null 2>&1; then + if ! is_array ${i}_${a}; then + error "$(gettext "%s should be an array")" "${i}_${a}" ret=1 fi fi @@ -66,8 +63,7 @@ lint_variable() { done for i in ${string[@]}; do - eval "keys=(\"\${!$i[@]}\")" - if (( ${#keys[*]} > 0 )); then + if declare -p "$i" > /dev/null 2>&1; then if is_array $i; then error "$(gettext "%s should not be an array")" "$i" ret=1 -- 2.17.1

2 1