pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

debootstrap: update to 1.0.100 so distfile fetches.



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Fri May 25 15:31:23 2018 +0300
Changeset:	4212e6ee87d6f4c882050a84ab11b6dc80610640

Modified Files:
	debootstrap/MESSAGE
	debootstrap/Makefile
	debootstrap/PLIST
	debootstrap/distinfo
	debootstrap/patches/patch-debootstrap

Log Message:
debootstrap: update to 1.0.100 so distfile fetches.

update instructions to install a newer debian

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

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

diffstat:
 debootstrap/MESSAGE                   | 10 +++++-----
 debootstrap/Makefile                  |  2 +-
 debootstrap/PLIST                     |  7 +++++++
 debootstrap/distinfo                  | 10 +++++-----
 debootstrap/patches/patch-debootstrap | 22 +++++++++++-----------
 5 files changed, 29 insertions(+), 22 deletions(-)

diffs:
diff --git a/debootstrap/MESSAGE b/debootstrap/MESSAGE
index e08621e1e7..dba3f0a34a 100644
--- a/debootstrap/MESSAGE
+++ b/debootstrap/MESSAGE
@@ -1,12 +1,12 @@
 ===========================================================================
 $NetBSD: MESSAGE,v 1.2 2015/03/22 00:28:40 tnn2 Exp $
 
-To setup a Debian "wheezy" chroot on NetBSD/amd64 system:
+To setup a Debian "stretch" chroot on NetBSD/amd64 system:
 
-host# PATH=${PATH}:${PREFIX}/gnu/bin debootstrap --arch=amd64 wheezy /emul/wheezy
-host# cp ${PREFIX}/share/debootstrap/libfakesyscall-amd64.so /emul/wheezy
-host# mount -t procfs -o linux proc /emul/wheezy/proc
-host# chroot /emul/wheezy /bin/bash
+host# PATH=${PATH}:${PREFIX}/gnu/bin debootstrap --arch=amd64 stretch /emul/stretch
+host# cp ${PREFIX}/share/debootstrap/libfakesyscall-amd64.so /emul/stretch
+host# mount -t procfs -o linux proc /emul/stretch/proc
+host# chroot /emul/stretch /bin/bash
 debian# export LD_PRELOAD=/libfakesyscall-amd64.so
 debian# apt-get moo
 
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index dc2558266d..04bc1ffdd3 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=			debootstrap_1.0.90
+DISTNAME=			debootstrap_1.0.100
 PKGNAME=			${DISTNAME:S/_/-/}
 CATEGORIES=			sysutils emulators
 MASTER_SITES=			${MASTER_SITE_DEBIAN:=pool/main/d/debootstrap/}
diff --git a/debootstrap/PLIST b/debootstrap/PLIST
index 46c5284395..0359adf604 100644
--- a/debootstrap/PLIST
+++ b/debootstrap/PLIST
@@ -9,12 +9,15 @@ share/debootstrap/libfakesyscall.c
 share/debootstrap/scripts/aequorea
 share/debootstrap/scripts/artful
 share/debootstrap/scripts/bartholomea
+share/debootstrap/scripts/bionic
 share/debootstrap/scripts/breezy
 share/debootstrap/scripts/bullseye
 share/debootstrap/scripts/buster
 share/debootstrap/scripts/chromodoris
+share/debootstrap/scripts/cosmic
 share/debootstrap/scripts/dapper
 share/debootstrap/scripts/dasyatis
+share/debootstrap/scripts/debian-common
 share/debootstrap/scripts/edgy
 share/debootstrap/scripts/etch
 share/debootstrap/scripts/etch-m68k
@@ -27,6 +30,10 @@ share/debootstrap/scripts/intrepid
 share/debootstrap/scripts/jaunty
 share/debootstrap/scripts/jessie
 share/debootstrap/scripts/jessie-kfreebsd
+share/debootstrap/scripts/kali
+share/debootstrap/scripts/kali-dev
+share/debootstrap/scripts/kali-last-snapshot
+share/debootstrap/scripts/kali-rolling
 share/debootstrap/scripts/karmic
 share/debootstrap/scripts/lenny
 share/debootstrap/scripts/lucid
diff --git a/debootstrap/distinfo b/debootstrap/distinfo
index ffbd4d4637..514992b181 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.90.tar.gz) = eb5d7bd58c16ee469799dfd50bb381f7d368db18
-RMD160 (debootstrap_1.0.90.tar.gz) = 4f53fe951fda2640955994bd9985d82b9ce74fc1
-SHA512 (debootstrap_1.0.90.tar.gz) = f8fc584d08b63f9f3fe1120b7b7ca41ef4acab4201ded08a45d7d5c1e4be67ff365840fbb65dad97c0798fd3d565148df2c465bc4cd3f62c0b31226dd1b2575d
-Size (debootstrap_1.0.90.tar.gz) = 69936 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 (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) = 871d8e81617390d90bc81534d4fcd109773a232a
+SHA1 (patch-debootstrap) = f344c912ffbb421fb7205a6b7a34b52bc58ad334
 SHA1 (patch-functions) = 53c09d983608d7360c6ba503aaafd0c419610d23
diff --git a/debootstrap/patches/patch-debootstrap b/debootstrap/patches/patch-debootstrap
index 5e4060e88d..3f8b7c8e80 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-11-14 04:01:52.000000000 +0000
+--- debootstrap.orig	2018-05-22 11:15:26.000000000 +0000
 +++ debootstrap
 @@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
  	if [ -x /debootstrap/debootstrap ]; then
@@ -20,16 +20,16 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  HOST_OS=""
  KEEP_DEBOOTSTRAP_DIR=""
  USE_DEBIANINSTALLER_INTERACTION=""
-@@ -428,7 +428,7 @@ elif in_path udpkg && \
- elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
- 	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
+@@ -475,7 +475,7 @@ elif in_path udpkg && \
+ elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
+ 	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
  fi
 -HOST_OS="$HOST_ARCH"
 +#HOST_OS="$HOST_ARCH"
  # basic host OS guessing for non-Debian systems
  if [ -z "$HOST_OS" ]; then
- 	case `uname` in
-@@ -444,6 +444,9 @@ if [ -z "$HOST_OS" ]; then
+ 	case $(uname) in
+@@ -491,6 +491,9 @@ if [ -z "$HOST_OS" ]; then
  		FreeBSD*)
  			HOST_OS=freebsd
  		;;
@@ -39,16 +39,16 @@ $NetBSD: patch-debootstrap,v 1.2 2015/07/10 07:45:00 thomasklausner Exp $
  	esac
  fi
  
-@@ -465,7 +468,7 @@ fi
+@@ -512,7 +515,7 @@ fi
  if [ "$TARGET" = "/" ]; then
  	CHROOT_CMD=""
  else
--	CHROOT_CMD="chroot $TARGET"
-+	CHROOT_CMD="chroot $TARGET /usr/bin/env LD_PRELOAD=/debootstrap/libfakesyscall-${ARCH}.so"
+-	CHROOT_CMD="chroot \"$TARGET\""
++	CHROOT_CMD="chroot \"$TARGET\" /usr/bin/env LD_PRELOAD=/debootstrap/libfakesyscall-${ARCH}.so"
  fi
  
- if [ -z "$SHA_SIZE" ]; then
-@@ -496,6 +499,7 @@ fi
+ # fakeroot cannot check /proc/1/environ
+@@ -550,6 +553,7 @@ fi
  
  if [ "$TARGET" != "" ]; then
  	mkdir -p "$TARGET/debootstrap"


Home | Main Index | Thread Index | Old Index