mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-07 03:45:23 +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
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
|
|
|
SPDX-License-Identifier: Artistic-1.0
|
|
|
|
Set some things that cannot be overriden in the perl Configure script to
|
|
generate with correct values for live-bootstrap.
|
|
|
|
NOTE: this patch CANNOT be applied to a non-live-bootstrap environment.
|
|
|
|
--- metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:03.155396204 +1100
|
|
+++ metaconfig-5.32.1~rc1/U/threads/archname.U 2022-02-27 21:30:49.392396204 +1100
|
|
@@ -79,7 +79,7 @@
|
|
?X: Very GCCian.
|
|
*) archname=`echo $targetarch|sed 's,^[^-]*-,,'` ;;
|
|
esac
|
|
-myarchname="$tarch"
|
|
+myarchname="i686-linux"
|
|
case "$archname" in
|
|
'') dflt="$tarch";;
|
|
*) dflt="$archname";;
|
|
--- metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:31:26.911396204 +1100
|
|
+++ metaconfig-5.32.1~rc1/U/modified/Oldconfig.U 2022-02-27 21:32:31.846396204 +1100
|
|
@@ -117,16 +117,13 @@
|
|
?X: on some machines to avoid the error message when uname is not found; e.g.
|
|
?X: old SUN-OS 3.2 would not execute hostname in (uname -a || hostname). Sigh!
|
|
?X: Now not using a subshell but instead $test.
|
|
-myuname=`$uname -a 2>/dev/null`
|
|
-$test -z "$myuname" && myuname=`hostname 2>/dev/null`
|
|
# Downcase everything to avoid ambiguity.
|
|
# Remove slashes and single quotes so we can use parts of this in
|
|
# directory and file names.
|
|
# Remove newlines so myuname is sane to use elsewhere.
|
|
# tr '[A-Z]' '[a-z]' would not work in EBCDIC
|
|
# because the A-Z/a-z are not consecutive.
|
|
-myuname=`echo $myuname | $sed -e "s,['/],,g" | \
|
|
- ./tr '[A-Z]' '[a-z]' | $tr $trnl ' '`
|
|
+myuname="linux (none) 4.14.341-openela #1 mon jan 1 00:00:01 1970 i686 gnulinux"
|
|
?X: Save the value we just computed to reset myuname after we get done here.
|
|
newmyuname="$myuname"
|
|
dflt=n
|
|
@@ -336,7 +333,7 @@
|
|
?X: Note the hostname on the second one, which will fool Configure
|
|
?X: into using the SysV case!
|
|
gnu) osname=gnu
|
|
- osvers="$3" ;;
|
|
+ osvers="4.14.341-openela" ;;
|
|
?X: HP-UX uname -a gives something like
|
|
?X: HP-UX foobar B.10.20 A 9000/735 2016483812 two-user license
|
|
?X: Preserve the full 10.20 string instead of the previous plain '10'.
|