Merge ~fheimes/ubuntu/+source/elfutils:elfutils-lp1908756-groovy into ubuntu/+source/elfutils:ubuntu/groovy-devel

Proposed by Frank Heimes on 2021-01-08
Status: Merged
Approved by: Sergio Durigan Junior on 2021-01-08
Approved revision: 63131bfaaf98ca9136b4b882793e75c0ba760bc6
Merged at revision: 63131bfaaf98ca9136b4b882793e75c0ba760bc6
Proposed branch: ~fheimes/ubuntu/+source/elfutils:elfutils-lp1908756-groovy
Merge into: ubuntu/+source/elfutils:ubuntu/groovy-devel
Diff against target: 99 lines (+66/-1)
4 files modified
debian/changelog (+12/-0)
debian/control (+2/-1)
debian/patches/elfutils-lp1908756-groovy.patch (+51/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior 2021-01-08 Approve on 2021-01-08
Canonical Server Core Reviewers 2021-01-08 Pending
Review via email: mp+395986@code.launchpad.net

Description of the change

debian/patches/elfutils-lp1908756-groovy.patch:
IBM Z: Fix endianess problem in pid_memory_read
backport from elfutils 0.182+
- libdwfl/linux-pid-attach.c: shift the upper 4 bytes + down on big
  endian 64 bit targets
- libdwfl/ChangeLog: updated the projects ChangeLog, too

Test build "elfutils - 0.181-1ubuntu1~ppa1" is available here:
https://launchpad.net/~fheimes/+archive/ubuntu/lp1908756/+packages
https://launchpad.net/~fheimes/+archive/ubuntu/lp1908756/+sourcepub/11977874/+listing-archive-extra

To post a comment you must log in.
Sergio Durigan Junior (sergiodj) wrote :

LGTM. Thanks a lot, Frank!

review: Approve
Sergio Durigan Junior (sergiodj) wrote :

$ git push pkg upload/0.181-1ubuntu0.1
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 2.26 KiB | 1.13 MiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/elfutils
 * [new tag] upload/0.181-1ubuntu0.1 -> upload/0.181-1ubuntu0.1

$ dput ubuntu elfutils_0.181-1ubuntu0.1_source.changes
Checking signature on .changes
gpg: /home/sergio/work/elfutils/elfutils_0.181-1ubuntu0.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/elfutils/elfutils_0.181-1ubuntu0.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading elfutils_0.181-1ubuntu0.1.dsc: done.
  Uploading elfutils_0.181-1ubuntu0.1.debian.tar.xz: done.
  Uploading elfutils_0.181-1ubuntu0.1_source.buildinfo: done.
  Uploading elfutils_0.181-1ubuntu0.1_source.changes: done.
Successfully uploaded packages.

Uploaded.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 33070ea..bf310df 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,15 @@
6+elfutils (0.181-1ubuntu0.1) groovy; urgency=medium
7+
8+ * debian/patches/elfutils-lp1908756-groovy.patch:
9+ IBM Z: Fix endianess problem in pid_memory_read
10+ backport from elfutils 0.182+
11+ - libdwfl/linux-pid-attach.c: shift the upper 4 bytes + down on big
12+ endian 64 bit targets
13+ - libdwfl/ChangeLog: updated the projects ChangeLog, too
14+ Thanks to Andreas Krebbel <krebbel@linux.ibm.com> (LP: #1908756)
15+
16+ -- Frank Heimes <frank.heimes@canonical.com> Fri, 08 Jan 2021 09:49:33 +0100
17+
18 elfutils (0.181-1) unstable; urgency=medium
19
20 * New upstream release.
21diff --git a/debian/control b/debian/control
22index c2dbd20..3a43ff8 100644
23--- a/debian/control
24+++ b/debian/control
25@@ -1,6 +1,7 @@
26 Source: elfutils
27 Priority: optional
28-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
29+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30+XSBC-Original-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
31 Uploaders: Kurt Roeckx <kurt@roeckx.be>,
32 Matthias Klose <doko@debian.org>
33 Build-Depends: debhelper (>= 11),
34diff --git a/debian/patches/elfutils-lp1908756-groovy.patch b/debian/patches/elfutils-lp1908756-groovy.patch
35new file mode 100644
36index 0000000..330a2f9
37--- /dev/null
38+++ b/debian/patches/elfutils-lp1908756-groovy.patch
39@@ -0,0 +1,51 @@
40+Description: elfutils unwinding broken for s390 compat
41+ libdw unwinding fails for 32 bit binaries.
42+ Elfutils biarch test currently fails on s390x doing unwinding for a 32 bit process.
43+Author: Andreas Krebbel <krebbel@linux.ibm.com>
44+Origin: backport
45+Bug-IBM: IBM Bugzilla 190488
46+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1908756
47+Forwarded: not-needed
48+Applied-Upstream: upstream patch/commit
49+ https://sourceware.org/git/?p=elfutils.git;a=commit;h=e4d985a3c1c873f77d20fa0cd421458cc2824996
50+Reviewed-by: Frank Heimes <frank.heimes@canonical.com>
51+Last-Update: 2021-01-08
52+---
53+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
54+--- a/libdwfl/ChangeLog
55++++ b/libdwfl/ChangeLog
56+@@ -1,3 +1,8 @@
57++2020-11-19 Andreas Krebbel <krebbel@linux.ibm.com>
58++
59++ * linux-pid-attach.c (pid_memory_read): Shift the upper 4 bytes
60++ down on big endian 64 bit targets.
61++
62+ 2020-08-20 Dmitry V. Levin <ldv@altlinux.org>
63+
64+ * Makefile.am (libdwfl_a_SOURCES): Conditionalize
65+--- a/libdwfl/linux-pid-attach.c
66++++ b/libdwfl/linux-pid-attach.c
67+@@ -193,14 +193,22 @@
68+ {
69+ struct __libdwfl_pid_arg *pid_arg = arg;
70+ pid_t tid = pid_arg->tid_attached;
71++ Dwfl_Process *process = dwfl->process;
72+ assert (tid > 0);
73+
74+ #ifdef HAVE_PROCESS_VM_READV
75+ if (read_cached_memory (pid_arg, addr, result))
76++ {
77++#if SIZEOF_LONG == 8
78++# if BYTE_ORDER == BIG_ENDIAN
79++ if (ebl_get_elfclass (process->ebl) == ELFCLASS32)
80++ *result >>= 32;
81++# endif
82++#endif
83+ return true;
84++ }
85+ #endif
86+
87+- Dwfl_Process *process = dwfl->process;
88+ if (ebl_get_elfclass (process->ebl) == ELFCLASS64)
89+ {
90+ #if SIZEOF_LONG == 8
91diff --git a/debian/patches/series b/debian/patches/series
92index 0024421..3f06e6a 100644
93--- a/debian/patches/series
94+++ b/debian/patches/series
95@@ -13,3 +13,4 @@ disable_werror.patch
96 #mips_cfi.patch
97 riscv-retval-workaround.patch
98 #disable-some-tests.diff
99+elfutils-lp1908756-groovy.patch

Subscribers

People subscribed via source and target branches