From 83dcd3081da6493ed84edb6cb049fcf3f4907bba Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Wed, 14 Feb 2018 01:37:47 -0500
Subject: debootstrap-1.0.93-1.parabola1: rebuild

---
 libre/debootstrap/PKGBUILD          | 10 +++++-----
 libre/debootstrap/arch-detect.patch | 25 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'libre/debootstrap')

diff --git a/libre/debootstrap/PKGBUILD b/libre/debootstrap/PKGBUILD
index faa9afdab..52ed99b4a 100644
--- a/libre/debootstrap/PKGBUILD
+++ b/libre/debootstrap/PKGBUILD
@@ -23,11 +23,11 @@ source=("git+https://anonscm.debian.org/git/d-i/debootstrap.git#tag=$pkgver"
         debootstrap.8
         gnewsense
         trisquel)
-sha256sums=('SKIP'
-            '1ac9a1426c365ea0c04ca17b54aeaea7c376fa8327df241a94e5f7dfa0a5796f'
-            '87bd2802e9fb1b31cfb7bf118dbfd6fe81b1036c17c247755369580963cb83fe'
-            '03e019a67130b8c0c5b7c966082f717ef735fb2b01979fab70064f3a476408b5'
-            'b499eb3f04f77a83da0600f32976b038b7c80e09c66217e6f9a1b71f7ca9ebc5')
+sha512sums=('SKIP'
+            '824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1'
+            '39795caf3a0fd8bc874d00937580184904cac10c8cdf17b14cc0b5bca9b4732ecedb7161c2fb76f004d270a91396a2e74fa405c96167ab6c5a36553d1da715f0'
+            '968ef005bf1f399b3400080b2ba65f1b32c067c49faadc1caa7ee524a85980f0a6625c7b06838e01bbd8b99a496492da77a38f0e17f0a81fc029ee611fe639b6'
+            'b192dcbd0d85923ddd97d1094bbcf36edb36a095bfe06e0971707651524f6712c7ab21f733ba6f24e5cbc2e977aec7c52645e41b78d04e45fca65971f89a47a7')
 
 prepare() {
   cd debootstrap
diff --git a/libre/debootstrap/arch-detect.patch b/libre/debootstrap/arch-detect.patch
index 20e5ff682..821580358 100644
--- a/libre/debootstrap/arch-detect.patch
+++ b/libre/debootstrap/arch-detect.patch
@@ -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
-- 
cgit v1.2.3