Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Go 1.22.1 via tools. ``` | Package | Update | Change | |---|---|---| | [LINBIT/drbd](https://togithub.com/LINBIT/drbd) | patch | `9.2.7` -> `9.2.8` | | git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git | minor | `20240115` -> `20240220` | | git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git | patch | `6.6.18` -> `6.6.20` | | git://git.musl-libc.org/musl | patch | `1.2.4` -> `1.2.5` | | [tukaani-project/xz](https://togithub.com/tukaani-project/xz) | minor | `v5.4.6` -> `v5.6.0` | ``` DRBD is re-enabled, fingers crossed. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
- Loading branch information
Showing
7 changed files
with
67 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| https://git.alpinelinux.org/aports/plain/main/musl/handle-aux-at_base.patch | ||
|
|
||
| This is required to make the gcompat ELF interpreter stub work with some | ||
| packed binaries. | ||
|
|
||
| diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c | ||
| index b125eb1..616c6a6 100644 | ||
| --- a/src/env/__init_tls.c | ||
| +++ b/src/env/__init_tls.c | ||
| @@ -66,8 +66,10 @@ void *__copy_tls(unsigned char *mem) | ||
| } | ||
|
|
||
| #if ULONG_MAX == 0xffffffff | ||
| +typedef Elf32_Ehdr Ehdr; | ||
| typedef Elf32_Phdr Phdr; | ||
| #else | ||
| +typedef Elf64_Ehdr Ehdr; | ||
| typedef Elf64_Phdr Phdr; | ||
| #endif | ||
|
|
||
| @@ -77,15 +79,23 @@ extern const size_t _DYNAMIC[]; | ||
| static void static_init_tls(size_t *aux) | ||
| { | ||
| unsigned char *p; | ||
| - size_t n; | ||
| + size_t n, e; | ||
| Phdr *phdr, *tls_phdr=0; | ||
| size_t base = 0; | ||
| void *mem; | ||
|
|
||
| - for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) { | ||
| + if (aux[AT_BASE]) { | ||
| + Ehdr *ehdr = (void *)aux[AT_BASE]; | ||
| + p = (unsigned char *)aux[AT_BASE] + ehdr->e_phoff; | ||
| + n = ehdr->e_phnum; | ||
| + e = ehdr->e_phentsize; | ||
| + } else { | ||
| + p = (void *)aux[AT_PHDR]; | ||
| + n = aux[AT_PHNUM]; | ||
| + e = aux[AT_PHENT]; | ||
| + } | ||
| + for (; n; n--, p+=e) { | ||
| phdr = (void *)p; | ||
| - if (phdr->p_type == PT_PHDR) | ||
| - base = aux[AT_PHDR] - phdr->p_vaddr; | ||
| if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) | ||
| base = (size_t)_DYNAMIC - phdr->p_vaddr; | ||
| if (phdr->p_type == PT_TLS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters