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

[pacman-dev] [PATCH v2] pacman-key: hide lsign and revoke output behind --verbose
by Matthew Sexton 04 Nov '19

04 Nov '19

To cut down on spam during --populate, both locally signing and revoking keys now hide the specific keys being signed or revoked, but can be shown with --verbose. A count was added, to show the number of keys signed/revoked during the process. Partially Implements: FS#64142 - pacman-key: make populate less noisy Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> --- v2: Corrected some issues identified by Allan. Squashed the two commits into one. scripts/pacman-key.sh.in | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 05aab0c2..3627a805 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -51,6 +51,7 @@ REFRESH=0 UPDATEDB=0 USE_COLOR='y' VERIFY=0 +VERBOSE=0 usage() { printf "pacman-key (pacman) %s\n" ${myver} @@ -77,6 +78,7 @@ usage() { printf -- "$(gettext " --populate Reload the default keys from the (given) keyrings\n\ in '%s'")\n" "@pkgdatadir@/keyrings" printf -- "$(gettext " --refresh-keys Update specified or all keys from a keyserver")\n" + printf -- "$(gettext " --verbose Show extra information")\n" echo printf -- "$(gettext "Options:")\n" printf -- "$(gettext " --config <file> Use an alternate config file (instead of\n\ @@ -332,11 +334,16 @@ populate_keyring() { done if (( ${#revoked_ids[@]} > 0 )); then + local key_count=0 msg "$(gettext "Disabling revoked keys in keyring...")" for key_id in "${!revoked_ids[@]}"; do - msg2 "$(gettext "Disabling key %s...")" "${key_id}" + if (( VERBOSE )); then + msg2 "$(gettext "Disabling key %s...")" "${key_id}" + fi printf 'disable\nquit\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --edit-key "${key_id}" 2>/dev/null + key_count=$((key_count+1)) done + msg2 "$(gettext "Disabled %s keys.")" "${key_count}" fi } @@ -445,19 +452,24 @@ lsign_keys() { check_keyids_exist local ret=0 + local key_count=0 for key_id in "$@"; do - msg2 "$(gettext "Locally signing key %s...")" "${key_id}" + if (( VERBOSE )); then + msg2 "$(gettext "Locally signing key %s...")" "${key_id}" + fi # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${key_id}" 2>/dev/null if (( PIPESTATUS[1] )); then error "$(gettext "%s could not be locally signed.")" "${key_id}" ret=1 fi + key_count=$((key_count+1)) done if (( ret )); then exit 1 fi + msg2 "$(gettext "Locally signed %s keys.")" "${key_count}" } receive_keys() { @@ -541,7 +553,7 @@ OPT_SHORT="adefhlruvV" OPT_LONG=('add' 'config:' 'delete' 'edit-key' 'export' 'finger' 'gpgdir:' 'help' 'import' 'import-trustdb' 'init' 'keyserver:' 'list-keys' 'list-sigs' 'lsign-key' 'nocolor' 'populate' 'recv-keys' 'refresh-keys' 'updatedb' - 'verify' 'version') + 'verbose' 'verify' 'version') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION fi @@ -574,6 +586,7 @@ while (( $# )); do -r|--recv-keys) RECEIVE=1 UPDATEDB=1 ;; --refresh-keys) REFRESH=1 ;; -u|--updatedb) UPDATEDB=1 ;; + --verbose) VERBOSE=1 ;; -v|--verify) VERIFY=1 ;; -h|--help) usage; exit 0 ;; -- 2.23.0

1 0

[pacman-dev] [PATCH 1/2] pacman-key: added verbose to commandline options
by Matthew Sexton 04 Nov '19

