Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package debootstrap for openSUSE:Factory checked in at 2021-06-07 22:45:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/debootstrap (Old) and /work/SRC/openSUSE:Factory/.debootstrap.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "debootstrap" Mon Jun 7 22:45:08 2021 rev:23 rq:898193 version:1.0.124 Changes: -------- --- /work/SRC/openSUSE:Factory/debootstrap/debootstrap.changes 2020-05-04 18:42:01.585237751 +0200 +++ /work/SRC/openSUSE:Factory/.debootstrap.new.32437/debootstrap.changes 2021-06-07 22:45:33.456693561 +0200 @@ -1,0 +2,10 @@ +Mon Jun 7 18:46:46 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 1.0.124 + * functions: Turn for loops variables into locals + * functions: add zstd control&data support to the ar extractor + * stage1: re-mkdir /proc if it is a symlink instead of umount. + * Add --inrelease-path option to allow specifying by-hash + InRelease location. + +------------------------------------------------------------------- Old: ---- debootstrap-1.0.123.tar.bz2 New: ---- debootstrap-1.0.124.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ debootstrap.spec ++++++ --- /var/tmp/diff_new_pack.hsAwhB/_old 2021-06-07 22:45:33.832694196 +0200 +++ /var/tmp/diff_new_pack.hsAwhB/_new 2021-06-07 22:45:33.836694203 +0200 @@ -1,7 +1,7 @@ # # spec file for package debootstrap # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2012 Frank Lichtenheld <fr...@lichtenheld.de> # # All modifications and additions to the file contributed by third parties @@ -18,12 +18,12 @@ Name: debootstrap -Version: 1.0.123 +Version: 1.0.124 Release: 0 Summary: Bootstrap a basic Debian system License: MIT URL: https://salsa.debian.org/installer-team/debootstrap -Source: https://salsa.debian.org/installer-team/debootstrap/-/archive/%{version}/%{name}-%{version}.tar.bz2 +Source: %{url}/-/archive/%{version}/%{name}-%{version}.tar.bz2 Patch0: %{name}-norootforbuild.patch Requires: wget Recommends: gpg2 ++++++ debootstrap-1.0.123.tar.bz2 -> debootstrap-1.0.124.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/debian/changelog new/debootstrap-1.0.124/debian/changelog --- old/debootstrap-1.0.123/debian/changelog 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/debian/changelog 2021-04-26 16:02:48.000000000 +0200 @@ -1,3 +1,33 @@ +debootstrap (1.0.124) experimental; urgency=medium + + [ Colin Watson ] + * Add (Ubuntu) groovy as a symlink to gutsy. + + [ Samuel Thibault ] + * functions: Turn for loops variables into locals, suggested by jhcha54008. + + [ YunQiang Su ] + * stage1: re-mkdir /proc if it is a symlink instead of umount. (Closes: #968927) + + [ Luca Falavigna ] + * Add (Ubuntu) hirsute as a symlink to gutsy. + + [ Tobias Koch ] + * Add --inrelease-path option to allow specifying by-hash InRelease + location. + + [ Dimitri John Ledkov ] + * functions: add zstd control&data support to the ar extractor LP: #1923845 + * Add (Ubuntu) impish as a symlink to gutsy. + * gutsy: sync changes from Ubuntu, to ensure that impish+ are always + merged-usr. + * gutsy: use --extractor=ar if dpkg-deb has no zstd support (i.e. on + Debian & non-Ubuntu derivatives). + * rules,control: adjust Recommends/Suggests to be appropriate on each + distro. + + -- Dimitri John Ledkov <x...@ubuntu.com> Mon, 26 Apr 2021 15:02:44 +0100 + debootstrap (1.0.123) unstable; urgency=medium * Reinstate safeguard removed in 1.0.121, which is absolutely needed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/debian/control new/debootstrap-1.0.124/debian/control --- old/debootstrap-1.0.123/debian/control 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/debian/control 2021-04-26 16:02:48.000000000 +0200 @@ -12,9 +12,8 @@ Package: debootstrap Architecture: all Depends: ${misc:Depends}, wget -Recommends: gnupg, ${keyring}, arch-test (>= 0.11~), -Suggests: ubuntu-archive-keyring, - squid-deb-proxy-client, +Recommends: gnupg, ${debootstrap:Recommends} +Suggests: squid-deb-proxy-client, ${debootstrap:Suggests} 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/debian/rules new/debootstrap-1.0.124/debian/rules --- old/debootstrap-1.0.123/debian/rules 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/debian/rules 2021-04-26 16:02:48.000000000 +0200 @@ -1,13 +1,17 @@ #! /usr/bin/make -f ifeq (0,$(shell dpkg-vendor --derives-from Ubuntu; echo $$?)) - KEYRING := ubuntu-keyring + RECOMMENDS := ubuntu-keyring + SUGGESTS := debian-archive-keyring, arch-test (>= 0.11~), else ifeq (0,$(shell dpkg-vendor --derives-from Tanglu; echo $$?)) - KEYRING := tanglu-archive-keyring + RECOMMENDS := tanglu-archive-keyring, arch-test (>= 0.11~), + SUGGESTS := debian-archive-keyring, ubuntu-archive-keyring, binutils, xz-utils, zstd else ifeq (0,$(shell dpkg-vendor --derives-from Kali; echo $$?)) - KEYRING := kali-archive-keyring + RECOMMENDS := kali-archive-keyring, arch-test (>= 0.11~), + SUGGESTS := debian-archive-keyring, ubuntu-archive-keyring, binutils, xz-utils, zstd else - KEYRING := debian-archive-keyring + RECOMMENDS := debian-archive-keyring, arch-test (>= 0.11~), + SUGGESTS := ubuntu-archive-keyring, binutils, xz-utils, zstd endif %: @@ -23,7 +27,7 @@ $(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap-udeb override_dh_gencontrol: - dh_gencontrol -- -Vkeyring=$(KEYRING) + dh_gencontrol -- -Vdebootstrap:Recommends='$(RECOMMENDS)' -Vdebootstrap:Suggests='$(SUGGESTS)' # Specify gzip to mitigate #770217: override_dh_builddeb: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/debootstrap new/debootstrap-1.0.124/debootstrap --- old/debootstrap-1.0.123/debootstrap 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/debootstrap 2021-04-26 16:02:48.000000000 +0200 @@ -46,6 +46,7 @@ CHECKCERTIF="" PRIVATEKEY="" CACHE_DIR="" +INRELEASE_PATH="" DEF_MIRROR="http://deb.debian.org/debian"; DEF_HTTPS_MIRROR="https://deb.debian.org/debian"; @@ -129,6 +130,10 @@ --private-key=file read the private key from file --certificate=file use the client certificate stored in file (PEM) --no-check-certificate do not check certificate against certificate authorities + + --inrelease-path determine the path to the InRelease file of the main + archive relative to the normal position of an InRelease + file EOF } @@ -423,6 +428,17 @@ CHECKCERTIF="--no-check-certificate" shift ;; + --inrelease-path|--inrelease-path=?*) + if [ "$1" = "--inrelease-path" ] && [ -n "$2" ]; then + INRELEASE_PATH="$2" + shift 2 + elif [ "$1" != "${1#--inrelease-path=}" ]; then + INRELEASE_PATH=${1#--inrelease-path=} + shift 1 + else + error 1 NEEDARG "option requires an argument %s" "$1" + fi + ;; -*) error 1 BADARG "unrecognized or invalid option %s" "$1" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/debootstrap.8 new/debootstrap-1.0.124/debootstrap.8 --- old/debootstrap-1.0.123/debootstrap.8 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/debootstrap.8 2021-04-26 16:02:48.000000000 +0200 @@ -173,6 +173,11 @@ .IP .IP "\fB\-\-private\-key=FILE\fP" Read the private key from file +.IP +.IP "\fB\-\-inrelease\-path\fP" +Determine the path to the InRelease file of the suite relative to the +normal position of an InRelease file +.IP .SH EXAMPLES . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/functions new/debootstrap-1.0.124/functions --- old/debootstrap-1.0.123/functions 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/functions 2021-04-26 16:02:48.000000000 +0200 @@ -7,6 +7,7 @@ in_path () { local OLD_IFS="$IFS" + local dir IFS=":" for dir in $PATH; do if [ -x "$dir/$1" ]; then @@ -22,7 +23,7 @@ error () { # <error code> <name> <string> <args> - local err name fmt + local err name fmt x err="$1" name="$2" fmt="$3" @@ -39,7 +40,7 @@ warning () { # <name> <string> <args> - local name fmt + local name fmt x name="$1" fmt="$2" shift; shift @@ -54,7 +55,7 @@ info () { # <name> <string> <args> - local name fmt + local name fmt x name="$1" fmt="$2" shift; shift @@ -101,7 +102,7 @@ progress () { # <now> <end> <name> <string> <args> - local now end name fmt + local now end name fmt x now="$1" end="$2" name="$3" @@ -253,6 +254,7 @@ SUPPORTED_VARIANTS="-" variants () { + local v SUPPORTED_VARIANTS="$*" for v in $*; do if doing_variant "$v"; then return 0; fi @@ -334,6 +336,7 @@ local dest_base local nocache="" local byhash="" + local a from_base="$1"; shift dest_base="$1"; shift if [ "$1" = "nocache" ]; then @@ -531,6 +534,7 @@ } extract_release_components () { + local c local reldest="$1"; shift TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")" for c in $TMPCOMPONENTS ; do @@ -551,7 +555,7 @@ CODENAME="" validate_suite () { - local reldest suite + local reldest suite s reldest="$1" CODENAME=$(sed -n "s/^Codename: *//p" "$reldest") @@ -623,7 +627,13 @@ progress 0 100 DOWNREL "Downloading Release file" progress_next 100 - if get "$m1/dists/$suite/InRelease" "$inreldest" nocache; then + if [ -n "$INRELEASE_PATH" ]; then + get "$m1/dists/$suite/$INRELEASE_PATH" "$inreldest" nocache || + error 1 NOGETREL "Failed getting release file %s" \ + "$m1/dists/$suite/$INRELEASE_PATH" + split_inline_sig "$inreldest" "$reldest" "$relsigdest" + progress 100 100 DOWNREL "Downloading Release file" + elif get "$m1/dists/$suite/InRelease" "$inreldest" nocache; then split_inline_sig "$inreldest" "$reldest" "$relsigdest" progress 100 100 DOWNREL "Downloading Release file" else @@ -653,7 +663,7 @@ download_release_indices () { local m1 inreldest reldest relsigdest totalpkgs \ subpath xzi bz2i gzi normi i ext \ - donepkgs pkgdest acquirebyhash + donepkgs pkgdest acquirebyhash s c m m1="${MIRRORS%% *}" for s in $SUITE $EXTRA_SUITES; do inreldest="$TARGET/$($DLDEST rel "$s" "$m1" "dists/$s/InRelease")" @@ -792,7 +802,8 @@ } download_release () { - local m1 numdebs countdebs totaldebs leftoverdebs path pkgdest dloaddebs + local m1 numdebs countdebs totaldebs leftoverdebs path pkgdest \ + dloaddebs s c m m1="${MIRRORS%% *}" numdebs="$#" @@ -859,7 +870,7 @@ } download_main_indices () { - local m1 comp path pkgdest + local m1 comp path pkgdest m s c m1="${MIRRORS%% *}" comp="${USE_COMPONENTS}" progress 0 100 DOWNMAINPKGS "Downloading Packages file" @@ -887,7 +898,7 @@ } download_main () { - local m1 path pkgdest debdest + local m1 path pkgdest debdest p s c m m1="${MIRRORS%% *}" :>"$TARGET/debootstrap/debpaths" @@ -930,7 +941,7 @@ ###################################################### deb choosing support get_debs () { - local field m1 c path pkgdest + local field m1 s c path pkgdest field="$1" shift for m1 in $MIRRORS; do @@ -974,6 +985,7 @@ case "$tarball" in control.tar.gz) cat_cmd=zcat ;; control.tar.xz) cat_cmd=xzcat ;; + control.tar.zst) cat_cmd=zstdcat ;; control.tar) cat_cmd=cat ;; *) error 1 UNKNOWNCONTROLCOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;; esac @@ -996,6 +1008,7 @@ data.tar.gz) cat_cmd=zcat ;; data.tar.bz2) cat_cmd=bzcat ;; data.tar.xz) cat_cmd=xzcat ;; + data.tar.zst) cat_cmd=zstdcat ;; data.tar) cat_cmd=cat ;; *) error 1 UNKNOWNDATACOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;; esac @@ -1009,6 +1022,7 @@ valid_extractor () { local extractor="$1" + local E for E in $EXTRACTORS_SUPPORTED; do if [ "$extractor" = "$E" ]; then @@ -1045,7 +1059,7 @@ extract () { ( cd "$TARGET" || exit 1 - local p cat_cmd + local p cat_cmd pkg p=0 for pkg in $(debfor "$@"); do p=$(($p + 1)) @@ -1106,6 +1120,7 @@ setup_apt_sources () { + local m s c mkdir -p "$TARGET/etc/apt" for m in "$@"; do for s in $SUITE $EXTRA_SUITES; do @@ -1130,7 +1145,7 @@ UMOUNT_DIRS= umount_exit_function () { - local realdir + local realdir dir for dir in $UMOUNT_DIRS; do realdir="$(in_target_nofail readlink -f "$dir")" [ "$realdir" ] || continue @@ -1176,7 +1191,12 @@ umount_on_exit /dev/shm umount_on_exit /proc umount_on_exit /proc/bus/usb - umount "$TARGET/proc" 2>/dev/null || true + if [ -L "$TARGET/proc" ];then + rm -f $TARGET/proc + mkdir $TARGET/proc + else + umount "$TARGET/proc" 2>/dev/null || true + fi # some container environment are used at second-stage, it already treats /proc and so on if [ -z "$(ls -A "$TARGET/proc")" ]; then @@ -1296,6 +1316,7 @@ } setup_devices_bind () { + local device mount -t tmpfs nodev "$TARGET/dev" umount_on_exit /dev for device in null zero full random urandom tty pts shm ptmx; do @@ -1530,6 +1551,7 @@ local PKGS="$*" local ALLPKGS="$PKGS"; local ALLPKGS2=""; + local s c while [ "$PKGS" != "" ]; do local NEWPKGS="" for s in $SUITE $EXTRA_SUITES; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/scripts/groovy new/debootstrap-1.0.124/scripts/groovy --- old/debootstrap-1.0.123/scripts/groovy 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.124/scripts/groovy 2021-06-07 22:45:34.460695257 +0200 @@ -0,0 +1 @@ +symbolic link to gutsy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/scripts/gutsy new/debootstrap-1.0.124/scripts/gutsy --- old/debootstrap-1.0.123/scripts/gutsy 2020-03-14 02:07:25.000000000 +0100 +++ new/debootstrap-1.0.124/scripts/gutsy 2021-04-26 16:02:48.000000000 +0200 @@ -40,6 +40,18 @@ *) LIBC="libc6" ;; esac +case $SUITE in + gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan|focal|groovy|hirsute) ;; + *) + # impish+ will use zstd compression, check if supported + dpkg_zstd="$(dpkg-deb --help 2>/dev/null | grep ' zstd,' || :)" + if [ -z "$EXTRACTOR_OVERRIDE" ] && [ -z "$dpkg_zstd" ]; then + info CHOSENEXTRACTOR "%s uses zstd compression, setting --extractor=ar option" "$SUITE" + export EXTRACTOR_OVERRIDE=ar + fi + ;; +esac + work_out_debs () { required="$(get_debs Priority: required)" @@ -70,6 +82,30 @@ esac ;; esac + + # do not install usrmerge in fresh bootstraps + # but do print it for germinate to accept it into minimal + if [ "$WHAT_TO_DO" = "finddebs printdebs kill_target" ]; then + case "$CODENAME" in + # "merged-usr" blacklist for past releases + gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan|focal|groovy) + ;; + hirsute) + # keep hirsute buildd chroots split-usr to allow for escape hatch + if ! doing_variant buildd; then + if [ -z "$MERGED_USR" ] || [ "$MERGED_USR" = "yes" ]; then + base="$base usrmerge" + fi + fi + ;; + *) + # all future series post hirsute use merged-usr in buildd chroots too + if [ -z "$MERGED_USR" ] || [ "$MERGED_USR" = "yes" ]; then + base="$base usrmerge" + fi + ;; + esac + fi } first_stage_install () { @@ -78,7 +114,25 @@ gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic) [ -z "$MERGED_USR" ] && MERGED_USR="no" ;; + disco|eoan|focal|groovy) + # see https://bugs.debian.org/838388 + EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k" + ;; + hirsute) + # keep hirsute buildd chroots split-usr to allow for escape hatch + if [ -z "$MERGED_USR" ]; then + if doing_variant buildd; then + MERGED_USR="no" + else + MERGED_USR="yes" + fi + fi + # see https://bugs.debian.org/838388 + EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k" + ;; *) + # all future series post hirsute use merged-usr in buildd chroots too + [ -z "$MERGED_USR" ] && MERGED_USR="yes" # see https://bugs.debian.org/838388 EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/scripts/hirsute new/debootstrap-1.0.124/scripts/hirsute --- old/debootstrap-1.0.123/scripts/hirsute 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.124/scripts/hirsute 2021-06-07 22:45:34.288694966 +0200 @@ -0,0 +1 @@ +symbolic link to groovy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap-1.0.123/scripts/impish new/debootstrap-1.0.124/scripts/impish --- old/debootstrap-1.0.123/scripts/impish 1970-01-01 01:00:00.000000000 +0100 +++ new/debootstrap-1.0.124/scripts/impish 2021-06-07 22:45:34.188694797 +0200 @@ -0,0 +1 @@ +symbolic link to gutsy
