Hello community, here is the log from the commit of package debootstrap for openSUSE:Factory checked in at 2016-03-07 13:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/debootstrap (Old) and /work/SRC/openSUSE:Factory/.debootstrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "debootstrap" Changes: -------- --- /work/SRC/openSUSE:Factory/debootstrap/debootstrap.changes 2015-11-24 22:34:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.debootstrap.new/debootstrap.changes 2016-03-07 13:29:45.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Mar 5 13:50:54 UTC 2016 - [email protected] + +- Update to 1.0.79 (changes since 1.0.75): + * Stop creating useless device nodes (deb#571136). + * Fix permissions on device nodes (deb#812811, deb#813124). + * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb. + * Split setup_devices in setup_devices (which now only deals with + static device nodes) and setup_dynamic_devices, and move the + calls to setup_devices from the beginning of the second stage to + the end of the first stage. + setup_dynamic_devices mounts the appropriate filesystems which + provide dynamic device nodes for the architectures which need + one in debootstrap (kfreebsd and hurd). + * hurd: move setting up dev and servers firmlink to setup_proc + stage. Also firmlink proc there (deb#768102). + +------------------------------------------------------------------- Old: ---- debootstrap_1.0.75.tar.gz New: ---- debootstrap_1.0.79.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ debootstrap.spec ++++++ --- /var/tmp/diff_new_pack.Qp46IS/_old 2016-03-07 13:29:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Qp46IS/_new 2016-03-07 13:29:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package debootstrap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Frank Lichtenheld <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: debootstrap -Version: 1.0.75 +Version: 1.0.79 Release: 0 Summary: Bootstrap a basic Debian system License: MIT @@ -27,7 +27,7 @@ Source0: http://httpredir.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz Source1: devices.tar.gz Patch0: %{name}-norootforbuild.patch -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} >= 1120 BuildArch: noarch %else BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,7 +41,7 @@ into. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 cp -f %{SOURCE1} . @@ -54,7 +54,7 @@ %files %defattr(-,root,root) -%doc README TODO debian/changelog debian/copyright +%doc README TODO debian/{changelog,copyright} %{_sbindir}/%{name} %{_datadir}/%{name}/ %{_mandir}/man?/%{name}.?%{?ext_man} ++++++ debootstrap_1.0.75.tar.gz -> debootstrap_1.0.79.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/debian/changelog new/debootstrap-1.0.79/debian/changelog --- old/debootstrap/debian/changelog 2015-11-11 18:49:30.000000000 +0100 +++ new/debootstrap-1.0.79/debian/changelog 2016-02-19 07:23:59.000000000 +0100 @@ -1,3 +1,56 @@ +debootstrap (1.0.79) unstable; urgency=medium + + [ Samuel Thibault ] + * hurd: move setting up dev and servers firmlink to setup_proc stage. Also + firmlink proc there. Thanks Gabriele Giacone for all the investigation! + (Closes: #768102) + + -- Christian Perrier <[email protected]> Fri, 19 Feb 2016 07:23:59 +0100 + +debootstrap (1.0.78+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Split setup_devices in setup_devices (which now only deals with static + device nodes) and setup_dynamic_devices, and move the calls to + setup_devices from the beginning of the second stage to the end of the + first stage. + setup_dynamic_devices mounts the appropriate filesystems which provide + dynamic device nodes for the architectures which need one in + debootstrap (kfreebsd and hurd). + This fixes a bug in --second-stage introduced in 1.0.34 and exposed + by the devices-related changes of 1.0.76: the second stage debootstrap + runs "dpkg --print-architecture >/dev/null" at the very beginning of + the program when /dev is still empty, so it creates an empty regular + file in place of /dev/null and this will cause mknod to fail later. + (Closes: #813232) + + -- Marco d'Itri <[email protected]> Wed, 17 Feb 2016 01:23:23 +0100 + +debootstrap (1.0.78) unstable; urgency=high + + * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb. + * Don't call mknod with the --mode option, it's not supported in + busybox. Use -m instead - fixes the broken fix for #812811. + Closes: #813124. Urgency high to get this fix propagated quickly - + it's breaking d-i installs right now. Adding myself to uploaders and + uploading. + + -- Steve McIntyre <[email protected]> Fri, 29 Jan 2016 16:36:00 +0000 + +debootstrap (1.0.77) unstable; urgency=medium + + [ Marco d'Itri ] + * Fix permissions on device nodes (Closes: #812811). + + -- Cyril Brulebois <[email protected]> Wed, 27 Jan 2016 20:22:05 +0100 + +debootstrap (1.0.76) unstable; urgency=medium + + [ Marco d'Itri ] + * Stop creating useless device nodes (Closes: #571136). + + -- Cyril Brulebois <[email protected]> Sun, 24 Jan 2016 08:55:18 +0100 + debootstrap (1.0.75) unstable; urgency=medium * Stop cleaning KEEP_DEBOOTSTRAP_DIR twice, as spotted by Chris Lamb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/debian/control new/debootstrap-1.0.79/debian/control --- old/debootstrap/debian/control 2015-10-22 12:37:41.000000000 +0200 +++ new/debootstrap-1.0.79/debian/control 2016-01-30 05:03:04.000000000 +0100 @@ -2,11 +2,11 @@ Section: admin Priority: extra Maintainer: Debian Install System Team <[email protected]> -Uploaders: Junichi Uekawa <[email protected]>, Colin Watson <[email protected]>, Christian Perrier <[email protected]> +Uploaders: Junichi Uekawa <[email protected]>, Colin Watson <[email protected]>, Christian Perrier <[email protected]>, Steve McIntyre <[email protected]> Build-Depends: debhelper (>= 9), makedev (>= 2.3.1-69) [linux-any] Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/debootstrap.git -Vcs-Git: git://anonscm.debian.org/d-i/debootstrap.git +Vcs-Browser: https://anonscm.debian.org/cgit/d-i/debootstrap.git +Vcs-Git: https://anonscm.debian.org/git/d-i/debootstrap.git Package: debootstrap Architecture: all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/functions new/debootstrap-1.0.79/functions --- old/debootstrap/functions 2015-10-22 12:37:53.000000000 +0200 +++ new/debootstrap-1.0.79/functions 2016-02-18 05:01:23.000000000 +0100 @@ -1021,6 +1021,10 @@ fi ;; hurd*) + # firmlink $TARGET/{dev,servers,proc} to the system ones. + settrans -a "$TARGET/dev" /hurd/firmlink /dev + settrans -a "$TARGET/servers" /hurd/firmlink /servers + settrans -a "$TARGET/proc" /hurd/firmlink /proc ;; *) umount_on_exit /dev/pts @@ -1046,6 +1050,7 @@ ln -s /proc "$TARGET" } +# create the static device nodes setup_devices () { if doing_variant fakechroot; then setup_devices_fakechroot @@ -1054,31 +1059,55 @@ case "$HOST_OS" in kfreebsd*) - in_target mount -t devfs devfs /dev ;; + ;; freebsd) - mount -t devfs devfs $TARGET/dev ;; + ;; hurd*) - setup_devices_hurd ;; + ;; *) - if [ -e "$DEVICES_TARGZ" ]; then + if true; then + setup_devices_simple + elif [ -e "$DEVICES_TARGZ" ]; then zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -) else - if [ -e /dev/.devfsd ] ; then - in_target mount -t devfs devfs /dev - else - error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ" - fi + error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ" fi ;; esac } -setup_devices_hurd () { - # Use the setup-translators of the hurd package, and firmlink - # $TARGET/{dev,servers} to the system ones. - in_target /usr/lib/hurd/setup-translators -k - settrans -a $TARGET/dev /hurd/firmlink /dev - settrans -a $TARGET/servers /hurd/firmlink /servers +# enable the dynamic device nodes +setup_dynamic_devices () { + if doing_variant fakechroot; then + return 0 + fi + + case "$HOST_OS" in + kfreebsd*) + in_target mount -t devfs devfs /dev ;; + freebsd) + mount -t devfs devfs $TARGET/dev ;; + hurd*) + # Use the setup-translators of the hurd package + in_target /usr/lib/hurd/setup-translators -k ;; + esac +} + +setup_devices_simple () { + # The list of devices that can be created in a container comes from + # src/core/cgroup.c in the systemd source tree. + mknod -m 666 $TARGET/dev/null c 1 3 + mknod -m 666 $TARGET/dev/zero c 1 5 + mknod -m 666 $TARGET/dev/full c 1 7 + mknod -m 666 $TARGET/dev/random c 1 8 + mknod -m 666 $TARGET/dev/urandom c 1 9 + mknod -m 666 $TARGET/dev/tty c 5 0 + mkdir $TARGET/dev/pts/ $TARGET/dev/shm/ + ln -s pts/ptmx $TARGET/dev/ptmx + ln -s /proc/self/fd $TARGET/dev/fd + ln -s /proc/self/fd/0 $TARGET/dev/stdin + ln -s /proc/self/fd/1 $TARGET/dev/stdout + ln -s /proc/self/fd/2 $TARGET/dev/stderr } setup_devices_fakechroot () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/aequorea new/debootstrap-1.0.79/scripts/aequorea --- old/debootstrap/scripts/aequorea 2015-11-11 18:43:25.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/aequorea 2016-02-18 05:01:23.000000000 +0100 @@ -57,6 +57,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -77,7 +79,7 @@ } second_stage_install () { - setup_devices + setup_dynamic_devices x_core_install () { smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/breezy new/debootstrap-1.0.79/scripts/breezy --- old/debootstrap/scripts/breezy 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/breezy 2016-02-18 05:01:23.000000000 +0100 @@ -44,6 +44,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -71,7 +73,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc umount_on_exit /dev/.static/dev umount_on_exit /dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/dapper new/debootstrap-1.0.79/scripts/dapper --- old/debootstrap/scripts/dapper 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/dapper 2016-02-18 05:01:23.000000000 +0100 @@ -51,6 +51,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -78,7 +80,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/edgy new/debootstrap-1.0.79/scripts/edgy --- old/debootstrap/scripts/edgy 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/edgy 2016-02-18 05:01:23.000000000 +0100 @@ -57,6 +57,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -84,8 +86,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices - if doing_variant fakechroot; then setup_proc_fakechroot else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/feisty new/debootstrap-1.0.79/scripts/feisty --- old/debootstrap/scripts/feisty 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/feisty 2016-02-18 05:01:23.000000000 +0100 @@ -57,6 +57,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -84,8 +86,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices - if doing_variant fakechroot; then setup_proc_fakechroot else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/gutsy new/debootstrap-1.0.79/scripts/gutsy --- old/debootstrap/scripts/gutsy 2015-05-16 20:24:16.000000000 +0200 +++ new/debootstrap-1.0.79/scripts/gutsy 2016-02-18 05:01:23.000000000 +0100 @@ -64,6 +64,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -91,8 +93,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices - if doing_variant fakechroot; then setup_proc_fakechroot else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/hoary new/debootstrap-1.0.79/scripts/hoary --- old/debootstrap/scripts/hoary 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/hoary 2016-02-18 05:01:23.000000000 +0100 @@ -65,6 +65,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -98,7 +100,6 @@ baseprog=0 bases=7 - setup_devices setup_proc umount_on_exit /.dev umount_on_exit /dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/hoary.buildd new/debootstrap-1.0.79/scripts/hoary.buildd --- old/debootstrap/scripts/hoary.buildd 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/hoary.buildd 2016-02-18 05:01:23.000000000 +0100 @@ -61,6 +61,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -93,7 +95,6 @@ baseprog=0 bases=40 - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/potato new/debootstrap-1.0.79/scripts/potato --- old/debootstrap/scripts/potato 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/potato 2016-02-18 05:01:23.000000000 +0100 @@ -54,6 +54,8 @@ touch "$TARGET/var/lib/dpkg/info/${pkg}.list" } + setup_devices + x_feign_install dpkg if [ -e "$TARGET/usr/bin/perl-5.005.dist" ]; then @@ -71,7 +73,6 @@ export DEBIAN_FRONTEND=Noninteractive - setup_devices setup_proc ln "$TARGET/sbin/ldconfig.new" "$TARGET/sbin/ldconfig" in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/sarge new/debootstrap-1.0.79/scripts/sarge --- old/debootstrap/scripts/sarge 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/sarge 2016-02-18 05:01:23.000000000 +0100 @@ -107,6 +107,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -134,7 +136,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/sarge.buildd new/debootstrap-1.0.79/scripts/sarge.buildd --- old/debootstrap/scripts/sarge.buildd 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/sarge.buildd 2016-02-18 05:01:23.000000000 +0100 @@ -68,6 +68,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -95,7 +97,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/sid new/debootstrap-1.0.79/scripts/sid --- old/debootstrap/scripts/sid 2015-05-16 20:24:16.000000000 +0200 +++ new/debootstrap-1.0.79/scripts/sid 2016-02-18 05:01:23.000000000 +0100 @@ -53,6 +53,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -73,7 +75,7 @@ } second_stage_install () { - setup_devices + setup_dynamic_devices x_core_install () { smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/warty new/debootstrap-1.0.79/scripts/warty --- old/debootstrap/scripts/warty 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/warty 2016-02-18 05:01:23.000000000 +0100 @@ -53,6 +53,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -84,7 +86,6 @@ DEBCONF_NONINTERACTIVE_SEEN=true export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/warty.buildd new/debootstrap-1.0.79/scripts/warty.buildd --- old/debootstrap/scripts/warty.buildd 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/warty.buildd 2016-02-18 05:01:23.000000000 +0100 @@ -61,6 +61,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -93,7 +95,6 @@ baseprog=0 bases=40 - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/woody new/debootstrap-1.0.79/scripts/woody --- old/debootstrap/scripts/woody 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/woody 2016-02-18 05:01:23.000000000 +0100 @@ -93,6 +93,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -120,7 +122,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debootstrap/scripts/woody.buildd new/debootstrap-1.0.79/scripts/woody.buildd --- old/debootstrap/scripts/woody.buildd 2013-12-04 00:51:45.000000000 +0100 +++ new/debootstrap-1.0.79/scripts/woody.buildd 2016-02-18 05:01:23.000000000 +0100 @@ -68,6 +68,8 @@ chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -95,7 +97,6 @@ baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig
