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

valgrind (1:3.15.0-1ubuntu9) focal; urgency=medium * Prevent valgrind trying to use unrecognised z14/z15 instructions. LP: #1866211 -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 03 Apr 2020 11:34:19 +0100 valgrind (1:3.15.0-1ubuntu8) focal; urgency=medium * No-change rebuild for glibc 2.31. -- Matthias Klose <doko@ubuntu.com> Fri, 06 Mar 2020 14:39:58 +0100 valgrind (1:3.15.0-1ubuntu7) focal; urgency=medium * Cherry pick upstream commit Bug 416301 - s390x: Support "compare and signal" instructions (LP: #1862183) -- Julian Andres Klode <juliank@ubuntu.com> Thu, 06 Feb 2020 15:49:24 +0100 valgrind (1:3.15.0-1ubuntu6) focal; urgency=medium * debian/valgrind.install: - include /usr/libexec/valgrind which ships the dh_view tools (lp: #1856067) * debian/rules: - use dh_missing --fail-missing to we don't overlook not install files -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 Dec 2019 16:18:01 +0100 valgrind (1:3.15.0-1ubuntu5) focal; urgency=medium * Drop MPI 1 support to fix FTBFS with openmpi 4.0 -- Balint Reczey <rbalint@ubuntu.com> Thu, 28 Nov 2019 19:35:25 +0100 valgrind (1:3.15.0-1ubuntu4) focal; urgency=medium * Don't look for debug alt file in debug image if it is already found (LP: #1848211) -- Balint Reczey <rbalint@ubuntu.com> Wed, 27 Nov 2019 13:52:54 +0100 valgrind (1:3.15.0-1ubuntu3) eoan; urgency=medium * No-change upload with strops.h and sys/strops.h removed in glibc. -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 11:14:57 +0000 valgrind (1:3.15.0-1ubuntu2) eoan; urgency=medium * debian/patches/armv7-illegal-opcode.patch: fix a crash due to an unhandled thumb instruction on armhf. Closes LP: #1837068. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 01 Aug 2019 08:22:37 -0700 valgrind (1:3.15.0-1ubuntu1) eoan; urgency=low * Merge from Debian unstable. Remaining changes: - Lower over-inflated valgrind-dbg Recommends to Suggests instead. - Don't strip vgpreload* on ARM; this results in unusable stack traces without valgrind-dbg. - Configure with --enable-only64bit on AArch64. - Enable parallel builds. - debian/patches/usrmerge_support.patch: make valgrind aware of usrmerge; if we can't find the debug files under the full objpath (including /usr), also try the alternative path by stripping out /usr. * Dropped changes, which had been cherry-picked from upstream: - Cherrypick s390x/z13 fixes from valgrind master (3.15) - s390x Fix vector facility bit. - ppc64el fix POWER 3.0 addex instruction. -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 15 Jul 2019 22:09:50 -0700

