Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: util-linux

util-linux (2.36-2ubuntu1) groovy; urgency=medium * Merge from Debian unstable. Remaining changes: - Build hwclock with audit support. - Drop debian/hwclock.rules and debian/util-linux.hwclock.default, recent kernels sync the RTC automatically. - 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. (see LP #505887) - Add sulogin-lockedpwd.patch: Make sure file systems can be fixed on machines with locked root accounts (as Ubuntu does by default). Don't require --force for sulogin. - Clean up weekly fstrim cron file, now a systemd timer unit. -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 01 Aug 2020 21:14:53 +0200

Modifications :
  1. Download patch debian/util-linux.hwclock.default

    --- 2.36-2/debian/util-linux.hwclock.default 2020-08-01 17:28:26.000000000 +0000 +++ 2.36-2ubuntu1/debian/util-linux.hwclock.default 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# Defaults for the hwclock init script. See hwclock(5) and hwclock(8). - -# This is used to specify that the hardware clock incapable of storing -# years outside the range of 1994-1999. Set to yes if the hardware is -# broken or no if working correctly. -#BADYEAR=no - -# Set this to yes if it is possible to access the hardware clock, -# or no if it is not. -#HWCLOCKACCESS=yes - -# Set this to any options you might need to give to hwclock, such -# as machine hardware clock type for Alphas. -#HWCLOCKPARS= - -# Set this to the hardware clock device you want to use, it should -# probably match the CONFIG_RTC_HCTOSYS_DEVICE kernel config option. -#HCTOSYS_DEVICE=rtc0 -
  2. Download patch debian/rules

    --- 2.36-2/debian/rules 2020-08-01 17:28:26.000000000 +0000 +++ 2.36-2ubuntu1/debian/rules 2020-08-01 19:14:26.000000000 +0000 @@ -8,6 +8,7 @@ CONFOPTS += --enable-raw CONFOPTS += --with-selinux CONFOPTS += --with-smack CONFOPTS += --enable-partx +CONFOPTS += --with-audit ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) CONFOPTS += --without-systemd --without-udev --without-audit else @@ -134,9 +135,9 @@ override_dh_installinit: ifeq (linux,$(DEB_HOST_ARCH_OS)) ifeq (,$(findstring s390,$(DEB_HOST_ARCH))) # install /etc/init.d/hwclock.sh - dh_installinit --name=hwclock.sh --no-start - # install /etc/default/hwclock - dh_installinit --name=hwclock + # - update-rc.d manually handled in maintainers scripts as there + # is special per-arch considerations. + dh_installinit --name=hwclock.sh --noscripts endif endif # install uuidd sysvinit script
  3. Download patch debian/util-linux.install

    --- 2.36-2/debian/util-linux.install 2020-08-01 17:28:26.000000000 +0000 +++ 2.36-2ubuntu1/debian/util-linux.install 2020-07-29 16:42:25.000000000 +0000 @@ -1,5 +1,4 @@ #!/usr/bin/dh-exec --with=install -debian/hwclock.rules => /usr/lib/udev/rules.d/85-hwclock.rules debian/hwclock-set => /usr/lib/udev/hwclock-set # Rename mkswap to mkswap.linux on non-linux. [linux-any] sbin/mkswap
  4. Download patch debian/patches/sulogin-fallback-static-sh.patch

    --- 2.36-2/debian/patches/sulogin-fallback-static-sh.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.36-2ubuntu1/debian/patches/sulogin-fallback-static-sh.patch 2020-06-25 15:07:13.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Add support for /bin/static-sh as fallback if the regular shell fails to execute +Author: Michael Vogt <michael.vogt@ubuntu.com> +Bug-Ubuntu: https://launchpad.net/bugs/505887 + +--- a/login-utils/sulogin.c ++++ b/login-utils/sulogin.c +@@ -795,6 +795,11 @@ + xsetenv("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(void)
  5. Download patch debian/control

    --- 2.36-2/debian/control 2020-08-01 17:28:26.000000000 +0000 +++ 2.36-2ubuntu1/debian/control 2020-07-29 16:42:24.000000000 +0000 @@ -18,7 +18,8 @@ Build-Depends: bc <!stage1 !nocheck>, po-debconf, socat <!stage1 !nocheck>, systemd [linux-any] <!stage1>, - zlib1g-dev + zlib1g-dev, + libaudit-dev Build-Conflicts: libcryptsetup-dev Section: base Priority: required @@ -404,7 +405,7 @@ Depends: ${misc:Depends}, Package-Type: udeb Description: stripped down miscellaneous system utilities, for debian-installer This is a minimal version of util-linux for debian-installer. It only - contains the blkid binary at the moment. + contains the blkid and fallocate binaries at the moment. Package: rfkill Architecture: linux-any
  6. Download patch debian/util-linux.maintscript

    --- 2.36-2/debian/util-linux.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 2.36-2ubuntu1/debian/util-linux.maintscript 2020-06-25 15:07:13.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/cron.weekly/fstrim 2.31.1-0.4ubuntu1~
  7. Download patch debian/patches/series

    --- 2.36-2/debian/patches/series 2020-08-01 17:28:26.000000000 +0000 +++ 2.36-2ubuntu1/debian/patches/series 2020-07-30 09:38:48.000000000 +0000 @@ -1,2 +1,4 @@ +sulogin-fallback-static-sh.patch +sulogin-lockedpwd.patch 0001-hexdump-automatically-use-C-when-called-as-hd.patch verbose-tests.patch
  8. Download patch debian/patches/sulogin-lockedpwd.patch

    --- 2.36-2/debian/patches/sulogin-lockedpwd.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.36-2ubuntu1/debian/patches/sulogin-lockedpwd.patch 2020-06-25 15:07:13.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Make sure file systems can be fixed on machines with locked root accounts (as Ubuntu does by default). Don't require --force for sulogin. +Author: Martin Pitt <martin.pitt@ubuntu.com> +Bug-Debian: https://bugs.debian.org/326678 + +Index: util-linux-2.33.1-0.1ubuntu1/login-utils/sulogin.c +=================================================================== +--- util-linux-2.33.1-0.1ubuntu1.orig/login-utils/sulogin.c ++++ util-linux-2.33.1-0.1ubuntu1/login-utils/sulogin.c +@@ -983,7 +983,8 @@ + const char *passwd = pwd->pw_passwd; + const char *answer; + int doshell = 0; +- int deny = !opt_e && locked_account_password(pwd->pw_passwd); ++ /* Ubuntu's root account is locked by default allow access without --force */ ++ int deny = 0; + + doprompt(passwd, con, deny); +
  1. util-linux