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

[pacman-dev] [PATCH] makepkg: reduce strictness of pkgver in depends linting
by Eli Schwartz 18 Jul '18

18 Jul '18

This change was introduced to prevent entries like depends=('foo>'). However, it had the unintended side effect of causing a number of working PKGBUILDs to fail to build. This happened when a PKGBUILD defined one variable through calling a "complex" statement within the PKGBUILD's package function (e.g. a function or evaluating in a subshell), then used it to define the package metadata variable. extract_function_variable() cannot execute the package function in order to retrieve this information, so it performs a simple grep + eval instead and in the process misses the contextual awareness of running within the package function. While not catching these "issues" can result in incorrect SRCINFO, the resulting packages are fine. Stop aborting on the common case where the pkgver of a dependency is dynamically set during the package function until the large number of broken PKGBUILDs are fixed, and the restrictions of the PKGBUILD format are documented. "Fixes" FS#58776 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Less extreme alternative to https://lists.archlinux.org/pipermail/pacman-dev/2018-July/022717.html I would like to at least check for and correctly reject the case where the depends contains a non-empty pkgver without utilizing indirection, but is incorrect. scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in index 40cdc65a..e363a039 100644 --- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -46,7 +46,8 @@ lint_depends() { # remove optional epoch in version specifier ver=${depend##$name@(<|>|=|>=|<=)?(+([0-9]):)} lint_one_pkgname depends "$name" || ret=1 - if [[ $ver != $depend ]]; then + # Don't validate empty version because of https://bugs.archlinux.org/task/58776 + if [[ $ver != $depend && -n $ver ]]; then # remove optional pkgrel in version specifier check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 fi -- 2.18.0

1 0

[pacman-dev] [PATCH v2] alpm-hooks.5: include more information on hook files
by Jouke Witteveen 18 Jul '18

18 Jul '18

--- I'm sorry for sending a revision of such a minor patch, but I could not stand having messed up the line lengths. This is a follow-up to my hook sorting patch. The information added is also available in pacman.conf(5), and in pacman(8), but this looks like a good place to repeat it. Regards, - Jouke doc/alpm-hooks.5.asciidoc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/alpm-hooks.5.asciidoc b/doc/alpm-hooks.5.asciidoc index 1d19f96e..e6f1f8e3 100644 --- a/doc/alpm-hooks.5.asciidoc +++ b/doc/alpm-hooks.5.asciidoc @@ -30,9 +30,14 @@ DESCRIPTION libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more -'[Trigger]' section describing which transactions it should be run for. Hook -file names are required to have the suffix ".hook". Hooks are run in -alphabetical order of their file name. +'[Trigger]' section describing which transactions it should be run for. + +Hooks are read from files located in the system hook directory ++{datarootdir}/libalpm/hooks+, and additional custom directories. Additional +directories are specified linkman:pacman.conf[5]. The default additional +directory is +{sysconfdir}/pacman.d/hooks+. Hook file names are required to +have the suffix ".hook". Hooks are run in alphabetical order of their file +name, where the ordering ignores the suffix. TRIGGERS -------- -- 2.18.0

2 1

[pacman-dev] [PATCH] Handle root prefix in overwrite operations
by Allan McRae 18 Jul '18

18 Jul '18

