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

[pacman-dev] [PATCH] pacman/pacman-conf: -i/--is-set switch, returns 0 if option set
by Matthew Sexton 07 Oct '19

07 Oct '19

Returns 1 if option not set. Returns 1 with error to stderr if flag does not exist. Case insensitive. Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> --- src/pacman/pacman-conf.c | 44 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index efc62cdd..ada4bd9f 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -25,7 +25,7 @@ const char *myname = "pacman-conf", *myver = "1.0.0"; alpm_list_t *directives = NULL; -char sep = '\n', *repo_name = NULL; +char sep = '\n', *repo_name = NULL, *check_name = NULL; const char *config_file = NULL; int repo_list = 0, verbose = 0; @@ -47,6 +47,7 @@ static void usage(int ret) fputs(_(" -r, --repo=<remote> query options for a specific repo\n"), stream); fputs(_(" -v, --verbose always show directive names\n"), stream); fputs(_(" -l, --repo-list list configured repositories\n"), stream); + fputs(_(" -i, --is-set returns 0 (successful) if config flag is set\n"), stream); fputs(_(" -h, --help display this help information\n"), stream); fputs(_(" -V, --version display version information\n"), stream); cleanup(); @@ -58,7 +59,7 @@ static void parse_opts(int argc, char **argv) int c; config_file = CONFFILE; - const char *short_opts = "c:hlR:r:Vv"; + const char *short_opts = "c:h:i:lR:r:Vv"; struct option long_opts[] = { { "config" , required_argument , NULL , 'c' }, { "rootdir" , required_argument , NULL , 'R' }, @@ -67,6 +68,7 @@ static void parse_opts(int argc, char **argv) { "verbose" , no_argument , NULL , 'v' }, { "help" , no_argument , NULL , 'h' }, { "version" , no_argument , NULL , 'V' }, + { "is-set" , required_argument , NULL , 'i' }, { 0, 0, 0, 0 }, }; @@ -99,6 +101,9 @@ static void parse_opts(int argc, char **argv) cleanup(); exit(0); break; + case 'i': + check_name = optarg; + break; case '?': default: usage(1); @@ -391,6 +396,39 @@ static int list_directives(void) return ret; } +static int check_config_flags( void ) +{ + /* 1 = flag-not-set. Regardless of whether flag exists or not */ + int ret = 1; + short value; + + if (strcasecmp(check_name, "Color") == 0) { + value = config->color; + } else if (strcasecmp(check_name, "UseSyslog") == 0) { + value = config->usesyslog; + } else if (strcasecmp(check_name, "TotalDownload") == 0) { + value = config->totaldownload; + } else if (strcasecmp(check_name, "CheckSpace") == 0) { + value = config->checkspace; + } else if (strcasecmp(check_name, "VerbosePkgLists") == 0) { + value = config->verbosepkglists; + } else if (strcasecmp(check_name, "DisableDownloadTimeout") == 0) { + value = config->disable_dl_timeout; + } else if (strcasecmp(check_name, "ILoveCandy") == 0) { + value = config->chomp; + } else { + value = -1; + } + + if (value == -1) { + fprintf(stderr, _("error: unknown config option '%s'\n"), check_name); + ret = 1; + } else { + ret = !value; + } + return ret; +} + int main(int argc, char **argv) { int ret = 0; @@ -427,6 +465,8 @@ int main(int argc, char **argv) list_repos(); } else if(repo_name) { ret = list_repo_directives(); + } else if (check_name) { + ret = check_config_flags(); } else { ret = list_directives(); } -- 2.23.0

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-221-g8f89e509
by Allan McRae 07 Oct '19

