patchelf: Update 0.18.0 -> 0.18.0+git

Patchelf hasn't released since 2023 but does have fixes on its master branch. We've been
seeing segfaults on relocated qemu-img binaries from qemu-system-native in some cases
and using an updated patchelf does seem to avoid these.

The patches have all be applied upstream.

https://github.com/NixOS/patchelf/commit/0e338941fc730c1e7080ca04fc1ee18b9ae2854b is 2/3 combined

License-Update: Change http -> https
[https://github.com/NixOS/patchelf/commit/30da44915ec3d22e27dad457dd585e985f576986]

[YOCTO #16003]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/patchelf/patchelf/0001-Set-interpreter-only-when-necessary.patch b/meta/recipes-devtools/patchelf/patchelf/0001-Set-interpreter-only-when-necessary.patch
deleted file mode 100644 (file)
index 9a8216b..0000000
--- a/meta/recipes-devtools/patchelf/patchelf/0001-Set-interpreter-only-when-necessary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f5df94952e87eaa390e5c845bc48fdb3dbc31cc2 Mon Sep 17 00:00:00 2001
-From: Yuta Hayama <hayama@lineo.co.jp>
-Date: Fri, 21 Jul 2023 10:47:02 +0900
-Subject: [PATCH] Set interpreter only when necessary
-
-If the given interpreter is already set, nothing needs to be done.
-As with modifySoname(), it skips unnecessary processing.
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
-Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/508]
-
- src/patchelf.cc | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/patchelf.cc b/src/patchelf.cc
-index 86429c4..e562c49 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -1460,6 +1460,11 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const std::string &
- template<ElfFileParams>
- void ElfFile<ElfFileParamNames>::setInterpreter(const std::string & newInterpreter)
- {
-+    if (getInterpreter() == newInterpreter) {
-+        debug("given interpreter is already set\n");
-+        return;
-+    }
-+
-     std::string & section = replaceSection(".interp", newInterpreter.size() + 1);
-     setSubstr(section, 0, newInterpreter + '\0');
-     changed = true;

diff --git a/meta/recipes-devtools/patchelf/patchelf/0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch b/meta/recipes-devtools/patchelf/patchelf/0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch
deleted file mode 100644 (file)
index 7906f0f..0000000
--- a/meta/recipes-devtools/patchelf/patchelf/0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1198329b922f3cdddc3e87a7c81d7730b646c088 Mon Sep 17 00:00:00 2001
-From: Yuta Hayama <hayama@lineo.co.jp>
-Date: Fri, 28 Jul 2023 16:22:31 +0900
-Subject: [PATCH] align startOffset with p_align instead of pagesize for
- compatibility
-
-According to the ELF specification, the alignment of loadable process segments
-should satisfy (p_vaddr mod pagesize) == (p_offset mod pagesize). However,
-glibc earlier than 2.35 incorrectly requires that the LOAD segment be (p_vaddr
-mod p_align) == (p_offset mod p_align), and will output the error message
-"ELF load command address/offset not properly aligned" if this is not met.
-
-Since there are many systems that use glibc earlier than 2.35, it is preferable
-that newly added LOAD segments satisfy (p_vaddr mod p_align) == (p_offset mod
-p_align) for compatibility.
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
-Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/510]
-
- src/patchelf.cc | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/patchelf.cc b/src/patchelf.cc
-index 82b4b46..6edb81a 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -843,7 +843,13 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
-         neededSpace += headerTableSpace;
-     debug("needed space is %d\n", neededSpace);
- 
--    Elf_Off startOffset = roundUp(fileContents->size(), getPageSize());
-+    /* glibc earlier than 2.35 requires that the LOAD segment satisfies
-+       (p_vaddr mod p_align) == (p_offset mod p_align).
-+       The ELF specification requires that loadable process segments satisfy
-+       (p_vaddr mod pagesize) == (p_offset mod pagesize), so glibc is probably
-+       wrong, but here startOffset is calculated according to p_align for
-+       compatibility. */
-+    Elf_Off startOffset = roundUp(fileContents->size(), alignStartPage);
- 
-     // In older version of binutils (2.30), readelf would check if the dynamic
-     // section segment is strictly smaller than the file (and not same size).

diff --git a/meta/recipes-devtools/patchelf/patchelf/0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch b/meta/recipes-devtools/patchelf/patchelf/0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch
deleted file mode 100644 (file)
index 37eaf99..0000000
--- a/meta/recipes-devtools/patchelf/patchelf/0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 299ad5766921d593e11a42a8e4dec55b4b350876 Mon Sep 17 00:00:00 2001
-From: Yuta Hayama <hayama@lineo.co.jp>
-Date: Mon, 31 Jul 2023 11:58:49 +0900
-Subject: [PATCH] make LOAD segment extensions based on p_align instead of
- pagesize
-
-Since the p_align of the LOAD segment is no longer pagesize, the actual p_align
-value is used to calculate for the LOAD segment extension.
-
-If calculated with pagesize, new LOAD segment may be added even though the
-existing LOAD segment can be extended.
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
-Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/510]
-
- src/patchelf.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/patchelf.cc b/src/patchelf.cc
-index 6edb81a..86429c4 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -885,7 +885,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
-         rdi(lastSeg.p_type) == PT_LOAD &&
-         rdi(lastSeg.p_flags) == (PF_R | PF_W) &&
-         rdi(lastSeg.p_align) == alignStartPage) {
--        auto segEnd = roundUp(rdi(lastSeg.p_offset) + rdi(lastSeg.p_memsz), getPageSize());
-+        auto segEnd = roundUp(rdi(lastSeg.p_offset) + rdi(lastSeg.p_memsz), alignStartPage);
-         if (segEnd == startOffset) {
-             auto newSz = startOffset + neededSpace - rdi(lastSeg.p_offset);
-             wri(lastSeg.p_filesz, wri(lastSeg.p_memsz, newSz));

diff --git a/meta/recipes-devtools/patchelf/patchelf_0.18.0.bb b/meta/recipes-devtools/patchelf/patchelf_git.bb
similarity index 58%
rename from meta/recipes-devtools/patchelf/patchelf_0.18.0.bb
rename to meta/recipes-devtools/patchelf/patchelf_git.bb
index 6e86ddbde634416892da6dd3f31b45cd17727f84..daeae961424424be306d7add7f468108c19b7794 100644 (file)
--- a/meta/recipes-devtools/patchelf/patchelf_0.18.0.bb
+++ b/meta/recipes-devtools/patchelf/patchelf_git.bb
@@ -5,13 +5,12 @@ HOMEPAGE = "https://github.com/NixOS/patchelf"
 LICENSE = "GPL-3.0-only"
 
 SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
-    file://0001-Set-interpreter-only-when-necessary.patch \
-    file://0002-align-startOffset-with-p_align-instead-of-pagesize-f.patch \
-    file://0003-make-LOAD-segment-extensions-based-on-p_align-instea.patch \
 "
-SRCREV = "99c24238981b7b1084313aca8f5c493bb46f302c"
+SRCREV = "b49de1b3384e7928bf0df9a889fe5a4e7b3fbddf"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+PV = "0.18.0+git"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
 
 inherit autotools