Modifications :
  1. Download patch debian/patches/0001-Bug-416301-s390x-Support-compare-and-signal-instruct.patch
  2. Download patch debian/patches/0001-Don-t-look-for-debug-alt-file-in-debug-image-if-it-i.patch

    --- 1:3.15.0-1/debian/patches/0001-Don-t-look-for-debug-alt-file-in-debug-image-if-it-i.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/patches/0001-Don-t-look-for-debug-alt-file-in-debug-image-if-it-i.patch 2020-02-06 14:49:24.000000000 +0000 @@ -0,0 +1,28 @@ +From 391a9558e2a53c901b7d7eefdf3cf898b738eb71 Mon Sep 17 00:00:00 2001 +From: Balint Reczey <balint.reczey@canonical.com> +Date: Thu, 28 Nov 2019 13:34:21 +0100 +Subject: [PATCH] Don't look for debug alt file in debug image if it is already + found + +With dwz the .gnu_debuglink section may appear duplicated in the +debug file referenced originally in the .gnu_debuglink section. + +https://bugs.launchpad.net/ubuntu/+source/valgrind/+bug/1848211 + +Signed-off-by: Balint Reczey <balint.reczey@canonical.com> +--- + coregrind/m_debuginfo/readelf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/coregrind/m_debuginfo/readelf.c ++++ b/coregrind/m_debuginfo/readelf.c +@@ -3017,7 +3017,8 @@ + if (!ML_(sli_is_valid)(debug_frame_escn)) + FIND(need_dwarf2, ".zdebug_frame", debug_frame_escn) + +- FIND( need_dwarf2, ".gnu_debugaltlink", debugaltlink_escn) ++ if (!ML_(sli_is_valid)(debugaltlink_escn)) ++ FIND( need_dwarf2, ".gnu_debugaltlink", debugaltlink_escn) + + FIND( need_dwarf1, ".debug", dwarf1d_escn) + FIND( need_dwarf1, ".line", dwarf1l_escn)
  3. Download patch debian/patches/0001-s390x-Unset-facility-bits-for-unsupported-z14-z15-fa.patch

    --- 1:3.15.0-1/debian/patches/0001-s390x-Unset-facility-bits-for-unsupported-z14-z15-fa.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/patches/0001-s390x-Unset-facility-bits-for-unsupported-z14-z15-fa.patch 2020-04-03 10:34:13.000000000 +0000 @@ -0,0 +1,43 @@ +From a74504f6589a2de47b78c78fdfae2b51cd99a3e7 Mon Sep 17 00:00:00 2001 +From: Andreas Arnez <arnez@linux.ibm.com> +Date: Thu, 19 Mar 2020 17:39:15 +0100 +Subject: [PATCH] s390x: Unset facility bits for unsupported z14/z15 facilities + +Ensure that the facility bits for CPU facilities unsupported by Valgrind +are unset, particularly for the new deflate-conversion facility. +--- + VEX/priv/guest_s390_helpers.c | 3 +++ + VEX/pub/libvex_s390x_common.h | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/VEX/priv/guest_s390_helpers.c b/VEX/priv/guest_s390_helpers.c +index 5877743c9..9c3e028e2 100644 +--- a/VEX/priv/guest_s390_helpers.c ++++ b/VEX/priv/guest_s390_helpers.c +@@ -379,6 +379,9 @@ s390x_dirtyhelper_STFLE(VexGuestS390XState *guest_state, ULong *addr) + s390_set_facility_bit(addr, S390_FAC_CTREXE, 0); + s390_set_facility_bit(addr, S390_FAC_TREXE, 0); + s390_set_facility_bit(addr, S390_FAC_MSA4, 0); ++ s390_set_facility_bit(addr, S390_FAC_VXE, 0); ++ s390_set_facility_bit(addr, S390_FAC_VXE2, 0); ++ s390_set_facility_bit(addr, S390_FAC_DFLT, 0); + + return cc; + } +diff --git a/VEX/pub/libvex_s390x_common.h b/VEX/pub/libvex_s390x_common.h +index 8723ee21d..cf91860ee 100644 +--- a/VEX/pub/libvex_s390x_common.h ++++ b/VEX/pub/libvex_s390x_common.h +@@ -104,6 +104,9 @@ + #define S390_FAC_TREXE 73 // transactional execution + #define S390_FAC_MSA4 77 // message-security-assist 4 + #define S390_FAC_VX 129 // vector facility ++#define S390_FAC_VXE 135 // vector enhancements facility 1 ++#define S390_FAC_VXE2 148 // vector enhancements facility 2 ++#define S390_FAC_DFLT 151 // deflate-conversion facility + + + /*--------------------------------------------------------------*/ +-- +2.23.0 +
  4. Download patch debian/rules

    --- 1:3.15.0-1/debian/rules 2019-07-14 10:23:29.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/rules 2020-02-06 14:49:24.000000000 +0000 @@ -10,17 +10,28 @@ CFLAGS += $(shell dpkg-buildflags --get CFLAGS += "-I/usr/include/$(DEB_HOST_MULTIARCH)" # fixes #676029 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +ifeq ($(DEB_HOST_ARCH_CPU),arm) + DH_STRIP_OPTS := -X vgpreload +else + DH_STRIP_OPTS := +endif + +CONFARGS = --enable-tls +ifeq ($(DEB_HOST_ARCH_CPU),arm64) + CONFARGS += --enable-only64bit +endif + %: - dh $@ --with=autoreconf + dh $@ --parallel --with=autoreconf override_dh_auto_configure: - dh_auto_configure -- --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + dh_auto_configure -- $(CONFARGS) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" override_dh_auto_test: : # do nothing for now override_dh_auto_build: - dh_auto_build + dh_auto_build --parallel $(MAKE) -C docs FAQ.txt $(MAKE) -C docs html-docs $(MAKE) -C docs man-pages @@ -29,7 +40,7 @@ override_dh_shlibdeps: dh_shlibdeps -Xdebian/valgrind/usr/lib/$(DEB_HOST_MULTIARCH)/valgrind/getoff-x86-linux # fixes #762386 override_dh_strip: - dh_strip --dbg-package=valgrind-dbg + dh_strip --dbg-package=valgrind-dbg $(DH_STRIP_OPTS) override_dh_dwz: : # do nothing for now @@ -44,3 +55,6 @@ override_dh_install: override_dh_installchangelogs: dh_installchangelogs NEWS + +override_dh_missing: + dh_missing --fail-missing
  5. Download patch debian/control

    --- 1:3.15.0-1/debian/control 2019-07-14 10:23:29.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/control 2020-02-06 14:49:24.000000000 +0000 @@ -1,7 +1,8 @@ Source: valgrind Section: devel Priority: optional -Maintainer: Alessandro Ghedini <ghedo@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Alessandro Ghedini <ghedo@debian.org> Build-Depends: debhelper (>= 12), gdb, gcc-multilib [amd64], @@ -20,8 +21,8 @@ Homepage: http://www.valgrind.org/ Package: valgrind Architecture: amd64 arm64 armhf i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el s390x x32 Depends: ${misc:Depends}, ${shlibs:Depends}, libc6-dbg -Suggests: valgrind-mpi, kcachegrind, alleyoop, valkyrie (>> 1.3.0) -Recommends: valgrind-dbg, gdb +Suggests: valgrind-dbg, valgrind-mpi, kcachegrind, alleyoop, valkyrie (>> 1.3.0) +Recommends: gdb Breaks: valgrind-dev Replaces: valgrind-dev Description: instrumentation framework for building dynamic analysis tools
  6. Download patch debian/valgrind.install

    --- 1:3.15.0-1/debian/valgrind.install 2019-07-14 10:23:29.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/valgrind.install 2020-02-06 14:49:24.000000000 +0000 @@ -2,5 +2,6 @@ usr/bin/* usr/include/* usr/share/* usr/lib/* +usr/libexec/valgrind debian/valgrind.sh usr/bin debian/supp/* usr/lib/valgrind
  7. Download patch debian/patches/usrmerge_support.patch

    --- 1:3.15.0-1/debian/patches/usrmerge_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/patches/usrmerge_support.patch 2020-02-06 14:49:24.000000000 +0000 @@ -0,0 +1,68 @@ +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> +Subject: Try objpath without /usr if the debug file can't be found. + +Trying an alternative path, so that find the debug info for things that +would have been installed in /lib. The debug info is still being installed +into /usr/lib/debug/lib/*, not /usr/lib/debug/usr/lib/* despite what the +objpath says, so if we can't immediately find the right debug file, we can +try again with the "/usr" part stripped out. + +Last-Update: 2019-01-10 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/valgrind/+bug/1808508 + +Index: valgrind-3.14.0/coregrind/m_debuginfo/readelf.c +=================================================================== +--- valgrind-3.14.0.orig/coregrind/m_debuginfo/readelf.c ++++ valgrind-3.14.0/coregrind/m_debuginfo/readelf.c +@@ -1318,6 +1318,7 @@ DiImage* find_debug_file( struct _DebugI + + if (dimg == NULL && debugname != NULL) { + HChar *objdir = ML_(dinfo_strdup)("di.fdf.2", objpath); ++ HChar *usrmerge_objdir = objdir; + HChar *objdirptr; + + if ((objdirptr = VG_(strrchr)(objdir, '/')) != NULL) +@@ -1335,23 +1336,43 @@ DiImage* find_debug_file( struct _DebugI + if (dimg != NULL) goto dimg_ok; + } + ++ if ((objdirptr = VG_(strstr)(usrmerge_objdir, "usr")) != NULL) ++ usrmerge_objdir = objdirptr + VG_(strlen)("usr"); ++ + VG_(sprintf)(debugpath, "%s/%s", objdir, debugname); + dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); + if (dimg != NULL) goto dimg_ok; + ++ VG_(sprintf)(debugpath, "%s/%s", usrmerge_objdir, debugname); ++ dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); ++ if (dimg != NULL) goto dimg_ok; ++ + VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname); + dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); + if (dimg != NULL) goto dimg_ok; + ++ VG_(sprintf)(debugpath, "%s/.debug/%s", usrmerge_objdir, debugname); ++ dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); ++ if (dimg != NULL) goto dimg_ok; ++ + VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname); + dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); + if (dimg != NULL) goto dimg_ok; + ++ VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", usrmerge_objdir, debugname); ++ dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); ++ if (dimg != NULL) goto dimg_ok; ++ + if (extrapath) { + VG_(sprintf)(debugpath, "%s%s/%s", extrapath, + objdir, debugname); + dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); + if (dimg != NULL) goto dimg_ok; ++ ++ VG_(sprintf)(debugpath, "%s%s/%s", extrapath, ++ usrmerge_objdir, debugname); ++ dimg = open_debug_file(debugpath, buildid, crc, rel_ok, NULL); ++ if (dimg != NULL) goto dimg_ok; + } + + if (serverpath) {
  8. Download patch debian/patches/series

    --- 1:3.15.0-1/debian/patches/series 2019-07-14 10:23:29.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/patches/series 2020-04-03 10:34:13.000000000 +0000 @@ -5,4 +5,10 @@ 08_fix-spelling-in-manpage.patch 09_fix-armhf-detect.patch 10_mpi-pkg-config.patch +usrmerge_support.patch 11_arm64-cache-flush.patch +armv7-illegal-opcode.patch +0001-Don-t-look-for-debug-alt-file-in-debug-image-if-it-i.patch +drop-MPI-1-support.patch +0001-Bug-416301-s390x-Support-compare-and-signal-instruct.patch +0001-s390x-Unset-facility-bits-for-unsupported-z14-z15-fa.patch
  9. Download patch debian/patches/armv7-illegal-opcode.patch

    --- 1:3.15.0-1/debian/patches/armv7-illegal-opcode.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/patches/armv7-illegal-opcode.patch 2020-02-06 14:49:24.000000000 +0000 @@ -0,0 +1,34 @@ +From 1dbb2bc02eb157c4d561bb36236bfc7006d59f0b Mon Sep 17 00:00:00 2001 +From: Philippe De Muyter <phdm@macqel.be> +Date: Sat, 30 Sep 2017 10:23:35 +0200 +Subject: [PATCH] VEX/priv/guest_arm_toIR.c: fix 0xEBAD 0x1CCA (sub.w r12, sp, + r10, lsl #7) +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1837068 +Origin: https://bugs.kde.org/show_bug.cgi?id=385262 + +disInstr(thumb): unhandled instruction: 0xEBAD 0x1CCA +==10358== Illegal opcode at address 0x5900DA3 +==10358== at 0x5900DA2: bsaes_cbc_encrypt (bsaes-armv7.S:1084) +(gdb) x /i $pc +=> 0x5900da2 <bsaes_cbc_encrypt+34>: sub.w r12, sp, r10, lsl #7 +--- + VEX/priv/guest_arm_toIR.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: valgrind-3.15.0/VEX/priv/guest_arm_toIR.c +=================================================================== +--- valgrind-3.15.0.orig/VEX/priv/guest_arm_toIR.c ++++ valgrind-3.15.0/VEX/priv/guest_arm_toIR.c +@@ -21186,10 +21186,10 @@ + && rD != 15 && rN == 13 && imm5 <= 31 && how == 0) { + valid = True; + } +- /* also allow "sub.w reg, sp, reg lsl #N for N=0 .. 5 ++ /* also allow "sub.w reg, sp, reg lsl #N for N=0 .. 7 + (T1) "SUB (SP minus register) */ + if (!valid && INSN0(8,5) == BITS4(1,1,0,1) // sub +- && rD != 15 && rN == 13 && imm5 <= 5 && how == 0) { ++ && rD != 15 && rN == 13 && imm5 <= 7 && how == 0) { + valid = True; + } + if (valid) {
  10. Download patch debian/patches/drop-MPI-1-support.patch

    --- 1:3.15.0-1/debian/patches/drop-MPI-1-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:3.15.0-1ubuntu9/debian/patches/drop-MPI-1-support.patch 2020-02-06 14:49:24.000000000 +0000 @@ -0,0 +1,67 @@ +From a3262243ca01f7cfe3ae86b168d5b3a7e5d1cbc0 Mon Sep 17 00:00:00 2001 +From: Balint Reczey <balint.reczey@canonical.com> +Date: Thu, 28 Nov 2019 19:31:12 +0100 +Subject: [PATCH] Drop MPI 1 support + +Signed-off-by: Balint Reczey <balint.reczey@canonical.com> +--- + mpi/libmpiwrap.c | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +diff --git a/mpi/libmpiwrap.c b/mpi/libmpiwrap.c +index 488bb13fd..a740ea562 100644 +--- a/mpi/libmpiwrap.c ++++ b/mpi/libmpiwrap.c +@@ -278,8 +278,6 @@ static void showTy ( FILE* f, MPI_Datatype ty ) + else if (ty == MPI_LONG_INT) fprintf(f,"LONG_INT"); + else if (ty == MPI_SHORT_INT) fprintf(f,"SHORT_INT"); + else if (ty == MPI_2INT) fprintf(f,"2INT"); +- else if (ty == MPI_UB) fprintf(f,"UB"); +- else if (ty == MPI_LB) fprintf(f,"LB"); + # if defined(MPI_WCHAR) + else if (ty == MPI_WCHAR) fprintf(f,"WCHAR"); + # endif +@@ -350,20 +348,11 @@ static void showCombiner ( FILE* f, int combiner ) + # endif + case MPI_COMBINER_CONTIGUOUS: fprintf(f, "CONTIGUOUS"); break; + case MPI_COMBINER_VECTOR: fprintf(f, "VECTOR"); break; +-#if defined(MPI_COMBINER_HVECTOR_INTEGER) +- case MPI_COMBINER_HVECTOR_INTEGER: fprintf(f, "HVECTOR_INTEGER"); break; +-# endif + case MPI_COMBINER_HVECTOR: fprintf(f, "HVECTOR"); break; + case MPI_COMBINER_INDEXED: fprintf(f, "INDEXED"); break; +-#if defined(MPI_COMBINER_HINDEXED_INTEGER) +- case MPI_COMBINER_HINDEXED_INTEGER: fprintf(f, "HINDEXED_INTEGER"); break; +-# endif + case MPI_COMBINER_HINDEXED: fprintf(f, "HINDEXED"); break; + #if defined(MPI_COMBINER_INDEXED_BLOCK) + case MPI_COMBINER_INDEXED_BLOCK: fprintf(f, "INDEXED_BLOCK"); break; +-# endif +-#if defined(MPI_COMBINER_STRUCT_INTEGER) +- case MPI_COMBINER_STRUCT_INTEGER: fprintf(f, "STRUCT_INTEGER"); break; + # endif + case MPI_COMBINER_STRUCT: fprintf(f, "STRUCT"); break; + #if defined(MPI_COMBINER_SUBARRAY) +@@ -458,8 +447,9 @@ Bool isMSI ( MPI_Status* status ) + static long extentOfTy ( MPI_Datatype ty ) + { + int r; ++ MPI_Aint lb; + MPI_Aint n; +- r = PMPI_Type_extent(ty, &n); ++ r = MPI_Type_get_extent(ty, &lb, &n); + assert(r == MPI_SUCCESS); + return (long)n; + } +@@ -733,8 +723,6 @@ void walk_type ( void(*f)(void*,long), char* base, MPI_Datatype ty ) + f(base + offsetof(Ty,loc), sizeof(int)); + return; + } +- if (ty == MPI_LB || ty == MPI_UB) +- return; /* have zero size, so nothing needs to be done */ + goto unhandled; + /*NOTREACHED*/ + } +-- +2.17.1 +
  1. valgrind