Date: Wednesday, February 7, 2018 @ 15:52:41 Author: eschwartz Revision: 290017
upgpkg: debootstrap 1.0.93-2 FS#48908 fix sourcing bashisms in a script using #!/bin/sh Modified: debootstrap/trunk/PKGBUILD debootstrap/trunk/arch-detect.patch -------------------+ PKGBUILD | 4 ++-- arch-detect.patch | 25 ++++++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-07 15:28:28 UTC (rev 290016) +++ PKGBUILD 2018-02-07 15:52:41 UTC (rev 290017) @@ -3,7 +3,7 @@ pkgname=debootstrap pkgver=1.0.93 -pkgrel=1 +pkgrel=2 pkgdesc="Bootstrap a basic Debian system" arch=('any') license=('GPL') @@ -15,7 +15,7 @@ 'debian-archive-keyring: check release signatures for Debian' 'ubuntu-keyring: check release signatures for Ubuntu') sha512sums=('57a6aa5d27b1b600f49db847b238e412a9819c499995e4dbc63943bb7c6a738f4d97befc2a9d25575a6d619bdc64e838654fa629573ee5fe95c6bc56758a1b8b' - '9e4c805b174eeb9ecab13701249c56542c1dc0c371df5f708540d17959f89de80763c4311972abb8f1d4f82b13080f7aa835028c1e5016ee17eebc32c8daa6e7') + '824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1') prepare() { cd debootstrap-$pkgver Modified: arch-detect.patch =================================================================== --- arch-detect.patch 2018-02-07 15:28:28 UTC (rev 290016) +++ arch-detect.patch 2018-02-07 15:52:41 UTC (rev 290017) @@ -1,18 +1,21 @@ ---- a/debootstrap 2016-03-22 21:13:58.000000000 +0800 -+++ b/debootstrap 2016-03-22 21:13:09.573621800 +0800 -@@ -419,6 +419,15 @@ +diff --git a/debootstrap b/debootstrap +index fcdb20f..184900d 100755 +--- a/debootstrap ++++ b/debootstrap +@@ -427,6 +427,16 @@ elif in_path udpkg && \ HOST_ARCH=`/usr/bin/udpkg --print-architecture` elif [ -e $DEBOOTSTRAP_DIR/arch ]; then HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch` +elif in_path pacman; then -+ CARCH="$(. /etc/makepkg.conf && echo $CARCH)" -+ case "$CARCH" in -+ "i686") HOST_ARCH="i386" ;; -+ "x86_64") HOST_ARCH="amd64" ;; -+ "armv7h") HOST_ARCH="armhf" ;; -+ "aarch64") HOST_ARCH="arm64" ;; -+ *) echo "Unknown architecture: $CARCH" && exit 1 -+ esac ++ # pacman 5.1 will have `pacman-conf Architecture` ++ CARCH="$(bash -c '. /etc/makepkg.conf && echo $CARCH')" ++ case "$CARCH" in ++ "i686") HOST_ARCH="i386" ;; ++ "x86_64") HOST_ARCH="amd64" ;; ++ "armv7h") HOST_ARCH="armhf" ;; ++ "aarch64") HOST_ARCH="arm64" ;; ++ *) echo "Unknown architecture: $CARCH" && exit 1 ++ esac fi HOST_OS="$HOST_ARCH" # basic host OS guessing for non-Debian systems