mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 04:58:47 +00:00
mulhern
6e23502b38
[YOCTO #3867] Five additional patches which cause the --os flag to be accepted and observed are added. An additional distro, Yocto, is added. The individual patches are described below. upgrade_options_processing.patch: Changes setOptions procedure so that it accepts named parameters for greater flexibility and adjusts all invocations accordingly. Uses more precise specifications in invocatiosn of Getop::Long::GetOptions. Omits code associated with a commented out flag. accept_os_flag_in_backend.patch: Accepts and observes an additional --os flag in BastilleBackEnd. allow_os_with_assess.patch: No longer print a usage message and quit if --assess or its related flags are specified along with the --os flag. edit_usage_message.patch: Edit usage message to include the specification of an --os flag with the specification of an --assess flag. organize_distro_discovery.patch: Separates inferring the distro from specifying the distro. Adds a "Yocto" distro among the other Linux distros. Causes the specified distro to override the inferred distro with a warning message when they are different. Previously if either the inferred distro or the specified distro was not among supported distros Bastille would quit with an error. Signed-off-by: mulhern <mulhern@yoctoproject.org>
44 lines
1.2 KiB
Diff
44 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 2013-08-21 08:59:06.647950000 -0400
|
|
+++ Bastille/bin/bastille 2013-08-21 15:55:53.193631711 -0400
|
|
@@ -195,7 +195,6 @@
|
|
systemFileLocations
|
|
|
|
isAssessing='no'
|
|
-nonXArg='no'
|
|
|
|
if [ $PERL_V_MAJ -eq $MIN_V_MAJ -a $PERL_V_MIN -lt $MIN_V_MIN -o $PERL_V_MAJ -lt $MIN_V_MAJ ]; then # invalid Perl
|
|
printErr
|
|
@@ -316,12 +315,10 @@
|
|
'--os')
|
|
options_left="$options_left --os"
|
|
optarg='yes'
|
|
- nonXArg='yes'
|
|
;;
|
|
'-f')
|
|
options_left="$options_left -f"
|
|
optarg='yes'
|
|
- nonXArg='yes'
|
|
;;
|
|
# Non-exclusive (undocumented and unsupported) options follow:
|
|
# There is no validity/combination checking done with these.
|
|
@@ -345,11 +342,6 @@
|
|
fi
|
|
done
|
|
|
|
-#Detect case where -f or --os attempted use with --assess
|
|
- if [ \( x$nonXArg = xyes \) -a \( x$isAssessing = xyes \) ]; then
|
|
- printUsage
|
|
- exit 2
|
|
- fi
|
|
|
|
# We have a valid version of perl! Verify that all the required
|
|
# modules can be found.
|