- Pacman-dev - lists.archlinux.org

[pacman-dev] Discrepancies with keyring locations in pacman-key manual.
by Gabriel Hansson 27 Feb '19

27 Feb '19

Hello, Working on a project which requires me to learn a bit about package signing in Arch. Anyway, read the manual which states that keyrings are stored in /usr/local/share/keyrings since that is where --populate looks when used with pacman-key. Yet as far as I know, key can be perfectly stored in /usr/share/keyrings and found with populate. So sending this mail mostly as a question whether a correction should be made in the manual or if there is something that I'm missing :) Best regards, Gabriel Hansson

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-139-gadb961a8
by Allan McRae 23 Feb '19

23 Feb '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 adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 (commit) via ba7a41031c201b20d26cb69aa8b25acfb55c56bd (commit) via 3c774252ef11fd71270895bbbe892c81093aac77 (commit) via 656e851f0a3947a997d852da267e06e47355d134 (commit) via 4b83bcfcee46b6adcb80fc7a9fb85d3af58fb741 (commit) from 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a (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 adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 Author: Sever Oraz <severoraz(a)gmail.com> Date: Tue Feb 12 23:27:05 2019 +0100 Use standard, consistent units in the download progress. Rather than use M/s which can be either MB or MiB, specify that it uses MiB (consistent with the displayed total size). Fixes FS#59201 Signed-off-by: Sever Oraz <severoraz(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ba7a41031c201b20d26cb69aa8b25acfb55c56bd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 13 13:10:27 2019 -0500 meson: fix static/shared split again shared_library does not generate a sane pkg-config file because it assumes we don't want dependencies. Additionally, since we key off of buildstatic, when *not* using buildstatic but attempting to build libalpm on its own as static using -Ddefault_library=static, we are building and linking to a shared libalpm anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3c774252ef11fd71270895bbbe892c81093aac77 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Feb 15 11:38:17 2019 -0500 libmakepkg: migrate to schema.sh for integsums We cannot use most of the arrays defined in schema.sh as srcinfo is dependent on the order, but migrate the hashes for now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 656e851f0a3947a997d852da267e06e47355d134 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 20 20:55:44 2019 -0500 makepkg: simplify run_pacman logic We don't need to check the options twice, since it is the same check both times. Instead, merge the conditionals. As far as I can tell, the only reason the checks for: - PACMAN_OPTS and - whether to use sudo were ever separated is due to the historic existence of --asroot, since the second check included a check for (( ! ASROOT )) until it was cleaned up in commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b83bcfcee46b6adcb80fc7a9fb85d3af58fb741 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 20 21:35:19 2019 -0500 makepkg: implement locking for pacman commands When pacman is run as root to do -S, -U, or -R, it would immediately abort if pacman is not ready for use. Instead, poll the lockfile and wait until it becomes available. Implements FS#28840 Original-patch-by: Georges Dubus <georges.dubus(a)compiletoi.net> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: meson.build | 4 ++-- scripts/libmakepkg/srcinfo.sh.in | 3 ++- scripts/makepkg.sh.in | 17 ++++++++++++----- src/pacman/callback.c | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fixes bug FS 59201
by Sever Oraz 21 Feb '19

21 Feb '19

