diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e4db1e6eb..1f6cbb39e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,22 @@ --> + + 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 diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 7d98d9008..974a7292f 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -52,7 +52,7 @@ su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc' fi - Fix is regression in the package that affects 32-bit architectures: + Fix a regression in the package that affects 32-bit architectures: sed -e '/ia32/s/^/1:/' \ -e '/SSE2/s/^1://' \ 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/eudev.xml b/chapter06/eudev.xml index 129d99d94..b9aca2c4c 100644 --- a/chapter06/eudev.xml +++ b/chapter06/eudev.xml @@ -62,8 +62,7 @@ BLKID_LIBS='-L/tools/lib -lblkid' \ --enable-keymap \ --disable-introspection \ --disable-gudev \ - --disable-gtk-doc-html \ - --with-firmware-path=/lib/firmware + --disable-gtk-doc-html Compile the package: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 1ba0e7c84..183b33c75 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -155,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/general.ent b/general.ent index 49fc0a39b..a222181d3 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ - + - +