Changeset d035526

Timestamp:

06/04/2007 07:36:27 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

513b259

Parents:

c1f28d5

Message:

HLFS: Added support for additional build features.

Files:

• Config.in (modified) (1 diff)
• HLFS/hlfs.xsl (modified) (2 diffs)
• common/libs/func_book_parser (modified) (1 diff)
• common/libs/func_validate_configs.sh (modified) (1 diff)
• jhalfs (modified) (1 diff)

Config.in

@@ -397 +397 @@
                 default "2.6"           if KERNEL_26
                 default "2.4"           if KERNEL_24
+
+        menu    "HLFS Additional Features"
+                depends on BOOK_HLFS
+
+                config  SET_SSP
+                bool    "Stack-smashing protector"
+                default y
+
+                config  SET_ASLR
+                bool    "Address-space layout randomization"
+                default y
+
+                config  SET_PAX
+                bool    "PaX-aware ELF executables and kernel"
+                default y
+
+                config  SET_HARDENED_TMP
+                bool    "Hardened temporary files creation"
+                default y
+
+                config  SET_WARNINGS
+                bool    "Additional warnings"
+                default y
+
+                config  SET_MISC
+                bool    "Miscellaneous features"
+                default y
+
+                config  SET_BLOWFISH
+                bool    "Blowfish passwords"
+                default y
+        endmenu
+
+        config  SSP
+                depends on SET_SSP
+                string
+                default ",ssp,"
+
+        config  ASLR
+                depends on SET_ASLR
+                string
+                default ",aslr,"
+
+        config  PAX
+                depends on SET_PAX
+                string
+                default ",pax,"
+
+        config  HARDENED_TMP
+                depends on SET_HARDENED_TMP
+                string
+                default ",hardened_tmp,"
+
+        config  WARNINGS
+                depends on SET_WARNINGS
+                string
+                default ",warnings,"
+
+        config  MISC
+                depends on SET_MISC
+                string
+                default ",misc,"
+
+        config  BLOWFISH
+                depends on SET_BLOWFISH
+                string
+                default ",blowfish,"
         #--- End HLFS specific params
 

HLFS/hlfs.xsl

@@ -36 +36 @@
   -->
   <xsl:param name="bomb-testsuite" select="n"/>
+
+  <!-- Additional features -->
+  <xsl:param name="features">,ssp,aslr,pax,hardened_tmp,warnings,misc,blowfish,</xsl:param>
 
   <!-- Time zone -->
@@ -150 +153 @@
     <xsl:if test="(@condition=$model or not(@condition)) and
                   (@vendor=$kernel or not(@vendor)) and
-                  child::* = userinput and not(@role = 'nodump')">
+                  child::* = userinput and (not(@role) or
+                  (@role and contains($features,concat(',',@role,','))))">
       <xsl:apply-templates select="userinput" mode="screen"/>
     </xsl:if>

common/libs/func_book_parser

@@ -126 +126 @@
                  --stringparam testsuite $TEST \
                  --stringparam bomb-testsuite $BOMB_TEST \
+                 --stringparam features $SSP$ASLR$PAX$HARDENED_TMP$WARNINGS$MISC$BLOWFISH \
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE \

common/libs/func_validate_configs.sh

@@ -32 +32 @@
   # BOOK Settings by book
   local -r   LFS_book="$BOOK_common BLFS_TOOL"
-  local -r  HLFS_book="$BOOK_common BLFS_TOOL MODEL KERNEL GRSECURITY_HOST"
+  local -r HLFS_added="SET_SSP SET_ASLR SET_PAX SET_HARDENED_TMP SET_WARNINGS \
+                       SET_MISC SET_BLOWFISH"
+  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 CLFS2_book="$BOOK_common BLFS_TOOL        $BOOK_clfsX"

jhalfs

@@ -112 +112 @@
 INSTALL_LOG=${INSTALL_LOG:-n}
 CLEAN=${CLEAN:=n}
+SET_SSP=${SET_SSP:=n}
+SET_ASLR=${SET_ASLR:=n}
+SET_PAX=${SET_PAX:=n}
+SET_HARDENED_TMP=${SET_HARDENED_TMP:=n}
+SET_WARNINGS=${SET_WARNINGS:=n}
+SET_MISC=${SET_MISC:=n}
+SET_BLOWFISH=${SET_BLOWFISH:=n}
 
 # Book surces envars