debootstrap: update to 1.0.84:

debootstrap (1.0.84) unstable; urgency=medium

  [ Ansgar Burchardt ]
  * Add support for xz-compressed Packages indices. (Closes: #837649)

 -- Christian Perrier <bubulle@debian.org>  Thu, 06 Oct 2016 06:59:38 +0200

debootstrap (1.0.83) unstable; urgency=medium

  [ Ansgar Burchardt ]
  * functions: Validate that the requested suite is listed in the
    Release file's Suite or Codename field. (Closes: #837075)
  * Add support for merged-/usr, enabled by a new --merged-usr option.
    (Closes: #810301)
  * Feign install of dpkg in second stage. This avoids problems when
    using dpkg-deb together with busybox' tar. (Closes: #837185)
  * README: Use https://.

  [ Steve McIntyre ]
  * Update Standards-Version to 3.9.8 (no changes needed)

 -- Steve McIntyre <93sam@debian.org>  Tue, 13 Sep 2016 13:16:41 +0100

debootstrap (1.0.82) unstable; urgency=medium

  [ Alex Bennée ]
  * Excise all devices.tar.gz code. Closes: #830869

 -- Christian Perrier <bubulle@debian.org>  Thu, 08 Sep 2016 07:09:56 +0200
This commit is contained in:
Thomas Klausner 2016-10-19 15:48:19 +02:00
parent f358e05238
commit 37fd4c8bff
6 changed files with 19 additions and 31 deletions

1
TODO
View File

@ -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.84
o desmume-0.9.11
o directfb-1.0.0
o dolphin-4.0

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.5 2015/08/06 07:56:45 thomasklausner Exp $
DISTNAME= debootstrap_1.0.81
DISTNAME= debootstrap_1.0.84
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= sysutils emulators
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}

View File

@ -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.81.tar.gz) = 9482ef8fa26ca6e919ee25e6abc003e7932d8fa4
RMD160 (debootstrap_1.0.81.tar.gz) = 56d0ccc3ad7915af9511340ff15b44074214cc28
SHA512 (debootstrap_1.0.81.tar.gz) = 3869f98070d3a5d2f41824fa9caaae97cfa408e01f356358568df91015970bf3624e93ed4b7666a086d42883fcb1d061f5854a8ece90d0ffdb685c898cb9462d
Size (debootstrap_1.0.81.tar.gz) = 64394 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 (ubuntu-archive-keyring_2012.05.19-5_all.deb) = 3c84538420d612fad3e31ad768a9f1b172a958b9
RMD160 (ubuntu-archive-keyring_2012.05.19-5_all.deb) = 2a8b1e8825945345f3a4f11918f1a5f99fe0511c
SHA512 (ubuntu-archive-keyring_2012.05.19-5_all.deb) = e692786f6ef54d83c629689503879203d721f7029161f498c015e603e3e64444c7502fdaa6e460f053ddc602b4004e732e49c766cb6226a9041032c381c686fa
Size (ubuntu-archive-keyring_2012.05.19-5_all.deb) = 18384 bytes
SHA1 (patch-Makefile) = 021a7732eb6f6b8e99f0011402d73d6c07d295ad
SHA1 (patch-debootstrap) = 8df498e5c5af1a516edfee58d7e8ef2301aea2c9
SHA1 (patch-functions) = 90e0421e41c42c465b69db1f1e568989b0346a3c
SHA1 (patch-Makefile) = c549532e9a5842b586a85a091eb1204c84f29859
SHA1 (patch-debootstrap) = 8e03c0208840037d4c5e6e1fbeb5213ca67ae513
SHA1 (patch-functions) = 5a51c6102699cbd0bab867bb0dd9100dabc40559

View File

@ -2,9 +2,9 @@ $NetBSD: patch-Makefile,v 1.1 2015/03/21 23:37:22 tnn2 Exp $
Allow user-destdir installation
--- Makefile.orig 2014-12-30 04:00:48.000000000 +0000
--- Makefile.orig 2016-09-07 03:01:46.000000000 +0000
+++ Makefile
@@ -20,10 +20,10 @@ install:
@@ -12,8 +12,8 @@ install:
mkdir -p $(DESTDIR)/usr/sbin
cp -a scripts/* $(DSDIR)/scripts/
@ -15,5 +15,3 @@ Allow user-destdir installation
- chown root:root $(DESTDIR)/usr/sbin/debootstrap
+# chown root:root $(DESTDIR)/usr/sbin/debootstrap
chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
ifeq ($(shell uname),Linux)

View File

@ -1,6 +1,6 @@
$NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
--- debootstrap.orig 2015-05-16 18:24:16.000000000 +0000
--- debootstrap.orig 2016-09-14 03:01:54.000000000 +0000
+++ debootstrap
@@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
if [ -x /debootstrap/debootstrap ]; then
@ -11,16 +11,16 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
fi
fi
@@ -30,7 +30,7 @@ DISABLE_KEYRING=""
FORCE_KEYRING=""
@@ -29,7 +29,7 @@ FORCE_KEYRING=""
VARIANT=""
MERGED_USR="no"
ARCH=""
-HOST_ARCH=""
+HOST_ARCH="$(uname -m)"
HOST_OS=""
KEEP_DEBOOTSTRAP_DIR=""
USE_DEBIANINSTALLER_INTERACTION=""
@@ -421,7 +421,7 @@ elif in_path udpkg && \
@@ -428,7 +428,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
@@ -437,6 +437,9 @@ if [ -z "$HOST_OS" ]; then
@@ -444,6 +444,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
@@ -468,7 +471,7 @@ elif doing_variant scratchbox; then
@@ -475,7 +478,7 @@ elif doing_variant scratchbox; then
[ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET"
CHROOT_CMD="sb2 -eR -t $SB2_TARGET"
else
@ -48,7 +48,7 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
fi
if [ -z "$SHA_SIZE" ]; then
@@ -499,6 +502,7 @@ fi
@@ -506,6 +509,7 @@ fi
if [ "$TARGET" != "" ]; then
mkdir -p "$TARGET/debootstrap"

View File

@ -1,8 +1,8 @@
$NetBSD: patch-functions,v 1.2 2015/03/22 01:52:06 tnn2 Exp $
--- functions.orig 2016-02-18 04:01:23.000000000 +0000
--- functions.orig 2016-10-05 13:09:24.000000000 +0000
+++ functions
@@ -1020,6 +1020,11 @@ setup_proc () {
@@ -1044,6 +1044,11 @@ setup_proc () {
mount -t linprocfs proc $TARGET/proc
fi
;;
@ -14,12 +14,3 @@ $NetBSD: patch-functions,v 1.2 2015/03/22 01:52:06 tnn2 Exp $
hurd*)
# firmlink $TARGET/{dev,servers,proc} to the system ones.
settrans -a "$TARGET/dev" /hurd/firmlink /dev
@@ -1068,7 +1073,7 @@ setup_devices () {
if true; then
setup_devices_simple
elif [ -e "$DEVICES_TARGZ" ]; then
- zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
+ zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xpf -)
else
error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
fi