From a90bdb602597a99a5646d8de13fd92b47e5fcb12 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Sat, 4 Oct 2014 19:45:14 +0000 Subject: Import trunk. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10770 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- INSTALL | 2 +- chapter01/changelog.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++-- chapter01/whatsnew.xml | 21 +++++++++++++++++---- chapter03/introduction.xml | 2 +- chapter03/patches.xml | 8 ++++++++ chapter06/glibc.xml | 23 +++++++++-------------- chapter06/grub.xml | 4 ---- chapter06/man-db.xml | 4 ---- chapter06/perl.xml | 4 ++++ packages.ent | 18 +++++++++--------- patches.ent | 10 +++++++--- 11 files changed, 101 insertions(+), 42 deletions(-) diff --git a/INSTALL b/INSTALL index 4e744b671..a67f53496 100644 --- a/INSTALL +++ b/INSTALL @@ -41,7 +41,7 @@ If you want to convert the XML to PDF, install the items listed above (except lynx) and then install the following: * JDK - - http://www.linuxfromscratch.org/blfs/view/svn/general/jdk.html + - http://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html * FOP and JAI - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index bb2d86cb3..4c4c13881 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,12 +35,55 @@ --> + + 2014-10-02 + + + [bdubbs] - Added perl patch to fix CVE-2014-4330. + to prevent infinite recursion in Data::Dumper. Fixes + #3681. + + + [bdubbs] - Update to grub-2.02~beta2. It's been + in beta for over 9 months and a 'stable' does not seem + to be forthcoming. Fixes + #3450. + + + [bdubbs] - Update glibc tests known to sometimes fail. + + + + + + 2014-09-29 + + + [bdubbs] - Update bash upstream patches and added fixes for + CVE-2014-6271, CVE-2014-7169, and CVE-2014-7187 (through upstream + patch bash43-027). + + + [bdubbs] - Update to tzdata-2014h. Fixes + #3682. + + + [bdubbs] - Update to man-db-2.7.0.2. Fixes + #3683. + + + [bdubbs] - Improved wget command line in Section 3.1. Fixes + #3684. + + + + 2014-09-26 - [krejzi] - Updated bash upstream patches - and added fixes for CVE-2014-7169. Fixes [krejzi] - Updated bash upstream patches and added fixes for + CVE-2014-7169. Fixes #3680. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 5d79026fc..bf16c4fe6 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -109,9 +109,9 @@ - + @@ -205,9 +205,9 @@ - + @@ -237,11 +237,24 @@ Added: + + + &bash-fixes-patch; + + + + &perl-fix-patch; + Removed: + + + bash-4.3-upstream_fixes-3.patch + + diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index cbe8a31a4..3c4f26452 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -53,7 +53,7 @@ wget-list as an input to wget. For example: -wget -i wget-list -P $LFS/sources +wget --input-file=wget-list --continue --directory-prefix=$LFS/sources Additionally, starting with LFS-7.0, there is a separate file, md5sums, which can be used to verify that all diff --git a/chapter03/patches.xml b/chapter03/patches.xml index edbfa3fb9..7636fbe3d 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -116,6 +116,14 @@ + + Perl Data::Dumper Patch - &perl-fix-patch-size;: + + Download: + MD5 sum: &perl-fix-patch-md5; + + + Readline Upstream Fixes Patch - &readline-fixes-patch-size;: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index a881ffa57..7e2287706 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -115,15 +115,11 @@ cd ../glibc-build issues seen for this version of LFS: - - Other tests known to fail on some architectures are posix/bug-regex32, - misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, nptl/tst-robust8, - and stdio-common/bug22. + Other tests known to fail on some architectures are + malloc/tst-malloc-usable and nptl/tst-cleanupx4. ---> + Though it is a harmless message, the install stage of Glibc will diff --git a/chapter06/grub.xml b/chapter06/grub.xml index 7941debd6..545508dcb 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -40,10 +40,6 @@ Installation of GRUB - Fix an incompatibility between this package and Glibc-&glibc-version;: - -sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h - Prepare GRUB for compilation: ./configure --prefix=/usr \ diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 24f3f697a..503c9c07a 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -41,10 +41,6 @@ Installation of Man-DB - Disable two tests that fail: - -sed -i 's/mandb-2 mandb-3 mandb-4/mandb-3/' src/tests/Makefile.in - Prepare Man-DB for compilation: ./configure --prefix=/usr \ diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 443c4c5ac..c7bc8963e 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -56,6 +56,10 @@ export BUILD_ZLIB=False export BUILD_BZIP2=0 + Fix a potential security problem: + +patch -Np1 -i ../&perl-fix-patch; + To have full control over the way Perl is set up, you can remove the -des options from the following command and hand-pick the way this package is built. Alternatively, use the command exactly as below to diff --git a/packages.ent b/packages.ent index d5bb4bd76..9510724da 100644 --- a/packages.ent +++ b/packages.ent @@ -275,10 +275,10 @@ - - - - + + + + @@ -413,10 +413,10 @@ - + - + @@ -562,10 +562,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index ed4f69505..cbc0e58d7 100644 --- a/patches.ent +++ b/patches.ent @@ -2,9 +2,9 @@ - - - + + + @@ -53,6 +53,10 @@ + + + + -- cgit v1.2.3-54-g00ecf