HLFS: Additional features has been full disabled in the book for now.

This commit is contained in:
Manuel Canales Esparcia 2007-06-18 19:52:52 +00:00
parent e900430ef9
commit 6d5844cee3
2 changed files with 34 additions and 33 deletions

View file

@ -397,37 +397,37 @@ menu "--- BOOK Settings"
default "2.6" if KERNEL_26 default "2.6" if KERNEL_26
default "2.4" if KERNEL_24 default "2.4" if KERNEL_24
menu "HLFS Additional Features" # menu "HLFS Additional Features"
depends on BOOK_HLFS # depends on BOOK_HLFS
#
config SET_SSP # config SET_SSP
bool "Stack-smashing protector" # bool "Stack-smashing protector"
default y # default y
#
config SET_ASLR # config SET_ASLR
bool "Address-space layout randomization" # bool "Address-space layout randomization"
default y # default y
#
config SET_PAX # config SET_PAX
bool "PaX-aware ELF executables and kernel" # bool "PaX-aware ELF executables and kernel"
default y # default y
#
config SET_HARDENED_TMP # config SET_HARDENED_TMP
bool "Hardened temporary files creation" # bool "Hardened temporary files creation"
default y # default y
#
config SET_WARNINGS # config SET_WARNINGS
bool "Additional warnings" # bool "Additional warnings"
default y # default y
#
config SET_MISC # config SET_MISC
bool "Miscellaneous features" # bool "Miscellaneous features"
default y # default y
#
config SET_BLOWFISH # config SET_BLOWFISH
bool "Blowfish passwords" # bool "Blowfish passwords"
default y # default y
endmenu # endmenu
config SSP config SSP
depends on SET_SSP depends on SET_SSP

View file

@ -31,8 +31,9 @@ inline_doc
# BOOK Settings by book # BOOK Settings by book
local -r LFS_book="$BOOK_common BLFS_TOOL" local -r LFS_book="$BOOK_common BLFS_TOOL"
local -r HLFS_added="SET_SSP SET_ASLR SET_PAX SET_HARDENED_TMP SET_WARNINGS \ #local -r HLFS_added="SET_SSP SET_ASLR SET_PAX SET_HARDENED_TMP SET_WARNINGS \
SET_MISC SET_BLOWFISH" # SET_MISC SET_BLOWFISH"
local -r HLFS_added=""
local -r HLFS_book="$BOOK_common BLFS_TOOL MODEL KERNEL GRSECURITY_HOST $HLFS_added" local -r HLFS_book="$BOOK_common BLFS_TOOL MODEL KERNEL GRSECURITY_HOST $HLFS_added"
local -r CLFS_book="$BOOK_common BLFS_TOOL METHOD $BOOK_clfsX TARGET32 BOOT_CONFIG" local -r CLFS_book="$BOOK_common BLFS_TOOL METHOD $BOOK_clfsX TARGET32 BOOT_CONFIG"
local -r CLFS2_book="$BOOK_common BLFS_TOOL $BOOK_clfsX" local -r CLFS2_book="$BOOK_common BLFS_TOOL $BOOK_clfsX"