The pacman --overwrite operation currently expects a path without the root prefix specified. This is unexpected, particularly given our conflict error message reports the path with the root prefix included. This patch allows libalpm to overwrite files with the root prefix specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/conflict.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 35946de5..2e87cfa1 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -401,8 +401,12 @@ static alpm_pkg_t *_alpm_find_file_owner(alpm_handle_t *handle, const char *path static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path) { + char rootedpath[PATH_MAX]; + snprintf(rootedpath, PATH_MAX, "%s%s", handle->root, path); + return handle->trans->flags & ALPM_TRANS_FLAG_FORCE - || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0; + || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0 + || _alpm_fnmatch_patterns(handle->overwrite_files, rootedpath) == 0; } /** -- 2.18.0

1 0

[pacman-dev] [PATCH] Revert "Deprecate --root in favour of --sysroot"
by Allan McRae 18 Jul '18

18 Jul '18

The use of --sysroot in the real world has flagged some issues that need addressing. Undeprecate --root for now. This reverts commit a278356f75866f89232e3e6230bbf9fb2dc1893c. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.8.asciidoc | 10 ++++++++++ src/pacman/pacman.c | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index b6f4dd76..66483bcb 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -130,6 +130,16 @@ Options *NOTE*: If specified, this is an absolute path, and the root path is not automatically prepended. +*-r, \--root* <path>:: + Specify an alternative installation root (default is `/`). This should + not be used as a way to install software into `/usr/local` instead of + `/usr`. + *NOTE*: If database path or log file are not specified on either the + command line or in linkman:pacman.conf[5], their default location will + be inside this root path. + *NOTE*: This option is not suitable for performing operations on a mounted + guest system. See '\--sysroot' instead. + *-v, \--verbose*:: Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc. diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe54793e..e0178da8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -211,6 +211,7 @@ static void usage(int op, const char * const myname) } addlist(_(" -b, --dbpath <path> set an alternate database location\n")); + addlist(_(" -r, --root <path> set an alternate installation root\n")); addlist(_(" -v, --verbose be verbose\n")); addlist(_(" --arch <arch> set an alternate architecture\n")); addlist(_(" --sysroot operate on a mounted guest system (root-only)\n")); @@ -449,8 +450,6 @@ static int parsearg_global(int opt) break; case OP_ROOT: case 'r': - pm_printf(ALPM_LOG_WARNING, - _("option --root is deprecated; use --sysroot instead\n")); free(config->rootdir); config->rootdir = strdup(optarg); break; -- 2.18.0

1 0

[pacman-dev] [PATCH] doc: declare what type of comments we support in pacman.conf
by Eli Schwartz 18 Jul '18

18 Jul '18

Ini-style configuration formats are all over the place. So are we, for that matter, as we switched how we treated middle-of-line comments in commit 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 -- namely, they're not comments anymore. This is surprising to users, who report bugs because it used to work, but what's more surprising is that the only "documentation" for the type of comments users can be expected to use, is by guessing from our example pacman.conf and maybe discovering unreliable easter eggs. Fixes FS#58809 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/pacman.conf.5.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index e5fffecf..157e00ee 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -19,6 +19,8 @@ Each section defines a package repository that pacman can use when searching for packages in '\--sync' mode. The exception to this is the options section, which defines global options. +Comments are supported, only by beginning a line with the hash (#) symbol. + Example ------- -- 2.17.1

2 2

[pacman-dev] [PATCH] Remove checking of pkgver in depends entries
by Allan McRae 18 Jul '18

18 Jul '18

This change was introduced to prevent entries like depends=('foo>'). However, it had the unintended side effect of causing a number of working PKGBUILDs to fail to build. This happened when a PKGBUILD defined a variable through calling a "complex" statement within the PKGBUILD (e.g. a function or evaluating in a subshell). While not catching these "issues" can result in incorrect SRCINFO, the resulting packages are fine. Stop aborting on these issues until the large number of broken PKGBUILDs are fix, and the restrictions of the PKGBUILD format are documented. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in index 40cdc65a..6d25a317 100644 --- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -46,10 +46,10 @@ lint_depends() { # remove optional epoch in version specifier ver=${depend##$name@(<|>|=|>=|<=)?(+([0-9]):)} lint_one_pkgname depends "$name" || ret=1 - if [[ $ver != $depend ]]; then - # remove optional pkgrel in version specifier - check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 - fi +# if [[ $ver != $depend ]]; then +# # remove optional pkgrel in version specifier +# check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 +# fi done eval "$shellopts" -- 2.18.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.0-23-gacef70c1
by Allan McRae 18 Jul '18

18 Jul '18

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 acef70c1036e3234fe07f2dd1d105f0f59480baa (commit) via 8b4be66a3006abe209f6f6a8ef13991cfa57fe34 (commit) via 9a8c7154b1b5842a08db27bd3c3a1607fa0c8f0f (commit) via 4fe9adf418467505884dcc6e9a6ae9239c06c5f8 (commit) from 0d6e82d3748653a2b61ea34b940011ef97350768 (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 acef70c1036e3234fe07f2dd1d105f0f59480baa Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 21 15:36:05 2018 +1000 libmakepkg: remove accidentally added file A blank file slipped into libmakepkg in commit 2c94118d. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8b4be66a3006abe209f6f6a8ef13991cfa57fe34 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 21:17:18 2018 -0400 libmakepkg/tidy: fix debug sources not being properly detected sometimes DW_AT_comp_dir is meant to contain the directory in which the compiler was run DW_AT_name contains the source file the compiler was told to use. In the event that DW_AT_name is an absolute path, it is (obviously) not meant to be computed relative to DW_AT_comp_dir. However, we did not handle this correctly, and as a result tried to copy source files using doubled-up filepaths. The correct approach should be to use DW_AT_name on its own, in the event that it is an absolute path. See http://wiki.dwarfstd.org/index.php?title=Best_Practices. This fixes debug package generation for many packages that use absolute paths in their build systems... like CMake. Reported-by: Jagannathan Tiruvallur Eachambadi <jagannathante(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a8c7154b1b5842a08db27bd3c3a1607fa0c8f0f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 19 21:08:28 2018 +1000 Revert "makepkg: use the `declare` builtin when backing up variables to eval" This reverts commit 9e52a36794552b77ecf26f7f34b226d096978f1e. The change to use declare for the split package metadata backup/restore resulted in variables being declared at a local scope. When these variables were unset (mostly noticed with debug packaging) this left the variable at global scope defined. Revert back to the known good state. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fe9adf418467505884dcc6e9a6ae9239c06c5f8 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 19 20:44:14 2018 +1000 PKGBUILD(5): Remove reference to ChangeLog prototype inclusion We do not distribute a ChangeLog prototype, so should not reference it in the man page. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.asciidoc | 6 +++--- scripts/libmakepkg/lint_pkgbuild/3 | 0 scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/makepkg.sh.in | 20 ++++++++++++++++---- 4 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 scripts/libmakepkg/lint_pkgbuild/3 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [RFC PATCH] makepkg: extend the .BUILDINFO for enhanced reproducible support
by Eli Schwartz 18 Jul '18

18 Jul '18

Encode information about the compiler and strip flags used, as these will impact the resulting generated binaries. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- See https://kanboard.archlinux.org/public/task/40/7359bddc6311e0c07c31e421b6b49… for details. I've left out MAKEFLAGS as I'm unsure how this would actually affect the build. Also the various COMPRESS* options I simply don't know what to do with since we periodically add new ones and this results in updating them all over the place. Plus this isn't typically modified anyway and e.g. multithreaded compression tends to not be reproducible between two identical runs regardless, so I'm not sure we should be solving it... scripts/makepkg.sh.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 548feb91..3d6277d1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -680,7 +680,7 @@ write_pkginfo() { write_buildinfo() { msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" - write_kv_pair "format" "1" + write_kv_pair "format" "2" write_kv_pair "pkgname" "$pkgname" write_kv_pair "pkgbase" "$pkgbase" @@ -699,6 +699,13 @@ write_buildinfo() { write_kv_pair "builddir" "${BUILDDIR}" write_kv_pair "buildenv" "${BUILDENV[@]}" write_kv_pair "options" "${OPTIONS[@]}" + write_kv_pair "cppflags" "$CPPFLAGS" + write_kv_pair "cflags" "$CFLAGS" + write_kv_pair "cxxflags" "$CXXFLAGS" + write_kv_pair "ldflags" "$LDFLAGS" + write_kv_pair "strip_binaries" "$STRIP_BINARIES" + write_kv_pair "strip_shared" "$STRIP_SHARED" + write_kv_pair "strip_static" "$STRIP_STATIC" local pkglist=($(run_pacman -Qq)) local pkginfos="$(LC_ALL=C run_pacman -Qi ${pkglist[@]})" -- 2.18.0

3 5

[pacman-dev] [PATCH v2 1/3] configure: bump the minimum version of bash to 4.4
by Eli Schwartz 11 Jul '18

11 Jul '18

This is required in order to use declare -g and ${var@a} Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fb9d18e1..6ba9d737 100644 --- a/configure.ac +++ b/configure.ac @@ -193,18 +193,18 @@ AC_DEFUN([AX_PROG_PERL_VERSION], AX_PROG_PERL_VERSION([5.10.1], [], [AC_MSG_ERROR([perl is too old])]) AS_IF([test "x$BASH_SHELL" = "xfalse"], - AC_MSG_WARN([*** bash >= 4.1.0 is required for pacman scripts]), + AC_MSG_WARN([*** bash >= 4.4.0 is required for pacman scripts]), [bash_version_major=`$BASH_SHELL -c 'echo "${BASH_VERSINFO[[0]]}"'` bash_version_minor=`$BASH_SHELL -c 'echo "${BASH_VERSINFO[[1]]}"'` ok=yes if test "$bash_version_major" -lt 4; then ok=no fi - if test "$bash_version_major" -eq 4 && test "$bash_version_minor" -lt 1; then + if test "$bash_version_major" -eq 4 && test "$bash_version_minor" -lt 4; then ok=no fi if test "$ok" = "no"; then - AC_MSG_ERROR([*** bash >= 4.1.0 is required for pacman scripts]) + AC_MSG_ERROR([*** bash >= 4.4.0 is required for pacman scripts]) fi unset bash_version_major bash_version_minor ok]) -- 2.17.1

3 6

[pacman-dev] Add --nolist option for transactions
by me＠dk0.us 09 Jul '18

09 Jul '18

From: Dmitry Kudriavtsev <me(a)dk0.us> Adds a --nolist option for package transactions. This option removes the list display of packages to be installed or removed. Signed-off-by: Dmitry Kudriavtsev <me(a)dk0.us> --- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 5 +++++ src/pacman/remove.c | 7 +++++-- src/pacman/sync.c | 6 ++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index ababf2e0..1615d974 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,6 +50,7 @@ typedef struct __config_t { unsigned short help; unsigned short noconfirm; unsigned short noprogressbar; + unsigned short nolist; unsigned short logmask; unsigned short print; unsigned short checkspace; @@ -209,7 +210,8 @@ enum { OP_DOWNLOADONLY, OP_REFRESH, OP_ASSUMEINSTALLED, - OP_DISABLEDLTIMEOUT + OP_DISABLEDLTIMEOUT, + OP_NOLIST }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe54793e..18505bf6 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -204,6 +204,7 @@ static void usage(int op, const char * const myname) addlist(_(" --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); + addlist(_(" --nolist do not list packages before performing operation\n")); addlist(_(" -p, --print print the targets instead of performing the operation\n")); addlist(_(" --print-format <string>\n" " specify how the targets should be printed\n")); @@ -652,6 +653,9 @@ static int parsearg_trans(int opt) case OP_ASSUMEINSTALLED: parsearg_util_addlist(&(config->assumeinstalled)); break; + case OP_NOLIST: + config->nolist = 1; + break; default: return 1; } @@ -964,6 +968,7 @@ static int parseargs(int argc, char *argv[]) {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, {"disable-download-timeout", no_argument, 0, OP_DISABLEDLTIMEOUT}, + {"nolist", no_argument, 0, OP_NOLIST}, {0, 0, 0, 0} }; diff --git a/src/pacman/remove.c b/src/pacman/remove.c index a2269ed8..5df45c69 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -164,8 +164,11 @@ int pacman_remove(alpm_list_t *targets) } /* print targets and ask user confirmation */ - display_targets(); - printf("\n"); + if(!config->nolist) { + display_targets(); + printf("\n"); + } + if(yesno(_("Do you want to remove these packages?")) == 0) { retval = 1; goto cleanup; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3c6be89d..1e0c6c91 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -793,8 +793,10 @@ int sync_prepare_execute(void) goto cleanup; } - display_targets(); - printf("\n"); + if(!config->nolist) { + display_targets(); + printf("\n"); + } int confirm; if(config->op_s_downloadonly) { -- 2.18.0

5 7