| 1 |
commit: 89ca618781d4445695bcd312925377372b16c7c3 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Aug 8 20:24:29 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Aug 8 20:24:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=89ca6187 |
| 7 |
|
| 8 |
dev-libs/elfutils: bump musl-utils patch |
| 9 |
|
| 10 |
`strip` now uses FNM_EXTMATCH |
| 11 |
|
| 12 |
dev-libs/elfutils/Manifest | 3 +- |
| 13 |
dev-libs/elfutils/elfutils-0.170.ebuild | 2 +- |
| 14 |
.../elfutils/files/elfutils-0.170-musl-utils.patch | 125 +++++++++++++++++++++ |
| 15 |
3 files changed, 128 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest |
| 18 |
index bbae20d..b4bc220 100644 |
| 19 |
--- a/dev-libs/elfutils/Manifest |
| 20 |
+++ b/dev-libs/elfutils/Manifest |
| 21 |
@@ -6,10 +6,11 @@ AUX elfutils-0.168-musl-obstack-fts.patch 3866 SHA256 f3f0993948744f4d18f2618b22 |
| 22 |
AUX elfutils-0.168-musl-utils.patch 3833 SHA256 5f939b8e9c19ed84239ca30715c5117e42a8a0b46e854311440dcad5508bfb46 SHA512 b3ab2c6f8e04507580feedddaf7c0a260c70d96550d7befb4e060f1b7619c69ceddff43dae407fd677be939c48556bfd253d5bedd619e85fd8418a6fdcab0b01 WHIRLPOOL 22751e586c78479bc087a16668fcd4f0bb37c019795fbfd4eb52fb7cc5784259868252a48b70429339a659e97815050717ed34cf7dee61661b0cb26925efdd4b |
| 23 |
AUX elfutils-0.169-musl-libs.patch 3579 SHA256 05de076b4bbf8b0db103b943841825868e25b28fdd057d1d534d50180ec22bdd SHA512 401df45eea61a9acea175676d184983758915ab68dc37d72332c73b9ae2fab69094bb24bd9db9d79ad4f7b60f67cbac518f79cbb33cad9a6d55289728116bad3 WHIRLPOOL 71ae07ea3e4206881e16e0da51a82285ea51efecafa6897df175b0a8aa777e7479d1a2c0b130d0a1f3c95c8f5aec34e6a046f0a85c94b21cd2296c4a89763025 |
| 24 |
AUX elfutils-0.170-musl-obstack-fts.patch 3919 SHA256 165841d5e340c8b5c1afcda2e5a97e75e3e84e5a51b0c9339a5dfe7f030df6ec SHA512 13ca0d13c314a39789d4c8946f351b0ab7efe365637baab370fd5edc7e6f902c88f8d4fe70b8185ee0c33e2d7e6b583b90b1549c83921d895af1cd629932a851 WHIRLPOOL 4eb213b4212eb35ba3ebc3fed75ab1b47c028d2d7f07c93427cd0eef547c470b2938177d734eb3cf4f81e2416b8ac1416d9ca7114a1952f93829b53b5d4587a4 |
| 25 |
+AUX elfutils-0.170-musl-utils.patch 3915 SHA256 2548b0eec2a9d569c1ff0e0b5105ee215cadc5e796575691a86329d076733a2c SHA512 f15ab7b157e68f70898fa0385b9c516cc2c65983ba7798a3b1340d76fcc114de30cf0ca9ef448fa85f89d195f99e7bb8ac984d21f919b02ed8a09d39437854a4 WHIRLPOOL 724cd75fee887c4005938398d948b12f25dcc07d53aa1f48725a1116835d0c49b831584cafead2d9597a871cfe2960db95ec895786bca0b1041ee4ed3f4f7d15 |
| 26 |
DIST elfutils-0.166.tar.bz2 6496225 SHA256 3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30 SHA512 543e8f9fbebbef86c40b1d6dc93da04a8431071aad636b70e7a1b9536450990b237d100d354c29fd0c3605074b7a0621f5bdaab4c2664be42b2912ad283bc614 WHIRLPOOL 4de083bbb397235dd46c2ba6e0cbb615825c13d7e8413015d5ff08d72deae1d9a508c0f6e5f90e27cc709870064bc53a51b2a681f2a9b80e1f658bb7dc475f8d |
| 27 |
DIST elfutils-0.169.tar.bz2 8067758 SHA256 9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9 WHIRLPOOL dc4f689b403160272dccb1e306ee3584f6d06156d3318d745bba46f9b4a31a477795223233ffb420b096b1c196aba09492e4ab5803f6150326b48e1045f92e06 |
| 28 |
DIST elfutils-0.170.tar.bz2 8358001 SHA256 1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28 WHIRLPOOL ebb3069aa52e49b7e137c722ac490b12393e0c54656d6d7476193eaa4253b48209e62e4babd4819a52cf5a9f3a1a6f56945eb776f014df9cbd841aa392e94823 |
| 29 |
EBUILD elfutils-0.166.ebuild 2534 SHA256 871895d2063eb8de76d8a53097d44744d5a648b2a11b04e930f08a37dc4b0b4e SHA512 57f011f6758371eb072a0592d51e89e9ced73d795466a2c5158ebde65cc1d55ebe5f2e1e1bb2faec1f9891d1234d7ff5229fab82505d317678b01b204e3c4e17 WHIRLPOOL 4ea30b8d36cb3f50e997316312f41b916e3b2a34c6d5e91e350de34e61933b0bae2e7e930d6e012528d779b46f169625a5528cf6e210c113dab32f6543ad6483 |
| 30 |
EBUILD elfutils-0.169-r1.ebuild 2141 SHA256 5e4413bf86725d52069aa4e5cd1917f74736cca8a16fe3c70f1f6b20146d5003 SHA512 97782c1788311ec49db7802c80a85d37b17701a7902e4849d98df8071c91b263c748db76e13bde98ea988aba7d963389831fcda2f0c038d576b8f45bbaff48e3 WHIRLPOOL a65d1cb70b0e08b3588e38a3d4c8e3ff45b02f7eb79bed64f587b3416a5f1c3cf1a3a289206507018661dfead07ad8769d0c86fb9c22d39b2f6aed436d708a7c |
| 31 |
-EBUILD elfutils-0.170.ebuild 2146 SHA256 0ea284cdabb64dffbb57c66e907a837a650f4bacc0d087bb6572e9564b6d3ada SHA512 e364190e2361b7d1f202ac9cbff7bd456040f96120d1bfa3bc4e26e5c99d7415363db3ca739b144c35aa0ab7df587e98a51d5f6908c92f99fb1107f9f5f09222 WHIRLPOOL 1375bf0546e0f174d13fd027b0d66922f511d5cb23f6fcd22df8a1880020418d7640f0e33a3e70ce92b6609ee07887c8c1949152384ffce705cee81e4fbcb151 |
| 32 |
+EBUILD elfutils-0.170.ebuild 2139 SHA256 60eaf55dbf28a7c37069e8c7b01e03607c421db2d3af901d94215616d6479190 SHA512 91cce74f9c27c5e990f6f0f112e340cb620481eca89e49e78a92695ba722894e192eb959bfffde5c0766f1bdb01207a80c48afa587a6134acf8928ce58f1448b WHIRLPOOL 91eff9fa7189fdb00085f8578e738879d3cdf85118ad857e1c55c7554108e3389f2c10016b68bc3df106658de774fb224861c6f5587c305c0189daa041f9ed7b |
| 33 |
MISC metadata.xml 536 SHA256 c3a1800d65f3a779757015fa973588785610daa943a0f5781faf854792ef6993 SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac WHIRLPOOL 4f06288344e8654c048b3ed2aaee8353e0f76a1623eb6936564f65954d52247db57903bdc70f50cd7465681887279024bad5ddd6c9d9c4297a17ef758bd1cf43 |
| 34 |
|
| 35 |
diff --git a/dev-libs/elfutils/elfutils-0.170.ebuild b/dev-libs/elfutils/elfutils-0.170.ebuild |
| 36 |
index 01dd7ff..f0ad304 100644 |
| 37 |
--- a/dev-libs/elfutils/elfutils-0.170.ebuild |
| 38 |
+++ b/dev-libs/elfutils/elfutils-0.170.ebuild |
| 39 |
@@ -35,7 +35,7 @@ src_prepare() { |
| 40 |
# Add MUSL patches |
| 41 |
epatch "${FILESDIR}"/${P}-musl-obstack-fts.patch |
| 42 |
epatch "${FILESDIR}"/${PN}-0.169-musl-libs.patch |
| 43 |
- epatch "${FILESDIR}"/${PN}-0.168-musl-utils.patch |
| 44 |
+ epatch "${FILESDIR}"/${P}-musl-utils.patch |
| 45 |
|
| 46 |
eautoreconf |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/dev-libs/elfutils/files/elfutils-0.170-musl-utils.patch b/dev-libs/elfutils/files/elfutils-0.170-musl-utils.patch |
| 50 |
new file mode 100644 |
| 51 |
index 0000000..5e00561 |
| 52 |
--- /dev/null |
| 53 |
+++ b/dev-libs/elfutils/files/elfutils-0.170-musl-utils.patch |
| 54 |
@@ -0,0 +1,125 @@ |
| 55 |
+diff -Naur elfutils-0.170.orig/src/arlib.h elfutils-0.170/src/arlib.h |
| 56 |
+--- elfutils-0.170.orig/src/arlib.h 2017-08-08 13:18:49.812978045 -0700 |
| 57 |
++++ elfutils-0.170/src/arlib.h 2017-08-08 13:19:51.749654704 -0700 |
| 58 |
+@@ -29,6 +29,12 @@ |
| 59 |
+ #include <stdint.h> |
| 60 |
+ #include <sys/types.h> |
| 61 |
+ |
| 62 |
++#if !defined(ALLPERMS) |
| 63 |
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ |
| 64 |
++#endif |
| 65 |
++#if !defined(DEFFILEMODE) |
| 66 |
++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ |
| 67 |
++#endif |
| 68 |
+ |
| 69 |
+ /* State of -D/-U flags. */ |
| 70 |
+ extern bool arlib_deterministic_output; |
| 71 |
+diff -Naur elfutils-0.170.orig/src/elfcompress.c elfutils-0.170/src/elfcompress.c |
| 72 |
+--- elfutils-0.170.orig/src/elfcompress.c 2017-08-08 13:18:49.810978023 -0700 |
| 73 |
++++ elfutils-0.170/src/elfcompress.c 2017-08-08 13:19:51.752654737 -0700 |
| 74 |
+@@ -37,6 +37,13 @@ |
| 75 |
+ #include "libeu.h" |
| 76 |
+ #include "printversion.h" |
| 77 |
+ |
| 78 |
++#if !defined(ALLPERMS) |
| 79 |
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ |
| 80 |
++#endif |
| 81 |
++#if !defined(FNM_EXTMATCH) |
| 82 |
++# define FNM_EXTMATCH ( 1 << 5) |
| 83 |
++#endif |
| 84 |
++ |
| 85 |
+ /* Name and version of program. */ |
| 86 |
+ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; |
| 87 |
+ |
| 88 |
+diff -Naur elfutils-0.170.orig/src/readelf.c elfutils-0.170/src/readelf.c |
| 89 |
+--- elfutils-0.170.orig/src/readelf.c 2017-08-08 13:18:49.811978034 -0700 |
| 90 |
++++ elfutils-0.170/src/readelf.c 2017-08-08 13:19:51.760654824 -0700 |
| 91 |
+@@ -4517,10 +4517,11 @@ |
| 92 |
+ return base; |
| 93 |
+ } |
| 94 |
+ |
| 95 |
++static const char *listptr_name; |
| 96 |
++ |
| 97 |
+ static int |
| 98 |
+-compare_listptr (const void *a, const void *b, void *arg) |
| 99 |
++compare_listptr (const void *a, const void *b) |
| 100 |
+ { |
| 101 |
+- const char *name = arg; |
| 102 |
+ struct listptr *p1 = (void *) a; |
| 103 |
+ struct listptr *p2 = (void *) b; |
| 104 |
+ |
| 105 |
+@@ -4536,21 +4537,21 @@ |
| 106 |
+ p1->warned = p2->warned = true; |
| 107 |
+ error (0, 0, |
| 108 |
+ gettext ("%s %#" PRIx64 " used with different address sizes"), |
| 109 |
+- name, (uint64_t) p1->offset); |
| 110 |
++ listptr_name, (uint64_t) p1->offset); |
| 111 |
+ } |
| 112 |
+ if (p1->dwarf64 != p2->dwarf64) |
| 113 |
+ { |
| 114 |
+ p1->warned = p2->warned = true; |
| 115 |
+ error (0, 0, |
| 116 |
+ gettext ("%s %#" PRIx64 " used with different offset sizes"), |
| 117 |
+- name, (uint64_t) p1->offset); |
| 118 |
++ listptr_name, (uint64_t) p1->offset); |
| 119 |
+ } |
| 120 |
+ if (listptr_base (p1) != listptr_base (p2)) |
| 121 |
+ { |
| 122 |
+ p1->warned = p2->warned = true; |
| 123 |
+ error (0, 0, |
| 124 |
+ gettext ("%s %#" PRIx64 " used with different base addresses"), |
| 125 |
+- name, (uint64_t) p1->offset); |
| 126 |
++ listptr_name, (uint64_t) p1->offset); |
| 127 |
+ } |
| 128 |
+ } |
| 129 |
+ |
| 130 |
+@@ -4616,8 +4617,11 @@ |
| 131 |
+ sort_listptr (struct listptr_table *table, const char *name) |
| 132 |
+ { |
| 133 |
+ if (table->n > 0) |
| 134 |
+- qsort_r (table->table, table->n, sizeof table->table[0], |
| 135 |
+- &compare_listptr, (void *) name); |
| 136 |
++ { |
| 137 |
++ listptr_name = name; |
| 138 |
++ qsort (table->table, table->n, sizeof table->table[0], |
| 139 |
++ &compare_listptr); |
| 140 |
++ } |
| 141 |
+ } |
| 142 |
+ |
| 143 |
+ static bool |
| 144 |
+diff -Naur elfutils-0.170.orig/src/strip.c elfutils-0.170/src/strip.c |
| 145 |
+--- elfutils-0.170.orig/src/strip.c 2017-08-08 13:18:49.812978045 -0700 |
| 146 |
++++ elfutils-0.170/src/strip.c 2017-08-08 13:20:17.107931743 -0700 |
| 147 |
+@@ -47,6 +47,13 @@ |
| 148 |
+ #include <system.h> |
| 149 |
+ #include <printversion.h> |
| 150 |
+ |
| 151 |
++#if !defined(ACCESSPERMS) |
| 152 |
++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ |
| 153 |
++#endif |
| 154 |
++#if !defined(FNM_EXTMATCH) |
| 155 |
++# define FNM_EXTMATCH ( 1 << 5) |
| 156 |
++#endif |
| 157 |
++ |
| 158 |
+ typedef uint8_t GElf_Byte; |
| 159 |
+ |
| 160 |
+ /* Name and version of program. */ |
| 161 |
+diff -Naur elfutils-0.170.orig/src/unstrip.c elfutils-0.170/src/unstrip.c |
| 162 |
+--- elfutils-0.170.orig/src/unstrip.c 2017-08-08 13:18:49.812978045 -0700 |
| 163 |
++++ elfutils-0.170/src/unstrip.c 2017-08-08 13:19:51.765654879 -0700 |
| 164 |
+@@ -56,6 +56,15 @@ |
| 165 |
+ # define _(str) gettext (str) |
| 166 |
+ #endif |
| 167 |
+ |
| 168 |
++#ifndef strndupa |
| 169 |
++#define strndupa(s, n) \ |
| 170 |
++ ({const char *__in = (s); \ |
| 171 |
++ size_t __len = strnlen (__in, (n)) + 1; \ |
| 172 |
++ char *__out = (char *) alloca (__len); \ |
| 173 |
++ __out[__len-1] = '\0'; \ |
| 174 |
++ (char *) memcpy (__out, __in, __len-1);}) |
| 175 |
++#endif |
| 176 |
++ |
| 177 |
+ /* Name and version of program. */ |
| 178 |
+ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; |
| 179 |
+ |
Archives