- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v3 1/5] pacman-conf.c: accept short options
by iff＠escondida.tk 11 Feb '18

11 Feb '18

From: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- As per agregory's request in #archlinux-pacman, this version of the patch leaves the check for '?' well enough alone. '?' is getopt_long(3)'s way of indicating user error, and we can think of default: as indicating options forgotten in development. src/pacman/pacman-conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..3c9a80e2 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -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

2 7

[pacman-dev] [PATCH v2 1/5] pacman-conf.c: accept short options
by iff＠escondida.tk 11 Feb '18

11 Feb '18

From: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- This verion of the patch simply drops the check for '?', since it's caught by "default" anyway. The other patches are unchanged, except where rebased against this modified patch. src/pacman/pacman-conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..0f81ece6 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -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' }, @@ -96,7 +96,6 @@ static void parse_opts(int argc, char **argv) cleanup(); exit(0); break; - case '?': default: usage(1); break; -- 2.16.1

1 4

[pacman-dev] [PATCH 0/5] Miscellaneous pacman-conf tweaks
by iff＠escondida.tk 09 Feb '18

09 Feb '18

From: Ivy Foster <iff(a)escondida.tk> I started fiddling around with pacman-conf today, because I wanted to add short options to it, and then just sort of...kept on for a bit. Oh, I could be wrong, but I think that 'pacman-conf --repo <foo>' pretty much covers [FS#25568][1]. [1]: https://bugs.archlinux.org/task/25568 Ivy Foster (5): pacman-conf: accept short options pacman-conf: simplify usage() pacman-conf: Make myname and myver into cpp macros MYNAME and MYVER pacman-conf: Make cleanup run automagically at exit pacman-conf.c: make parse_opts only parse opts src/pacman/pacman-conf.c | 84 +++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) -- 2.16.1

3 8

[pacman-dev] [PATCH] makepkg --packagelist: just list the built package files we will build
by Eli Schwartz 08 Feb '18

08 Feb '18

Currently this seems to be only theoretically useful. The most likely reason for wanting a packagelist is in order to script makepkg and derive the filenames for the packages we want to install or repo-add, but in the current implementation this requires a lot of additional post-processing which must be duplicated in every utility to wrap makepkg. - It is of minimal use to know what packages might get created on some other device utilizing a different CPU/OS architecture, so don't list them. - It is non-trivial to reimplement makepkg's logic for sourcing any of several makepkg.conf configuration files, then applying environment overrides in order to get the PKGDEST and PKGEXT, so include them directly in the returned filenames. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/pkgbuild.sh.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 2a4bd3af..6cfda0b3 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -149,14 +149,12 @@ print_all_package_names() { local version=$(get_full_version) local architecture pkg opts a for pkg in ${pkgname[@]}; do - get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + architecture=$(get_pkg_arch $pkg) get_pkgbuild_attribute "$pkg" 'options' 1 opts - for a in ${architecture[@]}; do - printf "%s-%s-%s\n" "$pkg" "$version" "$a" - if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then - printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" - fi - done + printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT" + if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" + fi done } -- 2.15.0

2 8

[pacman-dev] [RFC] --sysroot and nsswitch
by Andrew Gregory 27 Jan '18

27 Jan '18

Under glibc, various networking and user/group lookup functions cause /etc/nsswitch.conf to be read. Once it is read, the necessary libs are dynamically loaded. This causes a couple problems for our current chroot-based implementation of --sysroot. First, because we chroot almost immediately, pacman is likely to use the sysroot's nsswitch.conf and related files which may or may not be configured appropriately if they even exist. Second, glibc will try to load the libraries inside the sysroot rather than the host's copies, which may not match pacman's copy of glibc, not exist, or be broken. I've never dealt with NSS before, so maybe I'm missing something, but it doesn't really look like there's a right way for pacman to deal with a sysroot at all. I think that ideally we would use the host's networking configuration and the sysroot's user/group database configuration, but there doesn't appear to be a way to do that within a single process. Does anybody have any ideas for improving this situation before we release --sysroot into the wild? apg

1 0

[pacman-dev] [PATCH v3 1/2] pacman/query.c: in query_fileowner, make is_dir an int
by iff＠escondida.tk 25 Jan '18

25 Jan '18

From: Ivy Foster <iff(a)escondida.tk> S_ISDIR is int and "returns non-zero" if the file is a directory. Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- src/pacman/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 4a37a338..91ca78a7 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -158,8 +158,9 @@ static int query_fileowner(alpm_list_t *targets) char rpath[PATH_MAX], *rel_path; struct stat buf; alpm_list_t *i; - size_t len, is_dir; + size_t len; unsigned int found = 0; + int is_dir; if((filename = strdup(t->data)) == NULL) { goto targcleanup; -- 2.16.1

2 4

[pacman-dev] [PATCH v2 1/2] pacman/query.c: in query_fileowner, make is_dir an int
by iff＠escondida.tk 24 Jan '18

24 Jan '18

From: Ivy Foster <iff(a)escondida.tk> S_ISDIR is int and "returns non-zero" if the file is a directory. Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- I know this is super trivial; I just noticed it while working on the following patch, and didn't want to make an unrelated change in it. src/pacman/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 4a37a338..91ca78a7 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -158,8 +158,9 @@ static int query_fileowner(alpm_list_t *targets) char rpath[PATH_MAX], *rel_path; struct stat buf; alpm_list_t *i; - size_t len, is_dir; + size_t len; unsigned int found = 0; + int is_dir; if((filename = strdup(t->data)) == NULL) { goto targcleanup; -- 2.16.1

1 1

[pacman-dev] RFC: [PATCH] Deprecate --root in favour of --sysroot
by Allan McRae 19 Jan '18

19 Jan '18

The --root option was widely misunderstood, and is now replaced by --sysroot. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The idea of --sysroot was to provide something that --root never quite did. Is there any reason to keep --root? doc/pacman.8.txt | 10 ---------- src/pacman/pacman.c | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 48958358..a395b777 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -133,16 +133,6 @@ 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 8c7f715e..98b3f326 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -211,7 +211,6 @@ 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")); @@ -450,6 +449,8 @@ 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.16.0

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-223-ga7dbe463
by allan＠archlinux.org 19 Jan '18

19 Jan '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 a7dbe4635b4af9b5bd927ec0e7a211d1f6c1b0f2 (commit) via 9058d7fe9aa2bb494d5a6572c167db75d6d02d30 (commit) via d911438352ebec5a887dac02ceb0bb99f54b34fc (commit) via 19dabcc19a476735c4273e7ba4a0a7437d83078f (commit) via b2e088e42cfb5be2ed7247040a50acf92916d1c2 (commit) via d9eda13fc69eb0bfbbab6d7488e99e5c7b033d3a (commit) via 170bb80a1f8a020595738c7febdb15c68574ce29 (commit) via fa745fb4677c3de37aad93b180fe9475179eb7e6 (commit) via 0bbf9ddf9dff45346fb95bc6b6f1db8320551b6a (commit) via e8462a4f88335b200ad0a1c5d96e05a44af7e67c (commit) via 653d2dc86d5340c6854818bdab3dae65bf62d474 (commit) via 4d80d87f9069fba17ebf4d91cdb097b433a57908 (commit) via 2bda849bf9b39b423175d1ee1d8796b856cc9988 (commit) via 59b6fdeee1722a58d1599bcbd1e2c0fc33debc99 (commit) via 24ab8717d459c07c51f47b7b66736de17ca23e9e (commit) from 3a9a510ca873df123a117133c7cb3ebaa711159c (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 a7dbe4635b4af9b5bd927ec0e7a211d1f6c1b0f2 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sat Jan 13 16:43:12 2018 +0100 Add BUILDINFO man page Add a new man page which describes the structure of a BUILDINFO file included in a package produced by makepkg. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9058d7fe9aa2bb494d5a6572c167db75d6d02d30 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Jan 13 23:39:39 2018 -0500 pacman-key: do not set a default keyserver Recent versions of GnuPG are perfectly capable of using sane defaults, and the default SKS keyserver over hkps:// is better than hardcoding the same keyserver over hkp:// anyway. Fixes FS#55278 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d911438352ebec5a887dac02ceb0bb99f54b34fc Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 14 00:11:08 2018 -0500 vercmp: fail when the wrong number of arguments are provided Fixes FS#49093 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19dabcc19a476735c4273e7ba4a0a7437d83078f Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Jan 13 23:52:38 2018 -0500 Fix usage of install_package In commit ab2be5794de8a57426ec3fc0f631cc766a0b8227 return codes were implemented, and the output of install_package was improperly assigned to a variable when the return code was wanted. All we need to do is restore the previous exit handling, but return $? instead of hardcoding "0". Reported-by: xftroxgpx <xftroxgpx(a)protonmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b2e088e42cfb5be2ed7247040a50acf92916d1c2 Author: Joel Teichroeb <joel(a)teichroeb.net> Date: Mon Jan 15 13:15:23 2018 -0800 use pacman-conf in bash completion Signed-off-by: Joel Teichroeb <joel(a)teichroeb.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d9eda13fc69eb0bfbbab6d7488e99e5c7b033d3a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jan 13 11:50:00 2018 -0500 use pacman-conf in scripts Because parsing pacman.conf is so difficult that even we can't do it right. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 170bb80a1f8a020595738c7febdb15c68574ce29 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jan 13 11:49:59 2018 -0500 add pacman-conf utility Parsing pacman's configuration file is non-trivial and extremely difficult to do correctly from scripts; even our own do it incorrectly. pacman-conf is a dedicated tool specifically to allow scripts to parse config files, getting the same value that pacman itself would use. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa745fb4677c3de37aad93b180fe9475179eb7e6 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jan 13 11:49:58 2018 -0500 extract default settings to separate function Default values for configuration settings were being set during alpm setup and in some cases were never saved back to the original config struct. Refactoring all default settings into a separate function and saving them onto the original config struct will allow pacman-conf to resolve the defaults without having to setup alpm. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0bbf9ddf9dff45346fb95bc6b6f1db8320551b6a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jan 13 11:49:57 2018 -0500 extract raw config file parser To allow pacman-conf to parse the configuration file without having to also setup alpm. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8462a4f88335b200ad0a1c5d96e05a44af7e67c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 10 18:18:34 2018 +1000 Support new OpenPGP format packets lengths RFC 4880 defines two packet formats for OpenPGP. Pacman aborted its key in keyring check with an error message if it encountered the new format. This was fine until some annoying Arch Trusted User generated a key using the new format! Implement the new format. This also required parsing the hashed sub packets. requiring the parsing code to moved to its own function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 653d2dc86d5340c6854818bdab3dae65bf62d474 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 9 12:50:37 2018 +1000 Fix moving source files into debug packages Commit 8bec63bf92d8dd028aa88dbd5109c314cdb9ebea attempted to switch to using -fdebug-prefix-map to set file locations in debug packages. It make a few mistakes... 1) Adding debug C{,XX}FLAGS only worked if DBGSRCDIR was defined in makepkg.conf. Fix this by falling back to the default value. 2) Using -fdebug-prefix-map altered a lot of assumptions about file locations when copying source files into debug packages. This resulted in lots of messages of failed cp in packaging output. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d80d87f9069fba17ebf4d91cdb097b433a57908 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Jan 7 19:30:41 2018 -0500 add missing newline to debug message Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2bda849bf9b39b423175d1ee1d8796b856cc9988 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Jan 7 19:30:42 2018 -0500 detect pkghash allocation failure If rehash ever failed with a full hash it would return the old hash that is already full. get_hash_position would then loop forever because it would never find an empty bucket. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 59b6fdeee1722a58d1599bcbd1e2c0fc33debc99 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 9 22:00:46 2018 +1000 Do not continuously try to open an invalid database If you manage to download a bad database (e.g. an html file when behind a proxy or with a badly configured webserver), pacman makes sure you know about it. Here is some example output: error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format I don't know how many times that gets printed because it goes beyond my scrollback buffer. Flag a database that we can "open" and "fstat" but not read from as invalid to avoid this. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24ab8717d459c07c51f47b7b66736de17ca23e9e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 9 20:48:35 2018 +1000 Handle empty string passed to query_owner Passing an empty string to pacman -Qo results in: error: No package owns <first directory in $PATH> Catch empty strings and report an error. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/BUILDINFO.5.txt | 67 ++++++ doc/Makefile.am | 4 +- lib/libalpm/be_local.c | 5 +- lib/libalpm/be_sync.c | 9 +- lib/libalpm/db.c | 5 +- lib/libalpm/pkghash.c | 23 +- lib/libalpm/pkghash.h | 4 +- lib/libalpm/signing.c | 178 ++++++++------ scripts/completion/bash_completion.in | 6 +- scripts/completion/zsh_completion.in | 4 +- scripts/libmakepkg/tidy/strip.sh.in | 9 +- scripts/makepkg.sh.in | 14 +- scripts/pacman-db-upgrade.sh.in | 21 +- scripts/pacman-key.sh.in | 6 +- src/pacman/.gitignore | 2 + src/pacman/Makefile.am | 17 +- src/pacman/conf.c | 179 +++++++------- src/pacman/conf.h | 2 + src/pacman/pacman-conf.c | 437 ++++++++++++++++++++++++++++++++++ src/pacman/query.c | 5 + src/util/vercmp.c | 13 +- 21 files changed, 793 insertions(+), 217 deletions(-) create mode 100644 doc/BUILDINFO.5.txt create mode 100644 src/pacman/pacman-conf.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/1] Add a BUILDINFO man page
by Jelle van der Waa 19 Jan '18

19 Jan '18

While working on the reprodcible build project I found it handy to have some resources about the contents of the BUILDINFO file. This patch adds a man page about the structure of the BUILDINFO file, I've based it on the PKGBUILD man page. If this patch is accepted, I'll be motivated to add one for PKGINFO as well. Jelle van der Waa (1): Add BUILDINFO man page doc/BUILDINFO.5.txt | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/Makefile.am | 4 +++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 doc/BUILDINFO.5.txt -- 2.15.1

3 10