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.34-0.1ubuntu2) eoan; urgency=medium * d/p/prevent-fstrim-inside-container.patch: - Prevent fstrim to run inside a container environment. (LP: #1589289) -- Eric Desrochers <eric.desrochers@canonical.com> Wed, 21 Aug 2019 13:19:03 +0000 util-linux (2.34-0.1ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - Build hwclock with audit support. - Drop debian/hwclock.rules and 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. - Update s390-tools breaks/replaces, to the correct version for ubuntu. - Enable fstrim.timer by default. * Dropped changes, included upstream: - debian/patches/32-bit-safe-mbr-parsing.patch: [PATCH] libfdisk: (dos) Use strtoul to parse the label-id. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 15 Aug 2019 23:50:01 -0700

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

    --- 2.34-0.1/debian/util-linux.hwclock.default 2019-07-28 15:14:02.000000000 +0000 +++ 2.34-0.1ubuntu2/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.34-0.1/debian/rules 2019-07-28 15:14:02.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/rules 2019-07-28 21:44:43.000000000 +0000 @@ -11,6 +11,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 @@ -144,6 +145,7 @@ endif ln -s ../misc-utils/uuidd.rc debian/uuid-runtime.uuidd.init dh_installinit --name=uuidd --restart-after-upgrade rm -f debian/uuid-runtime.uuidd.init + dh_installsystemd --package=util-linux fstrim.timer override_dh_installpam: dh_installpam --package=util-linux --name=runuser
  3. Download patch debian/util-linux.install

    --- 2.34-0.1/debian/util-linux.install 2019-07-28 15:14:02.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/util-linux.install 2019-07-28 21:44:43.000000000 +0000 @@ -1,5 +1,4 @@ #!/usr/bin/dh-exec --with=install -debian/hwclock.rules => /lib/udev/rules.d/85-hwclock.rules debian/hwclock-set => /lib/udev/hwclock-set # perl gets to do rename, not us. debian/tmp/usr/bin/rename => /usr/bin/rename.ul
  4. Download patch debian/patches/sulogin-fallback-static-sh.patch

    --- 2.34-0.1/debian/patches/sulogin-fallback-static-sh.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/patches/sulogin-fallback-static-sh.patch 2018-02-14 22:20:35.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 +@@ -793,6 +793,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.34-0.1/debian/control 2019-07-28 15:14:02.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/control 2019-07-28 21:44:43.000000000 +0000 @@ -19,10 +19,12 @@ Build-Depends: bc <!stage1 !nocheck>, socat <!stage1 !nocheck>, systemd [linux-any] <!stage1>, bison, - zlib1g-dev + zlib1g-dev, + libaudit-dev Section: base Priority: required -Maintainer: LaMont Jones <lamont@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: LaMont Jones <lamont@debian.org> Uploaders: Adam Conrad <adconrad@0c3.net> Standards-Version: 4.4.0 Rules-Requires-Root: binary-targets @@ -79,7 +81,7 @@ Build-Profiles: <!stage1> XB-Important: yes Section: admin Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends} -Depends: ${misc:Depends}, util-linux (>= 2.29.2-3~) +Depends: ${misc:Depends}, util-linux (>= 2.30.1-0ubuntu4~) Suggests: nfs-common (>=1:1.1.0-13) Breaks: bash-completion (<< 1:2.1-4.3~) Replaces: bash-completion (<< 1:2.1-4.3~) @@ -112,8 +114,8 @@ Section: utils Priority: important Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: util-linux (<< 2.29.2-3~) -Breaks: util-linux (<< 2.29.2-3~) +Replaces: util-linux (<< 2.30.1-0ubuntu4~) +Breaks: util-linux (<< 2.30.1-0ubuntu4~) Multi-Arch: foreign Description: collection of partitioning utilities This package contains the classic fdisk, sfdisk and cfdisk partitioning @@ -368,7 +370,7 @@ Depends: ${misc:Depends}, ${shlibs:Depen 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/patches/prevent-fstrim-inside-container.patch

    --- 2.34-0.1/debian/patches/prevent-fstrim-inside-container.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/patches/prevent-fstrim-inside-container.patch 2019-08-21 13:17:10.000000000 +0000 @@ -0,0 +1,44 @@ +Description: fstrim shouldn't run inside a container + Container type implies the following products: + openvz OpenVZ/Virtuozzo + lxc Linux container implementation by LXC + lxc-libvirt Linux container implementation by libvirt + systemd-nspawn systemd's minimal container implementation, see systemd-nspawn(1) + docker Docker container manager + podman Podman container manager + rkt rkt app container runtime + wsl Windows Subsystem for Linux + + References: + https://www.freedesktop.org/software/systemd/man/systemd.unit.html + https://www.freedesktop.org/software/systemd/man/systemd-detect-virt.html# + + Fix: #840 +Author: Eric Desrochers <eric.desrochers@canonical.com> +Origin: upstream, https://github.com/karelzak/util-linux/commit/0280d31a2bd6292acd9a4b86d0f6b5feb275a618 +Bug: https://github.com/karelzak/util-linux/issues/840 +Bug-Ubuntu: https://launchpad.net/bugs/1589289 +Index: util-linux-2.34/sys-utils/fstrim.service.in +=================================================================== +--- util-linux-2.34.orig/sys-utils/fstrim.service.in ++++ util-linux-2.34/sys-utils/fstrim.service.in +@@ -1,6 +1,7 @@ + [Unit] + Description=Discard unused blocks on filesystems from /etc/fstab + Documentation=man:fstrim(8) ++ConditionVirtualization=!container + + [Service] + Type=oneshot +Index: util-linux-2.34/sys-utils/fstrim.timer +=================================================================== +--- util-linux-2.34.orig/sys-utils/fstrim.timer ++++ util-linux-2.34/sys-utils/fstrim.timer +@@ -1,6 +1,7 @@ + [Unit] + Description=Discard unused blocks once a week + Documentation=man:fstrim ++ConditionVirtualization=!container + + [Timer] + OnCalendar=weekly
  7. Download patch debian/util-linux.maintscript

    --- 2.34-0.1/debian/util-linux.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/util-linux.maintscript 2019-01-14 13:00:23.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/cron.weekly/fstrim 2.31.1-0.4ubuntu1~
  8. Download patch debian/patches/series

    --- 2.34-0.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/patches/series 2019-08-21 13:19:03.000000000 +0000 @@ -0,0 +1,3 @@ +sulogin-fallback-static-sh.patch +sulogin-lockedpwd.patch +prevent-fstrim-inside-container.patch
  9. Download patch debian/patches/sulogin-lockedpwd.patch

    --- 2.34-0.1/debian/patches/sulogin-lockedpwd.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.34-0.1ubuntu2/debian/patches/sulogin-lockedpwd.patch 2019-01-14 13:00:23.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 +@@ -982,7 +982,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