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.1.0-5ubuntu2) eoan; urgency=medium * Rebuild against new libjson-c4. -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 29 Jun 2019 13:48:37 +0200 cryptsetup (2:2.1.0-5ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - debian/control: + Recommend plymouth. + Depend on busybox-initramfs instead of busybox | busybox-static. - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox compatibility. -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 14 Jun 2019 14:09:31 -0700

Modifications :
  1. Download patch debian/control

    --- 2:2.1.0-5/debian/control 2019-06-10 12:51:15.000000000 +0000 +++ 2:2.1.0-5ubuntu2/debian/control 2019-06-10 15:41:08.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> Build-Depends: autoconf, @@ -69,11 +70,11 @@ Description: disk encryption support - c Package: cryptsetup-initramfs Architecture: all -Depends: busybox | busybox-static, +Depends: busybox-initramfs, cryptsetup-run (>= ${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
  2. Download patch debian/initramfs/cryptroot-unlock

    --- 2:2.1.0-5/debian/initramfs/cryptroot-unlock 2019-06-10 12:51:15.000000000 +0000 +++ 2:2.1.0-5ubuntu2/debian/initramfs/cryptroot-unlock 2019-06-10 15:41:09.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=$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
  1. cryptsetup