|
 |
54376c |
From 7a4b49897c3bc63bdf680f8cb1d7a04ac932a4ff Mon Sep 17 00:00:00 2001
|
|
|
54376c |
From: Christos Zoulas <christos@zoulas.com>
|
|
|
54376c |
Date: Mon, 21 May 2018 16:32:34 +0000
|
|
|
54376c |
Subject: [PATCH 1/2] Add missing commas.
|
|
|
54376c |
|
|
|
54376c |
Upstream-commit: defcf7e39943780dd19ca002c478e52ec9ee5cbc
|
|
|
54376c |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
54376c |
---
|
|
|
54376c |
magic/Magdir/elf | 2 +-
|
|
|
54376c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
54376c |
|
|
|
54376c |
diff --git a/magic/Magdir/elf b/magic/Magdir/elf
|
|
|
54376c |
index 7c6ac8f..d5b2d02 100644
|
|
|
54376c |
--- a/magic/Magdir/elf
|
|
|
54376c |
+++ b/magic/Magdir/elf
|
|
|
54376c |
@@ -50,7 +50,7 @@
|
|
|
54376c |
!:mime application/x-executable
|
|
|
54376c |
>16 leshort 3 shared object,
|
|
|
54376c |
!:mime application/x-sharedlib
|
|
|
54376c |
->16 leshort 4 core file
|
|
|
54376c |
+>16 leshort 4 core file,
|
|
|
54376c |
!:mime application/x-coredump
|
|
|
54376c |
# Core file detection is not reliable.
|
|
|
54376c |
#>>>(0x38+0xcc) string >\0 of '%s'
|
|
|
54376c |
--
|
|
|
54376c |
2.20.1
|
|
|
54376c |
|
|
|
54376c |
|
|
|
54376c |
From 1c7aa7b88ef9f53e19a64961867427b0c1f04857 Mon Sep 17 00:00:00 2001
|
|
|
54376c |
From: Christos Zoulas <christos@zoulas.com>
|
|
|
54376c |
Date: Tue, 22 Jan 2019 16:28:42 +0000
|
|
|
54376c |
Subject: [PATCH 2/2] Add Linux PowerPC core offsets for Linux (which are off-by-4
|
|
|
54376c |
of the regular offsets), after the regular Linux offsets so that there is no
|
|
|
54376c |
confusion. The linux offsets are tried first since they are before, so on PPC
|
|
|
54376c |
they should contain binary data and not match. Addition requested by: Ondrej
|
|
|
54376c |
Dubaj/Kamil Dudka
|
|
|
54376c |
|
|
|
54376c |
Upstream-commit: 6367a7c9b476767a692f76e78e3b355dc9386e48
|
|
|
54376c |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
54376c |
---
|
|
|
54376c |
src/readelf.c | 5 ++++-
|
|
|
54376c |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
54376c |
|
|
|
54376c |
diff --git a/src/readelf.c b/src/readelf.c
|
|
|
54376c |
index d96a538..c101483 100644
|
|
|
54376c |
--- a/src/readelf.c
|
|
|
54376c |
+++ b/src/readelf.c
|
|
|
54376c |
@@ -246,7 +246,10 @@ static const size_t prpsoffsets32[] = {
|
|
|
54376c |
84, /* SunOS 5.x (short name) */
|
|
|
54376c |
|
|
|
54376c |
44, /* Linux (command line) */
|
|
|
54376c |
- 28, /* Linux 2.0.36 (short name) */
|
|
|
54376c |
+ 28, /* Linux (short name) */
|
|
|
54376c |
+
|
|
|
54376c |
+ 48, /* Linux PowerPC (command line) */
|
|
|
54376c |
+ 32, /* Linux PowerPC (short name) */
|
|
|
54376c |
|
|
|
54376c |
8, /* FreeBSD */
|
|
|
54376c |
};
|
|
|
54376c |
--
|
|
|
54376c |
2.20.1
|
|
|
54376c |
|