r176 - in trunk/text: chapter03 chapter05 chapter05/06-libc chapter06 chapter06/10-libc chapter07

robert at linuxfromscratch.org robert at linuxfromscratch.org
Sat Feb 12 14:56:44 PST 2005


Author: robert
Date: 2005-02-12 15:56:42 -0700 (Sat, 12 Feb 2005)
New Revision: 176

Modified:
   trunk/text/chapter03/patches.txt
   trunk/text/chapter05/02-kernel-headers.txt
   trunk/text/chapter05/06-libc/06-glibc.txt
   trunk/text/chapter05/06-libc/06-uclibc.txt
   trunk/text/chapter06/08-kernel-headers.txt
   trunk/text/chapter06/10-libc/10-glibc.txt
   trunk/text/chapter06/10-libc/10-uclibc.txt
   trunk/text/chapter07/02-bootscripts.txt
   trunk/text/chapter07/10-kernel.txt
Log:
Added arc4random

Modified: trunk/text/chapter03/patches.txt
===================================================================
--- trunk/text/chapter03/patches.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter03/patches.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -3,7 +3,7 @@
 http://www.linuxfromscratch.org/patches/downloads/hlfs/binutils-2.15.94.0.2-hardened_cflags-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/binutils-2.15.94.0.2-pt_pax-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/binutils-2.15.94.0.2-uClibc_conf-1.patch
-http://www.linuxfromscratch.org/patches/downloads/hlfs/blfs-bootscripts-hlfs-2.patch
+http://www.linuxfromscratch.org/patches/downloads/hlfs/blfs-bootscripts-20041227-hlfs-2.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/bzip2-1.0.2-hardened_cflags-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/coreutils-5.2.1-suppress_uptime_kill_su-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/expect-5.42.1-spawn-1.patch
@@ -18,18 +18,19 @@
 http://www.linuxfromscratch.org/patches/downloads/hlfs/gcc-3.4.3-uClibc_conf-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/gcc-3.4.3-uClibc_libstdc++-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/gcc-3.4.3-uClibc_locale-1.patch
+http://www.linuxfromscratch.org/patches/downloads/hlfs/glibc-2.3.4-arc4random-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/glibc-2.3.4-dl_execstack_PaX-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/glibc-2.3.4-fstack_protector-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/glibc-2.3.4-pt_pax-1.patch
-http://www.linuxfromscratch.org/patches/downloads/hlfs/glibc-2.3.4-ssp_frandom-6.patch
+http://www.linuxfromscratch.org/patches/downloads/hlfs/glibc-2.3.4-ssp_arc4random-1.patch
 http://grsecurity.net/grsecurity-2.1.1-2.6.10-as2-200501242254.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/inetutils-1.4.2-kernel_headers-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/inetutils-1.4.2-no_server_man_pages-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/iproute2-2.6.9_ss040831-find_update-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/iproute2-2.6.9_ss040831-remove_db-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/lfs-bootscripts-3.1.0-hlfs-2.patch
-http://www.linuxfromscratch.org/patches/downloads/hlfs/linux-2.6.10-frandom-1.patch
-http://www.linuxfromscratch.org/patches/downloads/hlfs/linux-libc-headers-2.6-frandom-2.patch
+http://www.linuxfromscratch.org/patches/downloads/hlfs/linux-2.6.10-pseudo_random-1.patch
+http://www.linuxfromscratch.org/patches/downloads/hlfs/linux-libc-headers-2.6.10.0-pseudo_random-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/mktemp-1.5-add_tempfile-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/module-init-tools-3.1-nostatic-1.patch
 http://www.acm.rpi.edu/~dilinger/patches/2.6.10/as3/patch-2.6.10-as3.gz
@@ -39,7 +40,7 @@
 http://www.linuxfromscratch.org/patches/downloads/hlfs/readline-5.0-fixes-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/shadow-4.0.7-uClibc-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/uClibc-0.9.27-config-1.patch
