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

[Frank Heimes]

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

[Sergio Durigan Junior (sergiodj)]

LGTM. Thanks a lot, Frank!

review: Approve

[Sergio Durigan Junior (sergiodj)]

$ 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.

diff --git a/debian/changelog b/debian/changelog
index 33070ea..bf310df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+elfutils (0.181-1ubuntu0.1) groovy; urgency=medium
+
+  * 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
+    Thanks to Andreas Krebbel <[e-mail]> (LP: #1908756)
+
+ -- Frank Heimes <[e-mail]>  Fri, 08 Jan 2021 09:49:33 +0100
+
 elfutils (0.181-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index c2dbd20..3a43ff8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: elfutils
 Priority: optional
-Maintainer: Debian GCC Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GCC Maintainers <[e-mail]>
 Uploaders: Kurt Roeckx <[e-mail]>,
   Matthias Klose <[e-mail]>
 Build-Depends: debhelper (>= 11),
diff --git a/debian/patches/elfutils-lp1908756-groovy.patch b/debian/patches/elfutils-lp1908756-groovy.patch
new file mode 100644
index 0000000..330a2f9
--- /dev/null
+++ b/debian/patches/elfutils-lp1908756-groovy.patch
@@ -0,0 +1,51 @@
+Description: elfutils unwinding broken for s390 compat
+ libdw unwinding fails for 32 bit binaries.
+ Elfutils biarch test currently fails on s390x doing unwinding for a 32 bit process.
+Author: Andreas Krebbel <[e-mail]>
+Origin: backport
+Bug-IBM: IBM Bugzilla 190488
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1908756
+Forwarded: not-needed
+Applied-Upstream: upstream patch/commit
+ https://sourceware.org/git/?p=elfutils.git;a=commit;h=e4d985a3c1c873f77d20fa0cd421458cc2824996
+Reviewed-by: Frank Heimes <[e-mail]>
+Last-Update: 2021-01-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libdwfl/ChangeLog
++++ b/libdwfl/ChangeLog
+@@ -1,3 +1,8 @@
++2020-11-19  Andreas Krebbel  <[e-mail]>
++
++	* linux-pid-attach.c (pid_memory_read): Shift the upper 4 bytes
++	down on big endian 64 bit targets.
++
+ 2020-08-20  Dmitry V. Levin  <[e-mail]>
+ 
+ 	* Makefile.am (libdwfl_a_SOURCES): Conditionalize
+--- a/libdwfl/linux-pid-attach.c
++++ b/libdwfl/linux-pid-attach.c
+@@ -193,14 +193,22 @@
+ {
+   struct __libdwfl_pid_arg *pid_arg = arg;
+   pid_t tid = pid_arg->tid_attached;
++  Dwfl_Process *process = dwfl->process;
+   assert (tid > 0);
+ 
+ #ifdef HAVE_PROCESS_VM_READV
+   if (read_cached_memory (pid_arg, addr, result))
++    {
++#if SIZEOF_LONG == 8
++# if BYTE_ORDER == BIG_ENDIAN
++      if (ebl_get_elfclass (process->ebl) == ELFCLASS32)
++	*result >>= 32;
++# endif
++#endif
+     return true;
++    }
+ #endif
+ 
+-  Dwfl_Process *process = dwfl->process;
+   if (ebl_get_elfclass (process->ebl) == ELFCLASS64)
+     {
+ #if SIZEOF_LONG == 8
diff --git a/debian/patches/series b/debian/patches/series
index 0024421..3f06e6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ disable_werror.patch
 #mips_cfi.patch
 riscv-retval-workaround.patch
 #disable-some-tests.diff
+elfutils-lp1908756-groovy.patch