debootstrap: update to 1.0.86

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Nov 7 12:54:26 2016 +0100
Changeset:	f10806fa93aeb88bee716627a9d4e6e10eac751d

Modified Files:
	TODO
	debootstrap/Makefile
	debootstrap/PLIST
	debootstrap/distinfo
	debootstrap/patches/patch-debootstrap
Added Files:
	debootstrap/log

Log Message:
debootstrap: update to 1.0.86

debootstrap (1.0.86) unstable; urgency=high

  * Rework split_inline_sig by using shell built-ins instead of trying to
    mix sed and tr together, which might work on regular systems but not
    from inside the Debian Installer (Closes: #842591). Thanks to Ansgar
    Burchardt for the proof of concept!

 -- Cyril Brulebois <kibi%debian.org@localhost>  Sun, 30 Oct 2016 23:35:45 +0100

debootstrap (1.0.85) unstable; urgency=medium

  [ Julien Cristau ]
  * Add support for downloading and validating InRelease files, by splitting
    up detached signature from signed data.
  * Switch default mirror to deb.debian.org.

  [ Colin Watson ]
  * Add (Ubuntu) zesty as a symlink to gutsy.

  [ Ansgar Burchardt ]
  * Add jessie-kfreebsd to merged-/usr blacklist.
  * No longer Build-Depend on makedev. The code using it was already
    removed in debootstrap 1.0.82.
  * Do not use `tar -k` for older releases which might have file
    conflicts between the packages to be installed. (Closes: #838388)
  * Error out when seeing short options. (Closes: #548880)
  * Add oldoldstable -> sid script symlink. (Closes: #792734)
  * Add buster -> sid and bullseye -> sid script symlinks.
  * Only unpack and configure the base system when there are actually
    packages to install. (Closes: #825034)
  * debootstrap.8: Use stretch instead of wheezy in examples.

  [ Marco d'Itri ]
  * Enable merged-/usr by default. (Closes: #839046)

 -- Julien Cristau <jcristau%debian.org@localhost>  Fri, 21 Oct 2016 20:22:49 +0200

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f10806fa93aeb88bee716627a9d4e6e10eac751d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 TODO                                  |  1 -
 debootstrap/Makefile                  |  6 +++---
 debootstrap/PLIST                     |  4 ++++
 debootstrap/distinfo                  | 10 +++++-----
 debootstrap/log                       | 36 +++++++++++++++++++++++++++++++++++
 debootstrap/patches/patch-debootstrap |  4 ++--
 6 files changed, 50 insertions(+), 11 deletions(-)

diffs:
diff --git a/TODO b/TODO
index 200d405..12281c9 100644
--- a/TODO
+++ b/TODO
@@ -17,7 +17,6 @@ Suggested package updates
 	o cinelerra-4.5
 	o d4x-2.5.7.1
 	o daphne-1.0
-	o debootstrap-1.0.86
 	o desmume-0.9.11
 	o directfb-1.0.0
 	o dolphin-4.0
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index d3bd853..43b64b2 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.5 2015/08/06 07:56:45 thomasklausner Exp $
 
-DISTNAME=	debootstrap_1.0.84
+DISTNAME=	debootstrap_1.0.86
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}
@@ -19,8 +19,8 @@ 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}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/debootstrap
 USE_LANGUAGES=	# none
 
 USE_TOOLS+=	gmake xzcat tar bash:run
diff --git a/debootstrap/PLIST b/debootstrap/PLIST
index ab786e0..dc7c874 100644
--- a/debootstrap/PLIST
+++ b/debootstrap/PLIST
@@ -9,6 +9,8 @@ share/debootstrap/libfakesyscall.c
 share/debootstrap/scripts/aequorea
 share/debootstrap/scripts/bartholomea
 share/debootstrap/scripts/breezy
+share/debootstrap/scripts/bullseye
+share/debootstrap/scripts/buster
 share/debootstrap/scripts/chromodoris
 share/debootstrap/scripts/dapper
 share/debootstrap/scripts/dasyatis
@@ -29,6 +31,7 @@ share/debootstrap/scripts/lenny
 share/debootstrap/scripts/lucid
 share/debootstrap/scripts/maverick
 share/debootstrap/scripts/natty
+share/debootstrap/scripts/oldoldstable
 share/debootstrap/scripts/oldstable
 share/debootstrap/scripts/oneiric
 share/debootstrap/scripts/potato
@@ -56,4 +59,5 @@ share/debootstrap/scripts/woody
 share/debootstrap/scripts/woody.buildd
 share/debootstrap/scripts/xenial
 share/debootstrap/scripts/yakkety
+share/debootstrap/scripts/zesty
 share/debootstrap/ubuntu-archive-keyring.gpg
diff --git a/debootstrap/distinfo b/debootstrap/distinfo
index 749d011..fdac517 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.84.tar.gz) = 4ffcda1e4d82130cdd980784d1c673fcc7367b82
-RMD160 (debootstrap_1.0.84.tar.gz) = 0d69660deba14547561138037e382e2f28ecc07a
-SHA512 (debootstrap_1.0.84.tar.gz) = e062a5a46dd6668e8e236c6d11a5d0188231d0b457467b01fc4b4faa976b90281febc6b52e0e19bf94e62e3535c3072f2e971ac0cdfcdf1f570a401dba78cd19
-Size (debootstrap_1.0.84.tar.gz) = 65365 bytes
+SHA1 (debootstrap_1.0.86.tar.gz) = 3261092408a4f0a8d0939e07d1d5fea6e69369ed
+RMD160 (debootstrap_1.0.86.tar.gz) = 04d8843c1ae0e99466053fe1d2ea7c8b9abef6d4
+SHA512 (debootstrap_1.0.86.tar.gz) = f9f4714e7017ae8788cc0e3939b5365fde2298a6bc05b160af652d421b8330611414c524fcb8e2d1c265e70920a62400de04eb5e57aa81e6f240d6fd0ff829a2
+Size (debootstrap_1.0.86.tar.gz) = 65352 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) = 8e03c0208840037d4c5e6e1fbeb5213ca67ae513
+SHA1 (patch-debootstrap) = 54eff84145e092712419dd0766103180af402933
 SHA1 (patch-functions) = 5a51c6102699cbd0bab867bb0dd9100dabc40559
diff --git a/debootstrap/log b/debootstrap/log
new file mode 100644
index 0000000..a92269c
--- /dev/null
+++ b/debootstrap/log
@@ -0,0 +1,36 @@
+debootstrap (1.0.86) unstable; urgency=high
+
+  * Rework split_inline_sig by using shell built-ins instead of trying to
+    mix sed and tr together, which might work on regular systems but not
+    from inside the Debian Installer (Closes: #842591). Thanks to Ansgar
+    Burchardt for the proof of concept!
+
+ -- Cyril Brulebois <kibi%debian.org@localhost>  Sun, 30 Oct 2016 23:35:45 +0100
+
+debootstrap (1.0.85) unstable; urgency=medium
+
+  [ Julien Cristau ]
+  * Add support for downloading and validating InRelease files, by splitting
+    up detached signature from signed data.
+  * Switch default mirror to deb.debian.org.
+
+  [ Colin Watson ]
+  * Add (Ubuntu) zesty as a symlink to gutsy.
+
+  [ Ansgar Burchardt ]
+  * Add jessie-kfreebsd to merged-/usr blacklist.
+  * No longer Build-Depend on makedev. The code using it was already
+    removed in debootstrap 1.0.82.
+  * Do not use `tar -k` for older releases which might have file
+    conflicts between the packages to be installed. (Closes: #838388)
+  * Error out when seeing short options. (Closes: #548880)
+  * Add oldoldstable -> sid script symlink. (Closes: #792734)
+  * Add buster -> sid and bullseye -> sid script symlinks.
+  * Only unpack and configure the base system when there are actually
+    packages to install. (Closes: #825034)
+  * debootstrap.8: Use stretch instead of wheezy in examples.
+
+  [ Marco d'Itri ]
+  * Enable merged-/usr by default. (Closes: #839046)
+
+ -- Julien Cristau <jcristau%debian.org@localhost>  Fri, 21 Oct 2016 20:22:49 +0200
diff --git a/debootstrap/patches/patch-debootstrap b/debootstrap/patches/patch-debootstrap
index 01861d0..6733d97 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	2016-09-14 03:01:54.000000000 +0000
+--- debootstrap.orig	2016-10-27 19:53:47.000000000 +0000
 +++ debootstrap
 @@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
  	if [ -x /debootstrap/debootstrap ]; then
@@ -13,7 +13,7 @@ $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="yes"
  ARCH=""
 -HOST_ARCH=""
 +HOST_ARCH="$(uname -m)"