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: libguestfs

libguestfs (1:1.42.0-6ubuntu1) groovy; urgency=medium * Merge from Debian unstable. Remaining changes: + Add qemu build dependencies for arm64. + Disable Build-Depends on grub2, only needed for the quickchecks, which are disabled anyway. + Use qemu-s390x on s390x. - debian/rules: + Disable quickchecks. Requires a readable kernel image. -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 27 Jun 2020 10:36:46 +0200

Modifications :
  1. Download patch debian/rules

    --- 1:1.42.0-6/debian/rules 2020-05-30 21:41:16.000000000 +0000 +++ 1:1.42.0-6ubuntu1/debian/rules 2020-05-31 06:05:49.000000000 +0000 @@ -49,8 +49,9 @@ QEMU_CPU := $(shell echo $(DEB_HOST_GNU_ -e 's,powerpc(64.*)?,ppc64,' \ -e 's,arm.*,arm,') -# Run "make quickcheck" only on these architectures -QUICKCHECK_ARCHITECTURES := i386 amd64 +# Do not Run "make quickcheck" only on these architectures +# this requires a readable kernel image +#QUICKCHECK_ARCHITECTURES := i386 amd64 # Template for generating dh_{clean,configure,build,test} overrides. # $1 is replaced with the build number.
  2. Download patch debian/control

    --- 1:1.42.0-6/debian/control 2020-06-27 00:41:26.000000000 +0000 +++ 1:1.42.0-6ubuntu1/debian/control 2020-05-31 03:18:03.000000000 +0000 @@ -22,7 +22,9 @@ Build-Depends: debhelper (>= 12), gperf, libxml2-utils, qemu-system-arm [armel armhf arm64], qemu-system-mips [mips mipsel mips64 mips64el], - qemu-system-misc [s390x riscv64], + qemu-system-misc [riscv64], + qemu-system-s390x [s390x], + qemu-system-aarch64 [arm64], qemu-system-ppc [powerpc powerpcspe ppc64 ppc64el], qemu-system-sparc [sparc sparc64], qemu-system-x86 [i386 amd64], sgabios [i386 amd64], @@ -46,9 +48,6 @@ Build-Depends: debhelper (>= 12), flex, bison, golang-go [i386 amd64 armel armhf arm64 mips mipsel mips64el ppc64el], dh-php, php-all-dev | php5-dev, -# for testing (make quickcheck) - linux-image-amd64 [amd64], - linux-image-686-pae [i386] | linux-image-586 [i386] | linux-image-486 [i386], #-# appliance start acl, attr, @@ -71,7 +70,7 @@ Build-Depends: debhelper (>= 12), genisoimage, gfs2-utils, # gfs-tools, - grub2-common [amd64 arm64 armel armhf i386 mipsel ppc64el], +# grub2-common [amd64 arm64 armel armhf i386 mipsel ppc64el], hfsplus, iproute2 | iproute, iputils-arping, @@ -171,7 +170,9 @@ Depends: ${shlibs:Depends}, ${misc:Depen supermin (>= 5), qemu-system-arm [armel armhf arm64], qemu-system-mips [mips mipsel mips64 mips64el], - qemu-system-misc [s390x riscv64], + qemu-system-misc [riscv64], + qemu-system-s390x [s390x], + qemu-system-aarch64 [arm64], qemu-system-ppc [powerpc ppc64 ppc64el], qemu-system-sparc [sparc], qemu-system-x86 [i386 amd64], sgabios [i386 amd64],

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

Source: mdadm

mdadm (4.1-5ubuntu1) focal; urgency=medium [ dann frazier ] * Merge from Debian unstable. Remaining changes: - Ship finalrd hook. - Do not install mdadm-shutdown.service on Ubuntu. - Drop broken and unused init scripts in favor of native systemd units, which can cause failure to reconfigure mdadm package under certain confiment types. - Drop /etc/cron.d/mdadm and migrate to systemd mdcheck_start|continue timer units. - Drop /etc/cron.daily/mdadm and migrate to system mdmonitor-oneshot timer unit. - mdcheck_start.timer configures the mdcheck on a first sunday of the month, with a randomized start delay of up to 24h, and runs for at most 6h. mdcheck_continue.timer kicks off daily, with a randomized start delay of up to 12h, and continues mdcheck for at most 6h. - mdmonitor-oneshot.timer runs daily, with a randomized start delay of up to 24h. - One can use systemd drop-ins to change .timer units timings, set environmental variables to decrease/increase the length of checking, or start the checks by hand. Previously used checkarray is still available, albeit not used by timer units. - Above ensures that previous daily / monthly checks are performed, but are randomized, such that performance is not as impacted across a cluster of machines. - Honor the debconf daily autoscan setting in the systemd timer. -- dann frazier <dannf@ubuntu.com> Thu, 23 Jan 2020 11:41:55 -0700

Modifications :
  1. Download patch debian/rules

    --- 4.1-5/debian/rules 2019-03-12 03:58:03.000000000 +0000 +++ 4.1-5ubuntu1/debian/rules 2020-01-23 18:39:28.000000000 +0000 @@ -60,6 +60,8 @@ install-arch: build-arch $(DESTDIR)/usr/share/initramfs-tools/scripts/local-bottom/mdadm install -Dm0644 debian/mdadm.modules \ $(DESTDIR)/etc/modprobe.d/mdadm.conf + install -Dm0755 debian/mdadm.finalrd \ + $(DESTDIR)/usr/share/finalrd/mdadm.finalrd install -Dm0755 debian/mkconf $(DESTDIR)/usr/share/mdadm/mkconf install -Dm0755 debian/checkarray $(DESTDIR)/usr/share/mdadm/checkarray @@ -67,10 +69,11 @@ install-arch: build-arch install -Dm0755 udeb/mdadm $(DESTDIR_UDEB)/sbin/mdadm install -Dm0755 udeb/mdmon $(DESTDIR_UDEB)/sbin/mdmon install -Dm0644 $(DESTDIR)/lib/udev/rules.d/63-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules - install -Dm0644 debian/mdadm-shutdown.service $(DESTDIR)/lib/systemd/system/mdadm-shutdown.service ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes), yes) install -Dm0644 $(DESTDIR)/lib/udev/rules.d/64-md-raid-assembly.rules $(DESTDIR_UDEB)/lib/udev/rules.d/64-md-raid-assembly.rules install -Dm0644 debian/source_mdadm.py $(DESTDIR)/usr/share/apport/package-hooks/source_mdadm.py +else + install -Dm0644 debian/mdadm-shutdown.service $(DESTDIR)/lib/systemd/system/mdadm-shutdown.service endif binary-arch: install-arch @@ -79,12 +82,9 @@ binary-arch: install-arch dh_installdebconf dh_installdocs dh_installexamples -pmdadm mdadm.conf-example misc/syslog-events - dh_installinit --init-script=mdadm-waitidle --no-start -- stop 98 0 6 . - dh_link -pmdadm /dev/null /lib/systemd/system/mdadm-waitidle.service - dh_installinit -- defaults 25 - dh_link -pmdadm /dev/null /lib/systemd/system/mdadm.service dh_installman dh_installcron + dh_installsystemd -pmdadm mdcheck_continue.timer mdcheck_start.timer mdmonitor-oneshot.timer dh_installchangelogs ChangeLog dh_installlogcheck dh_link
  2. Download patch debian/control

    --- 4.1-5/debian/control 2019-08-09 17:16:06.000000000 +0000 +++ 4.1-5ubuntu1/debian/control 2020-01-23 18:39:24.000000000 +0000 @@ -1,7 +1,8 @@ Source: mdadm Section: admin Priority: optional -Maintainer: Debian QA Group <packages@qa.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org> Build-Depends: debhelper (>= 11), po-debconf, groff-base Standards-Version: 4.3.0 Vcs-Git: https://git.dgit.debian.org/mdadm @@ -11,7 +12,9 @@ Homepage: http://neil.brown.name/blog/md Package: mdadm Architecture: linux-any Depends: ${shlibs:Depends}, udev, ${misc:Depends}, lsb-base, debconf -Recommends: ${mta:Recommends}, kmod | module-init-tools +Recommends: ${mta:Recommends}, kmod | module-init-tools, finalrd (>= 3~) +Breaks: finalrd (<= 2) +Replaces: finalrd (<= 2) Suggests: ${mta:Suggests}, dracut-core Description: tool to administer Linux MD arrays (software RAID) The mdadm utility can be used to create, manage, and monitor MD
  3. Download patch debian/patches/systemd-honor-debconf-daily-scan.patch

    --- 4.1-5/debian/patches/systemd-honor-debconf-daily-scan.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.1-5ubuntu1/debian/patches/systemd-honor-debconf-daily-scan.patch 2020-01-23 18:39:28.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Honor the debconf mdadm/autoscan setting in the systemd timer + Debian added an mdadm/autoscan template to allow users to disable this + feature via debconf. This is exposed as a variable in /etc/default/mdadm, + which is processed by a cronjob in Debian. Ubuntu has dropped the cronjob + and moved to a systemd timer, so we need to add our own processing. +Author: dann frazier <dannf@ubuntu.com> + +Index: mdadm-4.1/systemd/mdmonitor-oneshot.service +=================================================================== +--- mdadm-4.1.orig/systemd/mdmonitor-oneshot.service ++++ mdadm-4.1/systemd/mdmonitor-oneshot.service +@@ -9,4 +9,5 @@ + Description=Reminder for degraded MD arrays + + [Service] +-ExecStart=BINDIR/mdadm --monitor --oneshot --scan ++EnvironmentFile=-/etc/default/mdadm ++ExecStart=sh -c '[ "$AUTOSCAN" != "true" ] || BINDIR/mdadm --monitor --oneshot --scan'
  4. Download patch debian/patches/randomize-timers.patch

    --- 4.1-5/debian/patches/randomize-timers.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.1-5ubuntu1/debian/patches/randomize-timers.patch 2020-01-23 18:39:28.000000000 +0000 @@ -0,0 +1,83 @@ +Description: Randomize md array check timers +Author: Dimitri John Ledkov <xnox@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1815201 + +Index: mdadm-4.1/systemd/mdcheck_continue.timer +=================================================================== +--- mdadm-4.1.orig/systemd/mdcheck_continue.timer ++++ mdadm-4.1/systemd/mdcheck_continue.timer +@@ -9,5 +9,6 @@ + Description=MD array scrubbing - continuation + + [Timer] +-OnCalendar= 1:05:00 +- ++OnCalendar=daily ++RandomizedDelaySec=12h ++Persistent=true +Index: mdadm-4.1/systemd/mdcheck_start.service +=================================================================== +--- mdadm-4.1.orig/systemd/mdcheck_start.service ++++ mdadm-4.1/systemd/mdcheck_start.service +@@ -11,7 +11,5 @@ Wants=mdcheck_continue.timer + + [Service] + Type=oneshot +-Environment= MDADM_CHECK_DURATION='"6 hours"' +-EnvironmentFile=-/run/sysconfig/mdadm +-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ++Environment=MDADM_CHECK_DURATION='"6 hours"' + ExecStart=/usr/share/mdadm/mdcheck --duration $MDADM_CHECK_DURATION +Index: mdadm-4.1/systemd/mdcheck_start.timer +=================================================================== +--- mdadm-4.1.orig/systemd/mdcheck_start.timer ++++ mdadm-4.1/systemd/mdcheck_start.timer +@@ -10,6 +10,8 @@ Description=MD array scrubbing + + [Timer] + OnCalendar=Sun *-*-1..7 1:00:00 ++RandomizedDelaySec=24h ++Persistent=true + + [Install] + WantedBy= mdmonitor.service +Index: mdadm-4.1/systemd/mdmonitor-oneshot.service +=================================================================== +--- mdadm-4.1.orig/systemd/mdmonitor-oneshot.service ++++ mdadm-4.1/systemd/mdmonitor-oneshot.service +@@ -9,7 +9,4 @@ + Description=Reminder for degraded MD arrays + + [Service] +-Environment= MDADM_MONITOR_ARGS=--scan +-EnvironmentFile=-/run/sysconfig/mdadm +-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +-ExecStart=BINDIR/mdadm --monitor --oneshot $MDADM_MONITOR_ARGS ++ExecStart=BINDIR/mdadm --monitor --oneshot --scan +Index: mdadm-4.1/systemd/mdmonitor-oneshot.timer +=================================================================== +--- mdadm-4.1.orig/systemd/mdmonitor-oneshot.timer ++++ mdadm-4.1/systemd/mdmonitor-oneshot.timer +@@ -9,7 +9,9 @@ + Description=Reminder for degraded MD arrays + + [Timer] +-OnCalendar= 2:00:00 ++OnCalendar=daily ++RandomizedDelaySec=24h ++Persistent=true + + [Install] + WantedBy= mdmonitor.service +Index: mdadm-4.1/systemd/mdcheck_continue.service +=================================================================== +--- mdadm-4.1.orig/systemd/mdcheck_continue.service ++++ mdadm-4.1/systemd/mdcheck_continue.service +@@ -12,7 +12,5 @@ ConditionPathExistsGlob = /var/lib/mdche + [Service] + Type=oneshot + Environment= MDADM_CHECK_DURATION='"6 hours"' +-EnvironmentFile=-/run/sysconfig/mdadm +-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh + ExecStart=/usr/share/mdadm/mdcheck --continue --duration $MDADM_CHECK_DURATION +
  5. Download patch debian/patches/series

    --- 4.1-5/debian/patches/series 2020-01-22 16:56:25.000000000 +0000 +++ 4.1-5ubuntu1/debian/patches/series 2020-01-23 18:40:10.000000000 +0000 @@ -18,3 +18,5 @@ mdmonitor-service-simplify.diff 0002-Assemble-add-support-for-RAID0-layouts.patch 0001-Respect-CROSS_COMPILE-when-CC-is-the-default.patch lp-1847924-introduce-new-array-state-broken.patch +randomize-timers.patch +systemd-honor-debconf-daily-scan.patch
  6. Download patch debian/mdadm.init

    --- 4.1-5/debian/mdadm.init 2019-03-12 03:58:03.000000000 +0000 +++ 4.1-5ubuntu1/debian/mdadm.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -#!/bin/sh -# -# Start the MD monitor daemon for all active MD arrays if desired. -# This script is not used under systemd. -# -# Copyright © 2001-2005 Mario Jou/3en <joussen@debian.org> -# Copyright © 2005-2009 Martin F. Krafft <madduck@debian.org> -# Distributable under the terms of the GNU GPL version 2. -# -### BEGIN INIT INFO -# Provides: mdadm -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog sendsigs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: MD monitoring daemon -# Description: mdadm provides a monitor mode, in which it will scan for -# problems with the MD devices. If a problem is found, the -# administrator is alerted via email, or a custom script is -# run. -### END INIT INFO -# -set -eu - -MDADM=/sbin/mdadm -MDMON=/sbin/mdmon -RUNDIR=/run/mdadm -PIDFILE=$RUNDIR/monitor.pid -DEBIANCONFIG=/etc/default/mdadm - -test -x "$MDADM" || exit 0 - -test -f /proc/mdstat || exit 0 - -START_DAEMON=true -test -f $DEBIANCONFIG && . $DEBIANCONFIG - -. /lib/lsb/init-functions - -is_true() -{ - case "${1:-}" in - [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; - *) return 1; - esac -} - -case "${1:-}" in - start) - if [ -x /usr/bin/systemd-detect-virt ] && /usr/bin/systemd-detect-virt --quiet --container; then - log_daemon_msg "Not starting MD monitoring service in container" - log_end_msg 0 - exit 0 - fi - - if is_true $START_DAEMON; then - log_daemon_msg "Starting MD monitoring service" "mdadm --monitor" - mkdir -p $RUNDIR - set +e - start-stop-daemon -S -p $PIDFILE -x $MDADM -- \ - --monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-} - log_end_msg $? - set -e - fi - if [ "$(echo $RUNDIR/md[0-9]*.pid)" != "$RUNDIR/md[0-9]*.pid" ]; then - log_daemon_msg "Restarting MD external metadata monitor" "mdmon --takeover --all" - set +e - $MDMON --takeover --all - log_end_msg $? - set -e - fi - ;; - stop) - if [ -f $PIDFILE ] ; then - log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor" - set +e - start-stop-daemon -K -p $PIDFILE -x $MDADM - rm -f $PIDFILE - log_end_msg $? - set -e - fi - for file in $RUNDIR/md[0-9]*.pid ; do - [ ! -f "$file" ] && continue - ln -sf $file /run/sendsigs.omit.d/mdmon-${file##*/} - done - ;; - status) - status_of_proc -p $PIDFILE "$MDADM" "mdadm" && exit 0 || exit $? - ;; - restart|reload|force-reload) - ${0:-} stop - ${0:-} start - ;; - *) - echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0
  7. Download patch debian/mdadm.maintscript

    --- 4.1-5/debian/mdadm.maintscript 2019-03-12 03:58:03.000000000 +0000 +++ 4.1-5ubuntu1/debian/mdadm.maintscript 2020-01-23 18:39:24.000000000 +0000 @@ -1 +1,5 @@ rm_conffile /etc/init.d/mdadm-raid 3.4-2~ +rm_conffile /etc/init.d/mdadm 4.1-2ubuntu2~ +rm_conffile /etc/init.d/mdadm-waitidle 4.1-2ubuntu2~ +rm_conffile /etc/cron.d/mdadm 4.1-2ubuntu3~ +rm_conffile /etc/cron.daily/mdadm 4.1-2ubuntu3~
  8. Download patch debian/mdadm.finalrd

    --- 4.1-5/debian/mdadm.finalrd 1970-01-01 00:00:00.000000000 +0000 +++ 4.1-5ubuntu1/debian/mdadm.finalrd 2020-01-23 18:39:24.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-3.0-only +set -e + +if [ "$1" = "setup" ] +then + . /usr/share/initramfs-tools/hook-functions + copy_exec /sbin/mdadm + copy_exec /sbin/mdmon + + exit 0 +fi + +mdmon --all --takeover +mdadm -vv --wait-clean --scan +mdadm -vv --stop --scan
  9. Download patch debian/mdadm.cron.d

    --- 4.1-5/debian/mdadm.cron.d 2019-03-12 03:58:03.000000000 +0000 +++ 4.1-5ubuntu1/debian/mdadm.cron.d 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# -# cron.d/mdadm -- schedules periodic redundancy checks of MD devices -# -# Copyright © martin f. krafft <madduck@madduck.net> -# distributed under the terms of the Artistic Licence 2.0 -# - -# By default, run at 00:57 on every Sunday, but do nothing unless the day of -# the month is less than or equal to 7. Thus, only run on the first Sunday of -# each month. crontab(5) sucks, unfortunately, in this regard; therefore this -# hack (see #380425). -57 0 * * 0 root if [ -x /usr/share/mdadm/checkarray ] && [ $(date +\%d) -le 7 ]; then /usr/share/mdadm/checkarray --cron --all --idle --quiet; fi
  10. Download patch debian/mdadm.cron.daily

    --- 4.1-5/debian/mdadm.cron.daily 2019-08-09 17:12:58.000000000 +0000 +++ 4.1-5ubuntu1/debian/mdadm.cron.daily 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#!/bin/sh -# -# cron.daily/mdadm -- daily check that MD devices are functional -# -# Copyright © 2008 Paul Slootman <paul@debian.org> -# distributed under the terms of the Artistic Licence 2.0 - -# As recommended by the manpage, run -# mdadm --monitor --scan --oneshot -# every day to ensure that any degraded MD devices don't go unnoticed. -# Email will go to the address specified in /etc/mdadm/mdadm.conf . -# -set -eu - -MDADM=/sbin/mdadm -[ -x $MDADM ] || exit 0 # package may be removed but not purged - -[ -e /etc/default/mdadm ] && . /etc/default/mdadm -[ $AUTOSCAN = false ] && exit 0 - -exec $MDADM --monitor --scan --oneshot

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

