mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 04:58:47 +00:00
mulhern
7654815dbf
[YOCTO #3867] Renames existing patches and removes some changes. Curses-and-IOLoader-changes.patch is renamed to call_output_config.patch. The new patch omits the removal of the pruning step in Load_Questions but retains the replacement of a call to a non-existant function with a call to an appropriate implemented function. yocto-standard-patch.patch is renamed to fixed_defined_warnings.patch. The new patch omits the definition of a yocto distro but includes the defined warnings fix. The recipe file is changed to include the new patches and also to omit a related action in the do_install script. Signed-off-by: mulhern <mulhern@yoctoproject.org>
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
Upstream Status: Inappropriate [No upstream maintenance]
|
|
|
|
Signed-off-by: Anne Mulhern <mulhern@yoctoproject.org>
|
|
|
|
---
|
|
|
|
Index: Bastille/bin/bastille
|
|
===================================================================
|
|
--- Bastille.orig/bin/bastille
|
|
+++ Bastille/bin/bastille
|
|
@@ -162,11 +162,12 @@ fi
|
|
# We check that the version is at least the minimum
|
|
|
|
PERL_VERSION=`${CURRENT_PERL_PATH}/perl -version |
|
|
- head -2 | # the second line contains the version
|
|
+ head -n 2 | # the second line contains the version
|
|
tr " " "\n" | # split words into separate lines
|
|
- sed -e "s/^v//" | # to get rid of the v in v5.6.0
|
|
- grep "^[1-9]\." | # find a "word" that starts with number dot
|
|
- sed -e "s/_/./"` # substitute _patchlevel with .patchlevel
|
|
+ grep "^(v" | # find a "word" that starts with '(v'
|
|
+ sed -e "s/^(v//" -e "s/)//" -e "s/_/./"`
|
|
+ # to get rid of the (v in v5.6.0
|
|
+ # substitute _patchlevel with .patchlevel
|
|
# (used in 5.005_03 and prior)
|
|
|
|
# everything before the first .
|