07 Oct '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 8f89e509d2f3d369cb5adb30dd85713ff1c5305c (commit) via f2442bc2e9d41a68b9965c272794600836c36b8b (commit) via 0a295f3f396b990e03ab8faec37566de85c99fec (commit) via 0e3a4bd1fbb740b6bfce2ceb3e6acdfe84a4d486 (commit) via facd9533b002194e58cc47672ce7e23d40968e96 (commit) via c0da1ba13a22f099936f60a0d2a752c9ab739ae0 (commit) from de6249ce221aae4062ea131d4f676f7e3d44af28 (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 8f89e509d2f3d369cb5adb30dd85713ff1c5305c Author: morganamilo <morganamilo(a)gmail.com> Date: Sun Sep 8 22:45:29 2019 +0100 pacman: speed up deptest Try and find an exact match via pkgcache before iterating the entire localdb. Gives a noticeable speed up for exact matches e.g. `pacman -T zlib` Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f2442bc2e9d41a68b9965c272794600836c36b8b Author: morganamilo <morganamilo(a)gmail.com> Date: Sun Sep 8 22:45:28 2019 +0100 libalpm: short circuit alpm_find_dbs_satisfier when a satisfying package is already installed, we always pick it instead of prompting the user. So we can return that package as soon as we find it, instead of waiting until we've iterated through all the databases. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0a295f3f396b990e03ab8faec37566de85c99fec Author: morganamilo <morganamilo(a)gmail.com> Date: Sun Sep 8 22:45:26 2019 +0100 libalpm: fix incorrect documentation Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e3a4bd1fbb740b6bfce2ceb3e6acdfe84a4d486 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Oct 2 03:20:13 2019 -0400 meson: work around broken pkg-config file with private requires In addition to the general issue of staticlibs linkage, linking a static lib to a library() does not seem to generate the needed Libs.private. Rework how we handle this entirely. Instead of relying on convenience libraries, we will *sigh* go extract a boatload of .o files again, then relink those to the installable libalpm, while mentioning our dependencies again. We still have our guaranteed static library for linking arbitrary programs with (e.g. vercmp), and we still only generate one identical copy of the .o files, but now we potentially `ar` it up twice, which isn't so bad. And linking still works, and pkg-config files also still work. One alternative would be to explicitly list our dependencies to pkgconfig.generate with requires_private, but since gpgme might be an elevated config-tool dependency, this can fail with: meson.build:341:10: ERROR: requires argument not a string, library with pkgconfig-generated file or pkgconfig-dependency object, got <GpgmeDependency gpgme: True> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit facd9533b002194e58cc47672ce7e23d40968e96 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Sep 18 23:46:58 2019 -0400 meson: fix incorrect libalpm version LIB_VERSION is supposed to be something like 11.0.1, not simply reiterate the project version. As a result, we ended up with this: $ pacman -V [...] Pacman v5.1.0 - libalpm v5.1.0 [...] Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c0da1ba13a22f099936f60a0d2a752c9ab739ae0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Sep 18 23:44:57 2019 -0400 meson: fix libcommon being publicly exposed as a static link dependency libcommon isn't even installed, so that means libalpm.a (if installed) is fatally broken as it misses objects. The problem is that meson doesn't handle this case correctly: https://github.com/mesonbuild/meson/issues/3934 https://github.com/mesonbuild/meson/issues/3937 https://github.com/mesonbuild/meson/pull/3939 Work around this by manually extracting libcommon's .o files into the list of objects used to create libalpm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/deps.c | 27 ++++++++++++++------------- meson.build | 28 +++++++++++++--------------- src/pacman/deptest.c | 4 +++- 3 files changed, 30 insertions(+), 29 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] libalpm: fix incorrect documentation
by morganamilo 07 Oct '19

07 Oct '19

