diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2018-12-16 14:22:09 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2018-12-16 14:22:09 +0000 |
| commit | 7e5667c859f17d261edc80b512f4ced2fd62ee35 (patch) | |
| tree | 10aa7da48481926ba5f69dca03b9e88c477baf90 /security/libgpg-error/files | |
| parent | Update nss to 3.36.0-9.el6_10. (diff) | |
security/libgpg-error: update to 1.33
Include upstream fix for not portable expr(1) usage. [1]
1: https://github.com/gpg/libgpg-error/commit/1d71dbb
Notes
Notes:
svn path=/head/; revision=487590
Diffstat (limited to 'security/libgpg-error/files')
| -rw-r--r-- | security/libgpg-error/files/patch-src_gpgrt-config | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/security/libgpg-error/files/patch-src_gpgrt-config b/security/libgpg-error/files/patch-src_gpgrt-config new file mode 100644 index 000000000000..0f4fce937f51 --- /dev/null +++ b/security/libgpg-error/files/patch-src_gpgrt-config @@ -0,0 +1,22 @@ +--- src/gpgrt-config.orig 2018-11-15 16:10:09 UTC ++++ src/gpgrt-config +@@ -448,8 +448,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 +@@ -568,7 +568,7 @@ done + + if [ -z "$module_list" ]; then + module_list=${myname%-config} +-elif expr match "$module_list" "=\|!=\|<\|>\|<=\|>=" >/dev/null; then ++elif expr "$module_list" : "=\|!=\|<\|>\|<=\|>=" >/dev/null; then + module_list="${myname%-config} $module_list" + fi + |