From 2984f9e668b6f7c65d83af8dd650eb3757c16778 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Tue, 23 Oct 2018 19:45:34 -0500
Subject: debootstrap-1.0.109-1.par1: updating version

---
 libre/debootstrap/PKGBUILD          | 31 ++++++++++++-------------------
 libre/debootstrap/arch-detect.patch |  6 +++---
 2 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'libre/debootstrap')

diff --git a/libre/debootstrap/PKGBUILD b/libre/debootstrap/PKGBUILD
index f49fc0a8e..24a65283b 100644
--- a/libre/debootstrap/PKGBUILD
+++ b/libre/debootstrap/PKGBUILD
@@ -1,39 +1,32 @@
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Maintainer: Andreas Grapentin <andreas@grapentin.org>
-# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 
 pkgname=debootstrap
-
-pkgver=1.0.93
-pkgrel=4
+pkgver=1.0.109
+pkgrel=1
 pkgrel+=.par1
-arch=(any)
-
 pkgdesc="Bootstrap a basic gNewSense and Trisquel system, without Debian support"
-url="https://tracker.debian.org/pkg/debootstrap"
+arch=(any)
 license=(GPL)
-
+url="https://tracker.debian.org/pkg/debootstrap"
 depends=(wget binutils)
-makedepends=(git)
-optdepends=('gnupg: check release signatures')
-replaces=(${pkgname}-libre)
-conflicts=(${pkgname}-libre)
-
-source=("git+https://anonscm.debian.org/git/d-i/debootstrap.git#tag=$pkgver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/felixonmars/debootstrap/archive/$pkgver.tar.gz"
         arch-detect.patch
         debootstrap.8
         gnewsense
         trisquel)
-sha512sums=('SKIP'
-            '824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1'
+optdepends=('gnupg: check release signatures')
+sha512sums=('8b2cf0ba3e0c672a2375ff323c18c18788e17a4bdf3e03d6b72f956a85b989d3998b89215bc7b99925decbba3c9a5dbeddfc72b9baf7c0571f11559ff8286272'
+            '56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97'
             '0b3507756b8f29d19146df3201143ccbd71cfd1f7ef865d184079180612b90c046cabab59fe42d246bfe476ae8fd5c43e81ee2fc3ee06bbc1fc3e75d9f1382ca'
             '968ef005bf1f399b3400080b2ba65f1b32c067c49faadc1caa7ee524a85980f0a6625c7b06838e01bbd8b99a496492da77a38f0e17f0a81fc029ee611fe639b6'
             'b192dcbd0d85923ddd97d1094bbcf36edb36a095bfe06e0971707651524f6712c7ab21f733ba6f24e5cbc2e977aec7c52645e41b78d04e45fca65971f89a47a7')
 
 prepare() {
-  cd debootstrap
+  cd debootstrap-$pkgver
 
   sed -i 's/sbin/bin/g' Makefile
 
@@ -79,7 +72,7 @@ prepare() {
 }
 
 package() {
-  cd debootstrap
+  cd debootstrap-$pkgver
   make DESTDIR="$pkgdir" install
 
   install -Dm644 debootstrap.8 "$pkgdir"/usr/share/man/man8/debootstrap.8
diff --git a/libre/debootstrap/arch-detect.patch b/libre/debootstrap/arch-detect.patch
index 821580358..2a76428fd 100644
--- a/libre/debootstrap/arch-detect.patch
+++ b/libre/debootstrap/arch-detect.patch
@@ -3,9 +3,9 @@ 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`
+ 	HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
+ elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
+ 	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
 +elif in_path pacman; then
 +	# pacman 5.1 will have `pacman-conf Architecture`
 +	CARCH="$(bash -c '. /etc/makepkg.conf && echo $CARCH')"
-- 
cgit v1.2.3