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

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

[voidlinux-github]

[-- 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" \

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976436
Comment:
@xtraeme 

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976561
Comment:
This revert is wrong (partially).

In chroot (void) all bins are in /usr/bin.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976652
Comment:
I'd like to see the exact error in your debian machine before reverting.

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

[voidlinux-github]

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

There is an updated 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: 995 bytes --]

From 2f7978dc4dd685144203bc15e17fa31bcc469cd3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 7 Jul 2019 09:04:12 +0200
Subject: [PATCH] xbps-src/chroot.sh: readd /usr/sbin to PATH

This partially reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687

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

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 17ba9dde6ca..d0a28203516 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} \

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

[voidlinux-github]

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

There is an updated 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: 995 bytes --]

From 2f7978dc4dd685144203bc15e17fa31bcc469cd3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 7 Jul 2019 09:04:12 +0200
Subject: [PATCH] xbps-src/chroot.sh: readd /usr/sbin to PATH

This partially reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687

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

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 17ba9dde6ca..d0a28203516 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} \

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976799
Comment:
xbps-shell is only used in the chroot case. I can't see how this could be affected by the host PATH.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976820
Comment:
So why don't explain this? 

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976820
Comment:
So why don't you explain this? 

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976846
Comment:
I didn't fully investigate it, just that it never configured the chroot.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976866
Comment:
You are reverting another unrelated thing. Look in xbps-src instead.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976907
Comment:
This revert is wrong.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976998
Comment:
```
+ '[' -n '' ']'
+ return 0
+ '[' pkg = chroot ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n 1 ']'
+ arg=' -j1'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ '[' -n '' ']'
+ action=' -j1 pkg'
+ env -i -- PATH=/usr/bin SHELL=/bin/sh HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 SOURCE_DATE_EPOCH= XBPS_ALLOW_CHROOT_BREAKOUT= /home/john/void-packages-test/common/chroot-style/uunshare.sh /home/john/void-packages-test/masterdir /home/john/void-packages-test /home/john/void-packages-test/hostdir '' /void-packages/xbps-src -j1 pkg dash
+ rv=1
+ return 1
+ exit_and_cleanup 1
+ local rval=1
+ '[' -n '' -a '' '!=' 1 ']'
+ exit 1
```
Mh.. true, it is actually `/usr/local/bin` that would been missing, since this is where I have the xbps tools installed

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508976998
Comment:
```
+ action=' -j1 pkg'
+ env -i -- PATH=/usr/bin SHELL=/bin/sh HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 SOURCE_DATE_EPOCH= XBPS_ALLOW_CHROOT_BREAKOUT= /home/john/void-packages-test/common/chroot-style/uunshare.sh /home/john/void-packages-test/masterdir /home/john/void-packages-test /home/john/void-packages-test/hostdir '' /void-packages/xbps-src -j1 pkg dash
+ rv=1
+ return 1
+ exit_and_cleanup 1
+ local rval=1
+ '[' -n '' -a '' '!=' 1 ']'
+ exit 1
```
Mh.. true, it is actually `/usr/local/bin` that would been missing, since this is where I have the xbps tools installed

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977086
Comment:
Found my mistake

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977143
Comment:
I reviewed almost all code for the `xbps-src-ultra-fast` branch...

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977224
Comment:
in my `xbps-src-ultra-fast` branch:

```
#
# Sanitize PATH.
#
if [ -z "$IN_CHROOT" ]; then
    # In non chroot case always prefer host tools.
    export PATH="$PATH:$XBPS_MASTERDIR/usr/bin"
fi
```

This should be even picking up your xbps tools at /usr/local/bin as long as your PATH is ok.

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

[voidlinux-github]

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

There is an updated 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: 1063 bytes --]

From acf4730b9673c606710039db592520538b1aae51 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 7 Jul 2019 09:04:12 +0200
Subject: [PATCH] xbps-src/chroot.sh: reuse $PATH from outsude

This partially reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687

This commit broke xbps-src when the xbps tools weren't in /usr/bin
---
 common/xbps-src/shutils/chroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 17ba9dde6ca..dec8fa36117 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -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:$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" \

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

[voidlinux-github]

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

There is an updated 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: 1063 bytes --]

From acf4730b9673c606710039db592520538b1aae51 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 7 Jul 2019 09:04:12 +0200
Subject: [PATCH] xbps-src/chroot.sh: reuse $PATH from outsude

This partially reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687

This commit broke xbps-src when the xbps tools weren't in /usr/bin
---
 common/xbps-src/shutils/chroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 17ba9dde6ca..dec8fa36117 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -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:$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" \

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977407
Comment:
Nope, doesn't work with you `xbps-src-ultra-fast`

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977407
Comment:
Nope, doesn't work with you `xbps-src-ultra-fast`. It never adds this PATH in front of the chroot command. 

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977571
Comment:
I see, I think we could get rid of this `PATH` and use the existing one.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977655
Comment:
Take a look at the commit here now.You did set the PATH before calling the chroot style to only ever contain `/usr/bin` so in my case it never contained the needed tools.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977655
Comment:
Take a look at the commit here now.You did set the PATH before calling the chroot style to only ever contain `/usr/bin` so in my case it never contained the needed tools.

Re: Revert "xbps-src/chroot.sh: sanitize PATH."

[voidlinux-github]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12875#issuecomment-508977878
Comment:
Looks ok now

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

[voidlinux-github]

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

There's a merged pull request on the void-packages repository

Revert "xbps-src/chroot.sh: sanitize PATH."
https://github.com/void-linux/void-packages/pull/12875
Description: This reverts commit e0e48d6f6a3e3975bd867d5ae9485ebfbb76a687.

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