Merge branch 'master' into upgrade

2 files changed, 188 insertions, 15 deletions

diff --git a/blfs/Makefile b/blfs/Makefile
index c3a5cf9..1e1a727 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -1,26 +1,46 @@
-targets = dhcpcd Linux-PAM OpenSSH sudo wget which wpa_supplicant
+targets = bind-utils-extra desktop-file-utils dhcpcd libpwquality Linux-PAM \
+		  OpenSSH shared-mime-info sudo systemd-extras wget which \
+		  wpa_supplicant
 
 all : $(targets)
 
 apache-ant : GLib java
 	@echo "apache-ant"
 
+Apr :
+	@echo "Apr"
+
+Apr-Util : Apr
+	@echo "Apr-Util"
+
+Apr-Util-Serf : Serf
+	@echo "Apru-Util-Serf"
+
+asciidoc : docbook-xsl fop libxslt Lynx
+	@echo "asciidoc"
+
 Berkeley_DB : java Sharutils
 	@echo "Berkeley_DB"
 
-bind-utils : libuv libxml2 PLY
+bind-utils : libuv libxml2
 	@echo "bind-utils"
 
 bind-utils-extra : json-c libcap-pam libxml2
 	@echo "bind-utils-extra"
 
+btrfs-progs : asciidoc LZO xmlto
+	@echo "btrfs-progs"
+
 CMake : cURL libuv libarchive nghttp2
 	@echo "CMake"
 
 CrackLib :
 	@echo "CrackLib"
 
-cURL : make-ca MIT_Kerberos nghttp2 OpenLDAP
+cryptsetup: json-c libpwquality LVM2 popt
+	@echo "make cryptsetup"
+
+cURL : make-ca MIT_Kerberos-keyutils nghttp2 OpenLDAP
 	@echo "cURL"
 
 cURL-extra : Brotli c-ares GnuTLS libidn2 libpsl libssh2 Samba
@@ -29,7 +49,7 @@ cURL-extra : Brotli c-ares GnuTLS libidn2 libpsl libssh2 Samba
 Cyrus-SASL : Berkeley_DB java sqlite3
 	@echo "Cyrus-SASL"
 
-Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos OpenLDAP PostgreSQL
+Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP PostgreSQL
 	@echo "Cyrus-SASL-Extra"
 
 desktop-file-utils : GLib
@@ -38,25 +58,52 @@ desktop-file-utils : GLib
 dhcpcd : ntp
 	@echo "dhcpcd"
 
+docbook-dsssl :
+	@echo "docbook-dsssl"
+
+docbook-dtd : sgml-common unzip
+	@echo "docbook-dtd"
+
+DocBook-Utils : docbook-dsssl docbook-dtd OpenJade
+	@echo "DocBook-Utils"
+
 docbook-xml : sgml-common unzip
 	@echo "docbook-xml"
 
 docbook-xsl :
 	@echo "docbook-xsl"
 
+Fontconfig : FreeType-HarfBuzz json-c DocBook-Utils libxml2
+	@echo "Fontconfig"
+
 fop : apache-ant
 	@echo "fop"
 
+FreeType :
+	@echo "FreeType"
+
+FreeType-HarfBuzz : libpng which
+	@echo "FreeType-HarfBuzz"
+
+HarfBuzz : GLib ICU
+	@echo "HarfBuzz"
+
 GC : libatomic_ops
 	@echo "GC"
 
 GDB : Guile six Valgrind-llvm
 	@echo "GDB"
 
-GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE #gobject-introspection \
-	shared-mime-info desktop-file-utils
+git : asciidoc cURL PCRE2 Subversion Tk Valgrind xmlto
+	@echo "git"
+
+GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
+	#gobject-introspection shared-mime-info desktop-file-utils
 	@echo "GLib"
 
+GnuTLS : Nettle make-ca libunistring libtasn1 p11-kit
+	@echo "GnuTLS"
+
 gobject-introspection : GLib GTK-Doc Mako
 	@echo "gobject-introspection"
 
@@ -72,6 +119,12 @@ Guile : GC libunistring #Runtime GDB Emacs
 ICU :
 	@echo "ICU"
 
+inih : ICU
+	@echo "inih"
+
+iptables :
+	@echo "iptables"
+
 IO-Socket-SSL : Net-SSLeay URI
 	@echo "IO-Socket-SSL"
 
@@ -81,6 +134,15 @@ itstool : docbook-xml
 java : # Runtime Deps - alsa-lib cups giflib xorg-lib
 	@echo "java"
 
+json-c : CMake
+	@echo "json-c"
+
+keyutils : MIT_Kerberos
+	@echo "keyutils"
+
+libaio :
+	@echo "libaio"
+
 libarchive : libxml2 LZO Nettle
 	@echo "libarchive"
 
@@ -102,19 +164,31 @@ libgcrypt : libgpg-error
 libgpg-error :
 	@echo "libgpg-error"
 
+libidn : GTK-Doc java Valgrind
+	@echo "libidn"
+
+libidn2 : git GTK-Doc libunistring
+	@echo "libidn2"
+
+libmicrohttpd :
+	@echo "libmicrohttpd"
+
 libnl :
 	@echo "libnl"
 
 libnsl : libtirpc rpcsvc-proto
 	@echo "libnsl"
 
+libpng :
+	@echo "libpng"
+
 libpwquality : CrackLib Linux-PAM
 	@echo "libpwquality"
 
 libtasn1 :
 	@echo "libtasn1"
 
-libtirpc : MIT_Kerberos
+libtirpc : MIT_Kerberos-keyutils
 	@echo "libtirpc"
 
 libunistring :
@@ -123,6 +197,18 @@ libunistring :
 libuv :
 	@echo "libuv"
 
+libXau : xorgproto
+	@echo "libXau"
+
+libxcb : libXau libXdmcp xcb-proto
+	@echo "libxcb"
+
+libXdmcp : fop xorgproto
+	@echo "libXdmcp"
+
+libxkbcommon : xkeyboard-config libxcb Wayland
+	@echo "libxkbcommon"
+
 libxml2 : ICU
 	@echo "libxml2"
 
@@ -135,18 +221,27 @@ libyaml :
 Linux-PAM : Berkeley_DB docbook-xml docbook-xsl fop libnsl libtirpc libxslt Lynx
 	@echo "Linux-PAM"
 
+qrencode :
+	@echo "qrencode"
+
 lxml : libxslt
 	@echo "lxml"
 
+LVM2 : libaio mdadm reiserfsprogs Valgrind which xfsprogs
+	@echo "LVM2"
+
 LLVM : CMake libxml2 Pygments PyYAML Valgrind Zip
 	@echo "LLVM"
 
-Lynx : Sharutils Zip
+Lynx : Sharutils Zip unzip
 	@echo "Lynx"
 
 LZO :
 	@echo "LZO"
 
+lz4 :
+	@echo "lz4"
+
 make-ca : p11-kit
 	@echo "make-ca"
 
@@ -156,9 +251,18 @@ Mako : MarkupSafe
 MarkupSafe :
 	@echo "MarkupSafe"
 
-MIT_Kerberos : bind-utils libedit OpenLDAP yasm
+mdadm :
+	@echo "mdadm"
+
+MIT_Kerberos :
 	@echo "MIT_Kerberos"
 
+MIT_Kerberos-keyutils : bind-utils keyutils libedit OpenLDAP yasm
+	@echo "MIT_Kerberos-keyutils"
+
+NASM : asciidoc xmlto
+	@echo "NASM"
+
 Net-SSLeay :
 	@echo "Net-SSLeay"
 
@@ -181,12 +285,18 @@ nspr :
 ntp : IO-Socket-SSL libcap-pam libedit libevent
 	@echo "ntp"
 
+OpenJade : OpenSP SGMLSpm Lynx
+	@echo "OpenJade"
+
 OpenLDAP : Berkeley_DB Cyrus-SASL
 	@echo "OpenLDAP"
 
 OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL Pth unixODBC
 	@echo "OpenLDAP-Extras"
 
+OpenSP : sgml-common xmlto
+	@echo "OpenSP"
+
 OpenSSH : libedit
 	@echo "OpenSSH"
 
@@ -199,8 +309,8 @@ PCRE : libedit Valgrind
 PCRE2 :
 	@echo "PCRE2"
 
-PLY :
-	@echo "PLY"
+popt :
+	@echo "popt"
 
 Pygments :
 	@echo "Pygments"
@@ -208,12 +318,27 @@ Pygments :
 PyYAML : libyaml
 	@echo "PyYAML"
 
+reiserfsprogs :
+	@echo "reiserfsprogs"
+
 rpcsvc-proto :
 	@echo "rpcsvc-proto"
 
+rsync : popt lz4
+	@echo "rsync"
+
+SCons : docbook-xsl libxslt
+	@echo "SCons"
+
+Serf : Apr-Util SCons MIT_Kerberos
+	@echo "serf"
+
 sgml-common :
 	@echo "sgml-common"
 
+SGMLSpm :
+	@echo "SGMLSpm"
+
 shared-mime-info : GLib itstool libxml2 xmlto
 	@echo "shared-mime-info"
 
@@ -226,36 +351,84 @@ six :
 sqlite3 : libedit unzip
 	@echo "sqlite3"
 
-sudo : bind-utils Linux-PAM MIT_Kerberos OpenLDAP
+Subversion : Apr-Util-Serf sqlite3
+	@echo "Subversion"
+
+Subversion-Extras : Apache apache-ant Boost Cyrus-SASL dbus Doxygen \
+	gnome-keyring java libsecret Ruby SWIG LZ4 UTF8proc
+	@echo "Subversion-Extras"
+
+sudo : bind-utils Linux-PAM MIT_Kerberos-keyutils OpenLDAP
 	@echo "sudo"
 
+systemd-extras : btrfs-progs cURL cryptsetup git GnuTLS iptables libcap-pam \
+	libgcrypt libidn2 libmicrohttpd libpwquality libxkbcommon lxml lz4 \
+	make-ca p11-kit PCRE2 qrencode rsync Valgrind zsh #gnu-efi kexec-tools \
+	libfido2 libmicrohttpd quota-tools Sphinx
+	@echo "systemd-extras"
+
+Tk : Xorg-Libs
+	@echo "Tk"
+
 unzip :
 	@echo "unzip"
 
 URI :
 	@echo "URI"
 
+util-macros : Xorg-Build-Environment
+	@echo "util-macros"
+
 Valgrind :
 	@echo "Valgrind"
 
 Valgrind-llvm : LLVM
 	@echo "Valgrind-llvm"
 
+Wayland : libxml2
+	@echo "Wayland"
+
+Wayland-Protocols : Wayland
+	@echo "Wayland-Protocols"
+
 wget : make-ca
 	@echo "wget"
 
 which :
 	@echo "which"
 
+whois : libidn2
+	@echo "whois"
+
 wpa_supplicant : libnl
 	@echo "WPA Supplicant"
 
+xcb-proto :
+	@echo "xcb-proto"
+
+xfsprogs : inih ICU
+	@echo "xfsprogs"
+
+xkeyboard-config : Xorg-Libs
+	@echo "xkeyboard-config"
+
 xmlto: docbook-xml docbook-xsl fop libxslt Lynx
 	@echo "xmlto"
 
+Xorg-Libs : Fontconfig libxcb xmlto fop Lynx
+	@echo "Xorg-Libs"
+
+Xorg-Build-Environment :
+	@echo "Xorg-Build-Environment"
+
+xorgproto : asciidoc util-macros
+	@echo "xorgproto"
+
 yasm :
 	@echo "yasm"
 
 Zip :
 	@echo "Zip"
 
+zsh : libcap-pam PCRE Valgrind
+	@echo "zsh"
diff --git a/packages.csv b/packages.csv
index 1de23eb..8854e20 100644
--- a/packages.csv
+++ b/packages.csv
@@ -3,7 +3,7 @@ attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a
 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.4,https://github.com/gavinhoward/bc/releases/download/@/bc-@.tar.xz,1b6dd492cc1f04e3df4d83493f362768
+bc,4.0.1,https://github.com/gavinhoward/bc/releases/download/@/bc-@.tar.xz,2e0906471bbde64d165a2f01aacd6e8a
 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
@@ -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,20210304,https://github.com/Mic92/iana-etc/releases/download/@/iana-etc-@.tar.gz,db2d94cf0d1115c0107ae2aed966dbee
+iana-etc,20210407,https://github.com/Mic92/iana-etc/releases/download/@/iana-etc-@.tar.gz,71c8c5c3f761e27a00c917bc14e765fd
 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
@@ -75,7 +75,7 @@ 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.2604,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,b9b50ddd0327cef5f1985b0222b8473f
+vim,8.2.2812,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,9b67782bfedb874a39eed51be65e3310
 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