Source: udisks2

udisks2 (2.9.0-1ubuntu4) groovy; urgency=medium * Backport patch from upstream to make integration tests more reliable. (LP: #1888062) -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 03 Aug 2020 21:13:39 +1200 udisks2 (2.9.0-1ubuntu3) groovy; urgency=medium * debian/patches/exfat_label_workaround.patch: - update also the test for escape label name, it has the same name limitation on exfat -- Sebastien Bacher <seb128@ubuntu.com> Wed, 01 Jul 2020 16:32:09 +0200 udisks2 (2.9.0-1ubuntu2) groovy; urgency=medium * debian/patches/exfat_label_workaround.patch: - use shorted test labels to be compatible with the new util-linux version which enforces a smaller limit to exfat names -- Sebastien Bacher <seb128@ubuntu.com> Tue, 30 Jun 2020 11:17:52 +0200 udisks2 (2.9.0-1ubuntu1) groovy; urgency=medium * debian/patches/try_timeout_increase.patch: - try waiting a bit before the settle for uevents to arrive, should workaround the s390x issue while the problem is being work on upstream -- Sebastien Bacher <seb128@ubuntu.com> Thu, 11 Jun 2020 17:29:27 +0200 udisks2 (2.9.0-1build1) groovy; urgency=medium * debian/patches/try_timeout_increase.patch: - try updating some test timeout value to see if that improves the problems on s390x -- Sebastien Bacher <seb128@ubuntu.com> Wed, 10 Jun 2020 09:38:04 +0200

Modifications :
  1. Download patch debian/control

    --- 2.9.0-1/debian/control 2020-05-27 17:42:37.000000000 +0000 +++ 2.9.0-1ubuntu4/debian/control 2020-08-03 09:13:39.000000000 +0000 @@ -1,7 +1,8 @@ Source: udisks2 Section: admin Priority: optional -Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>, Build-Depends: debhelper-compat (= 12),
  2. Download patch debian/patches/exfat_label_workaround.patch

    --- 2.9.0-1/debian/patches/exfat_label_workaround.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.9.0-1ubuntu4/debian/patches/exfat_label_workaround.patch 2020-08-03 09:12:25.000000000 +0000 @@ -0,0 +1,34 @@ +# Description: workaround tests failed on exfat with new util-linux versions +# Upstream: https://github.com/storaged-project/udisks/issues/784 +# +Index: udisks2-2.9.0/src/tests/integration-test +=================================================================== +--- udisks2-2.9.0.orig/src/tests/integration-test ++++ udisks2-2.9.0/src/tests/integration-test +@@ -870,7 +870,7 @@ class FS(UDisksTestCase): + + self._do_cli_check(fs_type) + if fs_type != 'minix': +- self._do_cli_check(fs_type, 'test%stst' % fs_type) ++ self._do_cli_check(fs_type, 't%stst' % fs_type) + + # put a different fs here instead of zeroing, so that we verify that + # udisks overrides existing FS (e. g. XFS complains then), and does not +@@ -884,7 +884,7 @@ class FS(UDisksTestCase): + self.write_stderr('[ud] ') + self._do_udisks_check(fs_type) + if fs_type != 'minix': +- self._do_udisks_check(fs_type, 'test%stst' % fs_type) ++ self._do_udisks_check(fs_type, 't%stst' % fs_type) + # also test fs_create with an empty label + self._do_udisks_check(fs_type, '') + # also test fs_create with the no-discard option +@@ -1040,6 +1040,8 @@ class FS(UDisksTestCase): + # VFAT does not support some characters + self.assertRaises(GLib.GError, fs.call_set_label_sync, l, no_options, None) + l = "n@a$me" ++ elif fs_type == 'exfat': ++ l = 'n"a\m\\"exft' + try: + fs.call_set_label_sync(l, no_options, None) + except GLib.GError as e:
  3. Download patch debian/patches/d2e0bfce.patch
  4. Download patch debian/patches/series

    --- 2.9.0-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.9.0-1ubuntu4/debian/patches/series 2020-08-03 09:13:00.000000000 +0000 @@ -0,0 +1,3 @@ +try_timeout_increase.patch +exfat_label_workaround.patch +d2e0bfce.patch
  5. Download patch debian/patches/try_timeout_increase.patch

    --- 2.9.0-1/debian/patches/try_timeout_increase.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.9.0-1ubuntu4/debian/patches/try_timeout_increase.patch 2020-08-03 09:12:25.000000000 +0000 @@ -0,0 +1,31 @@ +# Description: let time for uevents to arrive before settling +# Upstream: https://github.com/storaged-project/udisks/issues/777 +# +Index: udisks2-2.9.0/src/tests/integration-test +=================================================================== +--- udisks2-2.9.0.orig/src/tests/integration-test ++++ udisks2-2.9.0/src/tests/integration-test +@@ -357,7 +357,7 @@ class UDisksTestCase(unittest.TestCase): + def retry_busy(cls, fn, *args): + """Call a function until it does not fail with "Busy".""" + +- timeout = 10 ++ timeout = 30 + while timeout >= 0: + try: + return fn(*args) +@@ -608,9 +608,14 @@ class Manager(UDisksTestCase): + + options = GLib.Variant('a{sv}', {'label': GLib.Variant('s', 'foo')}) + block.call_format_sync('ext2', options, None) ++ ++ time.sleep(3) ++ + self.client.settle() + self.assertNotEqual(obj.get_property('filesystem'), None) + ++ time.sleep(3) ++ + self.assertEqual(block.get_property('id-label'), 'foo') + self.assertEqual(block.get_property('id-usage'), 'filesystem') + self.assertEqual(block.get_property('id-type'), 'ext2')
  1. libguestfs
  2. mdadm
  3. udisks2