diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index e6b719da18..1cb93a067e 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glibc" -PKG_VERSION="2.33" -PKG_SHA256="2e2556000e105dbd57f0b6b2a32ff2cf173bde4f0d85dffccfd8b7e51a0677ff" +PKG_VERSION="2.34" +PKG_SHA256="44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/software/libc/" PKG_URL="https://ftp.gnu.org/pub/gnu/glibc/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/devel/glibc/patches/arm/glibc-add-support-for-SHT_RELR-sections.patch b/packages/devel/glibc/patches/arm/glibc-add-support-for-SHT_RELR-sections.patch index 00b315697e..fe63042b81 100644 --- a/packages/devel/glibc/patches/arm/glibc-add-support-for-SHT_RELR-sections.patch +++ b/packages/devel/glibc/patches/arm/glibc-add-support-for-SHT_RELR-sections.patch @@ -26,8 +26,6 @@ been updated to include the new definitions. sysdeps/x86_64/dl-machine.h | 10 +++++++++ 8 files changed, 114 insertions(+), 4 deletions(-) -diff --git a/elf/do-rel.h b/elf/do-rel.h -index 1d0a1f2c5d..25babef6e1 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -26,6 +26,12 @@ @@ -43,7 +41,7 @@ index 1d0a1f2c5d..25babef6e1 100644 #ifndef DO_ELF_MACHINE_REL_RELATIVE # define DO_ELF_MACHINE_REL_RELATIVE(map, l_addr, relative) \ elf_machine_rel_relative (l_addr, relative, \ -@@ -46,12 +52,12 @@ elf_dynamic_do_Rel (struct link_map *map, +@@ -46,12 +52,12 @@ elf_dynamic_do_Rel (struct link_map *map const ElfW(Rel) *r = (const void *) reladdr; const ElfW(Rel) *end = (const void *) (reladdr + relsize); ElfW(Addr) l_addr = map->l_addr; @@ -58,7 +56,7 @@ index 1d0a1f2c5d..25babef6e1 100644 /* We never bind lazily during ld.so bootstrap. Unfortunately gcc is not clever enough to see through all the function calls to realize that. */ -@@ -80,8 +86,10 @@ elf_dynamic_do_Rel (struct link_map *map, +@@ -80,8 +86,10 @@ elf_dynamic_do_Rel (struct link_map *map else #endif { @@ -69,7 +67,7 @@ index 1d0a1f2c5d..25babef6e1 100644 const ElfW(Rel) *relative = r; r += nrelative; -@@ -108,9 +116,36 @@ elf_dynamic_do_Rel (struct link_map *map, +@@ -108,9 +116,36 @@ elf_dynamic_do_Rel (struct link_map *map if (l_addr != 0 || ! map->l_info[VALIDX(DT_GNU_PRELINKED)]) # endif #endif @@ -106,24 +104,22 @@ index 1d0a1f2c5d..25babef6e1 100644 #ifdef RTLD_BOOTSTRAP /* The dynamic linker always uses versioning. */ assert (map->l_info[VERSYMIDX (DT_VERSYM)] != NULL); -@@ -179,6 +214,7 @@ elf_dynamic_do_Rel (struct link_map *map, - skip_ifunc); +@@ -180,6 +215,7 @@ elf_dynamic_do_Rel (struct link_map *map # endif } -+#endif #endif ++#endif } } -@@ -189,3 +225,4 @@ elf_dynamic_do_Rel (struct link_map *map, + +@@ -189,3 +225,4 @@ elf_dynamic_do_Rel (struct link_map *map #undef elf_machine_rel_relative #undef DO_ELF_MACHINE_REL_RELATIVE #undef DO_RELA +#undef DO_RELR -diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h -index 6727233e1a..4345df9949 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h -@@ -76,6 +76,11 @@ auto inline void __attribute__((always_inline)) +@@ -76,6 +76,11 @@ auto inline void __attribute__((always_i elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, void *const reloc_addr); # endif @@ -135,7 +131,7 @@ index 6727233e1a..4345df9949 100644 # if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL auto inline void __attribute__((always_inline)) elf_machine_lazy_rel (struct link_map *map, -@@ -190,6 +195,15 @@ elf_machine_lazy_rel (struct link_map *map, +@@ -190,6 +195,15 @@ elf_machine_lazy_rel (struct link_map *m # define ELF_DYNAMIC_DO_RELA(map, lazy, skip_ifunc) /* Nothing to do. */ # endif @@ -151,7 +147,7 @@ index 6727233e1a..4345df9949 100644 /* This can't just be an inline function because GCC is too dumb to inline functions containing inlines themselves. */ # define ELF_DYNAMIC_RELOCATE(map, lazy, consider_profile, skip_ifunc) \ -@@ -198,6 +212,7 @@ elf_machine_lazy_rel (struct link_map *map, +@@ -198,6 +212,7 @@ elf_machine_lazy_rel (struct link_map *m (consider_profile)); \ ELF_DYNAMIC_DO_REL ((map), edr_lazy, skip_ifunc); \ ELF_DYNAMIC_DO_RELA ((map), edr_lazy, skip_ifunc); \ @@ -159,21 +155,19 @@ index 6727233e1a..4345df9949 100644 } while (0) #endif -diff --git a/elf/elf.h b/elf/elf.h -index 197b557d15..5b6da8e8ae 100644 --- a/elf/elf.h +++ b/elf/elf.h -@@ -446,7 +446,8 @@ typedef struct +@@ -443,7 +443,8 @@ typedef struct #define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ #define SHT_GROUP 17 /* Section group */ - #define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ + #define SHT_SYMTAB_SHNDX 18 /* Extended section indices */ -#define SHT_NUM 19 /* Number of defined types. */ +#define SHT_RELR 19 /* Relative relocation, only offsets */ +#define SHT_NUM 20 /* Number of defined types. */ #define SHT_LOOS 0x60000000 /* Start OS-specific. */ #define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes. */ #define SHT_GNU_HASH 0x6ffffff6 /* GNU-style hash table. */ -@@ -664,6 +665,12 @@ typedef struct +@@ -662,6 +663,12 @@ typedef struct Elf64_Sxword r_addend; /* Addend */ } Elf64_Rela; @@ -186,7 +180,7 @@ index 197b557d15..5b6da8e8ae 100644 /* How to extract and insert information held in the r_info field. */ #define ELF32_R_SYM(val) ((val) >> 8) -@@ -885,7 +892,10 @@ typedef struct +@@ -887,7 +894,10 @@ typedef struct #define DT_PREINIT_ARRAY 32 /* Array with addresses of preinit fct*/ #define DT_PREINIT_ARRAYSZ 33 /* size in bytes of DT_PREINIT_ARRAY */ #define DT_SYMTAB_SHNDX 34 /* Address of SYMTAB_SHNDX section */ @@ -198,7 +192,7 @@ index 197b557d15..5b6da8e8ae 100644 #define DT_LOOS 0x6000000d /* Start of OS-specific */ #define DT_HIOS 0x6ffff000 /* End of OS-specific */ #define DT_LOPROC 0x70000000 /* Start of processor-specific */ -@@ -937,6 +947,7 @@ typedef struct +@@ -939,6 +949,7 @@ typedef struct GNU extension. */ #define DT_VERSYM 0x6ffffff0 @@ -206,11 +200,9 @@ index 197b557d15..5b6da8e8ae 100644 #define DT_RELACOUNT 0x6ffffff9 #define DT_RELCOUNT 0x6ffffffa -diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h -index 4f6a86ef37..79ff22f0c0 100644 --- a/elf/get-dynamic-info.h +++ b/elf/get-dynamic-info.h -@@ -108,6 +108,9 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) +@@ -103,6 +103,9 @@ elf_get_dynamic_info (struct link_map *l # if ! ELF_MACHINE_NO_REL ADJUST_DYN_INFO (DT_REL); # endif @@ -220,7 +212,7 @@ index 4f6a86ef37..79ff22f0c0 100644 ADJUST_DYN_INFO (DT_JMPREL); ADJUST_DYN_INFO (VERSYMIDX (DT_VERSYM)); ADJUST_DYN_INFO (ADDRIDX (DT_GNU_HASH)); -@@ -134,6 +137,10 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) +@@ -129,6 +132,10 @@ elf_get_dynamic_info (struct link_map *l if (info[DT_REL] != NULL) assert (info[DT_RELENT]->d_un.d_val == sizeof (ElfW(Rel))); #endif @@ -231,8 +223,6 @@ index 4f6a86ef37..79ff22f0c0 100644 #ifdef RTLD_BOOTSTRAP /* Only the bind now flags are allowed. */ assert (info[VERSYMIDX (DT_FLAGS_1)] == NULL -diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h -index fde7cfd9e2..eaff6dbc6d 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -198,6 +198,7 @@ _dl_start_user: \n\ @@ -243,11 +233,10 @@ index fde7cfd9e2..eaff6dbc6d 100644 #define DL_PLATFORM_INIT dl_platform_init () -@@ -383,6 +384,15 @@ elf_machine_rela_relative (ElfW(Addr) l_addr, - *reloc_addr = l_addr + reloc->r_addend; +@@ -384,6 +385,15 @@ elf_machine_rela_relative (ElfW(Addr) l_ } -+inline void + inline void +__attribute__ ((always_inline)) +elf_machine_relr_relative (ElfW(Addr) l_addr, + void *const reloc_addr_arg) @@ -256,14 +245,13 @@ index fde7cfd9e2..eaff6dbc6d 100644 + *reloc_addr += l_addr; +} + - inline void ++inline void __attribute__ ((always_inline)) elf_machine_lazy_rel (struct link_map *map, -diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h -index 90856779b1..c586232c9d 100644 + ElfW(Addr) l_addr, --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h -@@ -296,6 +296,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, +@@ -296,6 +296,7 @@ elf_machine_plt_value (struct link_map * Prelinked libraries may use Elf32_Rela though. */ #define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP #define ELF_MACHINE_NO_REL 0 @@ -271,7 +259,7 @@ index 90856779b1..c586232c9d 100644 /* Names of the architecture-specific auditing callback functions. */ #define ARCH_LA_PLTENTER arm_gnu_pltenter -@@ -637,6 +638,15 @@ elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, +@@ -637,6 +638,15 @@ elf_machine_rel_relative (Elf32_Addr l_a *reloc_addr += l_addr; } @@ -287,11 +275,9 @@ index 90856779b1..c586232c9d 100644 # ifndef RTLD_BOOTSTRAP auto inline void __attribute__ ((always_inline)) -diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h -index 672d8f27ce..7c09608913 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h -@@ -286,6 +286,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, +@@ -285,6 +285,7 @@ elf_machine_plt_value (struct link_map * Prelinked libraries may use Elf32_Rela though. */ #define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP #define ELF_MACHINE_NO_REL 0 @@ -299,7 +285,7 @@ index 672d8f27ce..7c09608913 100644 #ifdef RESOLVE_MAP -@@ -658,6 +659,15 @@ elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, +@@ -657,6 +658,15 @@ elf_machine_rel_relative (Elf32_Addr l_a *reloc_addr += l_addr; } @@ -315,11 +301,9 @@ index 672d8f27ce..7c09608913 100644 # ifndef RTLD_BOOTSTRAP auto inline void __attribute__ ((always_inline)) -diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h -index 363a749cb2..10a200ba67 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h -@@ -214,6 +214,7 @@ _dl_start_user:\n\ +@@ -209,6 +209,7 @@ _dl_start_user:\n\ /* The x86-64 never uses Elf64_Rel/Elf32_Rel relocations. */ #define ELF_MACHINE_NO_REL 1 #define ELF_MACHINE_NO_RELA 0 @@ -327,11 +311,10 @@ index 363a749cb2..10a200ba67 100644 /* We define an initialization function. This is called very early in _dl_sysdep_start. */ -@@ -549,6 +550,15 @@ elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, - } +@@ -545,6 +546,15 @@ elf_machine_rela_relative (ElfW(Addr) l_ } -+auto inline void + auto inline void +__attribute ((always_inline)) +elf_machine_relr_relative (ElfW(Addr) l_addr, + void *const reloc_addr_arg) @@ -340,9 +323,7 @@ index 363a749cb2..10a200ba67 100644 + *reloc_addr += l_addr; +} + - auto inline void ++auto inline void __attribute ((always_inline)) elf_machine_lazy_rel (struct link_map *map, --- -2.30.2 - + ElfW(Addr) l_addr, const ElfW(Rela) *reloc, diff --git a/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch b/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch index 1a84602b10..f2c900be91 100644 --- a/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch +++ b/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch @@ -10,11 +10,9 @@ Subject: [PATCH] tls: libwidevinecdm.so: since 4.10.2252.0 has TLS with elf/dl-tls.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/elf/dl-tls.c b/elf/dl-tls.c -index 9fa62f5d..d8f2f740 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c -@@ -213,6 +213,11 @@ void +@@ -220,6 +220,11 @@ void _dl_determine_tlsoffset (void) { size_t max_align = TLS_TCB_ALIGN; @@ -26,6 +24,3 @@ index 9fa62f5d..d8f2f740 100644 size_t freetop = 0; size_t freebottom = 0; --- -2.31.1 - diff --git a/packages/devel/glibc/patches/glibc-fix-dns-with-broken-routers.patch b/packages/devel/glibc/patches/glibc-fix-dns-with-broken-routers.patch index 0af14346c7..6e8249579d 100644 --- a/packages/devel/glibc/patches/glibc-fix-dns-with-broken-routers.patch +++ b/packages/devel/glibc/patches/glibc-fix-dns-with-broken-routers.patch @@ -6,13 +6,11 @@ Date: Tue Oct 1 12:09:07 2013 +0300 ref: https://fedoraproject.org/wiki/Networking/NameResolution/ADDRCONFIG -diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index 7bb3ded..2085ee5 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c -@@ -830,6 +830,38 @@ gaih_inet (const char *name, const struct gaih_service *service, - } - } +@@ -730,6 +730,38 @@ gaih_inet (const char *name, const struc + if (res_ctx == NULL) + no_more = 1; + /* AI_ADDRCONFIG determines whether or not we should suppress any + * hostname lookups. If the local host has only IPv4 interfaces, @@ -49,7 +47,7 @@ index 7bb3ded..2085ee5 100644 while (!no_more) { no_data = 0; -@@ -837,7 +869,7 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -737,7 +769,7 @@ gaih_inet (const char *name, const struc /* gethostbyname4_r sends out parallel A and AAAA queries and is thus only suitable for PF_UNSPEC. */ @@ -58,7 +56,7 @@ index 7bb3ded..2085ee5 100644 fct4 = __nss_lookup_function (nip, "gethostbyname4_r"); if (fct4 != NULL) -@@ -942,20 +974,22 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -826,20 +858,22 @@ gaih_inet (const char *name, const struc if (fct != NULL) { @@ -90,11 +88,9 @@ index 7bb3ded..2085ee5 100644 { gethosts (AF_INET, struct in_addr); -diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c -index 34c2146..be7de0d 100644 --- a/sysdeps/unix/sysv/linux/check_pf.c +++ b/sysdeps/unix/sysv/linux/check_pf.c -@@ -234,7 +234,8 @@ make_request (int fd, pid_t pid) +@@ -224,7 +224,8 @@ make_request (int fd, pid_t pid) } else {