diff --git a/CH03-get-sources.sh b/CH03-get-sources.sh index 310e811..ebc3ae1 100644 --- a/CH03-get-sources.sh +++ b/CH03-get-sources.sh @@ -52,6 +52,7 @@ getSource "${coreutils_dnl}" "${coreutils_sha256}" "${coreutils_tarball}" getSource "${coreutils_patch_dnl}" "${coreutils_patch_sha256}" "${coreutils_patch_file}" getSource "${cracklib_dnl}" "${cracklib_sha256}" "${cracklib_tarball}" getSource "${cracklib_words_english_dnl}" "${cracklib_words_english_sha256}" "${cracklib_words_english_tarball}" +getSource "${curl_dnl}" "${curl_sha256}" "${curl_tarball}" getSource "${dbus_dnl}" "${dbus_sha256}" "${dbus_tarball}" getSource "${dejagnu_dnl}" "${dejagnu_sha256}" "${dejagnu_tarball}" getSource "${diffutils_dnl}" "${diffutils_sha256}" "${diffutils_tarball}" @@ -93,6 +94,7 @@ getSource "${libidn2_dnl}" "${libidn2_sha256}" "${libidn2_tarball}" getSource "${libpipeline_dnl}" "${libpipeline_sha256}" "${libpipeline_tarball}" getSource "${libpsl_dnl}" "${libpsl_sha256}" "${libpsl_tarball}" getSource "${libressl_dnl}" "${libressl_sha256}" "${libressl_tarball}" +getSource "${libtasn1_dnl}" "${libtasn1_sha256}" "${libtasn1_tarball}" getSource "${libtool_dnl}" "${libtool_sha256}" "${libtool_tarball}" getSource "${libunistring_dnl}" "${libunistring_sha256}" "${libunistring_tarball}" getSource "${libxcrypt_dnl}" "${libxcrypt_sha256}" "${libxcrypt_tarball}" @@ -109,6 +111,7 @@ getSource "${mpfr_dnl}" "${mpfr_sha256}" "${mpfr_tarball}" getSource "${ncurses_dnl}" "${ncurses_sha256}" "${ncurses_tarball}" getSource "${ninja_dnl}" "${ninja_sha256}" "${ninja_tarball}" getSource "${openssl_dnl}" "${openssl_sha256}" "${openssl_tarball}" +getSource "${p11kit_dnl}" "${p11kit_sha256}" "${p11kit_tarball}" getSource "${patch_dnl}" "${patch_sha256}" "${patch_tarball}" getSource "${perl_dnl}" "${perl_sha256}" "${perl_tarball}" getSource "${pkgconf_dnl}" "${pkgconf_sha256}" "${pkgconf_tarball}" diff --git a/CH8Build/BLFS.08-curl.sh b/CH8Build/BLFS.08-curl.sh new file mode 100644 index 0000000..2fa6e16 --- /dev/null +++ b/CH8Build/BLFS.08-curl.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +source versions.sh + +GLSOURCES="/sources" + +pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}" + +[ -d curl-${curl_version} ] && rm -rf curl-${curl_version} + +tar -Jxf ${curl_tarball} + +cd curl-${curl_version} + +./configure --prefix=/usr \ + --disable-static \ + --with-openssl \ + --with-ca-path=/etc/ssl/certs + +make +if [ $? -ne 0 ]; then + myfail "Failed building curl" +fi + +make install +if [ $? -ne 0 ]; then + myfail "Failed installing curl" +fi + +rm -rf docs/examples/.deps + +find docs \( -name Makefile\* -o \ + -name \*.1 -o \ + -name \*.3 -o \ + -name CMakeLists.txt \) -delete + +cp -R docs -T /usr/share/doc/curl-${curl_version} + +popd + +# cleanup + +pushd $GLSOURCES + +rm -rf curl-${curl_version} + +popd diff --git a/CH8Build/BLFS.09-libtasn1.sh b/CH8Build/BLFS.09-libtasn1.sh new file mode 100644 index 0000000..91de476 --- /dev/null +++ b/CH8Build/BLFS.09-libtasn1.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +source versions.sh + +GLSOURCES="/sources" + +pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}" + +[ -d libtasn1-${libtasn1_version} ] && rm -rf libtasn1-${libtasn1_version} + +tar -zxf ${libtasn1_tarball} + +cd libtasn1-${libtasn1_version} + +./configure --prefix=/usr \ + --disable-static + +make +if [ $? -ne 0 ]; then + myfail "Failed building libtasn1" +fi + +if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then + echo "running libtasn1 make check" + make check > ${GLSOURCES}/libtasn1.check.log 2>&1 +fi + +make install +if [ $? -ne 0 ]; then + myfail "Failed installing libtasn1" +fi + +make -C doc/reference install-data-local + +popd + +# cleanup + +pushd $GLSOURCES + +rm -rf libtasn1-${libtasn1_version} + +popd diff --git a/CH8Build/BLFS.10-p11kit.sh b/CH8Build/BLFS.10-p11kit.sh new file mode 100644 index 0000000..f9ebd2a --- /dev/null +++ b/CH8Build/BLFS.10-p11kit.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +source versions.sh + +GLSOURCES="/sources" + +pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}" + +[ -d p11-kit-${p11kit_version} ] && rm -rf p11-kit-${p11kit_version} + +tar -Jxf ${p11kit_tarball} + +cd p11-kit-${p11kit_version} + +sed '20,$ d' -i trust/trust-extract-compat + +cat >> trust/trust-extract-compat << "EOF" +# Copy existing anchor modifications to /etc/ssl/local +/usr/libexec/make-ca/copy-trust-modifications + +# Update trust stores +/usr/sbin/make-ca -r +EOF + +mkdir p11-build && cd p11-build + +meson setup .. \ + --prefix=/usr \ + --buildtype=release \ + -D trust_paths=/etc/pki/anchors + +ninja +if [ $? -ne 0 ]; then + myfail "Failed building p11-kit" +fi + +ninja install +if [ $? -ne 0 ]; then + myfail "Failed installing p11-kit" +fi + +ln -sf /usr/libexec/p11-kit/trust-extract-compat /usr/bin/update-ca-certificates + +ln -sf ./pkcs11/p11-kit-trust.so /usr/lib/libnssckbi.so + +popd + +# cleanup + +pushd $GLSOURCES + +rm -rf p11-kit-${p11kit_version} + +popd diff --git a/CH8Build/Master2.sh b/CH8Build/Master2.sh index de36f39..c41cfd4 100644 --- a/CH8Build/Master2.sh +++ b/CH8Build/Master2.sh @@ -1,6 +1,7 @@ #!/bin/bash # compiles the system software +FULLSET="90" /bin/bash CH08.35-libtool.sh @@ -8,7 +9,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.35-libtool.sh" exit 1 else - echo "LFS Chapter 8 Libtool complete [36/82]" + echo "LFS Chapter 8 Libtool complete [36/${FULLSET}]" sleep 3 fi @@ -18,7 +19,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.36-gdbm.sh" exit 1 else - echo "LFS Chapter 8 GDBM complete [37/82]" + echo "LFS Chapter 8 GDBM complete [37/${FULLSET}]" sleep 3 fi @@ -28,7 +29,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.37-gperf.sh" exit 1 else - echo "LFS Chapter 8 Gperf complete [38/82]" + echo "LFS Chapter 8 Gperf complete [38/${FULLSET}]" sleep 3 fi @@ -38,7 +39,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.38-expat.sh" exit 1 else - echo "LFS Chapter 8 Expat complete [39/82]" + echo "LFS Chapter 8 Expat complete [39/${FULLSET}]" sleep 3 fi @@ -48,7 +49,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.39-inetutils.sh" exit 1 else - echo "LFS Chapter 8 Inetutils Complete [40/82]" + echo "LFS Chapter 8 Inetutils Complete [40/${FULLSET}]" sleep 3 fi @@ -58,7 +59,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.40-less.sh" exit 1 else - echo "LFS Chapter 8 Less Complete [41/82]" + echo "LFS Chapter 8 Less Complete [41/${FULLSET}]" sleep 3 fi @@ -68,7 +69,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.41-perl.sh" exit 1 else - echo "LFS Chapter 8 Perl Complete [42/82]" + echo "LFS Chapter 8 Perl Complete [42/${FULLSET}]" sleep 3 fi @@ -78,7 +79,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.42-xml-parser.sh" exit 1 else - echo "LFS Chapter 8 XML::Parser Complete [43/82]" + echo "LFS Chapter 8 XML::Parser Complete [43/${FULLSET}]" sleep 3 fi @@ -88,7 +89,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.43-intltool.sh" exit 1 else - echo "LFS Chapter 8 Intltool Complete [44/82]" + echo "LFS Chapter 8 Intltool Complete [44/${FULLSET}]" sleep 3 fi @@ -98,7 +99,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.44-autoconf.sh" exit 1 else - echo "LFS Chapter 8 Autoconf Complete [45/82]" + echo "LFS Chapter 8 Autoconf Complete [45/${FULLSET}]" sleep 3 fi @@ -108,7 +109,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.45-automake.sh" exit 1 else - echo "LFS Chapter 8 Automake Complete [46/82]" + echo "LFS Chapter 8 Automake Complete [46/${FULLSET}]" sleep 3 fi @@ -118,7 +119,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.46-libressl.sh" exit 1 else - echo "LFS Chapter 8 LibreSSL (OpenSSL) Complete [47/82]" + echo "LFS Chapter 8 LibreSSL (OpenSSL) Complete [47/${FULLSET}]" sleep 3 fi @@ -128,7 +129,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.47-kmod.sh" exit 1 else - echo "LFS Chapter 8 Kmod Complete [48/82]" + echo "LFS Chapter 8 Kmod Complete [48/${FULLSET}]" sleep 3 fi @@ -138,7 +139,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.48-libelf.sh" exit 1 else - echo "LFS Chapter 8 Libelf Complete [49/82]" + echo "LFS Chapter 8 Libelf Complete [49/${FULLSET}]" sleep 3 fi @@ -148,7 +149,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.49-libffi.sh" exit 1 else - echo "LFS Chapter 8 Libffi Complete [50/82]" + echo "LFS Chapter 8 Libffi Complete [50/${FULLSET}]" sleep 3 fi @@ -166,7 +167,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.49b-openssl.sh" exit 1 else - echo "LFS Chapter 8 OpenSSL Complete [51/82]" + echo "LFS Chapter 8 OpenSSL Complete [51/${FULLSET}]" sleep 3 fi @@ -176,7 +177,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.50-python.sh" exit 1 else - echo "LFS Chapter 8 Python Complete [52/82]" + echo "LFS Chapter 8 Python Complete [52/${FULLSET}]" sleep 3 fi @@ -194,7 +195,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.51-flit-core.sh" exit 1 else - echo "LFS Chapter 8 Flit-Core Complete [53/82]" + echo "LFS Chapter 8 Flit-Core Complete [53/${FULLSET}]" sleep 3 fi @@ -204,7 +205,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.52-wheel.sh" exit 1 else - echo "LFS Chapter 8 Wheel Complete [54/82]" + echo "LFS Chapter 8 Wheel Complete [54/${FULLSET}]" sleep 3 fi @@ -214,7 +215,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.53-setuptools.sh" exit 1 else - echo "LFS Chapter 8 Setuptools Complete [55/82]" + echo "LFS Chapter 8 Setuptools Complete [55/${FULLSET}]" sleep 3 fi @@ -224,7 +225,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.54-ninja.sh" exit 1 else - echo "LFS Chapter 8 Ninja Complete [56/82]" + echo "LFS Chapter 8 Ninja Complete [56/${FULLSET}]" sleep 3 fi @@ -234,7 +235,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.55-ninja.sh" exit 1 else - echo "LFS Chapter 8 Meson Complete [57/82]" + echo "LFS Chapter 8 Meson Complete [57/${FULLSET}]" sleep 3 fi @@ -244,7 +245,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.56-coreutils.sh" exit 1 else - echo "LFS Chapter 8 Coreutils Complete [58/82]" + echo "LFS Chapter 8 Coreutils Complete [58/${FULLSET}]" sleep 3 fi @@ -254,7 +255,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.57-check.sh" exit 1 else - echo "LFS Chapter 8 Check Complete [59/82]" + echo "LFS Chapter 8 Check Complete [59/${FULLSET}]" sleep 3 fi @@ -264,7 +265,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.58-diffutils.sh" exit 1 else - echo "LFS Chapter 8 Diffutils Complete [60/82]" + echo "LFS Chapter 8 Diffutils Complete [60/${FULLSET}]" sleep 3 fi @@ -274,7 +275,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.59-gawk.sh" exit 1 else - echo "LFS Chapter 8 Gawk Complete [61/82]" + echo "LFS Chapter 8 Gawk Complete [61/${FULLSET}]" sleep 3 fi @@ -284,7 +285,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.60-findutils.sh" exit 1 else - echo "LFS Chapter 8 Findutils Complete [62/82]" + echo "LFS Chapter 8 Findutils Complete [62/${FULLSET}]" sleep 3 fi @@ -294,7 +295,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.61-groff.sh" exit 1 else - echo "LFS Chapter 8 Groff Complete [63/82]" + echo "LFS Chapter 8 Groff Complete [63/${FULLSET}]" sleep 3 fi @@ -304,7 +305,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.62-grub.sh" exit 1 else - echo "LFS Chapter 8 Grub Complete [64/82]" + echo "LFS Chapter 8 Grub Complete [64/${FULLSET}]" sleep 3 fi @@ -314,7 +315,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.63-gzip.sh" exit 1 else - echo "LFS Chapter 8 Gzip Complete [65/82]" + echo "LFS Chapter 8 Gzip Complete [65/${FULLSET}]" sleep 3 fi @@ -324,7 +325,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.64-iproute2.sh" exit 1 else - echo "LFS Chapter 8 IPRoute2 Complete [66/82]" + echo "LFS Chapter 8 IPRoute2 Complete [66/${FULLSET}]" sleep 3 fi @@ -334,7 +335,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.65-kbd.sh" exit 1 else - echo "LFS Chapter 8 Kbd Complete [67/82]" + echo "LFS Chapter 8 Kbd Complete [67/${FULLSET}]" sleep 3 fi @@ -344,7 +345,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.66-libpipeline.sh" exit 1 else - echo "LFS Chapter 8 Libpipeline Complete [68/82]" + echo "LFS Chapter 8 Libpipeline Complete [68/${FULLSET}]" sleep 3 fi @@ -354,7 +355,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.67-make.sh" exit 1 else - echo "LFS Chapter 8 Make Complete [69/82]" + echo "LFS Chapter 8 Make Complete [69/${FULLSET}]" sleep 3 fi @@ -364,7 +365,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.68-patch.sh" exit 1 else - echo "LFS Chapter 8 Patch Complete [70/82]" + echo "LFS Chapter 8 Patch Complete [70/${FULLSET}]" sleep 3 fi @@ -374,7 +375,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.69-tar.sh" exit 1 else - echo "LFS Chapter 8 Tar Complete [71/82]" + echo "LFS Chapter 8 Tar Complete [71/${FULLSET}]" sleep 3 fi @@ -384,7 +385,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.70-texinfo.sh" exit 1 else - echo "LFS Chapter 8 Texinfo Complete [72/82]" + echo "LFS Chapter 8 Texinfo Complete [72/${FULLSET}]" sleep 3 fi @@ -394,7 +395,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.71-vim.sh" exit 1 else - echo "LFS Chapter 8 Vim Complete [73/82]" + echo "LFS Chapter 8 Vim Complete [73/${FULLSET}]" sleep 3 fi @@ -404,7 +405,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.72-markupsafe.sh" exit 1 else - echo "LFS Chapter 8 MarkupSafe Complete [74/82]" + echo "LFS Chapter 8 MarkupSafe Complete [74/${FULLSET}]" sleep 3 fi @@ -414,7 +415,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.73-jinja2.sh" exit 1 else - echo "LFS Chapter 8 Jinja2 Complete [75/82]" + echo "LFS Chapter 8 Jinja2 Complete [75/${FULLSET}]" sleep 3 fi @@ -424,7 +425,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.74-systemd.sh" exit 1 else - echo "LFS Chapter 8 SystemD Complete [76/82]" + echo "LFS Chapter 8 SystemD Complete [76/${FULLSET}]" sleep 3 fi @@ -434,7 +435,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.75-dbus.sh" exit 1 else - echo "LFS Chapter 8 D-Bus Complete [77/82]" + echo "LFS Chapter 8 D-Bus Complete [77/${FULLSET}]" sleep 3 fi @@ -444,7 +445,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.76-mandb.sh" exit 1 else - echo "LFS Chapter 8 Man-DB Complete [78/82]" + echo "LFS Chapter 8 Man-DB Complete [78/${FULLSET}]" sleep 3 fi @@ -454,7 +455,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.77-procps-ng.sh" exit 1 else - echo "LFS Chapter 8 Procps-ng Complete [79/82]" + echo "LFS Chapter 8 Procps-ng Complete [79/${FULLSET}]" sleep 3 fi @@ -464,7 +465,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.78-util-linux.sh" exit 1 else - echo "LFS Chapter 8 Util-linux Complete [80/82]" + echo "LFS Chapter 8 Util-linux Complete [80/${FULLSET}]" sleep 3 fi @@ -474,7 +475,7 @@ if [ $? -ne 0 ]; then echo "failed CH08.79-e2fsprogs.sh" exit 1 else - echo "LFS Chapter 8 E2fsprogs Complete [81/82]" + echo "LFS Chapter 8 E2fsprogs Complete [81/${FULLSET}]" sleep 3 fi @@ -486,7 +487,7 @@ if [ $? -ne 0 ]; then echo "failed BLFS.03-gpm.sh" exit 1 else - echo "BLFS GPM Daemon Install Complete [82/82]" + echo "BLFS GPM Daemon Install Complete [82/${FULLSET}]" sleep 3 fi @@ -496,7 +497,7 @@ if [ $? -ne 0 ]; then echo "failed BLFS.04-libunistring.sh" exit 1 else - echo "BLFS Libunistring Install Complete [83/86]" + echo "BLFS Libunistring Install Complete [83/${FULLSET}]" sleep 3 fi @@ -506,7 +507,7 @@ if [ $? -ne 0 ]; then echo "failed BLFS.05-libidn2.sh" exit 1 else - echo "BLFS Libisn2 Install Complete [84/86]" + echo "BLFS Libisn2 Install Complete [84/${FULLSET}]" sleep 3 fi @@ -516,7 +517,7 @@ if [ $? -ne 0 ]; then echo "failed BLFS.06-libpsl.sh" exit 1 else - echo "BLFS Libpsl Install Complete [85/86]" + echo "BLFS Libpsl Install Complete [85/${FULLSET}]" sleep 3 fi @@ -526,7 +527,37 @@ if [ $? -ne 0 ]; then echo "failed BLFS.07-wget.sh" exit 1 else - echo "BLFS Wget Install Complete [86/86]" + echo "BLFS Wget Install Complete [86/${FULLSET}]" + sleep 3 +fi + +/bin/bash BLFS.08-curl.sh + +if [ $? -ne 0 ]; then + echo "failed BLFS.08-curl.sh" + exit 1 +else + echo "BLFS cURL Install Complete [87/${FULLSET}]" + sleep 3 +fi + +/bin/bash BLFS.09-libtasn1.sh + +if [ $? -ne 0 ]; then + echo "failed BLFS.09-libtasn1.sh" + exit 1 +else + echo "BLFS Libtasn1 Install Complete [88/${FULLSET}]" + sleep 3 +fi + +/bin/bash BLFS.10-p11kit.sh + +if [ $? -ne 0 ]; then + echo "failed BLFS.10-p11kit.sh" + exit 1 +else + echo "BLFS p11-kit Install Complete [89/${FULLSET}]" sleep 3 fi diff --git a/versions.sh b/versions.sh index f3e2b05..7be6364 100644 --- a/versions.sh +++ b/versions.sh @@ -496,4 +496,19 @@ wget_dnl="https://ftp.gnu.org/gnu/wget/wget-${wget_version}.tar.gz" wget_sha256="fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" wget_tarball="wget-${wget_version}.tar.gz" +curl_version="8.10.1" +curl_dnl="https://curl.se/download/curl-${curl_version}.tar.xz" +curl_sha256="73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee" +curl_tarball="curl-${curl_version}.tar.xz" + +libtasn1_version="4.19.0" +libtasn1_dnl="https://ftp.gnu.org/gnu/libtasn1/libtasn1-${libtasn1_version}.tar.gz" +libtasn1_sha256="1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a" +libtasn1_tarball="libtasn1-${libtasn1_version}.tar.gz" + +p11kit_version="0.25.5" +p11kit_dnl="https://github.com/p11-glue/p11-kit/releases/download/${p11kit_version}/p11-kit-${p11kit_version}.tar.xz" +p11kit_sha256="04d0a86450cdb1be018f26af6699857171a188ac6d5b8c90786a60854e1198e5" +p11kit_tarball="p11-kit-${p11kit_version}" + # EOF