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

cryptsetup (2:2.3.3-1ubuntu3) groovy; urgency=medium * debian/rules: - fix FTBFS on riscv64 adding --with-tmpfilesdir to ensure all archs, even without systemd knows how to ship cryptsetup.conf -- Didier Roche <didrocks@ubuntu.com> Thu, 18 Jun 2020 11:44:50 +0200 cryptsetup (2:2.3.3-1ubuntu2) groovy; urgency=medium * debian/cryptsetup-bin.install: - Fix FTBFS due to dh_missing detecting crypsetup.conf in debian/tmp where it was installed from ./scripts/crypsetup.conf. * Fix warning and error when running on ZFS on root: (LP: #1830110) - d/functions: Return an empty devno for ZFS devices as they don't have major:minor device numbers. - d/initramfs/hooks/cryptroot: Ignore and don't print an error message when devices don't have a devno. Submitted to debian upstream as bug #902449. -- Didier Roche <didrocks@ubuntu.com> Thu, 18 Jun 2020 10:12:10 +0200 cryptsetup (2:2.3.3-1ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - debian/control: + Recommend plymouth. + Depend on busybox-initramfs instead of busybox | busybox-static. - Fix cryptroot-unlock for busybox compatibility. -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 09 Jun 2020 10:40:32 -0700

Modifications :
  1. Download patch debian/functions

    --- 2:2.3.3-1/debian/functions 2020-06-03 23:41:44.000000000 +0000 +++ 2:2.3.3-1ubuntu3/debian/functions 2020-06-18 08:12:10.000000000 +0000 @@ -583,6 +583,7 @@ _resolve_device() { # Print the major:minor device ID(s) holding the file system currently # mounted currenty mounted on $mountpoint. # Return 0 on success, 1 on error (if $mountpoint is not a mountpoint). +# devno will be empty if the filesystem must be excluded. get_mnt_devno() { local wantmount="$1" devnos="" uuid dev IFS local spec mountpoint fstype _ DEV MAJ MIN @@ -596,8 +597,15 @@ get_mnt_devno() { # take the last mountpoint if used several times (shadowed) unset -v devnos spec="$(printf '%b' "$spec")" - _resolve_device "$spec" || continue # _resolve_device() already warns on error fstype="$(printf '%b' "$fstype")" + if [ "$fstype" = "zfs" ]; then + # Ignore ZFS entries as they don't have a major/minor and won't + # be imported when local-top cryptroot script will ran. + # Returns success with empty devno + printf '' + return 0 + fi + _resolve_device "$spec" || continue # _resolve_device() already warns on error if [ "$fstype" = "btrfs" ]; then # btrfs can span over multiple devices if uuid="$(_device_uuid "$DEV")"; then
  2. Download patch debian/rules

    --- 2:2.3.3-1/debian/rules 2020-06-03 23:41:44.000000000 +0000 +++ 2:2.3.3-1ubuntu3/debian/rules 2020-06-18 09:44:50.000000000 +0000 @@ -24,6 +24,7 @@ override_dh_auto_configure: --sbindir=/sbin \ --enable-libargon2 \ --enable-shared \ + --with-tmpfilesdir=/usr/lib/tmpfiles.d/ \ --enable-cryptsetup-reencrypt override_dh_auto_build:
  3. Download patch debian/control

    --- 2:2.3.3-1/debian/control 2020-06-03 23:41:44.000000000 +0000 +++ 2:2.3.3-1ubuntu3/debian/control 2020-06-04 03:14:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: cryptsetup Section: admin Priority: optional -Maintainer: Debian Cryptsetup Team <pkg-cryptsetup-devel@alioth-lists.debian.net> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Cryptsetup Team <pkg-cryptsetup-devel@alioth-lists.debian.net> Uploaders: Jonas Meurer <jonas@freesources.org>, Guilhem Moulin <guilhem@debian.org> Rules-Requires-Root: no @@ -76,11 +77,11 @@ Description: disk encryption support - c Package: cryptsetup-initramfs Architecture: all -Depends: busybox | busybox-static, +Depends: busybox-initramfs, cryptsetup (>= ${source:Version}), initramfs-tools (>= 0.129) | linux-initramfs-tool, ${misc:Depends} -Recommends: console-setup, kbd +Recommends: console-setup, kbd, plymouth Breaks: cryptsetup (<< 2:2.0.3-1) Replaces: cryptsetup (<< 2:2.0.3-1) Description: disk encryption support - initramfs integration
  4. Download patch debian/initramfs/cryptroot-unlock

    --- 2:2.3.3-1/debian/initramfs/cryptroot-unlock 2020-06-03 23:41:44.000000000 +0000 +++ 2:2.3.3-1ubuntu3/debian/initramfs/cryptroot-unlock 2020-06-04 03:14:44.000000000 +0000 @@ -40,8 +40,14 @@ fi pgrep_exe() { local exe pid exe="$(readlink -f -- "$1" 2>/dev/null)" && [ -f "$exe" ] || return 0 - ps -eo pid= | while read pid; do - [ "$(readlink -f "/proc/$pid/exe")" != "$exe" ] || printf '%d\n' "$pid" + ps | awk '{print $1, $5}' | while read LINE; do + set $LINE + local pid=$1 + local cmd=$(readlink -f -- "$2") + if [ "$cmd" == "$exe" ]; then + echo $pid + break + fi done } @@ -101,7 +107,7 @@ wait_for_prompt() { break fi - usleep 100000 + sleep 0.1 timer=$(( $timer - 1 )) if [ $timer -le 0 ]; then echo "Error: Timeout reached while waiting for askpass." >&2 @@ -112,7 +118,7 @@ wait_for_prompt() { # find the cryptsetup process with same $CRYPTTAB_NAME local o v for o in NAME TRIED OPTION_tries; do - if v="$(grep -z -m1 "^CRYPTTAB_$o=" "/proc/$pid/environ")"; then + if v="$(tr '\0' '\n' < "/proc/$pid/environ" | grep -m1 "^CRYPTTAB_$o=")"; then eval "CRYPTTAB_$o"="\${v#CRYPTTAB_$o=}" else eval unset -v "CRYPTTAB_$o" @@ -128,7 +134,7 @@ wait_for_prompt() { fi for pid in $(pgrep_exe "/sbin/cryptsetup"); do - if grep -Fxqz "CRYPTTAB_NAME=$CRYPTTAB_NAME" "/proc/$pid/environ"; then + if tr '\0' '\n' < "/proc/$pid/environ" | grep -Fxq "CRYPTTAB_NAME=$CRYPTTAB_NAME"; then PID=$pid BIRTH=$(stat -c"%Z" "/proc/$PID" 2>/dev/null) || break return 0 @@ -148,7 +154,7 @@ wait_for_prompt() { wait_for_answer() { local timer=$(( 10 * $TIMEOUT )) b while [ -d "/proc/$PID" ] && b=$(stat -c"%Z" "/proc/$PID" 2>/dev/null) && [ $b -le $BIRTH ]; do - usleep 100000 + sleep 0.1 timer=$(( $timer - 1 )) if [ $timer -le 0 ]; then echo "Error: Timeout reached while waiting for PID $PID." >&2
  5. Download patch debian/cryptsetup-bin.install

    --- 2:2.3.3-1/debian/cryptsetup-bin.install 2020-06-03 23:41:44.000000000 +0000 +++ 2:2.3.3-1ubuntu3/debian/cryptsetup-bin.install 2020-06-18 08:12:03.000000000 +0000 @@ -1,4 +1,4 @@ sbin/* -scripts/cryptsetup.conf /usr/lib/tmpfiles.d/ +usr/lib/tmpfiles.d/cryptsetup.conf usr/share/locale/*/*/* usr/share/man/*/*
  6. Download patch debian/initramfs/hooks/cryptroot

    --- 2:2.3.3-1/debian/initramfs/hooks/cryptroot 2020-06-03 23:41:44.000000000 +0000 +++ 2:2.3.3-1ubuntu3/debian/initramfs/hooks/cryptroot 2020-06-18 08:12:10.000000000 +0000 @@ -179,16 +179,18 @@ generate_initrd_crypttab() { { if devnos="$(get_mnt_devno /)"; then - usage=rootfs foreach_cryptdev crypttab_find_and_print_entry $devnos + if [ -n "$devnos" ]; then + usage=rootfs foreach_cryptdev crypttab_find_and_print_entry $devnos + fi else cryptsetup_message "WARNING: Couldn't determine root device" fi - if devnos="$(get_resume_devno)"; then + if devnos="$(get_resume_devno)" && [ -n "$devnos" ]; then usage=resume foreach_cryptdev crypttab_find_and_print_entry $devnos fi - if devnos="$(get_mnt_devno /usr)"; then + if devnos="$(get_mnt_devno /usr)" && [ -n "$devnos" ]; then usage="" foreach_cryptdev crypttab_find_and_print_entry $devnos fi

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

Source: netcat-openbsd

netcat-openbsd (1.217-2ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - Move the netcat transitional package here and have it depend on the peferred netcat-openbsd implementation of netcat, not netcat-traditional. -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 09 Jun 2020 13:21:58 -0700

Modifications :
  1. Download patch debian/control

    --- 1.217-2/debian/control 2020-06-05 01:16:35.000000000 +0000 +++ 1.217-2ubuntu1/debian/control 2020-06-05 03:14:00.000000000 +0000 @@ -1,7 +1,8 @@ Source: netcat-openbsd Section: net Priority: important -Maintainer: Aron Xu <aron@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Aron Xu <aron@debian.org> Uploaders: Guilhem Moulin <guilhem@debian.org> Standards-Version: 4.5.0 Rules-Requires-Root: no @@ -26,3 +27,13 @@ Description: TCP/IP swiss army knife . This package contains the OpenBSD rewrite of netcat, including support for IPv6, proxies, and Unix sockets. + +Package: netcat +Priority: extra +Section: oldlibs +Architecture: all +Depends: netcat-openbsd, ${misc:Depends} +Description: TCP/IP swiss army knife -- transitional package + This is a transitional package that depends on the netcat-openbsd + implementation of netcat, preferred in Ubuntu. It may be safely removed. +
  1. cryptsetup
  2. netcat-openbsd