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

strace (4.26-0.2ubuntu3) eoan; urgency=medium * also filter kexec_file_load out of the list of programs to run for other tests. -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 03 May 2019 05:19:49 +0000 strace (4.26-0.2ubuntu2) eoan; urgency=medium * debian/patches/kexec_file_load.patch: reintroduce now for arm64, which has added the syscall only in Linux 5.0 and later, so has the same problem as before with the split between kernel build headers and runtime kernel. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 May 2019 17:55:57 -0700 strace (4.26-0.2ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - Apply ptrace-error-verbosity.patch * Drop kexec_file_load.patch; was already disabled in previous versions, and causes no problems since we are consistently building/ testing devel against a much newer kernel than 4.11. * Drop fix-glibc-ftbfs.patch, fixed differently upstream. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 02 May 2019 16:50:08 -0700

Modifications :
  1. Download patch debian/rules

    --- 4.26-0.2/debian/rules 2019-01-11 23:59:31.000000000 +0000 +++ 4.26-0.2ubuntu3/debian/rules 2019-05-03 05:19:25.000000000 +0000 @@ -49,6 +49,10 @@ configure: %-stamp: %/Makefile $(MAKE) -C $* ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) +ifeq ($(DEB_HOST_ARCH),arm64) + # kexec_file_load only implemented on kernel >= 5.0 + sed -i -e'/kexec_file_load/ s/^#*/#/' tests/pure_executables.list +endif $*/strace -V $(MAKE) -C $* check VERBOSE=1 endif @@ -71,6 +75,7 @@ clean: dh_testdir dh_testroot rm -rf build build-udeb build64 strace64.1 debian/strace64.substvars + sed -i -e'/kexec_file_load/ s/^#*//' tests/pure_executables.list dh_clean binary: binary-indep binary-arch
  2. Download patch debian/patches/kexec_file_load.patch

    --- 4.26-0.2/debian/patches/kexec_file_load.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.26-0.2ubuntu3/debian/patches/kexec_file_load.patch 2019-05-03 05:19:35.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Skip kexec_file_load test on arm64 before 5.0. +Author: Adam Conrad <adconrad@ubuntu.com>, + Steve Langasek <steve.langasek@ubuntu.com> +Last-Update: 2019-05-02 + +Index: strace-4.26/tests/kexec_file_load.gen.test +=================================================================== +--- strace-4.26.orig/tests/kexec_file_load.gen.test ++++ strace-4.26/tests/kexec_file_load.gen.test +@@ -1,4 +1,12 @@ + #!/bin/sh -efu + # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (kexec_file_load -s9 ); do not edit. + . "${srcdir=.}/init.sh" ++ ++case $(uname -m) in ++ aarch64*) ++ # kexec_file_load was wired up after 4.18.x ++ require_min_kernel_version_or_skip 5.0 ++ ;; ++esac ++ + run_strace_match_diff -s9
  3. Download patch debian/control

    --- 4.26-0.2/debian/control 2019-01-11 23:59:31.000000000 +0000 +++ 4.26-0.2ubuntu3/debian/control 2019-01-13 16:57:05.000000000 +0000 @@ -1,5 +1,6 @@ Source: strace -Maintainer: Steve McIntyre <93sam@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Steve McIntyre <93sam@debian.org> Section: utils Priority: optional Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc sparc64 x32], debhelper (>= 10.0.0), gawk, libunwind-dev [amd64], libiberty-dev [amd64], libbluetooth-dev
  4. Download patch debian/patches/series

    --- 4.26-0.2/debian/patches/series 2019-01-13 09:28:34.000000000 +0000 +++ 4.26-0.2ubuntu3/debian/patches/series 2019-05-03 00:52:58.000000000 +0000 @@ -1,2 +1,4 @@ no-arm-unaligned-access +ptrace-error-verbosity.patch 0002-mips-o32-fix-build.patch +kexec_file_load.patch
  5. Download patch debian/patches/ptrace-error-verbosity.patch

    --- 4.26-0.2/debian/patches/ptrace-error-verbosity.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.26-0.2ubuntu3/debian/patches/ptrace-error-verbosity.patch 2018-04-11 14:18:47.000000000 +0000 @@ -0,0 +1,26 @@ +Description: try to make the PTRACE scope sysctl more discoverable via a + verbose error message when failures happen. +Author: Kees Cook <kees@ubuntu.com> + +Index: b/strace.c +=================================================================== +--- a/strace.c ++++ b/strace.c +@@ -1018,6 +1018,8 @@ static void + attach_tcb(struct tcb *const tcp) + { + if (ptrace_attach_or_seize(tcp->pid) < 0) { ++ if (errno == EPERM) ++ perror_msg("Could not attach to process. If your uid matches the uid of the target process, check the setting of /proc/sys/kernel/yama/ptrace_scope, or try again as the root user. For more details, see /etc/sysctl.d/10-ptrace.conf"); + perror_msg("attach: ptrace(%s, %d)", + ptrace_attach_cmd, tcp->pid); + droptcb(tcp); +@@ -1049,6 +1051,8 @@ attach_tcb(struct tcb *const tcp) + + ++ntid; + if (ptrace_attach_or_seize(tid) < 0) { ++ if (errno == EPERM) ++ perror_msg("Could not attach to process. If your uid matches the uid of the target process, check the setting of /proc/sys/kernel/yama/ptrace_scope, or try again as the root user. For more details, see /etc/sysctl.d/10-ptrace.conf"); + ++nerr; + debug_perror_msg("attach: ptrace(%s, %d)", + ptrace_attach_cmd, tid);
  1. strace