From 12a5b7ef26e481d08f89ff67ec293de4d5dcada7 Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Tue, 12 Mar 2019 03:14:14 +0200
Subject: [PATCH] debootstrap: update to 1.0.114 for the sole purpose of having

a fetchable distfile.
---
 debootstrap/Makefile                  |  4 ++--
 debootstrap/PLIST                     |  2 ++
 debootstrap/distinfo                  | 10 +++++-----
 debootstrap/patches/patch-debootstrap | 12 ++++++------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index 04bc1ffdd3..e474a81e23 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=			debootstrap_1.0.100
+DISTNAME=			debootstrap_1.0.114
 PKGNAME=			${DISTNAME:S/_/-/}
 CATEGORIES=			sysutils emulators
 MASTER_SITES=			${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}
@@ -19,7 +19,7 @@ DEPENDS+=	wget-[0-9]*:../../net/wget
 DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/debootstrap
 #WRKSRC=	${WRKDIR}/debootstrap.git
 USE_LANGUAGES=	# none
 
diff --git a/debootstrap/PLIST b/debootstrap/PLIST
index 0359adf604..11c1527b42 100644
--- a/debootstrap/PLIST
+++ b/debootstrap/PLIST
@@ -10,6 +10,7 @@ share/debootstrap/scripts/aequorea
 share/debootstrap/scripts/artful
 share/debootstrap/scripts/bartholomea
 share/debootstrap/scripts/bionic
+share/debootstrap/scripts/bookworm
 share/debootstrap/scripts/breezy
 share/debootstrap/scripts/bullseye
 share/debootstrap/scripts/buster
@@ -18,6 +19,7 @@ share/debootstrap/scripts/cosmic
 share/debootstrap/scripts/dapper
 share/debootstrap/scripts/dasyatis
 share/debootstrap/scripts/debian-common
+share/debootstrap/scripts/disco
 share/debootstrap/scripts/edgy
 share/debootstrap/scripts/etch
 share/debootstrap/scripts/etch-m68k
diff --git a/debootstrap/distinfo b/debootstrap/distinfo
index 514992b181..8c95825690 100644
--- a/debootstrap/distinfo
+++ b/debootstrap/distinfo
@@ -4,14 +4,14 @@ SHA1 (debian-archive-keyring_2014.3_all.deb) = 7f16adc03d5e2f21afba8ae843d1ed5d7
 RMD160 (debian-archive-keyring_2014.3_all.deb) = 13fec7c8c07af16742af3ddae29422726d341cc1
 SHA512 (debian-archive-keyring_2014.3_all.deb) = 7a24596f250eafb6e62d19523cd13c3b1809bea3f694bd92f3d427f67cd840e0292200e6b033b5c5c5cf41ab40233ae17d133a846be483afa1da3b67cac72931
 Size (debian-archive-keyring_2014.3_all.deb) = 40060 bytes
-SHA1 (debootstrap_1.0.100.tar.gz) = f1d1df3f49d537207bdd0371af50367e3cba60d0
-RMD160 (debootstrap_1.0.100.tar.gz) = 930eeeac31a7c49f80291390af4a3893416f2044
-SHA512 (debootstrap_1.0.100.tar.gz) = 36bdf55207d73f9b5c259b1d9c19c36918778ca35478bf654a97d82d5e98fb6293fbf68adfa2e0a113e0d53ec48f19173232587fb1f727068b2516e9e51436d3
-Size (debootstrap_1.0.100.tar.gz) = 72269 bytes
+SHA1 (debootstrap_1.0.114.tar.gz) = 7f95d561dc51d753f955302f9f9a72c6aaa86d94
+RMD160 (debootstrap_1.0.114.tar.gz) = d59c1158d8fe3aa3ab2353f9f73a80b2fffb9e5a
+SHA512 (debootstrap_1.0.114.tar.gz) = 3eb6c3d50a403c6edde229a2da3840117f603e3e9c211f89c8b1aa759bdcf8001b5f115ddcd345601087886b6ee838972f377f3f244cf26879ca87445d2a895a
+Size (debootstrap_1.0.114.tar.gz) = 75613 bytes
 SHA1 (ubuntu-archive-keyring_2012.05.19-1_all.deb) = 92ada09596a94c01f02929298f3a53d2531ff751
 RMD160 (ubuntu-archive-keyring_2012.05.19-1_all.deb) = 7bfda3f4b6b736265a2381ca86b2b0da9cc3f49f
 SHA512 (ubuntu-archive-keyring_2012.05.19-1_all.deb) = a7bbb034788268919c9ea0f21707436fb1f2f5d1b39a6f4d2cc78cf3f4b7dadc58c5a658beba403712cf3e6c5914bd8e21072ba105f93aa6761b8f0764016350
 Size (ubuntu-archive-keyring_2012.05.19-1_all.deb) = 17986 bytes
 SHA1 (patch-Makefile) = c549532e9a5842b586a85a091eb1204c84f29859
-SHA1 (patch-debootstrap) = f344c912ffbb421fb7205a6b7a34b52bc58ad334
+SHA1 (patch-debootstrap) = e26458e8485d185f5c1d14ed2ef6b90f49c8f3a2
 SHA1 (patch-functions) = 53c09d983608d7360c6ba503aaafd0c419610d23
diff --git a/debootstrap/patches/patch-debootstrap b/debootstrap/patches/patch-debootstrap
index 3f8b7c8e80..a298e931ee 100644
--- a/debootstrap/patches/patch-debootstrap
+++ b/debootstrap/patches/patch-debootstrap
@@ -1,6 +1,6 @@
 $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
 
---- debootstrap.orig	2018-05-22 11:15:26.000000000 +0000
+--- debootstrap.orig	2019-01-09 12:59:11.000000000 +0000
 +++ debootstrap
 @@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
  	if [ -x /debootstrap/debootstrap ]; then
@@ -13,14 +13,14 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  
 @@ -29,7 +29,7 @@ FORCE_KEYRING=""
  VARIANT=""
- MERGED_USR="no"
+ MERGED_USR=""
  ARCH=""
 -HOST_ARCH=""
 +HOST_ARCH="$(uname -m)"
  HOST_OS=""
  KEEP_DEBOOTSTRAP_DIR=""
  USE_DEBIANINSTALLER_INTERACTION=""
-@@ -475,7 +475,7 @@ elif in_path udpkg && \
+@@ -507,7 +507,7 @@ elif in_path udpkg && \
  elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
  	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
  fi
@@ -29,7 +29,7 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  # basic host OS guessing for non-Debian systems
  if [ -z "$HOST_OS" ]; then
  	case $(uname) in
-@@ -491,6 +491,9 @@ if [ -z "$HOST_OS" ]; then
+@@ -523,6 +523,9 @@ if [ -z "$HOST_OS" ]; then
  		FreeBSD*)
  			HOST_OS=freebsd
  		;;
@@ -39,7 +39,7 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  	esac
  fi
  
-@@ -512,7 +515,7 @@ fi
+@@ -544,7 +547,7 @@ fi
  if [ "$TARGET" = "/" ]; then
  	CHROOT_CMD=""
  else
@@ -48,7 +48,7 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  fi
  
  # fakeroot cannot check /proc/1/environ
-@@ -550,6 +553,7 @@ fi
+@@ -581,6 +584,7 @@ fi
  
  if [ "$TARGET" != "" ]; then
  	mkdir -p "$TARGET/debootstrap"