Date: Thu, 24 Apr 2014 22:42:06 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352075 - head/Mk/Scripts Message-ID: <201404242242.s3OMg6MC079426@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Apr 24 22:42:06 2014 New Revision: 352075 URL: http://svnweb.freebsd.org/changeset/ports/352075 QAT: https://qat.redports.org/buildarchive/r352075/ Log: - Fix check-stagedir causing staging violating. Quote all directory names when doing plist checks. This could leak out if an unsupported format was used such as 'rmdir -p' or 'rmdir dir1 dir2 dir3' With hat: portmgr Reported by: antoine Pointyhat to: bdrewery Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Thu Apr 24 22:31:24 2014 (r352074) +++ head/Mk/Scripts/check-stagedir.sh Thu Apr 24 22:42:06 2014 (r352075) @@ -364,8 +364,11 @@ check_missing_plist_items() { mkdir ${WRKDIR}/.missing-dirs comm -23 ${WRKDIR}/.plist-dirs-sorted-no-comments \ ${WRKDIR}/.staged-dirs-sorted > ${WRKDIR}/.missing-plist-dirs - sed "s,^,${WRKDIR}/.missing-dirs," ${WRKDIR}/.missing-plist-dirs | \ - xargs mkdir -p + # Creates the dirs in WRKDIR/.missing-dirs and ensure spaces are + # quoted. + sed -e "s,^,${WRKDIR}/.missing-dirs," \ + -e 's,^\(.*\)$,"\1",' \ + ${WRKDIR}/.missing-plist-dirs | xargs mkdir -p find -ds ${WRKDIR}/.missing-dirs | \ sed -e "s,^${WRKDIR}/.missing-dirs,," | \ while read dir; do \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404242242.s3OMg6MC079426>