[git] GPG-ERROR - branch, master, updated. gpgrt-1.33-3-g1d71dbb

[by NIIBE Yutaka]

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  1d71dbb13709318567aba5b61928d8af37563097 (commit)
      from  60f3d4440249d7beec3390df66143204ea80be39 (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 1d71dbb13709318567aba5b61928d8af37563097
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Dec 10 08:58:09 2018 +0900

    gpgrt-config: Portability fix for use of expr.
    
    * src/gpgrt-config (sysroot): Care about possible interpretation of
    minus sign be considered an option to a program.
    (MAIN): Don't use 'match' of expr but use ':' instead.
    
    --
    
    Reported-by: Roman Bogorodskiy <bogorodskiy at gmail.com>
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/gpgrt-config b/src/gpgrt-config
index 3a76869..646224f 100755
--- a/src/gpgrt-config
+++ b/src/gpgrt-config
@@ -404,8 +404,8 @@ sysroot () {
 	    _result="$_result${_result:+ }$_opt"
 	    shift
 	    _result="$_result $PKG_CONFIG_SYSROOT_DIR$1"
-	elif expr "$1" : "^$_opt" >/dev/null; then
-	    _result="$_result${_result:+ }$_opt$PKG_CONFIG_SYSROOT_DIR$(expr "$1" : "^$_opt\(.*\)")"
+	elif expr "x$1" : "^x$_opt" >/dev/null; then
+	    _result="$_result${_result:+ }$_opt$PKG_CONFIG_SYSROOT_DIR$(expr "x$1" : "^x$_opt\(.*\)")"
 	else
 	    _result="$_result${_result:+ }$1"
 	fi
@@ -575,7 +575,7 @@ done
 
 if [ -z "$module_list" ]; then
     module_list=$default_module
-elif expr match "$module_list" "=\|!=\|<\|>\|<=\|>=" >/dev/null; then
+elif expr "$module_list" : "=\|!=\|<\|>\|<=\|>=" >/dev/null; then
     module_list="$default_module $module_list"
 fi
 

-----------------------------------------------------------------------

Summary of changes:
 src/gpgrt-config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org