diff -Nru util-linux-2.26.2/debian/changelog util-linux-2.26.2/debian/changelog --- util-linux-2.26.2/debian/changelog 2015-05-12 03:42:51.000000000 +0000 +++ util-linux-2.26.2/debian/changelog 2015-05-19 04:26:17.000000000 +0000 @@ -1,3 +1,47 @@ +util-linux (2.26.2-3ubuntu1) wily; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Regularly trim SSDs automatically (core-1311-ssd-trimming): + + Add debian/fstrim-all.cron: Call fstrim --all. Installed as + /etc/cron.weekly/fstrim. + - Upstart support: + + Add hwclock{-save}.upstart, and install them in debian/rules. + + Drop debian/hwclock.rules and hwclock.default. + - Add mountall-options.patch, see patch header. + - Adjust the Breaks: cloud-utils to 0.27-0ubuntu16 (the Ubuntu version + that works with util-linux 2.26), and also move it to cloud-guest-utils. + - Add libudev-dev build dependency for enabling LABEL information in lsblk + (Closes: #776905) + - Add debian/libblkid1.maintscript to clean up /etc/blkid.conf on upgrade. + This needs to be kept until after Ubuntu 16.04 LTS. + * Add sulogin-lockedpwd.patch: Make sure file systems can be fixed on + machines with locked root accounts too, by presenting a shell in these + cases. Patch ported from sysvinit. + * Add sulogin-fallback-static-sh.patch: Add support for /bin/static-sh as + fallback if the regular shell fails to execute. Patch ported from + sysvinit. (LP: #505887) + + -- Martin Pitt Mon, 18 May 2015 17:52:25 +0200 + +util-linux (2.26.2-3) unstable; urgency=medium + + * The "moving in on sysvinit(-utils) turf" release. + + [ Andreas Henriksson ] + * Make Breaks against cloud-utils versioned + - cloud-utils 0.27-1 should now be fixed (see Bug#783826) + * mount: ship mountpoint utility (Closes: #753779) + * util-linux: ship sulogin, last, lastb, mesg utilities (Closes: #784566) + * Ship dmesg and renice completions + + [ Pino Toscano ] + * Update libmount1.symbols for non-linux archs (Closes: #784728) + + [ Andreas Henriksson ] + * Revert mistake in libblkid1 short description (Closes: #784822) + + -- Andreas Henriksson Fri, 15 May 2015 16:35:20 +0200 + util-linux (2.26.2-2ubuntu2) wily; urgency=medium * Version the Breaks: cloud-utils as 0.27-0ubuntu16 now works with diff -Nru util-linux-2.26.2/debian/control util-linux-2.26.2/debian/control --- util-linux-2.26.2/debian/control 2015-05-12 03:42:05.000000000 +0000 +++ util-linux-2.26.2/debian/control 2015-05-18 15:52:15.000000000 +0000 @@ -39,8 +39,8 @@ Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends} Depends: initscripts, lsb-base (>= 3.0-6), tzdata (>=2006c-2), ${misc:Depends} Suggests: dosfstools, kbd | console-tools, util-linux-locales -Replaces: bash-completion (<< 1:2.1-3) -Breaks: bash-completion (<< 1:2.1-3), grml-debootstrap (<< 0.68), cloud-guest-utils (<< 0.27-0ubuntu16) +Replaces: bash-completion (<< 1:2.1-4.1~), sysvinit-utils (<< 2.88dsf-59.1~) +Breaks: bash-completion (<< 1:2.1-4.1~), grml-debootstrap (<< 0.68), cloud-guest-utils (<< 0.27-0ubuntu16), sysvinit-utils (<< 2.88dsf-59.1~) Multi-Arch: foreign Description: Miscellaneous system utilities This package contains a number of important utilities, most of which @@ -68,6 +68,8 @@ Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends} Depends: ${misc:Depends} Suggests: nfs-common (>=1:1.1.0-13) +Replaces: initscripts (<< 2.88dsf-59.1~) +Breaks: initscripts (<< 2.88dsf-59.1~) Multi-Arch: foreign Description: Tools for mounting and manipulating filesystems This package provides the mount(8), umount(8), swapon(8), @@ -80,6 +82,8 @@ Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends} Depends: ${misc:Depends} Recommends: bsdmainutils +Replaces: bash-completion (<< 1:2.1-4.1~) +Breaks: bash-completion (<< 1:2.1-4.1~) Multi-Arch: foreign Description: basic utilities from 4.4BSD-Lite This package contains the bare minimum of BSD utilities needed for a @@ -110,7 +114,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same -Description: fdisk partitioning library +Description: block device id library The blkid library which allows system programs like fsck and mount to quickly and easily find block devices by filesystem UUID and LABEL. This allows system administrators to avoid specifying diff -Nru util-linux-2.26.2/debian/libmount1.symbols util-linux-2.26.2/debian/libmount1.symbols --- util-linux-2.26.2/debian/libmount1.symbols 2015-05-03 22:23:45.000000000 +0000 +++ util-linux-2.26.2/debian/libmount1.symbols 2015-05-15 14:35:41.000000000 +0000 @@ -181,19 +181,19 @@ mnt_mangle@MOUNT_2.19 2.19.1 mnt_match_fstype@MOUNT_2.19 2.19.1 mnt_match_options@MOUNT_2.19 2.19.1 - mnt_monitor_close_fd@MOUNT_2.26 2.26.2 - mnt_monitor_enable_kernel@MOUNT_2.26 2.26.2 - mnt_monitor_enable_userspace@MOUNT_2.26 2.26.2 - mnt_monitor_event_cleanup@MOUNT_2.26 2.26.2 - mnt_monitor_get_fd@MOUNT_2.26 2.26.2 - mnt_monitor_next_change@MOUNT_2.26 2.26.2 - mnt_monitor_wait@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_close_fd@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_enable_kernel@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_enable_userspace@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_event_cleanup@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_get_fd@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_next_change@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_wait@MOUNT_2.26 2.26.2 mnt_new_cache@MOUNT_2.19 2.19.1 (arch=linux-any)mnt_new_context@MOUNT_2.19 2.19.1 mnt_new_fs@MOUNT_2.19 2.19.1 mnt_new_iter@MOUNT_2.19 2.19.1 mnt_new_lock@MOUNT_2.19 2.19.1 - mnt_new_monitor@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_new_monitor@MOUNT_2.26 2.26.2 mnt_new_tabdiff@MOUNT_2.20 2.20.1 mnt_new_table@MOUNT_2.19 2.19.1 mnt_new_table_from_dir@MOUNT_2.19 2.19.1 @@ -213,7 +213,7 @@ mnt_pretty_path@MOUNT_2.20 2.20.1 mnt_ref_cache@MOUNT_2.24 2.24.2 mnt_ref_fs@MOUNT_2.24 2.24.2 - mnt_ref_monitor@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_ref_monitor@MOUNT_2.26 2.26.2 mnt_ref_table@MOUNT_2.24 2.24.2 (arch=linux-any)mnt_reset_context@MOUNT_2.19 2.19.1 mnt_reset_fs@MOUNT_2.19 2.19.1 @@ -271,7 +271,7 @@ mnt_unmangle@MOUNT_2.19 2.19.1 mnt_unref_cache@MOUNT_2.24 2.24.2 mnt_unref_fs@MOUNT_2.24 2.24.2 - mnt_unref_monitor@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_unref_monitor@MOUNT_2.26 2.26.2 mnt_unref_table@MOUNT_2.24 2.24.2 mnt_update_force_rdonly@MOUNT_2.19 2.19.1 mnt_update_get_filename@MOUNT_2.19 2.19.1 diff -Nru util-linux-2.26.2/debian/mount.install util-linux-2.26.2/debian/mount.install --- util-linux-2.26.2/debian/mount.install 2015-05-03 22:23:45.000000000 +0000 +++ util-linux-2.26.2/debian/mount.install 2015-05-15 14:35:41.000000000 +0000 @@ -1,9 +1,11 @@ bin/findmnt bin/mount bin/umount +bin/mountpoint sbin/losetup sbin/swapoff sbin/swapon +usr/share/man/man1/mountpoint.1 usr/share/man/man5/fstab.5 usr/share/man/man8/findmnt.8 usr/share/man/man8/losetup.8 diff -Nru util-linux-2.26.2/debian/patches/series util-linux-2.26.2/debian/patches/series --- util-linux-2.26.2/debian/patches/series 2015-05-07 10:42:37.000000000 +0000 +++ util-linux-2.26.2/debian/patches/series 2015-05-19 04:16:30.000000000 +0000 @@ -4,3 +4,5 @@ Disable-the-fallback-clause-in-hwclock-when-dev-rtc-.patch verbose-tests.patch mountall-options.patch +sulogin-lockedpwd.patch +sulogin-fallback-static-sh.patch diff -Nru util-linux-2.26.2/debian/patches/sulogin-fallback-static-sh.patch util-linux-2.26.2/debian/patches/sulogin-fallback-static-sh.patch --- util-linux-2.26.2/debian/patches/sulogin-fallback-static-sh.patch 1970-01-01 00:00:00.000000000 +0000 +++ util-linux-2.26.2/debian/patches/sulogin-fallback-static-sh.patch 2015-05-19 04:55:37.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Add support for /bin/static-sh as fallback if the regular shell fails to execute +Author: Michael Vogt +Bug-Ubuntu: https://launchpad.net/bugs/505887 + +Index: util-linux-2.26.2/login-utils/sulogin.c +=================================================================== +--- util-linux-2.26.2.orig/login-utils/sulogin.c ++++ util-linux-2.26.2/login-utils/sulogin.c +@@ -815,6 +815,11 @@ static void sushell(struct passwd *pwd) + setenv("SHELL", "/bin/sh", 1); + execl("/bin/sh", profile ? "-sh" : "sh", NULL); + warn(_("failed to execute %s"), "/bin/sh"); ++ ++ /* Fall back to static shell */ ++ setenv("SHELL", "/bin/static-sh", 1); ++ execl("/bin/static-sh", profile ? "-sh" : "sh", NULL); ++ warn(_("failed to execute %s"), "/bin/static-sh"); + } + + static void usage(FILE *out) diff -Nru util-linux-2.26.2/debian/patches/sulogin-lockedpwd.patch util-linux-2.26.2/debian/patches/sulogin-lockedpwd.patch --- util-linux-2.26.2/debian/patches/sulogin-lockedpwd.patch 1970-01-01 00:00:00.000000000 +0000 +++ util-linux-2.26.2/debian/patches/sulogin-lockedpwd.patch 2015-05-19 04:55:30.000000000 +0000 @@ -0,0 +1,62 @@ +Author: Thom May +Description: Make sure file systems can be fixed on machines with locked root accounts too, by presenting a shell in these cases. + +Accept locked passwords as valid too. Document this in sulogin.8. + +Bug-Debian: https://bugs.debian.org/326678 + +Index: util-linux-2.26.2/login-utils/sulogin.8 +=================================================================== +--- util-linux-2.26.2.orig/login-utils/sulogin.8 ++++ util-linux-2.26.2/login-utils/sulogin.8 +@@ -33,6 +33,10 @@ Give root password for system maintenanc + .br + (or type Control\-D for normal startup): + .PP ++If the root account is locked, as is the default on Ubuntu, no password ++prompt is displayed and \fIsulogin\fR behaves as if the correct password ++were entered. ++.PP + .B sulogin + will be connected to the current terminal, or to the optional \fItty\fR device that + can be specified on the command line (typically +Index: util-linux-2.26.2/login-utils/sulogin.c +=================================================================== +--- util-linux-2.26.2.orig/login-utils/sulogin.c ++++ util-linux-2.26.2/login-utils/sulogin.c +@@ -485,7 +485,6 @@ static struct passwd *getrootpwent(int t + p = line; + break; + } +- + fclose(fp); + + /* +@@ -522,7 +521,10 @@ static struct passwd *getrootpwent(int t + warnx(_("%s: no entry for root"), _PATH_SHADOW_PASSWD); + strcpy(pwd.pw_passwd, ""); + } +- if (!valid(pwd.pw_passwd)) { ++ /* disabled passwords are valid too */ ++ if (!(strcmp(pwd.pw_passwd, "*") == 0) || ++ !(strcmp(pwd.pw_passwd, "!") == 0) || ++ !valid(pwd.pw_passwd)) { + warnx(_("%s: root password garbled"), _PATH_SHADOW_PASSWD); + strcpy(pwd.pw_passwd, ""); + } +@@ -954,6 +956,15 @@ int main(int argc, char **argv) + } + + /* ++ * If the root password is locked, fire up a shell ++ */ ++ if ((strcmp(pwd->pw_passwd, "*") == 0) || ++ (strcmp(pwd->pw_passwd, "!") == 0)) { ++ /* fprintf(stderr, "sulogin: root account is locked, starting shell\n"); */ ++ sushell(pwd); ++ } ++ ++ /* + * Ask for the password on the consoles. + */ + list_for_each(ptr, &consoles) { diff -Nru util-linux-2.26.2/debian/rules util-linux-2.26.2/debian/rules --- util-linux-2.26.2/debian/rules 2015-05-07 10:42:20.000000000 +0000 +++ util-linux-2.26.2/debian/rules 2015-05-18 15:51:53.000000000 +0000 @@ -30,12 +30,6 @@ CONFOPTS += --disable-login CONFOPTS += --disable-nologin CONFOPTS += --disable-su -# => sysvinit-utils -CONFOPTS += --disable-sulogin -CONFOPTS += --disable-last -CONFOPTS += --disable-mesg -# => initscripts -CONFOPTS += --disable-mountpoint # => procps CONFOPTS += --disable-kill # => eject @@ -113,9 +107,6 @@ fi; \ done; \ done - # Removed these conflicting ones for now, see Bug#755986 - rm -f debian/util-linux/usr/share/bash-completion/completions/dmesg - rm -f debian/bsdutils/usr/share/bash-completion/completions/renice # rm -rf debian/*-udeb/usr/share/doc # automatically trim SSD drives diff -Nru util-linux-2.26.2/debian/util-linux.install util-linux-2.26.2/debian/util-linux.install --- util-linux-2.26.2/debian/util-linux.install 2015-05-07 10:42:20.000000000 +0000 +++ util-linux-2.26.2/debian/util-linux.install 2015-05-18 15:51:53.000000000 +0000 @@ -26,6 +26,7 @@ sbin/mkfs.minix sbin/runuser sbin/sfdisk [!sparc] +sbin/sulogin sbin/swaplabel sbin/wipefs usr/bin/chrt @@ -36,8 +37,11 @@ usr/bin/ipcrm usr/bin/ipcs usr/bin/isosize sbin/ +usr/bin/last +usr/bin/lastb usr/bin/line usr/bin/mcookie +usr/bin/mesg usr/bin/mips [mips mipsel] usr/bin/mips32 [mips mipsel] usr/bin/mips64 [mips mipsel] diff -Nru util-linux-2.26.2/debian/util-linux.manpages util-linux-2.26.2/debian/util-linux.manpages --- util-linux-2.26.2/debian/util-linux.manpages 2015-05-03 22:23:45.000000000 +0000 +++ util-linux-2.26.2/debian/util-linux.manpages 2015-05-15 14:35:41.000000000 +0000 @@ -15,8 +15,11 @@ debian/tmp/usr/share/man/man1/ipcmk.1 debian/tmp/usr/share/man/man1/ipcrm.1 debian/tmp/usr/share/man/man1/ipcs.1 +debian/tmp/usr/share/man/man1/last.1 +debian/tmp/usr/share/man/man1/lastb.1 debian/tmp/usr/share/man/man1/line.1 debian/tmp/usr/share/man/man1/mcookie.1 +debian/tmp/usr/share/man/man1/mesg.1 debian/tmp/usr/share/man/man1/more.1 debian/tmp/usr/share/man/man1/namei.1 debian/tmp/usr/share/man/man1/pg.1 @@ -50,6 +53,7 @@ debian/tmp/usr/share/man/man8/s390.8 [s390x] debian/tmp/usr/share/man/man8/s390x.8 [s390x] debian/tmp/usr/share/man/man8/sfdisk.8 [!sparc] +debian/tmp/usr/share/man/man8/sulogin.8 debian/tmp/usr/share/man/man8/swaplabel.8 debian/tmp/usr/share/man/man8/wipefs.8 debian/tmp/usr/share/man/man8/x86_64.8 [amd64]