04 Nov '19

Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> --- scripts/pacman-key.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 05aab0c2..a59dba52 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -51,6 +51,7 @@ REFRESH=0 UPDATEDB=0 USE_COLOR='y' VERIFY=0 +VERBOSE=0 usage() { printf "pacman-key (pacman) %s\n" ${myver} @@ -77,6 +78,7 @@ usage() { printf -- "$(gettext " --populate Reload the default keys from the (given) keyrings\n\ in '%s'")\n" "@pkgdatadir@/keyrings" printf -- "$(gettext " --refresh-keys Update specified or all keys from a keyserver")\n" + printf -- "$(gettext " --verbose Show extra information")\n" echo printf -- "$(gettext "Options:")\n" printf -- "$(gettext " --config <file> Use an alternate config file (instead of\n\ @@ -541,7 +543,7 @@ OPT_SHORT="adefhlruvV" OPT_LONG=('add' 'config:' 'delete' 'edit-key' 'export' 'finger' 'gpgdir:' 'help' 'import' 'import-trustdb' 'init' 'keyserver:' 'list-keys' 'list-sigs' 'lsign-key' 'nocolor' 'populate' 'recv-keys' 'refresh-keys' 'updatedb' - 'verify' 'version') + 'verify' 'version' 'verbose') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION fi @@ -575,6 +577,7 @@ while (( $# )); do --refresh-keys) REFRESH=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1 ;; + --verbose) VERBOSE=1 ;; -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; -- 2.23.0

3 4

[pacman-dev] [PATCH v3] libmakepkg: add optional argument support to parseopts
by Ethan Sommer 04 Nov '19

04 Nov '19

Adds a "?" suffix that can be used to indicate that an option's argument is optional. This allows options to have a default behaviour when the user doesn't specify one, e.g.: --color=[when] being able to behave like --color=auto when only --color is passed Options with optional arguments given on the command line will be returned in the form "--opt=optarg" and "-o=optarg". Despite that not being the syntax for passing an argument with a shortopt (trying to pass -o=foo would make -o's argument "=foo"), this is done to allow the caller to split the option and its optarg easily Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> --- scripts/libmakepkg/util/parseopts.sh.in | 116 +++++++++++++++--------- test/scripts/parseopts_test.sh | 12 ++- 2 files changed, 83 insertions(+), 45 deletions(-) diff --git a/scripts/libmakepkg/util/parseopts.sh.in b/scripts/libmakepkg/util/parseopts.sh.in index c056cb1e..42540438 100644 --- a/scripts/libmakepkg/util/parseopts.sh.in +++ b/scripts/libmakepkg/util/parseopts.sh.in @@ -18,16 +18,23 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # A getopt_long-like parser which portably supports longopts and -# shortopts with some GNU extensions. It does not allow for options -# with optional arguments. For both short and long opts, options -# requiring an argument should be suffixed with a colon. After the -# first argument containing the short opts, any number of valid long -# opts may be be passed. The end of the options delimiter must then be -# added, followed by the user arguments to the calling program. +# shortopts with some GNU extensions. For both short and long opts, +# options requiring an argument should be suffixed with a colon, and +# options with optional arguments should be suffixed with a question +# mark. After the first argument containing the short opts, any number +# of valid long opts may be be passed. The end of the options delimiter +# must then be added, followed by the user arguments to the calling +# program. +# +# Options with optional arguments will be returned as "--longopt=optarg" +# for longopts, or "-o=optarg" for shortopts. This isn't actually a valid +# way to pass an optional argument with a shortopt on the command line, +# but is done by parseopts to enable the caller script to split the option +# and its optarg easily. # # Recommended Usage: -# OPT_SHORT='fb:z' -# OPT_LONG=('foo' 'bar:' 'baz') +# OPT_SHORT='fb:zq?' +# OPT_LONG=('foo' 'bar:' 'baz' 'qux?') # if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then # exit 1 # fi @@ -49,29 +56,30 @@ parseopts() { longoptmatch() { local o longmatch=() for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then + if [[ ${o%[:?]} = "$1" ]]; then longmatch=("$o") break fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + [[ ${o%[:?]} = "$1"* ]] && longmatch+=("$o") done case ${#longmatch[*]} in 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; + # success, override with opt and return arg req (0 == none, 1 == required, 2 == optional) + opt=${longmatch%[:?]} + case $longmatch in + *:) return 1 ;; + *\?) return 2 ;; + *) return 0 ;; + esac + ;; 0) # fail, no match found return 255 ;; *) # fail, ambiguous match printf "${0##*/}: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" + printf " '%s'" "${longmatch[@]%[:?]}" printf '\n' return 254 ;; esac >&2 @@ -87,32 +95,47 @@ parseopts() { for (( i = 1; i < ${#1}; i++ )); do opt=${1:i:1} - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + case $shortopts in + # option requires optarg + *$opt:*) + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("-$opt" "${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("-$opt" "$2") + shift + break + # parse failure + else + printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + # option's optarg is optional + *$opt\?*) + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("-$opt=${1:i+1}") + break + # option has no optarg + else + OPTRET+=("-$opt") + fi + ;; + # option has no optarg + *$opt*) + OPTRET+=("-$opt") + ;; + # option doesn't exist + *) + printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 OPTRET=(--) return 1 - fi - fi + ;; + esac done ;; --?*=*|--?*) # long option @@ -145,6 +168,15 @@ parseopts() { return 1 fi ;; + 2) + # --longopt=optarg + if [[ $1 = *=* ]]; then + OPTRET+=("--$opt=$optarg") + # --longopt + else + OPTRET+=("--$opt") + fi + ;; 254) # ambiguous option -- error was reported for us by longoptmatch() OPTRET=(--) diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 9674c6a6..7d14bf29 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -16,12 +16,12 @@ if ! type -t parseopts &>/dev/null; then fi # borrow opts from makepkg -OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_SHORT="AcdefFghiLmop:rRsVb;" OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noextract' 'force' 'forcever:' 'geninteg' 'help' 'holdver' 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'noprepare' 'nosign' 'pkg:' 'rmdeps' 'repackage' 'skipinteg' 'sign' 'source' 'syncdeps' 'version' 'config:' - 'noconfirm' 'noprogressbar') + 'noconfirm' 'noprogressbar' 'opt;') tap_parse() { local result=$1 tokencount=$2; shift 2 @@ -31,7 +31,7 @@ tap_parse() { unset OPTRET } -tap_plan 50 +tap_plan 54 # usage: tap_parse <expected result> <token count> test-params... # a failed tap_parse will match only the end of options marker '--' @@ -111,4 +111,10 @@ tap_parse '--force --' 2 --force # exact match on possible stem (opt has optarg) tap_parse '--clean foo --' 3 --clean=foo +# long opt with empty, non-empty, and no optional arg +tap_parse '--opt= --opt=foo --opt --' 4 --opt= --opt=foo --opt + +# short opt with and without optional arg, and non-option arg +tap_parse '-b=foo -A -b -- foo' 5 -bfoo -Ab foo + tap_finish -- 2.23.0

3 4

[pacman-dev] [GIT] The official pacman repository branch, release/5.2.x, created. v5.2.1
by Allan McRae 01 Nov '19

01 Nov '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, release/5.2.x has been created at f6564377a2b0a0dd6294fb366a3f91a31142e124 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.2.1, created. v5.2.1
by Allan McRae 01 Nov '19

01 Nov '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 annotated tag, v5.2.1 has been created at 41ca4254dea45934fff98e3528621e43eb970cd1 (tag) tagging f6564377a2b0a0dd6294fb366a3f91a31142e124 (commit) replaces v5.2.0 tagged by Allan McRae on Fri Nov 1 11:05:25 2019 +1000 - Log ----------------------------------------------------------------- v5.2.1 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEZkWwqMcAXnjbHXhk+Z/+D+rpmb0FAl27hNUACgkQ+Z/+D+rp mb0HhggAn+jfI/ChONAE9nHx6n02s64cGarDBQ5JsUodr5VXNVfbnObI+KTxCgZI K16uAQwkL9kL+ssGMaPLzotna4wOVWzzJP2Ty7mco8cqaGOqHCS2m8n03gWKO+wF 6hL5ICXyNhJ+NOy5VKAYqEmZNS1yyxweJojHAa0nxwW23L8YorgSofO5hZPQeb22 DKA46ThoHn7i4nDxytY7gEiOav8nUr/sPq5JJvBdqNybTxghMwwPWLPC5n/kYYBd H5IAeiC25CAEBlRqnfeMSBi07cBMwoBOk7UwiURwY6Zu7XQ7Zwe0upB/o3u4HrEt bmAmswrp0vtFIAHv+0y08CKlU2t3zQ== =Miwf -----END PGP SIGNATURE----- Allan McRae (9): Fix distribution of meson files Update completion for -F changes Remove --force from completion Update copyright years Fix segfault importing PGP key for pacman -U operations Comma fail Update NEWS for pacman-5.2.1 Pull latest translations from Transifex Release 5.2.1 Eli Schwartz (5): meson: fix inodecmd for darwin/bsd makepkg: protect against unexpected whitespace in filenames makepkg: do not count hard links multiple times when calculating pkg size makepkg: only run --clean actions if we built a package autotools: be more templated when getting list of doc dist files Evangelos Foutras (1): Add pacman-conf(8) to the documentation index Nick Cao (1): Fix compression of package databases with zstd morganamilo (1): makepkg: don't warn when PACKAGER is unset ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.0-17-gf6564377
by Allan McRae 01 Nov '19

01 Nov '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 f6564377a2b0a0dd6294fb366a3f91a31142e124 (commit) via c9613f3a0ac0ecc3e7c3f99913eee1b49bf2bab1 (commit) via fca2f7e5984f794cdd714a85df86e378eb0fbf5e (commit) from 4d76cf6f074854c6c7fbd6b3a279c1a0c123d8c8 (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 f6564377a2b0a0dd6294fb366a3f91a31142e124 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 10:57:09 2019 +1000 Release 5.2.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c9613f3a0ac0ecc3e7c3f99913eee1b49bf2bab1 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 10:54:12 2019 +1000 Pull latest translations from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fca2f7e5984f794cdd714a85df86e378eb0fbf5e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 09:26:54 2019 +1000 Update NEWS for pacman-5.2.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 11 +++++++++++ configure.ac | 4 ++-- doc/index.asciidoc | 1 + meson.build | 4 ++-- scripts/po/bg.po | 5 +++-- scripts/po/br.po | 4 ++-- scripts/po/ca.po | 5 +++-- scripts/po/cs.po | 5 +++-- scripts/po/da.po | 5 +++-- scripts/po/de.po | 5 +++-- scripts/po/el.po | 5 +++-- scripts/po/en_GB.po | 5 +++-- scripts/po/eo.po | 4 ++-- scripts/po/es.po | 5 +++-- scripts/po/es_419.po | 4 ++-- scripts/po/eu.po | 4 ++-- scripts/po/eu_ES.po | 4 ++-- scripts/po/fi.po | 4 ++-- scripts/po/fr.po | 5 +++-- scripts/po/gl.po | 4 ++-- scripts/po/hu.po | 5 +++-- scripts/po/id.po | 4 ++-- scripts/po/it.po | 5 +++-- scripts/po/ja.po | 5 +++-- scripts/po/ko.po | 5 +++-- scripts/po/lt.po | 11 ++++++----- scripts/po/nb.po | 5 +++-- scripts/po/nl.po | 5 +++-- scripts/po/pacman-scripts.pot | 4 ++-- scripts/po/pl.po | 5 +++-- scripts/po/pt.po | 4 ++-- scripts/po/pt_BR.po | 5 +++-- scripts/po/ro.po | 4 ++-- scripts/po/ru.po | 5 +++-- scripts/po/sk.po | 4 ++-- scripts/po/sl.po | 4 ++-- scripts/po/sr.po | 5 +++-- scripts/po/sr(a)latin.po | 5 +++-- scripts/po/sv.po | 5 +++-- scripts/po/tr.po | 5 +++-- scripts/po/uk.po | 5 +++-- scripts/po/zh_CN.po | 5 +++-- scripts/po/zh_TW.po | 5 +++-- src/pacman/po/hr.po | 12 ++++++------ src/pacman/po/lt.po | 33 ++++++++++++++++++--------------- src/pacman/po/pt_BR.po | 4 ++-- 46 files changed, 149 insertions(+), 108 deletions(-) hooks/post-receive -- The official pacman repository

1 0