--- lib/libalpm/deps.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 71185c68..ce7869c3 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -643,10 +643,9 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t **targs, int include_explicit) * @param dep is the dependency to search for * @param dbs are the databases to search * @param excluding are the packages to exclude from the search - * @param prompt if true, will cause an unresolvable dependency to issue an - * interactive prompt asking whether the package should be removed from - * the transaction or the transaction aborted; if false, simply returns - * an error code without prompting + * @param prompt if true, ask an alpm_question_install_ignorepkg_t to decide + * if ignored packages should be installed; if false, skip ignored + * packages. * @return the resolved package **/ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, @@ -766,8 +765,11 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /** Find a package satisfying a specified dependency. * First look for a literal, going through each db one by one. Then look for - * providers. The first satisfier found is returned. + * providers. The first satisfier that belongs to an installed package is + * returned. If no providers belong to an installed package then an + * alpm_question_select_provider_t is created to select the provider. * The dependency can include versions with depmod operators. + * * @param handle the context handle * @param dbs an alpm_list_t* of alpm_db_t where the satisfier will be searched * @param depstring package or provision name, versioned or not -- 2.23.0

3 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-215-gde6249ce
by Allan McRae 07 Oct '19

07 Oct '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 de6249ce221aae4062ea131d4f676f7e3d44af28 (commit) from 2a792ac7bb1ceda42767c696e2664819b47ffc3b (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 de6249ce221aae4062ea131d4f676f7e3d44af28 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Aug 11 23:46:25 2019 -0400 Support file with seccomp enabled Not all compression types can be detected in the seccomp sandbox, so we need to disable it. This requires either configuring makepkg to know the sandbox is available, or checking for file >= 5.38 in which the sandbox option is a no-op even when seccomp is disabled. - Requires autoconf-archive for autotools version compare macro. - meson version comparison could be made a lot simpler using meson-git. Fixes FS#58626 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: RELEASE | 1 + build-aux/edit-script.sh.in | 1 + configure.ac | 19 +++++++++++++++++++ meson.build | 10 ++++++++++ meson_options.txt | 3 +++ scripts/Makefile.am | 1 + scripts/libmakepkg/source/file.sh.in | 2 +- 7 files changed, 36 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-214-g2a792ac7
by Allan McRae 07 Oct '19

07 Oct '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 2a792ac7bb1ceda42767c696e2664819b47ffc3b (commit) via f49233903521f19a1fcba6bf6c36abea71309a1e (commit) via 45e01e55c96d9abf8c73f6ee3766b16e5fbefc4d (commit) via 6d99a15f0bd9cba4500808114738065903312bf6 (commit) via a6ae5f0a04cd3cac70525f073bdb11e4bb9266e5 (commit) via b4e4b74acea3d652317b030e761300d5c7b437a2 (commit) via bcacb00fc89c04ec0b5e7ebefe3b605b266cef57 (commit) from 48752f1b4b16cd1dad56649cd36b253494aa9ff1 (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 2a792ac7bb1ceda42767c696e2664819b47ffc3b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 6 23:11:20 2019 -0400 pacman-key: clean keys on import to remove unknown signatures There is no good reason to bloat the keyring by importing tons of signatures we cannot use; drop any signatures that don't validate against another available key (probably the master keys). If any desired signatures get cleaned, the key can be refreshed after importing the new signing public key. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f49233903521f19a1fcba6bf6c36abea71309a1e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 6 23:11:19 2019 -0400 pacman-key: make sure we actually use the Web of Trust, which GnuPG doesn't. By default, the latest versions of GnuPG disable the Web of Trust and refuse to import signatures from public keyservers. This is to prevent denial of service attacks, because refusing to import signatures only if the key size is too big, is apparently too silly to consider. Either way, pacman needs the WoT. If pacman imports a key at all, it means everything failed and we are in fallback mode, trying to overcome a shortcoming in the availability of keys in the keyring package. (This commonly means the user needs to acquire a new key during the same transaction that updates archlinux-keyring.) In order for that new key to be usable, it *must* also import signatures from the Master Keys. I don't give credence to this supposed DoS, since the worst case scenario is nothing happening and needing to CTRL+C in order to exit the program. In the case of pacman, this is better than being unable to install anything at all (which is gnupg doing a much more harmful DoS to pacman), and in the already unusual case where something like --refresh-keys is being used directly instead of depending on the keyring package itself, gnupg supports WKD out of the box and will prefer that for people whose keys are marketed as being non-DOSable. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45e01e55c96d9abf8c73f6ee3766b16e5fbefc4d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 5 12:53:09 2019 -0400 pacman-key: when refreshing gpg.conf, don't truncate option checking If an option is a two-part option, we print both (separated by IFS=' '), but when grepping to see if it already exists, we only checked the first component. This means that something like keyserver-options could only check if there were existing keyserver options of any sort, but not which ones. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6d99a15f0bd9cba4500808114738065903312bf6 Author: Matthew Sexton <WSDMatty(a)gmail.com> Date: Tue Sep 10 05:33:53 2019 -0400 pacman/pacman-conf, testpkg: Added translatable strings Added gettext macro to warnings, helps, and errors for translation. Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a6ae5f0a04cd3cac70525f073bdb11e4bb9266e5 Author: Matthew Sexton <WSDMatty(a)gmail.com> Date: Sun Sep 8 22:52:57 2019 -0400 pacman: pacman-conf: removed hputs macro for usage display Using the macro got in the way of _() macro for translation All the macro did was make it so the writer didn't have to type \n", stream); at the end of every line. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b4e4b74acea3d652317b030e761300d5c7b437a2 Author: morganamilo <morganamilo(a)gmail.com> Date: Sun Sep 8 22:45:27 2019 +0100 libalpm: resolvedep(): don't compare names twice If we failed to get the pkg from pkgcache then we know no satisfying package exists by name. So only compare provides. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcacb00fc89c04ec0b5e7ebefe3b605b266cef57 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 6 21:33:41 2019 -0400 makepkg: add rust support for *FLAGS and debug-prefix-map The rust language supports $RUSTFLAGS to be used automatically in all rustc invocations. Allow setting this in makepkg.conf (e.g. for optimization or debuginfo support), and teach debug+strip to pass the rustc command line argument necessary to rewrite source file paths in the debugging symbols. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.asciidoc | 9 ++++++ etc/makepkg.conf.in | 2 ++ lib/libalpm/deps.c | 3 +- scripts/libmakepkg/buildenv.sh.in | 2 +- scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +- scripts/libmakepkg/buildenv/debugflags.sh.in | 2 ++ scripts/libmakepkg/lint_config/variable.sh.in | 8 ++--- scripts/pacman-key.sh.in | 8 ++++- src/pacman/pacman-conf.c | 46 +++++++++++++++------------ src/util/testpkg.c | 29 ++++++++++------- 10 files changed, 70 insertions(+), 41 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] pacman-key: when refreshing gpg.conf, don't truncate option checking
by Eli Schwartz 07 Oct '19

07 Oct '19

If an option is a two-part option, we print both (separated by IFS=' '), but when grepping to see if it already exists, we only checked the first component. This means that something like keyserver-options could only check if there were existing keyserver options of any sort, but not which ones. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/pacman-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index b05754e5..c3b02850 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -169,7 +169,7 @@ add_gpg_conf_option() { local conffile=$1; shift # looking for the option 'bare', only leading spaces or # chars allowed, # followed by at least one space and any other text or the end of line. - if ! grep -q "^[[:space:]#]*$1$[[:space:]].*$*$" "$conffile" &>/dev/null; then + if ! grep -q "^[[:space:]#]*$*$[[:space:]].*$*$" "$conffile" &>/dev/null; then printf '%s\n' "$*" >> "$conffile" fi } -- 2.22.0

2 6

[pacman-dev] [PATCH v2 1/2] pacman/pacman-conf: removed hputs macro for usage display
by Matthew Sexton 07 Oct '19

07 Oct '19

Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> --- src/pacman/pacman-conf.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index df874029..d9e596b8 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -37,19 +37,17 @@ static void cleanup(void) static void usage(int ret) { FILE *stream = (ret ? stderr : stdout); -#define hputs(x) fputs(x"\n", stream) - hputs("pacman-conf - query pacman's configuration file"); - hputs("usage: pacman-conf [options] [<directive>...]"); - hputs(" pacman-conf (--repo-list|--help|--version)"); - hputs("options:"); - 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 + fputs("pacman-conf - query pacman's configuration file\n", stream); + fputs("usage: pacman-conf [options] [<directive>...]\n", stream); + fputs(" pacman-conf (--repo-list|--help|--version)\n", stream); + fputs("options:\n", stream); + fputs(" -c, --config=<path> set an alternate configuration file\n", stream); + fputs(" -R, --rootdir=<path> set an alternate installation root\n", stream); + fputs(" -r, --repo=<remote> query options for a specific repo\n", stream); + fputs(" -v, --verbose always show directive names\n", stream); + fputs(" -l, --repo-list list configured repositories\n", stream); + fputs(" -h, --help display this help information\n", stream); + fputs(" -V, --version display version information\n", stream); cleanup(); exit(ret); } -- 2.23.0

2 4

[pacman-dev] [PATCH] makepkg: add rust support for *FLAGS and debug-prefix-map
by Eli Schwartz 07 Oct '19

07 Oct '19

The rust language supports $RUSTFLAGS to be used automatically in all rustc invocations. Allow setting this in makepkg.conf (e.g. for optimization or debuginfo support), and teach debug+strip to pass the rustc command line argument necessary to rewrite source file paths in the debugging symbols. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makepkg.conf.5.asciidoc | 9 +++++++++ etc/makepkg.conf.in | 2 ++ scripts/libmakepkg/buildenv.sh.in | 2 +- scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +- scripts/libmakepkg/buildenv/debugflags.sh.in | 2 ++ scripts/libmakepkg/lint_config/variable.sh.in | 8 ++++---- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 9292b2a6..3f37190d 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -72,6 +72,10 @@ Options **CXXFLAGS=**"cxxflags":: Flags used for the C++ compiler; see CFLAGS for more info. +**RUSTFLAGS=**"rustflags":: + Flags used for the Rust compiler, similar in spirit to CFLAGS. Read + linkman:rustc[1] for more details on the available flags. + **LDFLAGS=**"ldflags":: Flags used for the linker. Several options may be specified with common usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on @@ -89,6 +93,11 @@ Options **DEBUG_CXXFLAGS=**"debug_cxxflags":: Debug flags used for the C++ compiler; see DEBUG_CFLAGS for more info. +**DEBUG_RUSTFLAGS=**"debug_rustflags":: + Additional compiler flags appended to `RUSTFLAGS` for use in debugging. + Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for + more details on the available flags. + **BUILDENV=(**!distcc !color !ccache check !sign**)**:: This array contains options that affect the build environment; the defaults are shown here. All options should always be left in the array; to enable diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 7e5da993..caf5114b 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -40,11 +40,13 @@ CHOST="@CHOST@" #CFLAGS="-O2 -pipe" #CXXFLAGS="-O2 -pipe" #LDFLAGS="" +#RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags #DEBUG_CFLAGS="-g" #DEBUG_CXXFLAGS="-g" +#DEBUG_RUSTFLAGS="-C debuginfo=2" ######################################################################### # BUILD ENVIRONMENT diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index a8d416c8..2ecd741e 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -36,5 +36,5 @@ prepare_buildenv() { done # ensure all necessary build variables are exported - export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS CHOST } diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in index daccc9cc..871d0d69 100644 --- a/scripts/libmakepkg/buildenv/buildflags.sh.in +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in @@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_buildflags') buildenv_buildflags() { if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS + unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS fi } diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index ce9c1556..19c96700 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -32,7 +32,9 @@ buildenv_debugflags() { if check_option "debug" "y"; then DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srdir=${DBGSRCDIR:-/usr/src/debug}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" + RUSTFLAGS+=" $DEBUG_RUSTFLAGS" fi } diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 55ed6d6d..e73e13de 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -32,10 +32,10 @@ lint_config_variables() { local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ COMPRESSLRZ COMPRESSLZO COMPRESSZ) - local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS LDFLAGS DEBUG_CFLAGS - DEBUG_CXXFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES STRIP_SHARED - STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER GPGKEY - PKGEXT SRCEXT) + local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS DEBUG_CFLAGS + DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES + STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER + GPGKEY PKGEXT SRCEXT) local i keys ret=0 -- 2.22.0

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-207-g48752f1b
by Allan McRae 07 Oct '19

07 Oct '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 48752f1b4b16cd1dad56649cd36b253494aa9ff1 (commit) via 80e2e1c7c9f2cc2795f497f2101b0aeb7b7e8638 (commit) via 0c4a8ae24b8395b0dd4f8046615336e394a8e3f8 (commit) via 5dd2b3776dedd85c196be737ea9c177216448756 (commit) via fd70c1c7bb0cb0681ab8a46d5f0494e0f9d992c6 (commit) via 6f3810793f4b1fc82094ccb1847ed82b85a203e6 (commit) via bcb44891ef8aa6feee3090cc0fd87b60e73aed5d (commit) from 024fde9748692c71f0d9e6c667439c912a78b6df (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 48752f1b4b16cd1dad56649cd36b253494aa9ff1 Author: Jonas Witschel <diabonas(a)archlinux.org> Date: Wed Oct 2 16:40:55 2019 +0200 signing: add ability to import keys using a WKD Currently pacman relies on the SKS keyserver network to fetch unknown PGP keys. These keyservers are vulnerable to signature spamming attacks, potentionally making it impossible to import the required keys. An alternative to keyservers is a so-called Web Key Directory (WKD), a well-known, trusted location on a server from where the keys can be fetched. This commit adds the ability to retrieve keys from a WKD. Due to the mentioned vulnerabilities, the WKD is tried first, falling back to the keyservers only if no appropriate key is found there. In contrast to keyservers, keys in a WKD are not looked up using their fingerprint, but by email address. Since the email address of the signing key is usually not included in the signature, we will use the packager email address to perform the lookup. Also see FS#63171. Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80e2e1c7c9f2cc2795f497f2101b0aeb7b7e8638 Author: Jonas Witschel <diabonas(a)archlinux.org> Date: Wed Oct 2 16:40:54 2019 +0200 signing: move key import confirmation before key_search Ask the user whether they want to import a missing key before even doing a search on the keyserver. This will be useful for getting Web Key Directory support in place: for a WKD, looking up and importing a key are a single action, so the current key_search -> QUESTION -> key_import workflow does not apply. Since only the ID of the package signing key is available before key_search, we display the packager variable in addition to the key ID for user convenience. Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c4a8ae24b8395b0dd4f8046615336e394a8e3f8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 6 20:06:43 2019 -0400 dload: never return NULL from get_filename Downloads with a Content-Disposition header will typically not include slashes. When they do, we should most certainly only take the basename, but when they don't, we should treat the header value as the filename. Crash introduced in d197d8ab82cf when we started using get_filename in order to rightfully avoid an arbitrary file overwrite vulnerability. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5dd2b3776dedd85c196be737ea9c177216448756 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Oct 4 11:53:04 2019 +1000 makepkg.conf.5: Document PACKAGER format requirements Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fd70c1c7bb0cb0681ab8a46d5f0494e0f9d992c6 Author: Jonas Witschel <diabonas(a)archlinux.org> Date: Wed Oct 2 16:40:56 2019 +0200 libmakepkg: check if PACKAGER has the expected format for WKD lookup pacman should be able to extract an email address from PACKAGER for WKD lookup, so issue a warning if it is not of the form "Example Name <email(a)address.invalid>". Neither the name nor the email address must contain additional angle brackets. Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6f3810793f4b1fc82094ccb1847ed82b85a203e6 Author: morganamilo <morganamilo(a)gmail.com> Date: Mon Sep 9 19:39:09 2019 +0100 libmakepkg: fix typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcb44891ef8aa6feee3090cc0fd87b60e73aed5d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Aug 15 19:55:45 2019 -0400 autotools: distribute meson files If we use make dist to create the official, signed release tarballs, those will not have meson build files by default since autotools doesn't know what they are. Also distribute all src/common/ files. We never strictly needed any of them to be distributed with autotools, because the dist tarball dereferences the symlinks (???), but only some of them were being distributed, and meson needs them to be in the right location as we only build libcommon from the primary files. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 9 +- doc/Makefile.am | 1 + doc/makepkg.conf.5.asciidoc | 1 + lib/libalpm/Makefile.am | 2 + lib/libalpm/be_package.c | 12 ++- lib/libalpm/dload.c | 6 +- lib/libalpm/signing.c | 121 +++++++++++++++++++++----- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 22 ++++- scripts/Makefile.am | 2 + scripts/libmakepkg/buildenv.sh.in | 2 +- scripts/libmakepkg/lint_config/variable.sh.in | 6 ++ src/common/Makefile.am | 3 +- src/pacman/Makefile.am | 2 + src/pacman/callback.c | 13 +-- src/util/Makefile.am | 2 + test/pacman/Makefile.am | 1 + test/scripts/Makefile.am | 1 + test/util/Makefile.am | 1 + 19 files changed, 165 insertions(+), 44 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] dload: never return NULL from get_filename
by Dave Reisner 07 Oct '19

07 Oct '19

Downloads with a Content-Disposition header will typically not include slashes. When they do, we should most certainly only take the basename, but when they don't, we should treat the header value as the filename. Crash introduced in d197d8ab82cf when we started using get_filename in order to rightfully avoid an arbitrary file overwrite vulnerability. --- lib/libalpm/dload.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index e5696bb0..506dcb8e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -53,9 +53,11 @@ static const char *get_filename(const char *url) { char *filename = strrchr(url, '/'); if(filename != NULL) { - filename++; + return filename + 1; } - return filename; + + /* no slash found, it's a filename */ + return url; } static char *get_fullpath(const char *path, const char *filename, -- 2.23.0

2 1