Signed-off-by: Sever Oraz <severoraz(a)gmail.com> --- src/pacman/callback.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index ee75297c..c0f5ade1 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -837,16 +837,16 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) xfered_human = humanize_size(xfered, '\0', -1, &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); - /* We will show 1.62M/s, 11.6M/s, but 116K/s and 1116K/s */ + /* We will show 1.62 MiB/s, 11.6 MiB/s, but 116 KiB/s and 1116 KiB/s */ if(rate_human < 9.995) { - printf("%6.1f %3s %4.2f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.2f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } else if(rate_human < 99.95) { - printf("%6.1f %3s %4.1f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.1f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } else { - printf("%6.1f %3s %4.f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } if(eta_h == 0) { printf("%02u:%02u", eta_m, eta_s); -- 2.20.1

3 7

[pacman-dev] [PATCH] meson: fix static/shared split again
by Eli Schwartz 21 Feb '19

21 Feb '19

shared_library does not generate a sane pkg-config file because it assumes we don't want dependencies. Additionally, since we key off of buildstatic, when *not* using buildstatic but attempting to build libalpm on its own as static using -Ddefault_library=static, we are building and linking to a shared libalpm anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8e9dbd71..0f706c64 100644 --- a/meson.build +++ b/meson.build @@ -363,8 +363,8 @@ libalpm_a = static_library( link_with : [libcommon], install : true) -if not get_option('buildstatic') - libalpm = shared_library( +if get_option('default_library') != 'static' + libalpm = library( 'alpm', version : libalpm_version, link_whole: [libalpm_a], -- 2.20.1

2 1

[pacman-dev] [PATCH] makepkg: simplify run_pacman logic
by Eli Schwartz 21 Feb '19

21 Feb '19

We don't need to check the options twice, since it is the same check both times. Instead, merge the conditionals. As far as I can tell, the only reason the checks for: - PACMAN_OPTS and - whether to use sudo were ever separated is due to the historic existence of --asroot, since the second check included a check for (( ! ASROOT )) until it was cleaned up in commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 25700b09..c51fec45 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -217,12 +217,10 @@ missing_source_file() { run_pacman() { local cmd - if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then - cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") - else + if [[ $1 = -@(T|Q)*([[:alpha:]]) ]]; then cmd=("$PACMAN_PATH" "$@") - fi - if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then + else + cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else -- 2.20.1

2 1

[pacman-dev] [PATCH] makepkg: implement locking for pacman commands
by Eli Schwartz 21 Feb '19

21 Feb '19

When pacman is run as root to do -S, -U, or -R, it would immediately abort if pacman is not ready for use. Instead, poll the lockfile and wait until it becomes available. Implements FS#28840 Original-patch-by: Georges Dubus <georges.dubus(a)compiletoi.net> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cf30c302..25700b09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -228,6 +228,14 @@ run_pacman() { else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi + + local lockfile="$(pacman-conf DBPath)/db.lck" + if [[ -f $lockfile ]]; then + msg "$(gettext "Pacman is currently in use, please wait...")" + while [[ -f $lockfile ]]; do + sleep 3 + done + fi fi "${cmd[@]}" } -- 2.20.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-134-g477a66cd
by Allan McRae 12 Feb '19

12 Feb '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 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a (commit) via 86004227d14bef059f71290b3c0454ad88ea0f86 (commit) from db102c67efe9cfd4367a9110c8f97ceff5afcbe3 (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 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Feb 11 11:19:26 2019 -0500 build: link vercmp with a static copy of libalpm This has historically been the case in autotools since we want vercmp to not break mid-transaction in an install script. For convenience, we create libalpm.a and use this to optionally generate libalpm.so (when not configured with -Dbuildstatic=true) as well as to link any binary which explicitly wishes to be built statically "with libalpm", but does not care where a function is defined. meson then treats this correctly: it builds the object file only once for both libraries, and the compiler strips out unused functionality from the final static binary. Currently the only binary which requires this is vercmp. Fixes FS#61719 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 86004227d14bef059f71290b3c0454ad88ea0f86 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 12 11:17:30 2019 +1000 Add implicit fall through warning Requires modification to our comment about fall through to match compilers expectations. Works for GCC and Clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + meson.build | 16 +++++++++++++--- src/pacman/pacman.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] build: link vercmp with a static copy of libalpm
by Eli Schwartz 12 Feb '19

12 Feb '19

This has historically been the case in autotools since we want vercmp to not break mid-transaction in an install script. For convenience, we create libalpm.a and use this to optionally generate libalpm.so (when not configured with -Dbuildstatic=true) as well as to link any binary which explicitly wishes to be built statically "with libalpm", but does not care where a function is defined. meson then treats this correctly: it builds the object file only once for both libraries, and the compiler strips out unused functionality from the final static binary. Currently the only binary which requires this is vercmp. Fixes FS#61719 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- This is based on my initial suggestion via IRC for how to solve the vercmp build issue using two libalpm libraries. The important distinction is that in order to not be an error when buildstatic is used, we cannot try to create multiple rules that generate libalpm.a -- and also we don't want to install /usr/lib/libalpm_a.a meson.build | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..4a74786b 100644 --- a/meson.build +++ b/meson.build @@ -354,15 +354,24 @@ libcommon = static_library( include_directories : includes, install : false) -libalpm = library( +libalpm_a = static_library( 'alpm', libalpm_sources, - version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, link_with : [libcommon], install : true) +if not get_option('buildstatic') + libalpm = shared_library( + 'alpm', + version : libalpm_version, + link_whole: [libalpm_a], + install : true) +else + libalpm = libalpm_a +endif + install_headers( 'lib/libalpm/alpm.h', 'lib/libalpm/alpm_list.h') @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

2 1

[pacman-dev] [PATCH] Add implicit fall through warning
by Allan McRae 12 Feb '19

12 Feb '19

Requires modification to our comment about fall through to match compilers expectations. Works for GCC and Clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 1 + meson.build | 1 + src/pacman/pacman.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 415ed3cb..2f345b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -462,6 +462,7 @@ if test "x$warningflags" = "xyes" ; then CFLAGS_ADD([-Wformat-nonliteral], [WARNING_CFLAGS]) CFLAGS_ADD([-Wformat-security], [WARNING_CFLAGS]) CFLAGS_ADD([-Wignored-qualifiers], [WARNING_CFLAGS]) + CFLAGS_ADD([-Wimplicit-fallthrough], [WARNING_CFLAGS]) CFLAGS_ADD([-Winit-self], [WARNING_CFLAGS]) CFLAGS_ADD([-Wlogical-op], [WARNING_CFLAGS]) CFLAGS_ADD([-Wmissing-declarations], [WARNING_CFLAGS]) diff --git a/meson.build b/meson.build index 0a710653..02a3a3d3 100644 --- a/meson.build +++ b/meson.build @@ -220,6 +220,7 @@ if get_option('buildtype').startswith('debug') '-Wformat-nonliteral', '-Wformat-security', '-Wignored-qualifiers', + '-Wimplicit-fallthrough', '-Winit-self', '-Wlogical-op', '-Wmissing-declarations', diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index a2a420b6..3bb622e6 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -196,7 +196,7 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); - /* pass through */ + /* fall through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); addlist(_(" --assume-installed <package=version>\n" -- 2.20.1

1 0

[pacman-dev] [PATCH] build: link vercmp staticly with libalpm
by Dave Reisner 11 Feb '19

11 Feb '19

This makes the meson-built vercmp equivalent to the autotools build. Employ an intermediate archive of libalpm which our generic library rule can slurp in. Other alpm-only binaries (specifically we care about vercmp) can then link this in for alpm functionality without caring exactly where the function is defined. meson passes the right flags to ensure that unused data is stripped out of the executable. ref: FS#61719 --- meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..5c1efd73 100644 --- a/meson.build +++ b/meson.build @@ -354,12 +354,21 @@ libcommon = static_library( include_directories : includes, install : false) +libalpm_a = static_library( + 'alpm_a', + libalpm_sources, + version : libalpm_version, + include_directories : includes, + dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_with : [libcommon], + install : true) + libalpm = library( 'alpm', - libalpm_sources, version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_whole : [libalpm_a], link_with : [libcommon], install : true) @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

3 2