From eea170b1be59f3b5344178d4d95bf8050f4fb63a Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 2 Dec 2017 00:52:47 +0000 Subject: [PATCH] switching to _pbuild is tricky, you can't take it back. in particular, disable future PORTS_PRIVSEP mechanisms under pkg_create, because we should already be running as _pbuild by this point. --- usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index 524784a2255..68ec4fb4f15 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCreate.pm,v 1.128 2017/11/07 16:21:59 ajacoutot Exp $ +# $OpenBSD: PkgCreate.pm,v 1.129 2017/12/02 00:52:47 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -890,6 +890,9 @@ sub ask_tree delete $ENV{SUBPACKAGE}; $ENV{SUBDIR} = $dep->{pkgpath}; $ENV{ECHO_MSG} = ':'; + # XXX we're already running as ${BUILD_USER} + # so we can't do this again + push(@action, 'PORTS_PRIVSEP=No'); exec $make ('make', @action); } my $plist = OpenBSD::PackingList->read($fh, -- 2.20.1