From f5e821c9ec8417651988c3ce6020708a8cccae9c Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 11 Aug 2015 20:56:26 +0000 Subject: [PATCH] Update to procps-ng-3.3.11. Update to man-pages-4.02. Update to ncurses-6.0. Update to glibc-2.22. Update to linux-4.1.5. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10936 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 26 ++++++++++++++ chapter01/whatsnew.xml | 22 ++++-------- chapter03/patches.xml | 78 +---------------------------------------- chapter05/glibc.xml | 31 ---------------- chapter05/ncurses.xml | 5 --- chapter06/glibc.xml | 16 --------- chapter06/ncurses.xml | 7 +--- chapter06/procps.xml | 5 ++- general.ent | 4 +-- packages.ent | 30 ++++++++-------- patches.ent | 2 ++ 11 files changed, 56 insertions(+), 170 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 67ea98eb4..dc2ab5006 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,32 @@ --> + + 2015-08-11 + + + [bdubbs] - Update to procps-ng-3.3.11. Fixes + #3829. + + + [bdubbs] - Update to man-pages-4.02. Fixes + #3828. + + + [bdubbs] - Update to ncurses-6.0. Fixes + #3827. + + + [bdubbs] - Update to glibc-2.22. Fixes + *3826. + + + [bdubbs] - Update to linux-4.1.5. Fixes + *3825. + + + + 2015-08-03 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 0eaffa6a6..fbaeda3d8 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -94,9 +94,9 @@ Gettext &gettext-version; - + @@ -169,9 +169,9 @@ MPFR &mpfr-version; - + Patch &patch-version; @@ -181,9 +181,9 @@ - + @@ -247,17 +247,9 @@ &bash-fixes-patch; - - - Tcl-core-&tcl-version; - - &ncurses-gcc5-buildfixes-patch; + Tcl-core-&tcl-version; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 71315293a..f0e6724d6 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -33,31 +33,7 @@ MD5 sum: &bc-memory-leak-patch-md5; - Bzip2 Documentation Patch - &bzip2-docs-patch-size;: @@ -73,34 +49,6 @@ MD5 sum: &coreutils-i18n-patch-md5; - - - - Glibc FHS Patch - &glibc-fhs-patch-size;: @@ -117,14 +65,6 @@ Ncurses GCC 5 Fixes Patch - &ncurses-gcc5-buildfixes-patch-size;: @@ -132,14 +72,6 @@ MD5 sum: &ncurses-gcc5-buildfixes-patch-md5; - Readline Upstream Fixes Patch - &readline-fixes-patch-size;: @@ -156,15 +88,7 @@ MD5 sum: &sysvinit-consolidated-patch-md5; - + Total size of these patches: about diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 9916b4fb2..ecbefa16a 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -43,42 +43,11 @@ Installation of Glibc - - 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: mkdir -v ../glibc-build cd ../glibc-build - Next, prepare Glibc for compilation: diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml index 336172b59..a18a9c819 100644 --- a/chapter05/ncurses.xml +++ b/chapter05/ncurses.xml @@ -43,11 +43,6 @@ Installation of Ncurses - First, apply a patch to prevent a build failure - when building with GCC 5: - -patch -Np1 -i ../&ncurses-gcc5-buildfixes-patch; - Prepare Ncurses for compilation: ./configure --prefix=/tools \ diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 74a32b8de..2bbbf22b4 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -68,22 +68,6 @@ 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 - - Fix a potential security issue identified upstream: - -sed -i '/glibc.*pad/{i\ buflen = buflen > pad ? buflen - pad : 0; - s/ + pad//}' resolv/nss_dns/dns-host.c - - Fix a test case that fails when built using GCC 5: - -sed -e '/tst-audit2-ENV/i CFLAGS-tst-audit2.c += -fno-builtin' \ - -i elf/Makefile - The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index c82bfa5e0..ed4ff2560 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -41,11 +41,6 @@ Installation of Ncurses - First, apply a patch to prevent a build failure - when building with GCC 5: - -patch -Np1 -i ../&ncurses-gcc5-buildfixes-patch; - Don't install a static library that is not handled by configure: sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in @@ -113,7 +108,7 @@ /lib directory, where they are expected to reside: -mv -v /usr/lib/libncursesw.so.5* /lib +mv -v /usr/lib/libncursesw.so.6* /lib Because the libraries have been moved, one symlink points to a non-existent file. Recreate it: diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 7baf9d7cc..71c0e0b04 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -76,11 +76,10 @@ make check make install -Finally, move essential files to a location that can be found if +Finally, move essential libraries to a location that can be found if /usr is not mounted. -mv -v /usr/bin/pidof /bin -mv -v /usr/lib/libprocps.so.* /lib +mv -v /usr/lib/libprocps.so.* /lib ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so diff --git a/general.ent b/general.ent index b88c9485e..7cc27b13c 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ - + - + diff --git a/packages.ent b/packages.ent index 9a5110554..0cfec3d04 100644 --- a/packages.ent +++ b/packages.ent @@ -229,10 +229,10 @@ - - + + - + @@ -382,12 +382,12 @@ - + - + - + +