From kloecker at kde.org Mon Aug 8 12:41:14 2022 From: kloecker at kde.org (Ingo =?ISO-8859-1?Q?Kl=F6cker?=) Date: Mon, 08 Aug 2022 12:41:14 +0200 Subject: [PATCH GnuPG] gpg: Look up user ID to mark as primary by UID hash Message-ID: <5868514.lOV4Wx5bFT@daneel> A non-text attachment was scrubbed... Name: 0001-gpg-Look-up-user-ID-to-mark-as-primary-by-UID-hash.patch Type: text/x-patch Size: 6058 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: This is a digitally signed message part. URL: From kloecker at kde.org Tue Aug 9 12:08:11 2022 From: kloecker at kde.org (Ingo =?ISO-8859-1?Q?Kl=F6cker?=) Date: Tue, 09 Aug 2022 12:08:11 +0200 Subject: [PATCH GnuPG 2/2] gpg: Emit an ERROR status if --quick-set-primary-uid fails In-Reply-To: <5868514.lOV4Wx5bFT@daneel> References: <5868514.lOV4Wx5bFT@daneel> Message-ID: <5596008.DvuYhMxLoT@daneel> A second patch on top of 0001-gpg-Look-up-user-ID-to-mark-as-primary-by-UID-hash.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 0002-gpg-Emit-an-ERROR-status-if-quick-set-primary-uid-fa.patch Type: text/x-patch Size: 1490 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: This is a digitally signed message part. URL: From wk at gnupg.org Tue Aug 9 13:16:44 2022 From: wk at gnupg.org (Werner Koch) Date: Tue, 09 Aug 2022 13:16:44 +0200 Subject: [PATCH GnuPG] gpg: Look up user ID to mark as primary by UID hash In-Reply-To: <5868514.lOV4Wx5bFT@daneel> ("Ingo \=\?utf-8\?Q\?Kl\=C3\=B6cker\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 08 Aug 2022 12:41:14 +0200") References: <5868514.lOV4Wx5bFT@daneel> Message-ID: <87a68dpsyr.fsf@wheatstone.g10code.de> Hi! both patches look good to me. Salam-Shalom, Werner -- The pioneers of a warless world are the youth that refuse military service. - A. Einstein -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 227 bytes Desc: not available URL: From sam at gentoo.org Mon Aug 15 20:38:15 2022 From: sam at gentoo.org (Sam James) Date: Mon, 15 Aug 2022 19:38:15 +0100 Subject: [PATCH] tests/start-stop-agent: use 'command -v' instead of 'which' Message-ID: <20220815183815.1477624-1-sam@gentoo.org> `which` is an external command which isn't required by POSIX. Debian and other distributions (like Gentoo!) are looking to drop it from their base set of packages. Switch to `command -v` which should always work instead. Note we already use `command -v` at the start of this test anyway. Signed-off-by: Sam James --- tests/start-stop-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/start-stop-agent b/tests/start-stop-agent index 9b08b55b..ac5ca87d 100755 --- a/tests/start-stop-agent +++ b/tests/start-stop-agent @@ -15,7 +15,7 @@ fi GPG_AGENT_INFO= export GPG_AGENT_INFO -GPG_AGENT=$(which gpg-agent) +GPG_AGENT=$(command -v gpg-agent) token=$(echo "gpgme-$(pwd)" | tr ' ' '_') -- 2.37.2 From noloader at gmail.com Mon Aug 15 22:18:45 2022 From: noloader at gmail.com (Jeffrey Walton) Date: Mon, 15 Aug 2022 16:18:45 -0400 Subject: [PATCH] tests/start-stop-agent: use 'command -v' instead of 'which' In-Reply-To: <20220815183815.1477624-1-sam@gentoo.org> References: <20220815183815.1477624-1-sam@gentoo.org> Message-ID: On Mon, Aug 15, 2022 at 4:04 PM Sam James via Gnupg-devel wrote: > > `which` is an external command which isn't required by POSIX. > > Debian and other distributions (like Gentoo!) are looking > to drop it from their base set of packages. > > Switch to `command -v` which should always work instead. > > Note we already use `command -v` at the start of this test anyway. +1. `command -v` is Posix, and it properly handles things like user environments and shell aliases. Jeff From steffen at sdaoden.eu Mon Aug 15 23:32:43 2022 From: steffen at sdaoden.eu (Steffen Nurpmeso) Date: Mon, 15 Aug 2022 23:32:43 +0200 Subject: [PATCH] tests/start-stop-agent: use 'command -v' instead of 'which' In-Reply-To: References: <20220815183815.1477624-1-sam@gentoo.org> Message-ID: <20220815213243.eOlqa%steffen@sdaoden.eu> Jeffrey Walton via Gnupg-devel wrote in : |On Mon, Aug 15, 2022 at 4:04 PM Sam James via Gnupg-devel | wrote: |> |> `which` is an external command which isn't required by POSIX. |> |> Debian and other distributions (like Gentoo!) are looking |> to drop it from their base set of packages. |> |> Switch to `command -v` which should always work instead. |> |> Note we already use `command -v` at the start of this test anyway. | |+1. `command -v` is Posix, and it properly handles things like user |environments and shell aliases. It is not that easy. You possibly want to use Robert Elz's find_command script (don't mind my name): #!/bin/sh - #@ Find an executable command within a POSIX shell. #@ which(1) is not standardized, and command(1) -v may return non-executable, #@ so here is how it is possible to really find a usable executable file. #@ Use like this: #@ thecmd_testandset chown chown || #@ PATH="/sbin:${PATH}" thecmd_set chown chown || #@ PATH="/usr/sbin:${PATH}" thecmd_set_fail chown chown #@ or #@ thecmd_testandset_fail MAKE make #@ or #@ MAKE=/usr/bin/make thecmd_testandset_fail MAKE make #@ _However_, in order to support prefilled variables like "awk='busybox awk'" #@ spaces in command names found via path search are not supported. #@ That is to say that we take user-prefilled variable names with spaces as #@ granted, and actively fail to find commands with spaces ourselfs; like this #@ users of these functions can simply say: $VAR args, not "$VAR" args. # # 2017 - 2022 Steffen Nurpmeso . # Thanks to Robert Elz (kre). # Public Domain ## First of all, the actual functions need some environment: if [ -z "${SU_FIND_COMMAND_INCLUSION}" ]; then VERBOSE=1 ( set -o noglob ) >/dev/null 2>&1 && noglob_shell=1 || unset noglob_shell msg() { fmt=${1} shift printf >&2 -- "${fmt}\n" "${@}" } fi ## The actual functions acmd_test() { fc__acmd "${1}" 1 0 0; } acmd_test_fail() { fc__acmd "${1}" 1 1 0; } acmd_set() { fc__acmd "${2}" 0 0 0 "${1}"; } acmd_set_fail() { fc__acmd "${2}" 0 1 0 "${1}"; } acmd_testandset() { fc__acmd "${2}" 1 0 0 "${1}"; } acmd_testandset_fail() { fc__acmd "${2}" 1 1 0 "${1}"; } thecmd_set() { fc__acmd "${2}" 0 0 1 "${1}"; } thecmd_set_fail() { fc__acmd "${2}" 0 1 1 "${1}"; } thecmd_testandset() { fc__acmd "${2}" 1 0 1 "${1}"; } thecmd_testandset_fail() { fc__acmd "${2}" 1 1 1 "${1}"; } ## -- >8 - - 8< -- ## fc__pathsrch() { # pname=$1 exec=$2 varname=$3 verbok=$4 fcps__pname=$1 fcps__exec=$2 fcps__varname=$3 fcps__verbok=$4 # Commands with spaces are not found if [ "${fcps__exec}" != "${fcps__exec#* }" ]; then [ -n "${VERBOSE}" ] && [ ${fcps__verbok} -ne 0 ] && msg ' . ${%s} ... %s (has spaces, CANNOT be found)' \ "${fcps__pname}" "${fcps__exec}" return 1 fi # It may be an absolute path, check that first if [ "${fcps__exec}" != "${fcps__exec#/}" ] && [ -f "${fcps__exec}" ] && [ -x "${fcps__exec}" ]; then [ -n "${VERBOSE}" ] && [ ${fcps__verbok} -ne 0 ] && msg ' . ${%s} ... %s' \ "${fcps__pname}" "${fcps__exec}" [ -n "${fcps__varname}" ] && eval "${fcps__varname}"="${fcps__exec}" return 0 fi # Manual search over $PATH fcps__oifs=${IFS} IFS=: [ -n "${noglob_shell}" ] && set -o noglob set -- ${PATH} [ -n "${noglob_shell}" ] && set +o noglob IFS=${fcps__oifs} for fcps__path do if [ -z "${fcps__path}" ] || [ "${fcps__path}" = . ]; then if [ -d "${PWD}" ]; then fcps__path=${PWD} else fcps__path=. fi fi if [ -f "${fcps__path}/${fcps__exec}" ] && [ -x "${fcps__path}/${fcps__exec}" ]; then [ -n "${VERBOSE}" ] && [ ${fcps__verbok} -ne 0 ] && msg ' . ${%s} ... %s' \ "${fcps__pname}" "${fcps__path}/${fcps__exec}" [ -n "${fcps__varname}" ] && eval "${fcps__varname}"="${fcps__path}/${fcps__exec}" return 0 fi done return 1 } fc__acmd() { fca__pname=${1} fca__dotest=${2} fca__dofail=${3} \ fca__verbok=${4} fca__varname=${5} # Is the variable prefilled? if [ "${fca__dotest}" -ne 0 ]; then eval fca__dotest=\$${fca__varname} if [ -n "${fca__dotest}" ]; then # It could be something like "busybox awk". So if there is any # whitespace in a given variable, this cannot truly be solved in an # automatic fashion, we need to take it for granted if [ "${fca__dotest}" = "${fca__dotest#* }" ] || [ -f "${fca__dotest}" ]; then :; else [ -n "${VERBOSE}" ] && [ ${fca__verbok} -ne 0 ] && msg ' . ${%s} ... %s (spacy user data, unverifiable)' \ "${fca__pname}" "${fca__dotest}" return 0 fi if fc__pathsrch "${fca__pname}" "${fca__dotest}" "${fca__varname}" \ ${fca__verbok}; then return 0 fi msg 'WARN: ignoring non-executable ${%s}=%s' \ "${fca__pname}" "${fca__dotest}" fi fi if fc__pathsrch "${fca__pname}" "${fca__pname}" "${fca__varname}" \ ${fca__verbok}; then return 0 fi [ -n "${fca__varname}" ] && eval "${fca__varname}"= [ ${fca__dofail} -eq 0 ] && return 1 msg 'ERROR: no trace of utility '"${fca__pname}" exit 1 } # s-sh-mode --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From montel at kde.org Mon Aug 22 08:11:02 2022 From: montel at kde.org (Laurent Montel) Date: Mon, 22 Aug 2022 08:11:02 +0200 Subject: Add missing include (fix some qt6 compile error) Message-ID: <2221421.3T26gck7j8@localhost.localdomain> Hi, This patch will help to build against qt6. We need to include vs using forward declaration Could you apply it please ? Thanks -- Laurent Montel | laurent.montel at kdab.com | KDE/Qt Senior Software Engineer KDAB (France) S.A.S., a KDAB Group company Tel: France +33 (0)4 90 84 08 53, http://www.kdab.fr KDAB - The Qt, C++ and OpenGL Experts -------------- next part -------------- A non-text attachment was scrubbed... Name: add_missing_include_qstringlist_util.patch Type: text/x-patch Size: 710 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: This is a digitally signed message part. URL: