Merge branch 'upgrade' into chapter8

2 files changed, 14 insertions, 14 deletions

diff --git a/packages.csv b/packages.csv
index f9303e5..a80088d 100644
--- a/packages.csv
+++ b/packages.csv
@@ -1,9 +1,9 @@
-acl,2.2.53,http://download.savannah.gnu.org/releases/acl/acl-@.tar.gz,007aabf1dbb550bcddde52a244cd1070
-attr,2.4.48,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,bc1e5cb5c96d99b24886f1f527d3bb3d
+acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.gz,95ce715fe09acca7c12d3306d0f076b2
+attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a084f0f83b8cace34211f64d8
 autoconf,2.71,http://ftp.gnu.org/gnu/autoconf/autoconf-@.tar.xz,12cfa1687ffa2606337efe1a64416106
 automake,1.16.3,http://ftp.gnu.org/gnu/automake/automake-@.tar.xz,c27f608a4e1f302ec7ce42f1251c184e
 bash,5.1,http://ftp.gnu.org/gnu/bash/bash-@.tar.gz,bb91a17fd6c9032c26d0b2b78b50aff5
-bc,3.3.0,https://github.com/gavinhoward/bc/releases/download/@/bc-@.tar.xz,452ae2d467b1d7212bb7896c0c689825
+bc,3.3.4,https://github.com/gavinhoward/bc/releases/download/@/bc-@.tar.xz,1b6dd492cc1f04e3df4d83493f362768
 binutils,2.36.1,http://ftp.gnu.org/gnu/binutils/binutils-@.tar.xz,628d490d976d8957279bbbff06cf29d4
 bison,3.7.6,http://ftp.gnu.org/gnu/bison/bison-@.tar.xz,d61aa92e3562cb7292b004ce96173cf7
 bzip2,1.0.8,https://www.sourceware.org/pub/bzip2/bzip2-@.tar.gz,67e051268d0c475ea773822f7500d0e5
@@ -11,10 +11,10 @@ check,0.15.2,https://github.com/libcheck/check/releases/download/@/check-@.tar.g
 coreutils,8.32,http://ftp.gnu.org/gnu/coreutils/coreutils-@.tar.xz,022042695b7d5bcf1a93559a9735e668
 dejagnu,1.6.2,http://ftp.gnu.org/gnu/dejagnu/dejagnu-@.tar.gz,e1b07516533f351b3aba3423fafeffd6
 diffutils,3.7,http://ftp.gnu.org/gnu/diffutils/diffutils-@.tar.xz,4824adc0e95dbbf11dfbdfaad6a1e461
-e2fsprogs,1.46.1,https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v@/e2fsprogs-@.tar.gz,8c52585522b7ca6bdae2bdecba27b3a4
+e2fsprogs,1.46.2,https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v@/e2fsprogs-@.tar.gz,e8ef5fa3b72557be5e9fe564a25da6eb
 libelf,0.183,https://sourceware.org/ftp/elfutils/@/elfutils-@.tar.bz2,6f58aa1b9af1a5681b1cbf63e0da2d67
 eudev,3.2.10,https://dev.gentoo.org/~blueness/eudev/eudev-@.tar.gz,60b135a189523f333cea5f71a3345c8d
-expat,2.2.10,https://prdownloads.sourceforge.net/expat/expat-@.tar.xz,e0fe49a6b3480827c9455e4cfc799133
+expat,2.3.0,https://prdownloads.sourceforge.net/expat/expat-@.tar.xz,1c1b523a8d917e6d9f7af4f8881d8ec5
 expect,5.45.4,https://prdownloads.sourceforge.net/expect/expect@.tar.gz,00fce8de158422f5ccd2666512329bd2
 file,5.40,http://ftp.astron.com/pub/file/file-@.tar.gz,72540ea1cc8c6e1dee35d6100ec66589
 findutils,4.8.0,http://ftp.gnu.org/gnu/findutils/findutils-@.tar.xz,eeefe2e6380931a77dfa6d9350b43186
