Date: Mon, 23 Jul 2012 14:40:08 GMT From: Denis Generalov <gd@powernet.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/170087: [Patch] [poudriere] fix quoting for poudriere Message-ID: <201207231440.q6NEe8Km025004@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/170087; it has been noted by GNATS.
From: Denis Generalov <gd@powernet.ru>
To: Vincent Hoffman-Kazlauskas <vince@unsane.co.uk>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/170087: [Patch] [poudriere] fix quoting for poudriere
Date: Mon, 23 Jul 2012 18:32:49 +0400
This is a multi-part message in MIME format.
--Multipart=_Mon__23_Jul_2012_18_32_49_+0400_yU8i.aB.+XlNy8K6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
On Mon, 23 Jul 2012 14:15:33 GMT
Vincent Hoffman-Kazlauskas <vince@unsane.co.uk> wrote:
>
> >Number: 170087
> >Category: ports
> >Synopsis: [Patch] [poudriere] fix quoting for poudriere
> >Confidential: no
> >Severity: non-critical
> >Priority: low
> >Responsible: freebsd-ports-bugs
> >State: open
> >Quarter:
> >Keywords:
> >Date-Required:
> >Class: sw-bug
> >Submitter-Id: current-users
> >Arrival-Date: Mon Jul 23 14:20:11 UTC 2012
> >Closed-Date:
> >Last-Modified:
> >Originator: Vincent Hoffman-Kazlauskas
> >Release: 9.0-RELEASE-p3
> >Organization:
> >Environment:
> FreeBSD fbsd9vm 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>
> >Description:
> I was finding that net-p2p/rtorrent wouldnt build in a jail using poudriere, the error in the output being
> ====>> Cleaning the build queue
> [: /usr/local/poudriere_data/packages/83amd64-default/All/libsigc++-2.2.10: unexpected operator
> ====>> Cleaning up wrkdir
>
> the attached patch quotes this so + (and presumable other special characters) will not break the build.
> >How-To-Repeat:
> use a standard poudriere setup to build libtorrent (or rtorrent which requires libtorrent) C
> devel/libsigc++20 will build fine but isnt listed correctly as existing in the package list
> >Fix:
> apply the attached patch (quote the list so + characters aren't treated as operators)
>
> Patch attached with submission follows:
>
> --- common.sh.orig 2012-07-23 14:28:12.000000000 +0100
> +++ common.sh 2012-07-23 14:28:59.000000000 +0100
> @@ -635,7 +635,7 @@
> export LOCALBASE=${MYBASE:-/usr/local}
> while read p; do
> pn=$(awk -v o=${p} ' { if ($1 == o) {print $2} }' ${cache})
> - [ ! -f ${PKGDIR}/All/${pn}.${EXT} ] && queue="${queue} $p"
> + [ ! -f "${PKGDIR}/All/${pn}.${EXT}" ] && queue="${queue} $p"
> done < ${tmplist2}
>
> rm -f ${tmplist2} ${deplist} ${tmplist}
>
It's wrong patch I think.
Because ${cache} already contain broken data in this moment.
See attachment for correct patch.
>
> >Release-Note:
> >Audit-Trail:
> >Unformatted:
> _______________________________________________
> freebsd-ports-bugs@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
> To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"
--
Denis Generalov <gd@powernet.ru>
--Multipart=_Mon__23_Jul_2012_18_32_49_+0400_yU8i.aB.+XlNy8K6
Content-Type: text/x-diff;
name="src::poudriere.d::common.sh.patch"
Content-Disposition: attachment;
filename="src::poudriere.d::common.sh.patch"
Content-Transfer-Encoding: 7bit
--- src/poudriere.d/common.sh.orig 2012-07-23 17:48:32.000000000 +0400
+++ src/poudriere.d/common.sh 2012-07-23 17:49:00.000000000 +0400
@@ -610,7 +610,7 @@
local pn
msg "Caching missing port versions"
while read port; do
- if ! egrep -q "^${port} " ${cache}; then
+ if ! grep -q "^${port} " ${cache}; then
pn=$(injail make -C /usr/ports/${port} -VPKGNAME)
echo "${port} ${pn}" >> ${cache}
fi
--Multipart=_Mon__23_Jul_2012_18_32_49_+0400_yU8i.aB.+XlNy8K6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207231440.q6NEe8Km025004>