[PR PATCH] Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 508 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages revert-e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687
https://github.com/void-linux/void-packages/pull/12875

Revert "xbps-src/chroot.sh: sanitize PATH."
This reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687.

This commit broke xbps-src on Distros with split bin sbin like Debian

A patch file from https://github.com/void-linux/void-packages/pull/12875.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-revert-e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687-12875.patch --]
[-- Type: application/text/x-diff, Size: 1885 bytes --]

From a12297b88207892dcefad3f2b9e459ae90d8bbfc Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 7 Jul 2019 08:58:11 +0200
Subject: [PATCH] Revert "xbps-src/chroot.sh: sanitize PATH."

This reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687.

This commit broke xbps-src on Distros with split bin sbin like Debian
---
 common/xbps-src/shutils/chroot.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 17ba9dde6ca..ea8f7b62465 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -26,7 +26,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
 
 . /etc/xbps/xbps-src.conf
 
-PATH=/void-packages:/usr/bin
+PATH=/void-packages:/usr/bin:/usr/sbin
 
 exec env -i -- SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" \
     ${XBPS_ARCH+XBPS_ARCH=$XBPS_ARCH} ${XBPS_CHECK_PKGS+XBPS_CHECK_PKGS=$XBPS_CHECK_PKGS} \
@@ -121,7 +121,7 @@ chroot_sync_repos() {
             ${XBPS_MASTERDIR}/etc/xbps.d/22-repository-remote-x86_64.conf
     fi
 
-    # if -N is set, get rid of remote repos from x86_64 (glibc).
+    # if -N is set, comment out remote repositories from xbps.conf.
     if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
         rm -f ${XBPS_MASTERDIR}/etc/xbps.d/20-repository-remote.conf
         rm -f ${XBPS_MASTERDIR}/etc/xbps.d/22-repository-remote-x86_64.conf
@@ -198,7 +198,7 @@ chroot_handler() {
         [ -n "$XBPS_BINPKG_EXISTS" ] && arg="$arg -E"
 
         action="$arg $action"
-        env -i -- PATH="/usr/bin" SHELL=/bin/sh \
+        env -i -- PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \
             HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
             SOURCE_DATE_EPOCH="$SOURCE_DATE_EPOCH" \
             XBPS_ALLOW_CHROOT_BREAKOUT="$XBPS_ALLOW_CHROOT_BREAKOUT" \