@@ -30,7 +30,7 @@ grep,3.6,http://ftp.gnu.org/gnu/grep/grep-@.tar.xz,f47fe27049510b2249dba7f862ac1
 groff,1.22.4,http://ftp.gnu.org/gnu/groff/groff-@.tar.gz,08fb04335e2f5e73f23ea4c3adbf0c5f
 grub,2.04,https://ftp.gnu.org/gnu/grub/grub-@.tar.xz,5aaca6713b47ca2456d8324a58755ac7
 gzip,1.10,http://ftp.gnu.org/gnu/gzip/gzip-@.tar.xz,691b1221694c3394f1c537df4eee39d3
-iana-etc,20210202,https://github.com/Mic92/iana-etc/releases/download/@/iana-etc-@.tar.gz,1c193a4d6ca36274570d1505140a7bee
+iana-etc,20210304,https://github.com/Mic92/iana-etc/releases/download/@/iana-etc-@.tar.gz,db2d94cf0d1115c0107ae2aed966dbee
 inetutils,2.0,http://ftp.gnu.org/gnu/inetutils/inetutils-@.tar.xz,5e1018502cd131ed8e42339f6b5c98aa
 intltool,0.51.0,https://launchpad.net/intltool/trunk/@/+download/intltool-@.tar.gz,12e517cac2b57a0121cda351570f1e63
 iproute2,5.10.0,https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-@.tar.xz,19ffea480a21e600453776b7225f3319
@@ -39,13 +39,13 @@ kbd,2.4.0,https://www.kernel.org/pub/linux/utils/kbd/kbd-@.tar.xz,3cac5be0096fcf
 kmod,28,https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-@.tar.xz,0a2b887b1b3dfb8c0b3f41f598203e56
 less,563,http://www.greenwoodsoftware.com/less/less-@.tar.gz,1ee44fa71447a845f6eef5b3f38d2781
 lfs-bootscripts,20210201,http://www.linuxfromscratch.org/lfs/downloads/10.1/lfs-bootscripts-@.tar.xz,1fc441ef96c522974f7267dec8b40a47
-libcap,2.48,https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-@.tar.xz,ca71693a9abe4e0ad9cc33a755ee47e0
+libcap,2.49,https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-@.tar.xz,b43ae3690fe4d2cb32e4d25c0983ecd3
 libffi,3.3,https://sourceware.org/pub/libffi/libffi-@.tar.gz,6313289e32f1d38a9df4770b014a2ca7
 libpipeline,1.5.3,http://download.savannah.gnu.org/releases/libpipeline/libpipeline-@.tar.gz,dad443d0911cf9f0f1bd90a334bc9004
 libstdc++,10.2.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,e9fd9b1789155ad09bcf3ae747596b50
 libtool,2.4.6,http://ftp.gnu.org/gnu/libtool/libtool-@.tar.xz,1bfb9b923f2c1339b4d2ce1807064aa5
-linux,5.10.27,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,506ee265062384ac1194b2ea8317ca4f
-linux-api-headers,5.10.27,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,506ee265062384ac1194b2ea8317ca4f
+linux,5.10.28,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,e537f7035e3ae63ea494c83015af1447
+linux-api-headers,5.10.28,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,e537f7035e3ae63ea494c83015af1447
 m4,1.4.18,http://ftp.gnu.org/gnu/m4/m4-@.tar.xz,730bb15d96fffe47e148d1e09235af82
 make,4.3,http://ftp.gnu.org/gnu/make/make-@.tar.gz,fc7a67ea86ace13195b0bce683fd4469
 man-db,2.9.4,http://download.savannah.gnu.org/releases/man-db/man-db-@.tar.xz,6e233a555f7b9ae91ce7cd0faa322bce
@@ -55,7 +55,7 @@ mpc,1.2.1,https://ftp.gnu.org/gnu/mpc/mpc-@.tar.gz,9f16c976c25bb0f76b50be749cd7a
 mpfr,4.1.0,http://www.mpfr.org/mpfr-@/mpfr-@.tar.xz,bdd3d5efba9c17da8d83a35ec552baef
 ncurses,6.2,http://ftp.gnu.org/gnu/ncurses/ncurses-@.tar.gz,e812da327b1c2214ac1aed440ea3ae8d
 ninja,1.10.2,https://github.com/ninja-build/ninja/archive/v@/ninja-@.tar.gz,639f75bc2e3b19ab893eaf2c810d4eb4
