Hi list, I've almost prepared another NMU, please check it.
debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium * Non-maintainer upload. [ Hideki Yamane ] * Avoid unnecessary keyring warning with --second-stage option (Closes: #734324) * Output warning if falling back to sha1 (Closes: #775444) Thanks to jnqnfe <jnq...@gmail.com> for the patch. * Prevent unintended removal with --print-debs option (Closes: #833525) Thanks to Johannes Schauer <jo...@debian.org> for the patch * Add scripts for Kali Linux (Closes: #798564) * debian/control - Add "Suggests: squid-deb-proxy-client" [ Sjoerd Simons ] * Fix multiple components usage for --foreign/--second-stage (Closes: #806780) [ Michael Vogt ] * Try to auto-detect proxy if available (e.g. squid-deb-proxy-client) (Closes: #732628) -- Hideki Yamane <henr...@debian.org> Tue, 13 Mar 2018 21:02:16 +0900
>From 2a11ef58581ca9d6a6ccab46939839a7d1dbfabb Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Mon, 12 Mar 2018 20:57:09 +0900 Subject: [PATCH 01/13] Avoid unnecessary keyring warning with --second-stage option (Closes: #734324) --- functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions b/functions index 7024fc9..599931b 100644 --- a/functions +++ b/functions @@ -196,7 +196,8 @@ download_style () { } keyring () { - if [ -z "$KEYRING" ]; then + # avoid unnecessary warning with --second-stage + if [ -z "$KEYRING" ] && [ "$SECOND_STAGE_ONLY" != true ]; then if [ -e "$1" ]; then KEYRING="$1" elif [ -z "$DISABLE_KEYRING" ]; then -- 2.16.3
>From 473e2d6fdde8542628e4fc77c550927c8068ffdd Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Mon, 12 Mar 2018 21:19:49 +0900 Subject: [PATCH 02/13] note to fix #734324 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 88f34a6..b3cd14f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Avoid unnecessary keyring warning with --second-stage option + (Closes: #734324) + + -- Hideki Yamane <henr...@debian.org> Mon, 12 Mar 2018 20:58:42 +0900 + debootstrap (1.0.93+nmu4) unstable; urgency=medium * Non-maintainer Upload. -- 2.16.3
>From ce2a768e922d7b2a75dc61a05f75d771fc558d20 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Mon, 12 Mar 2018 21:43:51 +0900 Subject: [PATCH 03/13] Output warning if falling back to sha1 (Closes: #775444) --- debian/changelog | 2 ++ debootstrap | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index b3cd14f..101880d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium * Non-maintainer upload. * Avoid unnecessary keyring warning with --second-stage option (Closes: #734324) + * Output warning if falling back to sha1 (Closes: #775444) + Thanks to jnqnfe <jnq...@gmail.com> for the patch. -- Hideki Yamane <henr...@debian.org> Mon, 12 Mar 2018 20:58:42 +0900 diff --git a/debootstrap b/debootstrap index 61992ab..0160afa 100755 --- a/debootstrap +++ b/debootstrap @@ -475,6 +475,7 @@ if [ -z "$SHA_SIZE" ]; then SHA_SIZE=256 fi if ! in_path "sha${SHA_SIZE}sum" && ! in_path "sha${SHA_SIZE}"; then + warning SHA_SIZE "Cannot find binary for checking sha%s checksums, falling back to sha1" "${SHA_SIZE}" SHA_SIZE=1 fi DEBOOTSTRAP_CHECKSUM_FIELD="SHA$SHA_SIZE" -- 2.16.3
>From f9ed2111841072c28f29675c627b6e582136a5ff Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Tue, 13 Mar 2018 20:39:05 +0900 Subject: [PATCH 04/13] prevent removal when print-deb option was specified and its directory doesn't empty Based on patch by Johannes Schauer <jo...@debian.org> Closes: #833525 --- debootstrap | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/debootstrap b/debootstrap index 0160afa..6300517 100755 --- a/debootstrap +++ b/debootstrap @@ -422,6 +422,13 @@ fi ########################################################################### +TARGET_EMPTY=true +if [ -e "$TARGET"/* ]; then + TARGET_EMPTY=false +fi + +########################################################################### + if in_path dpkg && \ dpkg --print-architecture >/dev/null 2>&1; then HOST_ARCH=`/usr/bin/dpkg --print-architecture` @@ -701,8 +708,13 @@ if am_doing_phase second_stage; then fi if am_doing_phase kill_target; then - if [ "$KEEP_DEBOOTSTRAP_DIR" != true ]; then - info KILLTARGET "Deleting target directory" - rm -rf "$TARGET" + if [ "$KEEP_DEBOOTSTRAP_DIR" = true ]; then + true + # prevent removal when print-deb option was specified and its directory doesn't empty + elif [ "$PRINT_DEBS" = true ] && [ "$TARGET_EMPTY" != true ]; then + true + else + info KILLTARGET "Deleting target directory" + rm -rf --one-file-system "$TARGET" fi fi -- 2.16.3
>From 19d8242c41e43eb6d776f20ec6568a23232c5e6a Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Tue, 13 Mar 2018 20:46:11 +0900 Subject: [PATCH 05/13] note to close #833525 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 101880d..fa74839 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium (Closes: #734324) * Output warning if falling back to sha1 (Closes: #775444) Thanks to jnqnfe <jnq...@gmail.com> for the patch. + * Prevent unintended removal with --print-debs option (Closes: #833525) + Thanks to Johannes Schauer <jo...@debian.org> for the patch -- Hideki Yamane <henr...@debian.org> Mon, 12 Mar 2018 20:58:42 +0900 -- 2.16.3
>From 94926326a895f230ac6f5f466e52ddebf3936f8f Mon Sep 17 00:00:00 2001 From: Sjoerd Simons <sjoerd.sim...@collabora.co.uk> Date: Tue, 1 Dec 2015 09:09:07 +0100 Subject: [PATCH 06/13] Fix multiple components usage for --foreign commit e24e4b006736734e, bug #757819 made resolve_deps and setup_available in the --foreign case. However this only worked when using just one component as the USE_COMPONENTS variable is | delimited. Translate the USE_COMPONENTS variable on the fly from | delimited to space delimeted to allow multiple components to work again. Signed-off-by: Sjoerd Simons <sjoerd.sim...@collabora.co.uk> --- functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions b/functions index 599931b..bb7dae1 100644 --- a/functions +++ b/functions @@ -1398,14 +1398,14 @@ resolve_deps () { local ALLPKGS2=""; while [ "$PKGS" != "" ]; do local NEWPKGS="" - for c in ${COMPONENTS:-$USE_COMPONENTS}; do + for c in ${COMPONENTS:-$(echo ${USE_COMPONENTS} | tr '|' ' ')}; do local path="dists/$SUITE/$c/binary-$ARCH/Packages" local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")" NEWPKGS="$NEWPKGS $("$PKGDETAILS" GETDEPS "$pkgdest" $PKGS)" done PKGS=$(echo "$PKGS $NEWPKGS" | tr ' ' '\n' | sort | uniq) local REALPKGS="" - for c in ${COMPONENTS:-$USE_COMPONENTS}; do + for c in ${COMPONENTS:-$(echo ${USE_COMPONENTS} | tr '|' ' ')}; do local path="dists/$SUITE/$c/binary-$ARCH/Packages" local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")" REALPKGS="$REALPKGS $("$PKGDETAILS" PKGS REAL "$pkgdest" $PKGS | sed -n 's/ .*REAL.*$//p')" @@ -1421,7 +1421,7 @@ resolve_deps () { setup_available () { local m1="${MIRRORS%% *}" - for c in ${COMPONENTS:-$USE_COMPONENTS}; do + for c in ${COMPONENTS:-$(echo ${USE_COMPONENTS} | tr '|' ' ')}; do local path="dists/$SUITE/$c/binary-$ARCH/Packages" local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")" # XXX: What if a package is in more than one component? -- 2.16.3
>From 09a3e9c5a4e51b0f106b435ca1bdb0bc606e1f92 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Sun, 18 Mar 2018 00:14:58 +0900 Subject: [PATCH 07/13] fix regression Thanks to Ansgar Burchardt <ans...@debian.org> pointed out --- debootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debootstrap b/debootstrap index 6300517..cde1fd7 100755 --- a/debootstrap +++ b/debootstrap @@ -423,7 +423,7 @@ fi ########################################################################### TARGET_EMPTY=true -if [ -e "$TARGET"/* ]; then +if [ "$(ls -A "$TARGET")" ]; then TARGET_EMPTY=false fi -- 2.16.3
>From 8a37bab6d2c99b7370de290b3bb25af7371b3924 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Tue, 13 Mar 2018 20:59:15 +0900 Subject: [PATCH 08/13] note to fix #806780 --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa74839..c57ae53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium * Non-maintainer upload. + + [ Hideki Yamane ] * Avoid unnecessary keyring warning with --second-stage option (Closes: #734324) * Output warning if falling back to sha1 (Closes: #775444) @@ -8,7 +10,11 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium * Prevent unintended removal with --print-debs option (Closes: #833525) Thanks to Johannes Schauer <jo...@debian.org> for the patch - -- Hideki Yamane <henr...@debian.org> Mon, 12 Mar 2018 20:58:42 +0900 + [ Sjoerd Simons ] + * Fix multiple components usage for --foreign/--second-stage + (Closes: #806780) + + -- Hideki Yamane <henr...@debian.org> Tue, 13 Mar 2018 20:58:11 +0900 debootstrap (1.0.93+nmu4) unstable; urgency=medium -- 2.16.3
>From 0ab75af3d2be6a7a38f05d5824a9eca752374bbf Mon Sep 17 00:00:00 2001 From: Michael Vogt <m...@debian.org> Date: Thu, 19 Dec 2013 15:36:58 +0100 Subject: [PATCH 09/13] try to auto-detect proxy if available --- debootstrap | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debootstrap b/debootstrap index cde1fd7..083473d 100755 --- a/debootstrap +++ b/debootstrap @@ -49,6 +49,17 @@ PRIVATEKEY="" DEF_MIRROR="http://deb.debian.org/debian" DEF_HTTPS_MIRROR="https://deb.debian.org/debian" +# do auto proxy discovery +AUTOPROXY="" +eval $(apt-config shell AUTOPROXY Acquire::http::ProxyAutoDetect) +if [ -z "$http_proxy" ] && [ -x "$AUTOPROXY" ]; then + http_proxy="$($AUTOPROXY)" + if [ -n "$http_proxy" ]; then + echo "Using auto-detected proxy: $http_proxy" + export http_proxy + fi +fi + export LANG USE_COMPONENTS umask 022 -- 2.16.3
>From b128b343ce1df65bb2cae43f9b5072df4d0c9ca0 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Tue, 13 Mar 2018 21:03:33 +0900 Subject: [PATCH 10/13] note to fix #732628 --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c57ae53..ec9fa2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,11 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium * Fix multiple components usage for --foreign/--second-stage (Closes: #806780) - -- Hideki Yamane <henr...@debian.org> Tue, 13 Mar 2018 20:58:11 +0900 + [ Michael Vogt ] + * Try to auto-detect proxy if available (e.g. squid-deb-proxy-client) + (Closes: #732628) + + -- Hideki Yamane <henr...@debian.org> Tue, 13 Mar 2018 21:02:16 +0900 debootstrap (1.0.93+nmu4) unstable; urgency=medium -- 2.16.3
>From 27930cbe262dd955140551dfcfcd2667a4b84da6 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Tue, 13 Mar 2018 21:17:40 +0900 Subject: [PATCH 11/13] Add scripts for Kali Linux (Closes: #798564) --- scripts/kali | 13 +++++++++++++ scripts/kali-dev | 1 + scripts/kali-last-snapshot | 1 + scripts/kali-rolling | 1 + 4 files changed, 16 insertions(+) create mode 100644 scripts/kali create mode 120000 scripts/kali-dev create mode 120000 scripts/kali-last-snapshot create mode 120000 scripts/kali-rolling diff --git a/scripts/kali b/scripts/kali new file mode 100644 index 0000000..e13cd97 --- /dev/null +++ b/scripts/kali @@ -0,0 +1,13 @@ +mirror_style release +download_style apt +finddebs_style from-indices +variants - buildd fakechroot minbase +keyring /usr/share/keyrings/kali-archive-keyring.gpg +default_mirror https://http.kali.org/kali + +# include common settings +if [ -d /usr/share/debootstrap/scripts ]; then + . /usr/share/debootstrap/scripts/debian-common +else + . /debootstrap/debian-common +fi diff --git a/scripts/kali-dev b/scripts/kali-dev new file mode 120000 index 0000000..e0bd9f8 --- /dev/null +++ b/scripts/kali-dev @@ -0,0 +1 @@ +kali \ No newline at end of file diff --git a/scripts/kali-last-snapshot b/scripts/kali-last-snapshot new file mode 120000 index 0000000..e0bd9f8 --- /dev/null +++ b/scripts/kali-last-snapshot @@ -0,0 +1 @@ +kali \ No newline at end of file diff --git a/scripts/kali-rolling b/scripts/kali-rolling new file mode 120000 index 0000000..e0bd9f8 --- /dev/null +++ b/scripts/kali-rolling @@ -0,0 +1 @@ +kali \ No newline at end of file -- 2.16.3
>From c399e73a18354ed1fc5e0a83c0ae0627940033b5 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Sun, 18 Mar 2018 00:19:34 +0900 Subject: [PATCH 12/13] note to fix #798564 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index ec9fa2e..f4fb754 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium Thanks to jnqnfe <jnq...@gmail.com> for the patch. * Prevent unintended removal with --print-debs option (Closes: #833525) Thanks to Johannes Schauer <jo...@debian.org> for the patch + * Add scripts for Kali Linux (Closes: #798564) [ Sjoerd Simons ] * Fix multiple components usage for --foreign/--second-stage -- 2.16.3
>From 0d6b125460ab2abf0713dd697e58448a7834d77d Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Fri, 23 Mar 2018 22:14:06 +0900 Subject: [PATCH 13/13] Add "Suggests: squid-deb-proxy-client" --- debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f4fb754..b99ebc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ debootstrap (1.0.93+nmu5) UNRELEASED; urgency=medium * Prevent unintended removal with --print-debs option (Closes: #833525) Thanks to Johannes Schauer <jo...@debian.org> for the patch * Add scripts for Kali Linux (Closes: #798564) + * debian/control + - Add "Suggests: squid-deb-proxy-client" [ Sjoerd Simons ] * Fix multiple components usage for --foreign/--second-stage diff --git a/debian/control b/debian/control index 0d9d9a9..f323f50 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Package: debootstrap Architecture: all Depends: ${misc:Depends}, wget Recommends: gnupg, ${keyring} -Suggests: ubuntu-archive-keyring +Suggests: ubuntu-archive-keyring, + squid-deb-proxy-client, Description: Bootstrap a basic Debian system debootstrap is used to create a Debian base system from scratch, without requiring the availability of dpkg or apt. It does this by -- 2.16.3