-http://www.linuxfromscratch.org/patches/downloads/hlfs/uClibc-0.9.27-ssp-2.patch
+http://www.linuxfromscratch.org/patches/downloads/hlfs/uClibc-0.9.27-arc4random-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/util-linux-2.12q-fPIC-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/util-linux-2.12q-cramfs-1.patch
 http://www.linuxfromscratch.org/patches/downloads/hlfs/util-linux-2.12q-hardened_cflags-1.patch

Modified: trunk/text/chapter05/02-kernel-headers.txt
===================================================================
--- trunk/text/chapter05/02-kernel-headers.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter05/02-kernel-headers.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -5,7 +5,7 @@
 # something else depending on the version of Patch.
 
 patch --no-backup-if-mismatch -Np1 -i \
-	../linux-libc-headers-2.6-frandom-2.patch &&
+	../linux-libc-headers-2.6.10.0-pseudo_random-1.patch &&
 install -d /tools/include &&
 cp -R include/asm-i386 /tools/include/asm &&
 cp -R include/linux /tools/include

Modified: trunk/text/chapter05/06-libc/06-glibc.txt
===================================================================
--- trunk/text/chapter05/06-libc/06-glibc.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter05/06-libc/06-glibc.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -7,7 +7,8 @@
 # patch. The dl_execstack_PaX patch fixes a problem with the dynamic loader,
 # which is needed for system running PaX kernels.
 
-patch -Np1 -i ../glibc-2.3.4-ssp_frandom-6.patch &&
+patch -Np1 -i ../glibc-2.3.4-arc4random-1.patch &&
+patch -Np1 -i ../glibc-2.3.4-ssp_arc4random-1.patch &&
 patch -Np1 -i ../glibc-2.3.4-pt_pax-1.patch &&
 patch -Np1 -i ../glibc-2.3.4-dl_execstack_PaX-1.patch
 

Modified: trunk/text/chapter05/06-libc/06-uclibc.txt
===================================================================
--- trunk/text/chapter05/06-libc/06-uclibc.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter05/06-libc/06-uclibc.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -1,15 +1,15 @@
 - Chapter 5 - Installing uClibc 0.9.27
 
-# The configuration of uClibc does not provide a way to define HAVE_DEV_ERANDOM
-# to use erandom. This patch removes the 'ifdef' lines so it will use erandom.
+# This patch adds the arc4random() function to uClibc, and hooks for mktemp(3)
+# and SSP to use it.
 
-patch -Np1 -i ../uClibc-0.9.27-ssp-2.patch
+patch -Np1 -i ../uClibc-0.9.27-arc4random-1.patch
 
-# This patch adds a generic config file. The key features to switch on are PIC
-# and SSP. This will build with standard features. In chapter 6 you will be
-# able to configure uClibc to your more specific needs.
+# This patch adds a generic config file. The key features to switch on are PIC,
+# arc4random, and SSP. This will build with standard features. In chapter 6 you
+# will be able to configure uClibc to your more specific needs.
 
-patch -Np1 -i ../uClibc-0.9.27-config-1.patch
+patch -Np1 -i ../uClibc-0.9.27-config-2.patch
 
 # UClibc uses the -Os optimization to reduce size. The following command
 # will remove this so uClibc uses -O2 instead to optimize for speed.

Modified: trunk/text/chapter06/08-kernel-headers.txt
===================================================================
--- trunk/text/chapter06/08-kernel-headers.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter06/08-kernel-headers.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -1,7 +1,7 @@
 - Chapter 5 - Installing linux-libc-headers 2.6.10.0
 
 patch --no-backup-if-mismatch -Np1 -i \
-        ../linux-libc-headers-2.6-frandom-2.patch &&
+        ../linux-libc-headers-2.6.10.0-pseudo_random-1.patch &&
 cp -R include/asm-i386 /usr/include/asm &&
 cp -R include/linux /usr/include &&
 chown -R root:root /usr/include/{asm,linux} &&

