--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
I'd like to ask the unblocking of base-files (hopefully the only one
before the unblocking for the final /etc/debian_version and friends).
There is a fix that I would particularly like to see in jessie which
is the one for Bug#763405 regarding /mnt. The patch fixing this is
very small and as clean as it can be, but I had the bad luck of
fixing this bug at approximately the same date as Guillem was doing
deep changes in dpkg.
The changes in dpkg triggered a bug in the wheezy version of
debootstrap, but I was told that it was base-files who triggered the
bug, so I tried to help by making additional minor changes.
In the end, none of the minor changes helped anything at all because the
changes to fix the /mnt bug had anything to do with the debootstrap
bug, but as the changes are otherwise harmless, there is not really a
need to undo them.
[ You will notice that there are more changelog entries than actual
changed lines ].
Debdiff follows. Thanks.
diff -Nru base-files-7.6/debian/changelog base-files-7.10/debian/changelog
--- base-files-7.6/debian/changelog 2014-10-09 20:27:11.000000000 +0200
+++ base-files-7.10/debian/changelog 2014-10-27 13:36:05.000000000 +0100
@@ -1,3 +1,53 @@
+base-files (7.10) unstable; urgency=low
+
+ * Dropped "chown root:root" lines in postinst, as they are
+ completely redundant. The postinst script is run by root.
+ This might also help as a workaround for Bug#766459.
+
+ -- Santiago Vila <sanvila@debian.org> Mon, 27 Oct 2014 13:35:32 +0100
+
+base-files (7.9) unstable; urgency=low
+
+ * The change introduced in version 7.7 regarding /mnt seems to break
+ the ability of debootstrap currently in wheezy to create a sid chroot.
+ The case of initial install of /mnt is already handled by postinst line
+ "install_directory mnt 755 root" inside the big "if" block that
+ creates a bunch of other things, so we can restrict re-creating the /mnt
+ directory on upgrades to the case when we are really upgrading.
+ Therefore, the code is moved to the same "if" block where /etc/profile
+ and /etc/nsswitch.conf are upgraded to their new defaults when unchanged.
+ This might help as a workaround for Bug#766459.
+
+ -- Santiago Vila <sanvila@debian.org> Mon, 27 Oct 2014 12:33:22 +0100
+
+base-files (7.8) unstable; urgency=low
+
+ * The /etc/profile.d mechanism may be used to override PS1 setting
+ in /etc/bash.bashrc, which is particularly nice because there is
+ no need to modify /etc/profile or /etc/bash.bashrc for that,
+ but this is no longer possible if /etc/profile.d is sourced
+ before /etc/bash.bashrc. Therefore, /etc/profile.d is sourced
+ after /etc/bash.bashrc again. Closes: #766351.
+
+ -- Santiago Vila <sanvila@debian.org> Wed, 22 Oct 2014 16:10:30 +0200
+
+base-files (7.7) unstable; urgency=low
+
+ * Updated FAQ to explain that only /etc/debian_version is updated at
+ every point release, using Debian 8.x as an example, to be read by
+ users of jessie during its lifetime as stable. Closes: #621757.
+ * Changed default /etc/profile to source /etc/bash.bashrc after
+ processing profile.d stuff, not before. Closes: #698479.
+ * Drop comment lines about umask in /etc/profile, as it has been
+ there for enough time for everybody to take note.
+ * The directory /mnt is not included inside base-files.deb anymore.
+ Instead, it is created by postinst the very first time base-files
+ is installed (by debootstrap), or when upgrading from an earlier
+ base-files version. This should make the usual upgrade at every point
+ release to work even if /mnt is a stale mount point. Closes: #763405.
+
+ -- Santiago Vila <sanvila@debian.org> Tue, 21 Oct 2014 21:20:14 +0200
+
base-files (7.6) unstable; urgency=low
* By default, when the computer is booting, green and red colors are used
diff -Nru base-files-7.6/debian/directory-list base-files-7.10/debian/directory-list
--- base-files-7.6/debian/directory-list 2012-05-16 23:29:31.000000000 +0200
+++ base-files-7.10/debian/directory-list 2014-10-21 19:21:38.000000000 +0200
@@ -7,7 +7,6 @@
etc/skel
home
lib
-mnt
proc
root
run
diff -Nru base-files-7.6/debian/postinst.in base-files-7.10/debian/postinst.in
--- base-files-7.6/debian/postinst.in 2014-05-04 14:38:37.000000000 +0200
+++ base-files-7.10/debian/postinst.in 2014-10-27 13:36:30.000000000 +0100
@@ -58,6 +58,7 @@
install_from_default /usr/share/base-files/dot.bashrc /root/.bashrc
install_from_default /usr/share/base-files/profile /etc/profile
install_from_default /usr/share/base-files/motd /etc/motd
+ install_directory mnt 755 root
install_directory srv 755 root
install_directory opt 755 root
install_directory etc/opt 755 root
@@ -104,23 +105,23 @@
if [ ! -d /var/lib/dpkg ]; then
mkdir -m 755 -p /var/lib/dpkg
- chown root:root /var/lib/dpkg
fi
if [ ! -f /var/lib/dpkg/status ]; then
echo > /var/lib/dpkg/status
chmod 644 /var/lib/dpkg/status
- chown root:root /var/lib/dpkg/status
fi
if [ ! -f /usr/info/dir ] && [ ! -f /usr/share/info/dir ]; then
install_from_default /usr/share/base-files/info.dir /usr/share/info/dir
chmod 644 /usr/share/info/dir
- chown root:root /usr/share/info/dir
fi
if [ "$1" = "configure" ] && [ "$2" != "" ]; then
update_to_current_default profile
update_to_current_default nsswitch.conf
+ if dpkg --compare-versions "$2" lt-nl "7.7"; then
+ install_directory mnt 755 root
+ fi
fi
if dpkg --compare-versions "$2" lt-nl "6.10"; then
diff -Nru base-files-7.6/debian/README base-files-7.10/debian/README
--- base-files-7.6/debian/README 2014-07-19 17:59:22.000000000 +0200
+++ base-files-7.10/debian/README 2014-10-21 21:23:38.000000000 +0200
@@ -30,6 +30,14 @@
not a reliable way to know that anymore. Looking at the contents of
your /etc/apt/sources.list file is probably a much better way.
+Q. There is a new point release and I've just upgraded my system.
+The /etc/debian_version file now says 8.x but /etc/issue still says 8.
+Is this ok?
+
+A. Yes. The release managers asked me not to touch /etc/issue, as that's
+a file which is often customized by the user. The /etc/debian_version file,
+on the other side, is updated at every point release, so that the exact
+Debian version is shown when used by tools like reportbug.
* Other questions:
diff -Nru base-files-7.6/share/profile base-files-7.10/share/profile
--- base-files-7.6/share/profile 2011-07-29 19:03:27.000000000 +0200
+++ base-files-7.10/share/profile 2014-10-22 16:02:30.000000000 +0200
@@ -24,9 +24,6 @@
fi
fi
-# The default umask is now handled by pam_umask.
-# See pam_umask(8) and /etc/login.defs.
-
if [ -d /etc/profile.d ]; then
for i in /etc/profile.d/*.sh; do
if [ -r $i ]; then
diff -Nru base-files-7.6/share/profile.md5sums base-files-7.10/share/profile.md5sums
--- base-files-7.6/share/profile.md5sums 2012-12-12 12:00:00.000000000 +0100
+++ base-files-7.10/share/profile.md5sums 2014-10-22 16:03:02.000000000 +0200
@@ -8,4 +8,6 @@
3bde72168bca3746e9281e863d43d6dc 5.7 and 5.8
b94c2e3df2a779ac12080942df4d86ea 5.9 to 6.4
89126d8bba3325594e1539bcc97847f3 buggy version by sendfile
-91901ce5707909cfec8b3a1a6efbfa61 6.5 to current
+91901ce5707909cfec8b3a1a6efbfa61 6.5 to 7.6
+6c56009f8aabda9400878ce3c7fd91af 7.7
+ff2bae0480885c074afadec201f5c668 7.8 to current
--- End Message ---