From ebb98e5eafd1b69dc1cb2fd5c95859cebbeaef6b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 10 Apr 2018 12:28:07 +0200
Subject: [PATCH] debootstrap: remove bug-668001.patch.

A systemd-free stretch can be installed without this patch, e.g. using:

  debootstrap --verbose --include=sysvinit-core,makedev
    --exclude=init,systemd-sysv,systemd --components=main,contrib,non-free
    stretch ./rootdir http://http.debian.net/debian
---
 srcpkgs/debootstrap/files/bug-668001.patch | 41 ----------------------
 srcpkgs/debootstrap/template               |  3 +-
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 srcpkgs/debootstrap/files/bug-668001.patch

diff --git a/srcpkgs/debootstrap/files/bug-668001.patch b/srcpkgs/debootstrap/files/bug-668001.patch
deleted file mode 100644
index 28834ba5f41..00000000000
--- a/srcpkgs/debootstrap/files/bug-668001.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- usr/bin/debootstrap	2014-09-25 13:44:06.000000000 +0900
-+++ usr/bin/debootstrap	2014-10-17 11:57:17.000000000 +0900
-@@ -50,7 +50,7 @@
-         fi
-     fi
- fi
--export LANG USE_COMPONENTS
-+export LANG USE_COMPONENTS EXCLUDE
- umask 022
- 
- ###########################################################################
---- usr/share/debootstrap/functions	2014-09-15 18:23:00.000000000 +0900
-+++ usr/share/debootstrap/functions	2014-10-17 11:57:59.000000000 +0900
-@@ -1171,6 +1171,8 @@
- 			perl -e '
- $prevpkg = "";
- @d = ();
-+my %exclude;
-+$exclude{$_} = 1 for split(" ", $ENV{"EXCLUDE"});
- while (<STDIN>) {
- 	chomp;
- 	if (/^Package: (.*)$/) {
-@@ -1187,10 +1189,14 @@
- 	$in = 0 if (/^$/);
- 	if ($in and (/^Depends: (.*)$/ or /^Pre-Depends: (.*)$/)) {
- 		for $d (split /\s*,\s*/, $1) {
--			$d =~ s/\s*[|].*$//;
--			$d =~ s/\s*[(].*[)]\s*//;
--			$d =~ s/:.*//;
--			push @d, $d;
-+			for $p (split /\s*\|\s*/, $d) {
-+				$p =~ s/\s*[(].*[)]\s*//;
-+				$p =~ s/:.*//;
-+				if (!$exclude{$p}) {
-+					push @d, $p;
-+					last;
-+				}
-+			}
- 		}
- 	}
- }
diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index b7bba4da9e0..b4eb4723123 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
 version=1.0.96
-revision=1
+revision=2
 build_style=fetch
 depends="binutils bzip2 gnupg gzip tar wget xz"
 short_desc="Bootstrap a basic Debian system"
@@ -17,7 +17,6 @@ do_install() {
 	ar p ${pkgname}_${version}_all.deb data.tar.gz | tar xvzf - -C ${DESTDIR}
 	ar p debian-archive-keyring_2014.3_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
 	mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin
-	patch --no-backup-if-mismatch -d ${DESTDIR} -Np0 <${FILESDIR}/bug-668001.patch
 	sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap
 	vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE
 	rm ${DESTDIR}/usr/share/doc/debootstrap/copyright