Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/clippy/files/
Date: Thu, 02 Jun 2022 04:16:32
Message-Id: 1654143373.0cd8f42daa39a23e8f995f2a95f1ce7b6996af18.jsmolic@gentoo
1 commit: 0cd8f42daa39a23e8f995f2a95f1ce7b6996af18
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Jun 1 06:56:07 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 2 04:16:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd8f42d
7
8 dev-util/clippy: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/25718
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 dev-util/clippy/files/clippy-8.1-big-endian.patch | 57 -----------------------
16 1 file changed, 57 deletions(-)
17
18 diff --git a/dev-util/clippy/files/clippy-8.1-big-endian.patch b/dev-util/clippy/files/clippy-8.1-big-endian.patch
19 deleted file mode 100644
20 index fa715cf23858..000000000000
21 --- a/dev-util/clippy/files/clippy-8.1-big-endian.patch
22 +++ /dev/null
23 @@ -1,57 +0,0 @@
24 -https://github.com/FRRouting/frr/commit/cfc45e911e21820bc8b703b37e947a6a7e5d798a.patch
25 -https://github.com/FRRouting/frr/issues/10051
26 -
27 -From: David Lamparter <equinox@×××××××××××××××××.org>
28 -Date: Tue, 18 Jan 2022 09:50:25 +0100
29 -Subject: [PATCH] lib/clippy: don't endian-convert twice
30 -
31 -elf_getdata_rawchunk() already endian-converts; doing it again is, uh,
32 -counterproductive.
33 -
34 -Fixes: #10051
35 -Reported-by: Lucian Cristian <lucian.cristian@×××××.com>
36 -Signed-off-by: David Lamparter <equinox@×××××××××××××××××.org>
37 ---- a/lib/elf_py.c
38 -+++ b/lib/elf_py.c
39 -@@ -1071,26 +1071,25 @@ static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
40 - * always be a pointer...
41 - */
42 - if (elffile_virt2file(w, rel->r_offset, &offs)) {
43 -- Elf_Data *ptr, *conv;
44 -- GElf_Addr tmp;
45 -- Elf_Data mem = {
46 -- .d_buf = (void *)&tmp,
47 -- .d_type = ELF_T_ADDR,
48 -- .d_version = EV_CURRENT,
49 -- .d_size = sizeof(tmp),
50 -- .d_off = 0,
51 -- .d_align = 0,
52 -- };
53 -+ Elf_Data *ptr;
54 -
55 -+ /* NB: this endian-converts! */
56 - ptr = elf_getdata_rawchunk(w->elf, offs,
57 - w->elfclass / 8,
58 - ELF_T_ADDR);
59 -
60 -- conv = gelf_xlatetom(w->elf, &mem, ptr,
61 -- w->mmap[EI_DATA]);
62 -- if (conv) {
63 -- memcpy(&rel_offs, conv->d_buf,
64 -- conv->d_size);
65 -+ if (ptr) {
66 -+ char *dst = (char *)&rel_offs;
67 -+
68 -+ /* sigh. it endian-converts. but
69 -+ * doesn't size-convert.
70 -+ */
71 -+ if (BYTE_ORDER == BIG_ENDIAN &&
72 -+ ptr->d_size < sizeof(rel_offs))
73 -+ dst += sizeof(rel_offs) -
74 -+ ptr->d_size;
75 -+
76 -+ memcpy(dst, ptr->d_buf, ptr->d_size);
77 -
78 - relw->relative = false;
79 - relw->rela->r_addend = rel_offs;
80 -