Re: [PR PATCH] [Updated] common/xbps-src/shutils/chroot.sh: pass arguments to xbps-shell

[leahneukirchen <leahneukirchen@users.noreply.github.com>]

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

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages perl-net-openssh
https://github.com/void-linux/void-packages/pull/41840

common/xbps-src/shutils/chroot.sh: pass arguments to xbps-shell
Some software reads the shell from /etc/passwd and expects it to
implement standard flags like -c etc.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-perl-net-openssh-41840.patch --]
[-- Type: text/x-diff, Size: 2440 bytes --]

From 46e74276115a5d7a7e884545b26573b0c20b1487 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Jan 2023 15:06:21 +0100
Subject: [PATCH 1/2] common/xbps-src/shutils/chroot.sh: pass arguments to
 xbps-shell

Some software reads the shell from /etc/passwd and expects it to
implement standard flags like -c etc.
---
 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 823705030b97..b8cb25523724 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -89,7 +89,7 @@ PATH=/void-packages:/usr/bin
 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} \
     CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
-    PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
+    PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h "\$@"
 _EOF
 
     chmod 755 $XBPS_MASTERDIR/bin/xbps-shell

From e4c71f5dfeaf23089cc76608cfac713c60bf188d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Jan 2023 15:11:03 +0100
Subject: [PATCH 2/2] perl-Net-OpenSSH: update to 0.83.

---
 srcpkgs/perl-Net-OpenSSH/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-OpenSSH/template b/srcpkgs/perl-Net-OpenSSH/template
index 9ae5e02501c4..3468a8275973 100644
--- a/srcpkgs/perl-Net-OpenSSH/template
+++ b/srcpkgs/perl-Net-OpenSSH/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Net-OpenSSH'
 pkgname=perl-Net-OpenSSH
-version=0.82
+version=0.83
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -10,7 +10,7 @@ checkdepends="procps-ng"
 short_desc="Net::OpenSSH - Perl SSH client package implemented on top of OpenSSH"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
-#changelog="http://cpansearch.perl.org/src/SALVA/Net-OpenSSH-${version}/Changes"
 homepage="https://metacpan.org/release/Net-OpenSSH"
+changelog="https://metacpan.org/dist/Net-OpenSSH/changes"
 distfiles="${CPAN_SITE}/Net/Net-OpenSSH-${version}.tar.gz"
-checksum=d41aa24dd53466753209f5a67c6392e6f3fa599709169342cbcc5f4871d97e83
+checksum=43d7d8672e9d4ecbd1ceb2a99e4143ca665f227d04720c43307e352f96060adf