-openssl,1.1.1j,https://www.openssl.org/source/openssl-@.tar.gz,cccaa064ed860a2b4d1303811bf5c682
+openssl,1.1.1k,https://www.openssl.org/source/openssl-@.tar.gz,c4e7d95f782b08116afa27b30393dd27
 patch,2.7.6,http://ftp.gnu.org/gnu/patch/patch-@.tar.xz,78ad9937e4caadcba1526ef1853730d5
 perl,5.32.1,https://www.cpan.org/src/5.0/perl-@.tar.xz,7f104064b906ad8c7329ca5e409a32d7
 pkg-config,0.29.2,https://pkg-config.freedesktop.org/releases/pkg-config-@.tar.gz,f6e931e319531b736fadc017f470e68a
@@ -67,7 +67,7 @@ readline,8.1,http://ftp.gnu.org/gnu/readline/readline-@.tar.gz,e9557dd5b1409f5d7
 sed,4.8,http://ftp.gnu.org/gnu/sed/sed-@.tar.xz,6d906edfdb3202304059233f51f9a71d
 shadow,4.8.1,https://github.com/shadow-maint/shadow/releases/download/@/shadow-@.tar.xz,4b05eff8a427cf50e615bda324b5bc45
 sysklogd,1.5.1,http://www.infodrom.org/projects/sysklogd/download/sysklogd-@.tar.gz,c70599ab0d037fde724f7210c2c8d7f8
-sysvinit,2.98,http://download.savannah.gnu.org/releases/sysvinit/sysvinit-@.tar.xz,e3254f7622ea5cf2322b1b386a98ba59
+sysvinit,2.99,http://download.savannah.gnu.org/releases/sysvinit/sysvinit-@.tar.xz,6abc0ea61b8dd4a41b4e931a43b1bb90
 tar,1.34,http://ftp.gnu.org/gnu/tar/tar-@.tar.xz,9a08d29a9ac4727130b5708347c0f5cf
 tcl,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-src.tar.gz,8a4c004f48984a03a7747e9ba06e4da4
 tcl-doc,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea
@@ -75,8 +75,8 @@ texinfo,6.7,http://ftp.gnu.org/gnu/texinfo/texinfo-@.tar.xz,d4c5d8cc84438c5993ec
 time Zone Data,2021a,https://www.iana.org/time-zones/repository/releases/tzdata@.tar.gz,20eae7d1da671c6eac56339c8df85bbd
 udev-lfs Tarball,udev-lfs-20171102,http://anduin.linuxfromscratch.org/LFS/@.tar.xz,27cd82f9a61422e186b9d6759ddf1634
 util-linux,2.36.2,https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-@.tar.xz,f78419af679ac9678190ad961eb3cf27
-vim,8.2.2433,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,a26555c8919cf40938d2428d834bf913
+vim,8.2.2604,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,b9b50ddd0327cef5f1985b0222b8473f
 xml-parser,2.46,https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-@.tar.gz,80bb18a8e6240fcf7ec2f7b57601c170
 xz,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b
 zlib,1.2.11,https://zlib.net/zlib-@.tar.xz,85adef240c5f370b308da8c938951a68
-zstd,1.4.8,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,e873db7cfa5ef05832e6d55a5a572840
+zstd,1.4.9,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,eb718b8aae0302cabe20f968e500534d
diff --git a/patches.csv b/patches.csv
index 48917ee..780ca92 100644
--- a/patches.csv
+++ b/patches.csv
@@ -3,4 +3,4 @@ bzip2,1.0.8,http://www.linuxfromscratch.org/patches/lfs/10.1/bzip2-1.0.8-install
 coreutils,8.32,http://www.linuxfromscratch.org/patches/lfs/10.1/coreutils-8.32-i18n-1.patch,cd8ebed2a67fff2e231026df91af6776
 glibc,2.33,http://www.linuxfromscratch.org/patches/lfs/10.1/glibc-2.33-fhs-1.patch,9a5997c3452909b1769918c759eff8a2
 kbd,2.4.0,http://www.linuxfromscratch.org/patches/lfs/10.1/kbd-2.4.0-backspace-1.patch,f75cca16a38da6caa7d52151f7136895
-sysvinit,2.98,http://www.linuxfromscratch.org/patches/lfs/10.1/sysvinit-2.98-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc
+sysvinit,2.99,http://www.linuxfromscratch.org/patches/lfs/10.1/sysvinit-2.98-consolidated-1.patch,4900322141d493e74020c9cf437b2cdc