From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A6F31382C5 for ; Wed, 11 Apr 2018 09:59:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C28CE0A64; Wed, 11 Apr 2018 09:59:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48402E0A64 for ; Wed, 11 Apr 2018 09:59:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 956A3335C59 for ; Wed, 11 Apr 2018 09:58:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F8A9274 for ; Wed, 11 Apr 2018 09:58:56 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1523440732.79683c888a48734c9aac355a8b91fa69bb38c8d0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/di/, sys-block/di/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/di/di-4.45.ebuild sys-block/di/files/di-4.45-no_echo-n.patch X-VCS-Directories: sys-block/di/ sys-block/di/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 79683c888a48734c9aac355a8b91fa69bb38c8d0 X-VCS-Branch: master Date: Wed, 11 Apr 2018 09:58:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eddc5121-a67e-4846-b25e-3b2842b7fad8 X-Archives-Hash: b95c43b46ae951a9a079e3a0ce7ea8b5 commit: 79683c888a48734c9aac355a8b91fa69bb38c8d0 Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 11 09:54:27 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 11 09:58:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79683c88 sys-block/di: Avoid using non POSIX compliant "echo -n ... \c" Package-Manager: Portage-2.3.28, Repoman-2.3.9 sys-block/di/di-4.45.ebuild | 1 + sys-block/di/files/di-4.45-no_echo-n.patch | 172 +++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/sys-block/di/di-4.45.ebuild b/sys-block/di/di-4.45.ebuild index c910d5e247d..0f2ee5708aa 100644 --- a/sys-block/di/di-4.45.ebuild +++ b/sys-block/di/di-4.45.ebuild @@ -19,6 +19,7 @@ DEPEND="nls? ( sys-devel/gettext )" PATCHES=( "${FILESDIR}"/${PN}-4.33-build.patch + "${FILESDIR}"/${PN}-4.45-no_echo-n.patch ) src_configure() { diff --git a/sys-block/di/files/di-4.45-no_echo-n.patch b/sys-block/di/files/di-4.45-no_echo-n.patch new file mode 100644 index 00000000000..c0c1b1e0f2a --- /dev/null +++ b/sys-block/di/files/di-4.45-no_echo-n.patch @@ -0,0 +1,172 @@ +Neither "echo -n" nor "echo ... \c" is POSIX compliant. + +See "man 1p echo" section "APPLICATION USAGE" or +https://www.in-ulm.de/%7Emascheck/various/echo+printf/ + +--- di-4.45/C/tests.d/rpmbuild.sh ++++ di-4.45/C/tests.d/rpmbuild.sh +@@ -12,13 +12,13 @@ + locatecmd locrpmbuild rpmbuild + + if [ "${locrpmbuild}" = "" ];then +- echo ${EN} " skipped${EC}" >&5 ++ printf '%s' " skipped" >&5 + exit 0 + fi + + rvers=`rpmbuild --version | tr -cd '0-9' | sed 's/^\(...\).*/\1/'` + if [ $rvers -lt 470 ]; then +- echo ${EN} " old version skipped${EC}" >&5 ++ printf '%s' " old version skipped" >&5 + exit 0 + fi + +--- di-4.45/mkconfig/bin/shellfuncs.sh ++++ di-4.45/mkconfig/bin/shellfuncs.sh +@@ -28,17 +28,6 @@ + echo "mkconfig version ${_MKCONFIG_VERSION}" + } + +-setechovars () { +- EN='-n' +- EC='' +- if [ "`echo -n test`" = "-n test" ]; then +- EN='' +- EC='\c' +- fi +- export EN +- export EC +-} +- + dosubst () { + subvar=$1 + shift +--- di-4.45/mkconfig/bin/testfuncs.sh ++++ di-4.45/mkconfig/bin/testfuncs.sh +@@ -19,14 +19,14 @@ + + chkccompiler () { + if [ "${CC}" = "" ]; then +- echo ${EN} " no C compiler; skipped${EC}" >&5 ++ printf '%s' " no C compiler; skipped" >&5 + exit 0 + fi + } + + chkdcompiler () { + if [ "${DC}" = "" ]; then +- echo ${EN} " no D compiler; skipped${EC}" >&5 ++ printf '%s' " no D compiler; skipped" >&5 + exit 0 + fi + } +--- di-4.45/mkconfig/mkconfig.sh ++++ di-4.45/mkconfig/mkconfig.sh +@@ -154,7 +154,7 @@ + tlabel=$2 + + echo " $ifleveldisp[${tname}] ${tlabel} ... " >&9 +- echo ${EN} "${ifleveldisp}${tlabel} ... ${EC}" >&1 ++ printf '%s' "${ifleveldisp}${tlabel} ... " >&1 + } + + _doexport () { +--- di-4.45/mkconfig/units/c-main.sh ++++ di-4.45/mkconfig/units/c-main.sh +@@ -559,7 +559,7 @@ + eval $cmd + echo "## dcl(C): ${dcl}" >&9 + c=`echo ${dcl} | sed 's/[^,]*//g'` +- ccount=`echo ${EN} "$c${EC}" | wc -c` ++ ccount=`printf '%s' "$c" | wc -c` + domath ccount "$ccount + 1" # 0==1 also, unfortunately + c=`echo ${dcl} | sed 's/^[^(]*(//'` + c=`echo ${c} | sed 's/)[^)]*$//'` +--- di-4.45/mkconfig/units/d-main.sh ++++ di-4.45/mkconfig/units/d-main.sh +@@ -1680,7 +1680,7 @@ + echo "## tdcl(D): ${tdcl}" >&9 + if [ $argflag = 1 ]; then + c=`echo ${tdcl} | sed 's/[^,]*//g'` +- ccount=`echo ${EN} "$c${EC}" | wc -c` ++ ccount=`printf '%s' "$c" | wc -c` + domath ccount "$ccount + 1" # 0==1 also, unfortunately + c=`echo ${tdcl} | sed 's/^[^(]*(//'` + c=`echo ${c} | sed 's/)[^)]*$//'` +--- di-4.45/tests.d/buildsh.sh ++++ di-4.45/tests.d/buildsh.sh +@@ -43,7 +43,7 @@ + fi + fi + +- echo ${EN} " ${d}${EC}" >&5 ++ printf '%s' " ${d}" >&5 + ${MAKE:-make} ${TMAKEFLAGS} realclean + ${MAKE:-make} ${TMAKEFLAGS} -e prefix=${instdir} all > make.log 2>&1 + rc=$? +--- di-4.45/tests.d/diarg.sh ++++ di-4.45/tests.d/diarg.sh +@@ -93,7 +93,7 @@ + tdir=$_MKCONFIG_RUNTOPDIR/$d + + if [ -x ${tdir}/di ]; then +- echo ${EN} " ${d}${EC}" >&5 ++ printf '%s' " ${d}" >&5 + # most all unix + ${tdir}/di -n -f M / 2>/dev/null | grep '^/[ ]*$' > /dev/null 2>&1 + rc=$? +@@ -135,7 +135,7 @@ + done + + if [ $lrc -ne 0 ]; then +- echo ${EN} "*${EC}" >&5 ++ printf '%s' "*" >&5 + grc=1 + fi + else +--- di-4.45/tests.d/disort.sh ++++ di-4.45/tests.d/disort.sh +@@ -41,7 +41,7 @@ + fi + ) + if [ -x $tdir/di ]; then +- echo ${EN} " ${d}${EC}" >&5 ++ printf '%s' " ${d}" >&5 + echo "## regular sort first, then di sort" + echo "by special" + ${tdir}/di -n -a -f S | sort > s1 +@@ -118,12 +118,12 @@ + + rm -f s1 s2 + if [ $grc -ne 0 ]; then +- echo ${EN} "*${EC}" >&5 ++ printf '%s' "*" >&5 + fi + else + if [ $d = C ]; then + echo "## no di executable found for dir $d" +- echo ${EN} "*${EC}" >&5 ++ printf '%s' "*" >&5 + grc=1 + fi + fi +--- di-4.45/tests.d/ditot.sh ++++ di-4.45/tests.d/ditot.sh +@@ -27,7 +27,7 @@ + fi + ) + if [ -x ${tdir}/di ]; then +- echo ${EN} " ${d}${EC}" >&5 ++ printf '%s' " ${d}" >&5 + for format in $FORMATS; do + echo "Checking format: $format" + # have to exclude zfs, null (dragonflybsd) +@@ -37,7 +37,7 @@ + didata=`${tdir}/di -n -d1 -f $format -t -a -x null,zfs,ctfs,objfs,sharefs 2>/dev/null ` + summtot=`(echo "0 ";echo $didata | sed 's/ */ + /g'; echo " - p") | dc` + if [ $summtot -ne 0 ]; then +- echo ${EN} "*${EC}" >&5 ++ printf '%s' "*" >&5 + echo "## format: $format failed" + grc=1 + fi