diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 59ebfd16b..8adf96f60 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,24 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2021-08-02 + + + [bdubbs] - Update to glibc-2.34. Fixes + #4897. + + + [bdubbs] - Update to diffutils-3.8. Fixes + #4898. + + + [bdubbs] - Update to libcap-2.52. Fixes + #4899. + + + + 2021-08-01 @@ -61,7 +79,6 @@ - 2021-07-27 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 832f45a46..1445f30d8 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -69,9 +69,9 @@ - + E2fsprogs-&e2fsprogs-version; @@ -105,9 +105,9 @@ - + diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index d715d43cd..37a222bd1 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -62,10 +62,6 @@ esac patch -Np1 -i ../glibc-&glibc-version;-fhs-1.patch - Fix a build issue with gcc-11.1: - -sed 's/amx_/amx-/' -i sysdeps/x86/tst-cpu-features-supports.c - The Glibc documentation recommends building Glibc in a dedicated build directory: @@ -127,17 +123,6 @@ cd build - - - - This disables x86 ISA needed property in - Glibc libraries. Use it if - you are building Glibc with option in - CFLAGS, to workaround an issue in Glibc-2.33 - breaking it. - - - During this stage the following warning might appear: diff --git a/chapter07/texinfo.xml b/chapter07/texinfo.xml index af7d5ab30..b67d0ab46 100644 --- a/chapter07/texinfo.xml +++ b/chapter07/texinfo.xml @@ -43,6 +43,11 @@ Installation of Texinfo + First, fix an issue building the package with Glibc-2.34 or later: + +sed -e 's/__attribute_nonnull__/__nonnull/' \ + -i gnulib/lib/malloc/dynarray-skeleton.c + Prepare Texinfo for compilation: ./configure --prefix=/usr diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index e39efd95f..2935c84af 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -50,15 +50,6 @@ patch -Np1 -i ../&glibc-fhs-patch; - Fix a bug that causes issues with chrooted applications: - - sed -e '402a\ *result = local->data.services[database_index];' \ - -i nss/nss_database.c - - Fix a build issue with gcc-11.1: - -sed 's/amx_/amx-/' -i sysdeps/x86/tst-cpu-features-supports.c - The Glibc documentation recommends building Glibc in a dedicated build directory: @@ -126,17 +117,6 @@ cd build - - - - This disables x86 ISA needed property in - Glibc libraries. Use it if - you are building Glibc with option in - CFLAGS, to workaround an issue in Glibc-2.33 - breaking it. - - - Compile the package: @@ -179,14 +159,6 @@ esac is known to fail in the LFS chroot environment. - - - elf/tst-cpu-features-cpuinfo - will fail on non-intel CPUs with this version of glibc. - - The nss/tst-nss-files-hosts-multi test may fail for reasons that have not been determined. @@ -504,14 +476,15 @@ mkdir -pv /etc/ld.so.conf.d ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd, pcprofiledump, pldd, sln, sotruss, sprof, tzselect, xtrace, zdump, and zic - ld-&glibc-version;.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so}, + ld-linux-x86-64.so.2, ld-linux.so.2, + libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so}, libc.{a,so}, libc_nonshared.a, - libcrypt.{a,so}, libdl.{a,so}, libg.a, libm.{a,so}, - libmcheck.a, libmemusage.so, libmvec.{a,so}, libnsl.{a,so}, + libcrypt.{a,so}, libdl.{a,so.2}, libg.a, libm.{a,so}, + libmcheck.a, libmemusage.so, libmvec.{a,so}, libnsl.so.1, libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so, - libpcprofile.so, libpthread.{a,so}, - libpthread_nonshared.a, libresolv.{a,so}, librt.{a,so}, - libthread_db.so, and libutil.{a,so} + libpcprofile.so, libpthread.{a,so.0}, + libresolv.{a,so}, librt.{a,so.1}, + libthread_db.so, and libutil.{a,so.1} /usr/include/arpa, /usr/include/bits, /usr/include/gnu, /usr/include/net, /usr/include/netash, /usr/include/netatalk, /usr/include/netax25, /usr/include/neteconet, /usr/include/netinet, @@ -768,7 +741,7 @@ mkdir -pv /etc/ld.so.conf.d - ld-&glibc-version;.so + ld-*.so The helper program for shared library executables @@ -834,7 +807,9 @@ mkdir -pv /etc/ld.so.conf.d libdl - The dynamic linking interface library + Dummy library containing no functions. Previously was the + dynamic linking interface library, whose functions are now in + libc libdl @@ -886,7 +861,7 @@ mkdir -pv /etc/ld.so.conf.d libnsl - The network services library + The network services library, now deprecated libnsl @@ -918,7 +893,10 @@ mkdir -pv /etc/ld.so.conf.d libpthread - The POSIX threads library + Dummy library containing no functions. Previously contained + functions providing most of the interfaces specified + by the POSIX.1b Realtime Extension, now the functions are in + libc libpthread @@ -961,8 +939,11 @@ mkdir -pv /etc/ld.so.conf.d libutil - Contains code for standard functions used in - many different Unix utilities + >Dummy library containing no functions. Previously contained + code for standard functions used in + many different Unix utilities. These functions are now in + libc + libutil diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml index f1eaa060d..9c162a86a 100644 --- a/chapter08/strippingagain.xml +++ b/chapter08/strippingagain.xml @@ -43,9 +43,14 @@ -save_usrlib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so - libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version; - libitm.so.&libitm-version; libatomic.so.&libatomic-version;" +save_usrlib="ld-linux-x86-64.so.2 + libc.so.6 + libpthread.so.6 + libthread_db.so + libquadmath.so.&libquadmath-version; + libstdc++.so.6 + libitm.so.&libitm-version; + libatomic.so.&libatomic-version;" cd /usr/lib @@ -59,10 +64,13 @@ for LIB in $save_usrlib; do done online_usrbin="bash find strip" -online_usrlib="libbfd-&binutils-version;.so libdl-&glibc-version;.so - libhistory.so.&readline-version; libncursesw.so.&ncurses-version; - libm-&glibc-version;.so libreadline.so.&readline-version; - libz.so.&zlib-version; +online_usrlib="libbfd.so + libdl.so.2 + libhistory.so + libncursesw.so + libm.so.6 + libreadline.so + libz.so $(cd /usr/lib; find libnss*.so* -type f)" for BIN in $online_usrbin; do diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml index 9cbbda6a6..2543cd14d 100644 --- a/chapter08/texinfo.xml +++ b/chapter08/texinfo.xml @@ -61,6 +61,12 @@ --> + + Again, fix an issue building the package with Glibc-2.34 or later: + +sed -e 's/__attribute_nonnull__/__nonnull/' \ + -i gnulib/lib/malloc/dynarray-skeleton.c + Compile the package: make diff --git a/packages.ent b/packages.ent index 76c26c89c..41cbc4c4f 100644 --- a/packages.ent +++ b/packages.ent @@ -130,10 +130,10 @@ - - + + - + @@ -258,10 +258,10 @@ - - + + - + @@ -394,10 +394,10 @@ - - + + - +