From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- sys-libs/glibc/Manifest | 9 +++--- .../2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch | 32 ++++++++++++++++++++++ sys-libs/glibc/glibc-2.19-r2.ebuild | 2 +- sys-libs/glibc/glibc-2.26-r7.ebuild | 2 +- sys-libs/glibc/glibc-2.27-r6.ebuild | 2 +- sys-libs/glibc/glibc-2.28-r6.ebuild | 2 +- 6 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch (limited to 'sys-libs/glibc') diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index abf08e3a1e39..67928a4cbf36 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,3 +1,4 @@ +AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 BLAKE2B 19d218e91b1d3d38c526838600d0393de47a0e59ca3e05651bd28becb401021ddd2f6ef77b8740ca4e400f094ab5fd196f092cf25b20729eb4d42e2a200b9e03 SHA512 79876b12871b3e7693340bfdf99276ac0dfd6ff30bc977a9526af9e681fcbab2f25d3ac9e2b33f027c968b38a4b670237de54ffd08edc418423ecd82dddd1d67 AUX 2.19/glibc-2.19-kernel-2.6.16-compat.patch 3214 BLAKE2B 64af88703bddaa301ce25d4400e00140fae536882443510466510766a60ac1cf4ceca35ca0ad4384f0cdc05b79352ac7da92f555561d1f6cdd65f7cc8464c6d7 SHA512 c21d80b7ae5b2691e5b6d43a42153193822ccc2b4418728edd5f2fa72412992d103b61418b57f9cf26e72378b24aa7cbaed05eeb31a4ec312a715d258cf5232b AUX 2.25/glibc-2.25-gentoo-chk_fail.c 9068 BLAKE2B 6fabcbb981d92101ff3b97e8eed4da3c0ee4fc3d09ca344c2d0b7ee5e04fec66b5db314263541beeb1290bafa837795fef1a6300986de938d2958ba89a9c1f2f SHA512 4503002b0e2cee0b6efc4599152d24fcff330157d4e35992a77d0d83a2decc4cf2da2b8645a44d90d428a1d82300a4fd8d13c5937b7c89f368c12b3c9139be6f AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea @@ -24,12 +25,12 @@ DIST glibc-2.30-patches-1.tar.xz 19364 BLAKE2B 853ae651cf48a78796ac0a3c9c8409873 DIST glibc-2.30-patches-2.tar.xz 19588 BLAKE2B 672343ef8a44486304f03091844635febef9d1bc8000ab3382d702dcc1111a107b5e758355beaef8db5012f7e324e4c2365e10fc642b01c9f9a3a315de2dc7f6 SHA512 494155147b56e094a4427aed79e278b4a350928ddaff84330d6a40fad079131a4574f20c591dc95e572391b68ef72c49790571ee5323a2a541ec0757bcaeb161 DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b DIST glibc-9999-patches-14.tar.xz 17908 BLAKE2B a6e1f22a4358111ff757431c5d42fd020f6095584c3517aa854ea266129d1a177a7c09b310643f1cea32ffaf253806ac08f3aed864fb477097aaa2c4010450f4 SHA512 ef28b409b26472ec1d868167345aecfee70b1edf1863374dc2f25892f40c10f0826620a8b22fbbc9f737c8f611569b3412e8e2ea041da1ad1ef7f6398b82cddc -EBUILD glibc-2.19-r2.ebuild 37249 BLAKE2B 477834110e0ff22d012c892243ef5405ac700c54924e4f03fbed65701c31c3cd445c332d20fb4dee3728893d1a94ce2ef26bb164f7b8ae027651b9f1687d08d6 SHA512 1afce121f756cda0fce819a5227533daa74180dbdd9029aa1c6c0fb4210543b9e5d1e13cc7e6571f38221a4f4740a7e82f03a420e670368c35070cd2431e202d +EBUILD glibc-2.19-r2.ebuild 37294 BLAKE2B 61b3d7264b4591a645540b7be6b7f7c617dba61af38972ff9547d48bbf90b959e634391a4fbd950de631f092d23f4585b85e8b1eda5386dd57db5d201c7a306a SHA512 620140ba758d17e0d1edcc08e71477c5f9b240a2b86b170898841a9abc7e3090b5f3ec3730f44ff3315453696d1818c6f6c5e205544bb76efd3c562b05f2abf8 EBUILD glibc-2.24-r4.ebuild 4945 BLAKE2B abeea3d030413af56ead335673e72fe6231de26f9d770b58928300bc8f8632c1eb1a7d65ed1b8e7c0ccc32f1283cd2e72a30253900fcce1c8cb34c9afe8aca83 SHA512 6d4e53d4ffb0789a4f92fd171058997ad2ec52b9c6cd5e8086cf79ab44dddeb0e14158a1c2e2cdc9a462e9b6a77fabde696b174c757ecd143d28b7cd606abd3a EBUILD glibc-2.25-r11.ebuild 4932 BLAKE2B bdc57cade5e96352ecb62e032f0ad048ae1f95383e66745b76f291f58b153f7ae5c37ad96a94b628c9b115db11d1bf9cb093da1eb5d47f7a70bff59dd296a805 SHA512 486937b13919c3c64539a2da3ebb32f8bd8a1b2b7286562d3525a111f23cd34df90ffb0fe10b793c30dc51af767ee580b9dcebbf390fdf2544c1fe2f20240414 -EBUILD glibc-2.26-r7.ebuild 25458 BLAKE2B 5e00db722b4bc65203203e7463e897f6212b62f10a7c5c084a9db99c1daf23b5f4a6041a15f5e347869878f87889974bdee200ebeaca6b83e21f905571050c7d SHA512 42cc1e283e62753760bab06ac35be1686b939bd49976e43b484963416886f867b2fda3360eea6d16065217a3ef8e3fc3fb7b4073767b13c25e8e23575d01baaa -EBUILD glibc-2.27-r6.ebuild 40826 BLAKE2B 3eddb89bf0490e6c209e4d989975c17c64abdb323495e388a19727d6e79270a9b819909a85b34b86a9678f3020a1cf02f894e367bdf6779f77892e259230ddf9 SHA512 78c14022ce6aa26e4c9e52e83150cb57902a71f029607f0e0c703bd3c2ed9f8a20c4084e5754141d4e2bc35ed0ba6d0780d2789edfa9f6cf4b9f531713e45ea5 -EBUILD glibc-2.28-r6.ebuild 40596 BLAKE2B a3399bbdc64ae30dd885b7f4541be593bab6c551896ea4c954c224f716bae1e487640046cb1c95cdda074d71abc2bdf123850be49bdbe0c9802b127601829ca5 SHA512 898bb933c6b1f55042b14c46539efe6790558de54e140ffe5f6941fdfb0545c736611335b526f381f4cdab81bdc85f663b207fe6a34d2d5d66e432dd64dca012 +EBUILD glibc-2.26-r7.ebuild 25504 BLAKE2B fb61b5f6d84c58a183e5bff7143e11105c9a5ce6afcde505aede6cbaf48524e64aebe22eb47b877736fe82ca2a1eb4c6e9de7bff4d24dfe418bc2fcd89a2b276 SHA512 5ec483b841d43b8bcd9626d2ee94e56c6c58138c06a62b9bd53752396fe96e7e9c8dac565fd7de1dd30b04caaec790aec666b6e54870e37f4b2beb9d1644cd02 +EBUILD glibc-2.27-r6.ebuild 40871 BLAKE2B ca9730540a24b18d1da227e39ee5679012e8e28a8a787b21aefdf294b0668c28a1268103e459d52b233dce783cdfd1cf2fae6c582fd3a947dced3b9d7f0b138d SHA512 0965ba376cc7a55aa5cf960071a3d38c54ef180a443e3b8953d57e9e790a7365838ba24ca24750150d306db5fbd069e686add8ecc1c61c052f8756005ab62265 +EBUILD glibc-2.28-r6.ebuild 40641 BLAKE2B 0fb54fd95d02a5a6afc214625e743d5c2693809e274b7e2ab9664ae9f38056ba977cae6bc5751a0fe8208764da93ef9749d54f4bb5863c2026bb40c75cdf6869 SHA512 4e2e8bae3c31efce1a72c7baab698131f3903e69ba358a25090df3cd99d78ff7555cb366d48c7226e475cc43d06b437ba51a942365689c7f32de89fa8c18d941 EBUILD glibc-2.29-r2.ebuild 41930 BLAKE2B bcb1911a391d7b7d60741a3a8f0084613894fd1fc6d74086433f8eac5afa1a834c4ffbb786fa9590f84b1c0dd619f7957863ef4d389a810df28474125146c8a6 SHA512 f3565011646ed6b5d1107fa32c0ba288235669f966a9fd15050e9d913e362c2bef68cc1565b527bf732ab53fa111f7ab5910a05212fc6383732568501a7eaeb7 EBUILD glibc-2.29-r4.ebuild 42236 BLAKE2B 13a3249b2e56420e8587aeabded76157b2fa2a4f7bff84c25e9883af5334acb9a9e42d0d3f00abeaa3274f6b7d115afc9777b3deb0395cf91e67c140b08651f1 SHA512 1efb98c9cebfe87dcac0e51f7bb6294ac1e4e9cd5957830e3724fd45ff492195e5db450b590c7f4001bb54338902ed904bec2e34f50cc4a9d98a1e5e4eb140cc EBUILD glibc-2.29-r5.ebuild 42233 BLAKE2B 6a5918963b4f90b4e888bdb0c6153f50b536525db0fa7686c85cc0d79fc1fcfc1a3832145d2daea73cd8720bc8ffa92b3af4c17a27f59c5d141025f761067051 SHA512 f6bf65bf58c10803ab27e4b43167fa8bd6553bb7f4106732cab6fcb411e3289cb9aeb37bf3728a7d6c638851dfd7c2b267ead97716b23bf67513b6be8d475f6d diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch new file mode 100644 index 000000000000..72a616a046a8 --- /dev/null +++ b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/503838 +http://gcc.gnu.org/PR60465 +https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html +https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html + +newer versions of gcc generate relocations in the elf_get_dynamic_info func +which glibc relies on to populate some info structs. those structs are then +used by ldso to process relocations in itself. glibc requires that there are +no relocations until that point (*after* elf_get_dynamic_info), so we end up +crashing during elf_get_dynamic_info because the relocation has not yet been +processed. + +this hack shuffles the code in a way that tricks gcc into not generating the +relocation. we need to figure out something better for upstream. + +--- a/elf/get-dynamic-info.h ++++ b/elf/get-dynamic-info.h +@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) + info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM + + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn; + else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM) +- info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM +- + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn; ++ { ++ d_tag_utype i = ++ DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM ++ + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM; ++ info[i] = dyn; ++ } + ++dyn; + } + diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild index 75f849f69dc2..0fedbb8e9409 100644 --- a/sys-libs/glibc/glibc-2.19-r2.ebuild +++ b/sys-libs/glibc/glibc-2.19-r2.ebuild @@ -539,7 +539,7 @@ sanity_prechecks() { if has_version ">${CATEGORY}/${P}-r10000" ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction." - die "Aborting to save your system." + [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system." fi if ! do_run_test '#include \n#include \nint main(){return syscall(1000)!=-1;}\n' ; then diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild index bfbe9b01b033..34d8fb8a7ac9 100644 --- a/sys-libs/glibc/glibc-2.26-r7.ebuild +++ b/sys-libs/glibc/glibc-2.26-r7.ebuild @@ -122,7 +122,7 @@ pkg_pretend() { if has_version ">${CATEGORY}/${P}-r10000" ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction" - die "Aborting to save your system" + [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system." fi if ! glibc_run_test '#include \nint main(){return getpwuid(0)==0;}\n' diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild index 42be8144de45..f1409e36cf34 100644 --- a/sys-libs/glibc/glibc-2.27-r6.ebuild +++ b/sys-libs/glibc/glibc-2.27-r6.ebuild @@ -607,7 +607,7 @@ sanity_prechecks() { if has_version ">${CATEGORY}/${P}-r10000" ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction." - die "Aborting to save your system." + [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system." fi if ! do_run_test '#include \n#include \nint main(){return syscall(1000)!=-1;}\n' ; then diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild index d40991f16ab9..aa318b7e0f1b 100644 --- a/sys-libs/glibc/glibc-2.28-r6.ebuild +++ b/sys-libs/glibc/glibc-2.28-r6.ebuild @@ -598,7 +598,7 @@ sanity_prechecks() { if has_version ">${CATEGORY}/${P}-r10000" ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction." - die "Aborting to save your system." + [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system." fi if ! do_run_test '#include \n#include \nint main(){return syscall(1000)!=-1;}\n' ; then -- cgit v1.2.3