mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
a67db8fcbd
Ever since an old patch version, it has (for reasonable security reasons) not supported patched with ../ in the filename. Many of our patches have been relying on this behaviour being OK, because we start off with an ancient patch version that didn't perform such checks. As soon as we need this behaviour after we build a newer patch though, we will have problems. So, let's change the policy. Patches are relative to where tarballs are extracted, rather than the "working directory" - e.g. have patches for `coreutils-9.4/src/cp.c` instead of `src/cp.c`. Keeping this consistent has a few implications; - patches are applied from the build/ directory in bash era now, with `-p0` - when patches are manually applied in the bash era, use `-p` as required, usually `-p1` - in kaem era where patches are always manually applied, `-p1` is used
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
Our older version of binutils doesn't play very nicely with binutils for a
|
|
couple of edgecase macros. It seems that ALTERNATIVE is one of these. As we
|
|
know what your system will be (not Xen), we can manually evaluate and write
|
|
out the ALTERNATIVEs.
|
|
|
|
--- linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000
|
|
+++ linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000
|
|
@@ -412,9 +412,8 @@
|
|
|
|
movl %esp, %eax
|
|
call do_fast_syscall_32
|
|
- /* XEN PV guests always use IRET path */
|
|
- ALTERNATIVE "testl %eax, %eax; jz .Lsyscall_32_done", \
|
|
- "jmp .Lsyscall_32_done", X86_FEATURE_XENPV
|
|
+ testl %eax, %eax
|
|
+ jz .Lsyscall_32_done
|
|
|
|
/* Opportunistic SYSEXIT */
|
|
TRACE_IRQS_ON /* User mode traces as IRQs on. */
|
|
--- linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000
|
|
+++ linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000
|
|
@@ -55,8 +55,6 @@
|
|
/* If SYSENTER (Intel) or SYSCALL32 (AMD) is available, use it. */
|
|
ALTERNATIVE_2 "", SYSENTER_SEQUENCE, X86_FEATURE_SYSENTER32, \
|
|
SYSCALL_SEQUENCE, X86_FEATURE_SYSCALL32
|
|
-#else
|
|
- ALTERNATIVE "", SYSENTER_SEQUENCE, X86_FEATURE_SEP
|
|
#endif
|
|
|
|
/* Enter using int $0x80 */
|