diff --git a/Makefile b/Makefile index 70675e9bb..f1498857b 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,7 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ stylesheets/md5sum.xsl \ $(RENDERTMP)/sysv-md5sum.xml $(Q)sed -i -e \ - "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \ + "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \ $(BASEDIR)/md5sums #dump-commands: validate diff --git a/aux-file-data.sh b/aux-file-data.sh index f13f6d044..8be1b1d15 100755 --- a/aux-file-data.sh +++ b/aux-file-data.sh @@ -10,8 +10,8 @@ FILE=$1 ./make-aux-files.sh # Bootscript data -bootscripts=$(ls lfs-bootscripts*.bz2) -base=$(basename $bootscripts .tar.bz2) +bootscripts=$(ls lfs-bootscripts*.xz) +base=$(basename $bootscripts .tar.xz) bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ") bootmd5=$(md5sum $bootscripts | cut -f1 -d" ") diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index bd8bf5a0e..d5bb8b75c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,53 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2019-06-24 + + + [renodr] - Fixed issue with installing Check's documentation + in a verisoned directory. Thanks goes to Ryan Marsaw for the report. + This was fixed be removing the unrecognized/unused --docdir + and replacing it with a "docdir=" in the make install command. + + + + + + 2019-06-16 + + + [bdubbs] - Properly initialize a data structure in + OpenSSL to avoid valgrind uninitialized value errors. Fixes + #4491. + + + [bdubbs] - Update to meson-0.51.0. Fixes + #4483. + + + [bdubbs] - Update to gawk-5.0.1. Fixes + #4486. + + + [bdubbs] - Update to expat-2.2.7. Fixes + #4488. + + + [bdubbs] - Update to linux-5.1.15. Fixes + #4487. + + + [bdubbs] - Update to sysvinit-2.95. Fixes + #4484. + + + [bdubbs] - Update to bzip2-1.0.7. Fixes + #4490. + + + + 2019-06-18 @@ -70,7 +117,7 @@ [bdubbs] - Update to linux-5.1.10. Fixes #4478. - + [bdubbs] - Update to less-551. Fixes #4477. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 86e79246c..1cd1766b2 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -50,9 +50,9 @@ Bison-&bison-version; - + @@ -74,9 +74,9 @@ Eudev-&eudev-version; - + diff --git a/chapter06/check.xml b/chapter06/check.xml index 5374de5c1..739af9803 100644 --- a/chapter06/check.xml +++ b/chapter06/check.xml @@ -42,8 +42,7 @@ Prepare Check for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/check-&check-version; +./configure --prefix=/usr Build the package: @@ -59,7 +58,7 @@ Install the package and fix a script: -make install + make docdir=/usr/share/doc/check-&check-version; install sed -i '1 s/tools/usr/' /usr/bin/checkmk diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml index 8a040ad84..d37d598f3 100644 --- a/chapter06/libtool.xml +++ b/chapter06/libtool.xml @@ -50,7 +50,7 @@ make - To test the results (about 11.0 SBU), issue: +To test the results, issue: make check diff --git a/chapter06/openssl.xml b/chapter06/openssl.xml index 64ab29d7b..6d55a0552 100644 --- a/chapter06/openssl.xml +++ b/chapter06/openssl.xml @@ -43,6 +43,11 @@ Installation of OpenSSL + First, fix a problem identified upstream: + +sed -i '/\} data/s/ =.*$/;\n memset(\&data, 0, sizeof(data));/' \ + crypto/rand/rand_lib.c + Prepare OpenSSL for compilation: ./config --prefix=/usr \ diff --git a/general.ent b/general.ent index abe9d2187..8fd1345d4 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/lfs-bootscripts-20190524.tar.xz b/lfs-bootscripts-20190524.tar.xz new file mode 100644 index 000000000..0315fce62 Binary files /dev/null and b/lfs-bootscripts-20190524.tar.xz differ diff --git a/make-aux-files.sh b/make-aux-files.sh index fbec73302..ad8bcea6f 100755 --- a/make-aux-files.sh +++ b/make-aux-files.sh @@ -1,13 +1,13 @@ #!/bin/bash -rm -f lfs-bootscripts*.tar.bz2 +rm -f lfs-bootscripts*.tar.?z* # Get base file name and move bootscripts directory to that name version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2` mv bootscripts lfs-bootscripts-$version # Create the tarball and clean up -tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version +tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version mv lfs-bootscripts-$version bootscripts #rm -f udev-config*.bz2 diff --git a/packages.ent b/packages.ent index 234efcb97..3aeb2fd5f 100644 --- a/packages.ent +++ b/packages.ent @@ -80,10 +80,10 @@ - - + + - + @@ -167,10 +167,10 @@ - - - - + + + + @@ -212,10 +212,10 @@ - - + + - + @@ -391,7 +391,7 @@ - + @@ -431,12 +431,12 @@ - + - + - + - +