gentoo resync : 23.03.2018

2 files changed, 80 insertions, 0 deletions

diff --git a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
new file mode 100644
index 000000000000..9b25b29a89f3
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
@@ -0,0 +1,54 @@
+From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 19 Mar 2018 10:47:13 +0100
+Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell
+
+See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n"
+with "printf '%s'".
+---
+ configure | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/configure b/configure
+index f480f7b..2a7d485 100755
+--- a/configure
++++ b/configure
+@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto
+ INSTALL_LIB_SHARED=auto
+ INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR"
+ 
+-case $(echo -n) in
+-  -n) # SysV style
+-    ECHO_N=
+-    ECHO_C='\c'
+-    ;;
+-  *) # BSD style
+-    ECHO_N='-n '
+-    ECHO_C=
+-    ;;
+-esac
+-
+ # display error message and exit
+ die () {
+   echo
+@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT
+ 
+ str_concat()
+ {
+-  echo ${ECHO_N} $@ ${ECHO_C}
++  printf '%s ' $@
+ }
+ 
+ yn_nonempty()
+@@ -246,7 +235,7 @@ yn_nonempty()
+ # Use this before starting a check
+ start_check() {
+   echo "============ Checking for $1 ============" >> "$TMPLOG"
+-  echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}"
++  printf '%s' "Checking for $1 ... "
+   res_comment=""
+ }
+ 
+-- 
+2.16.2
+
diff --git a/app-crypt/rhash/files/unquote-cc.patch b/app-crypt/rhash/files/unquote-cc.patch
new file mode 100644
index 000000000000..77ccc9b2c5f7
--- /dev/null
+++ b/app-crypt/rhash/files/unquote-cc.patch
@@ -0,0 +1,26 @@
+From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 18 Mar 2018 14:23:28 +0000
+Subject: [PATCH] configure: Don't quote $CC when calling it
+
+It might have additional arguments.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index f480f7b..8ebb929 100755
+--- a/configure
++++ b/configure
+@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then
+ else
+   CC_TMP="$CC"
+   for CC in "$CC_TMP" gcc cc ; do
+-    if "$CC" -v >/dev/null 2>&1; then
++    if $CC -v >/dev/null 2>&1; then
+       cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
+       if test "$cc_name_tmp" = "gcc"; then
+         cc_name=$cc_name_tmp
+-- 
+2.16.1
+