Date: Fri, 05 Jul 2013 07:30:12 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: =?UTF-8?B?VWxyaWNoIFNww7ZybGVpbg==?= <uqs@FreeBSD.org> Cc: svn-ports-head@freebsd.org, Baptiste Daroussin <bapt@freebsd.org>, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r322214 - head/Mk Message-ID: <51D6BC54.9090009@FreeBSD.org> In-Reply-To: <CAJ9axoTar9p5UFPg%2BZyyUf_hRNkREKrcUWb%2BUef5_SKjXRKZ9A@mail.gmail.com> References: <201307030548.r635mPu1041408@svn.freebsd.org> <CAJ9axoTar9p5UFPg%2BZyyUf_hRNkREKrcUWb%2BUef5_SKjXRKZ9A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2RQBRCWEKEVEOENJPPGKJ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 7/4/2013 12:00 PM, Ulrich Sp=C3=B6rlein wrote: > Hey bapt >=20 > 2013/7/3 Baptiste Daroussin <bapt@freebsd.org <mailto:bapt@freebsd.org>= > >=20 > Author: bapt > Date: Wed Jul 3 05:48:25 2013 > New Revision: 322214 > URL: http://svnweb.freebsd.org/changeset/ports/322214 >=20 > Log: > pkg2ng is calling directly bsd.pkgng.mk <http://bsd.pkgng.mk>; if > present which will fail because of the lack of UID. > Define it if not already defined earlier >=20 > Submitted by: Yar Tikhiy <yar.tikhiy@gmail.com > <mailto:yar.tikhiy@gmail.com>> >=20 > Modified: > head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>; >=20 > Modified: head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>; > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > --- head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>; Wed Jul 3 > 03:01:20 2013 (r322213) > +++ head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>; Wed Jul 3 > 05:48:25 2013 (r322214) > @@ -36,6 +36,11 @@ ACTUAL-PACKAGE-DEPENDS?=3D \ > ${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}"= > " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} > 2>/dev/null || : ; \ > fi >=20 > +# Redifine pkg2ng calls durectly bsd.pkgng.mk <http://bsd.pkgng.mk= > > and needs it >=20 >=20 > Umm, spellcheck please? A proper sentence would also be appreciated. > =20 >=20 > + > +.if !defined(UID) > +UID!=3D ${ID} -u > +.endif >=20 >=20 > This is ridiculous and I'd put the fix in pkg2ng. It already verifies > that it's run by root, so you just need to pass UID=3D0 on the make(1) > command line there. I've just committed a fix to both pkg and bsd.pkgng.mk. The fix is required in bsd.pkgng.mk to be backwards compatible with older pkg releases. It can eventually come out though. > Furthermore, ${ID} is not defined here, so I'm not quite sure if this > fix does anything at all (or if you can override this in any way, in > which case "id -u" would have sufficed). >=20 > Cheers, > Uli --=20 Regards, Bryan Drewery ------enig2RQBRCWEKEVEOENJPPGKJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJR1rxYAAoJEG54KsA8mwz5NSEP/1Yih9i24YC/p8HkGO+KXVcy QtENQzwpyokES+py6tuUMO4m0oySJATZ4SV3W6e7LtkOPmqtnBfAxV+/BfJZqRcR J5WCuJiXlt0qmNreLuq+sJkLivSpMTPe6coMrXwCuYJ6OdQ15szv2XTZYrNeqGMj CwtPs+j93KNFHsX0adMsqLm9lHz32twugUhWueuxs8jto+EdHbuEtnnmiElCtix2 VbzFuo/4S5l19lgbOgPpWIINMOIKvNMrtZ75GJyqqVe4tn/LsgNWCUEETLP9EOSZ t0orLxcmHzybNl9BdM90mFglVJ0R2wWb9vDeiqqbEqkA53eA7+jniaA16FAU1aEv unB1A3/csaROHqHoJXXJEF1ep6Yn49DmkEF3IkCO6+792+mmnLoDz8n8KCXwFGmq bQaa1R3y1tzMUtjj6yrsqzjt5VzynO66dCZKWVuKMYBJpvFcNBW5Fi2Y/cFQW8Q4 ENwtmet8vCtU3fk4rm9gtTOs6UJr2IgzPB4E0gAxGO+KhmG0ROe+OkSllGghQR+w QzIj2LM7nYUpXzBEMMY8SJF+LYx7GwdR5+Nxv2wDCCM5BEIZq708+XGwCl4NFpGO jlnqWp28e84JPhASI5bqMz9qdlUOs4gCLbDWY6iVP8rJXjtSTlkB9eZCbl6Y4JpX G/X964nmvOuTyvSaoNhE =vd6J -----END PGP SIGNATURE----- ------enig2RQBRCWEKEVEOENJPPGKJ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51D6BC54.9090009>