From f30e3ce9a7677ec07fb85dd5fc1e7f8bdff20e41 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Fri, 6 Mar 2015 13:43:40 +0000 Subject: Merged trunk. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10866 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 36 ++++++ chapter05/glibc.xml | 6 + chapter06/coreutils.xml | 2 +- chapter06/e2fsprogs.xml | 6 + chapter06/glibc.xml | 8 +- chapter06/grep.xml | 4 + chapter06/util-linux.xml | 36 +++++- chapter08/grub.xml | 4 +- packages.ent | 278 +++++++++++++++++++++++------------------------ prologue/hostreqs.xml | 5 + 10 files changed, 240 insertions(+), 145 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4df3b4c8e..86c4cfedc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,42 @@ --> + + 2015-03-03 + + + [bdubbs] - Add a sed to fix an upstream security issue + in e2fsprogs. Fixes + #3759. + + + [bdubbs] - Add a sed to fix an upstream security issue + in grep. Fixes + #3760. + + + + + + 2015-02-25 + + + [bdubbs] - Add texinfo-4.7 or later to host system requirements. Fixes + #3756. + + + + + + 2015-02-23 + + + [bdubbs] - Add a fix to glibc for 32-bit architectures. Fixes + #3755. + + + + 2015-02-19 diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 445c0c6c1..974a7292f 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -52,6 +52,12 @@ su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc' fi + Fix a regression in the package that affects 32-bit architectures: + +sed -e '/ia32/s/^/1:/' \ + -e '/SSE2/s/^1://' \ + -i sysdeps/i386/i686/multiarch/mempcpy_chk.S + The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 003ddf9ff..7721830ad 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -53,7 +53,7 @@ later than all other files to prevent a make error: -patch -Np1 -i ../&coreutils-i18n-patch; && +patch -Np1 -i ../&coreutils-i18n-patch; touch Makefile.in diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 7aa781254..071fb147e 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -44,6 +44,12 @@ Installation of E2fsprogs + First, fix a potential security issue identified upstream: + +sed -e '/int.*old_desc_blocks/s/int/blk64_t/' \ + -e '/if (old_desc_blocks/s/super->s_first_meta_bg/desc_blocks/' \ + -i lib/ext2fs/closefs.c + The E2fsprogs documentation recommends that the package be built in a subdirectory of the source tree: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index aa7a0f986..bd68a6075 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -68,6 +68,12 @@ Glibc autoconf tests would give false results and defeat the goal of achieving a clean build. + Fix a regression in the package that affects 32-bit architectures: + +sed -e '/ia32/s/^/1:/' \ + -e '/SSE2/s/^1://' \ + -i sysdeps/i386/i686/multiarch/mempcpy_chk.S + The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: @@ -149,7 +155,7 @@ cd ../glibc-build --> Other tests known to fail on some architectures are - malloc/tst-malloc-usable and nptl/tst-cleanupx4. + malloc/tst-malloc-usable and nptl/tst-cleanupx4. diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 58b0db366..126b65182 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -40,6 +40,10 @@ Installation of Grep + First fix a potential security issue identified upstream: + +sed -i -e '/tp++/a if (ep <= tp) break;' src/kwset.c + Prepare Grep for compilation: ./configure --prefix=/usr --bindir=/bin diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 9f0bd00d4..54cb943ae 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -126,8 +126,9 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel, swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul, umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis, - wipefs, and x86_64 - libblkid.{a,so}, libmount.{a,so}, and libuuid.{a,so} + wipefs, x86_64, and zramctl + libblkid.{a,so}, libfdisk.{a,so}, libmount.{a,so}, + libsmartcols.{a,so}, and libuuid.{a,so} /etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, and /var/lib/hwclock @@ -1149,6 +1150,17 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" + + zramctl + + A program to set up and control zram (compressed ram disk) + devices + + zramctl + + + + libblkid @@ -1160,6 +1172,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" + + libfdisk + + Contains routines for manipulating partition tables + + libfdisk + + + + libmount @@ -1171,6 +1193,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" + + libsmartcols + + Contains routines for aiding screen output in tabular form + + libsmartcols + + + + libuuid diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 35ab56aa2..4fb89ab3f 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -34,8 +34,8 @@ url="&blfs-book;multimedia/libisoburn.html"> libisoburn package. -cd /tmp && -grub-mkrescue --output=grub-img.iso && +cd /tmp +grub-mkrescue --output=grub-img.iso xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso diff --git a/packages.ent b/packages.ent index 9d7794677..da588b24a 100644 --- a/packages.ent +++ b/packages.ent @@ -11,7 +11,7 @@ - + @@ -19,16 +19,16 @@ - - + + - - + + @@ -36,53 +36,53 @@ - - + + - + - - + + - - + + - + - - - - + + + + - - + + - + @@ -92,7 +92,7 @@ - + @@ -100,10 +100,10 @@ - - - - + + + + @@ -118,7 +118,7 @@ - + @@ -126,10 +126,10 @@ - + - - + +