Modified: trunk/text/chapter06/10-libc/10-glibc.txt
===================================================================
--- trunk/text/chapter06/10-libc/10-glibc.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter06/10-libc/10-glibc.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -22,8 +22,9 @@
 # http://sources.redhat.com/ml/libc-alpha/2004-03/msg00075.html
 # http://elfsh.segfault.net/papers/elf-rtld.txt
 
+patch -Np1 -i ../glibc-2.3.4-arc4random-1.patch &&
+patch -Np1 -i ../glibc-2.3.4-ssp_arc4random-1.patch &&
 patch -Np1 -i ../glibc-2.3.4-fstack_protector-1.patch &&
-patch -Np1 -i ../glibc-2.3.4-ssp_frandom-6.patch &&
 patch -Np1 -i ../glibc-2.3.4-pt_pax-1.patch &&
 patch -Np1 -i ../glibc-2.3.4-dl_execstack_PaX-1.patch &&
 mkdir ../glibc-build &&
@@ -74,6 +75,10 @@
 make -C ../glibc-2.3.4/linuxthreads/man &&
 make -C ../glibc-2.3.4/linuxthreads/man install
 
+# And the man page for arc4random().
+
+install -m644 ../glibc-2.3.4/manual/arc4random.3 /usr/share/man/man3
+
 # Create the nsswitch configuration file.
 
 cat > /etc/nsswitch.conf << "EOF"

Modified: trunk/text/chapter06/10-libc/10-uclibc.txt
===================================================================
--- trunk/text/chapter06/10-libc/10-uclibc.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter06/10-libc/10-uclibc.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -1,8 +1,8 @@
 - Chapter 6 - Installing uClibc 0.9.27
 
-# First patch the ssp.c file.
+# First patch to add arc4random.
 
-patch -Np1 -i ../uClibc-0.9.27-ssp-2.patch
+patch -Np1 -i ../uClibc-0.9.27-arc4random-1.patch
 
 # Change the default optimization option so it uses -O2.
 

Modified: trunk/text/chapter07/02-bootscripts.txt
===================================================================
--- trunk/text/chapter07/02-bootscripts.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter07/02-bootscripts.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -15,7 +15,7 @@
 # Then unpack blfs-bootscripts. The patch adds frandom to random's start
 # command. Then install the random seed script.
 
-patch -Np1 -i ../blfs-bootscripts-hlfs-2.patch &&
+patch -Np1 -i ../blfs-bootscripts-20041227-hlfs-2.patch &&
 make install-random
 
 # This is also a good time to create a random-seed file so it is

Modified: trunk/text/chapter07/10-kernel.txt
===================================================================
--- trunk/text/chapter07/10-kernel.txt	2005-02-12 22:24:55 UTC (rev 175)
+++ trunk/text/chapter07/10-kernel.txt	2005-02-12 22:56:42 UTC (rev 176)
@@ -22,7 +22,7 @@
 # which patches and versions are being used. Grsecurity patches against the
 # 'as' kernel tree.
 
-install -m444 /sources/hlfs-packages/linux-2.6.10-frandom-1.patch /usr/src &&
+install -m444 /sources/linux-2.6.10-pseudo_random-1.patch /usr/src &&
 install -m444 \
 	/sources/hlfs-packages/patch-2.6.10-as3.gz /usr/src &&
 gunzip /usr/src/patch-2.6.10-as3.gz &&
@@ -33,7 +33,7 @@
 # Then change to the Linux source directory and apply the patch.
 
 cd /usr/src/linux &&
-patch -Np1 -i ../linux-2.6.10-frandom-1.patch &&
+patch -Np1 -i ../linux-2.6.10-pseudo_random-1.patch &&
 patch -Np1 -i ../patch-2.6.10-as3
 
 # This grsecurity patch is made for as2, and we are using as3. One hunk will




More information about the hlfs-dev mailing list