diff --git a/README-Darwin.md b/README-Darwin.md
deleted file mode 100644
index d960c0ba5..000000000
--- a/README-Darwin.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Darwin
-
-The Build-Scripts should work out-of-the-box for modern Darwin, like OS X 10.5. Once you run the setup recipes you should be able to build most programs with the scripts.
-
-Modern OpenSSH no longer supports DSA keys by default. Default DSA support was disabled at OpenSSH 7.9. You should ensure you have an Ecdsa or Ed25519 key (or enable DSA keys in `sshd_config`). Also see [OpenSSH Release Notes](https://www.openssh.com/releasenotes.html).
-
-After installing OpenSSH you should also tune `sshd_config` to suit your taste. You can disable password logins, enable public key logins, etc.
-
-## System Integrity Protection
-
-OS X 10.12 added System Integrity Protection (SIP). If SIP is in effect, then you have to disable SIP to modify the Launch Daemon and install `ssh-8.plist`. Also see [Disabling and Enabling System Integrity Protection](https://developer.apple.com/documentation/security/disabling_and_enabling_system_integrity_protection) and [About macOS Recovery on Intel-based Mac computers](https://support.apple.com/en-us/HT201314)..
-
-## Setup
-
-Once you clone the repo you should perform a one-time setup. The setup installs updated CA certificates and builds a modern Wget. `setup-cacerts.sh` installs a local copy of 11 CA certificates in `$HOME/.build-scripts/cacerts`. They are used to download source code packages for programs and libraries. `setup-wget.sh` installs a local copy of `wget` in `$HOME/.build-scripts/wget`. It is a reduced-functionality version of Wget with only HTTPS, IPv4, IPv6 and large-file support. It is anemic but functional enough to download packages over HTTPS.
-
-```
-$ ./setup-cacerts.sh
-...
-
-$ ./setup-wget.sh
-...
-```
-
-You can build the fully-functional version of Wget by running `./build-wget.sh`, but it is not needed for OpenSSH.
-
-## OpenSSH
-
-The following steps should be performed to update OpenSSH. The new OpenSSH is permanently installed at `/opt/ssh` (as opposed to a location like `/usr/local`). `/opt/ssh` will have a standard filesystem below it.
-
-```
-$ INSTX_PREFIX=/opt/ssh ./build-openssh.sh
-```
-
-After building and installing OpenSSH you have to tell Darwin to use it. To do so you create a plist and tell the launch daemon about it.
-
-First, generate new keys and/or copy existing keys to `$INSTX_PREFIX/etc`. You probably have new keys from `make install`, so copy existing keys as required.
-
-Second, create or copy an existing `sshd_config` to `$INSTX_PREFIX/etc`.
-
-Third, open `/System/Library/LaunchDaemons/ssh-8.plist` in a text editor. Add the following launch configuration.
-
-```
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>Label</key>
-        <string>com.openssh.sshd.8</string>
-        <key>Program</key>
-        <string>/opt/ssh/sbin/sshd</string>
-        <key>ProgramArguments</key>
-        <array>
-                <string>/opt/ssh/sbin/sshd</string>
-                <string>-i</string>
-                <string>-e</string>
-                <string>-f</string>
-                <string>/opt/ssh/etc/sshd_config</string>
-        </array>
-        <key>SHAuthorizationRight</key>
-        <string>system.preferences</string>
-        <key>Sockets</key>
-        <dict>
-                <key>Listeners</key>
-                <dict>
-                        <key>SockServiceName</key>
-                        <string>22</string>
-                </dict>
-        </dict>
-        <key>StandardErrorPath</key>
-        <string>/var/log/sshd.8.log</string>
-        <key>inetdCompatibility</key>
-        <dict>
-                <key>Wait</key>
-                <false/>
-        </dict>
-</dict>
-</plist>
-```
-
-Be sure to use a name like `com.openssh.sshd.8` to avoid collisions with Apple's SSH service.
-
-Finally, load the new configuration.
-
-```
-sudo launchctl load -w /System/Library/LaunchDaemons/ssh-8.plist
-```
-
-If needed, you can disable Apple's SSH daemon with the following.
-
-```
-sudo launchctl unload -w /System/Library/LaunchDaemons/ssh.plist
-```
diff --git a/README-Solaris.md b/README-Solaris.md
deleted file mode 100644
index 603d0317e..000000000
--- a/README-Solaris.md
+++ /dev/null
@@ -1,274 +0,0 @@
-# Solaris
-
-The Build-Scripts should work out-of-the-box for modern Solaris, like Solaris 10 or Solaris 11. Once you run the setup recipes you should be able to build most programs with the scripts.
-
-Solaris ships with a modified version of OpenSSH 1.2.12, so updating OpenSSH is an important operation. A new OpenSSH will allow you to use Ecdsa and Ed25519 keys. After building a new OpenSSH you have to update the existing Solaris configuration so the operating system uses the new OpenSSH.
-
-Modern OpenSSH no longer supports DSA keys by default. Default DSA support was disabled at OpenSSH 7.9. You should ensure you have an Ecdsa or Ed25519 key (or enable DSA keys in `sshd_config`). Also see [OpenSSH Release Notes](https://www.openssh.com/releasenotes.html).
-
-After installing OpenSSH you should also tune `sshd_config` to suit your taste. You can disable password logins, enable public key logins, etc.
-
-## Setup
-
-Once you clone the repo you should perform a one-time setup. The setup installs updated CA certificates and builds a modern Wget. `setup-cacerts.sh` installs a local copy of 11 CA certificates in `$HOME/.build-scripts/cacerts`. They are used to download source code packages for programs and libraries. `setup-wget.sh` installs a local copy of `wget` in `$HOME/.build-scripts/wget`. It is a reduced-functionality version of Wget with only HTTPS, IPv4, IPv6 and large-file support. It is anemic but functional enough to download packages over HTTPS.
-
-```
-$ ./setup-cacerts.sh
-...
-
-$ ./setup-wget.sh
-...
-```
-
-You can build the fully-functional version of Wget by running `./build-wget.sh`, but it is not needed for OpenSSH.
-
-## OpenSSH
-
-The following steps should be performed to update OpenSSH. The new OpenSSH is permanently installed at `/opt/ssh` (as opposed to a location like `/usr/local`). `/opt/ssh` will have a standard Linux filesystem below it.
-
-```
-$ INSTX_PREFIX=/opt/ssh ./build-openssh.sh
-```
-
-After building and installing OpenSSH you have to tell Solaris to use it. First, backup `/lib/svc/method/sshd`:
-
-```
-$ sudo su -
-...
-
-# cp -r /lib/svc/method/sshd /lib/svc/method/sshd.bu
-```
-
-Second, open `/lib/svc/method/sshd` in a text editor. Change the hard-coded `/etc/ssh` to `$SSHDIR`. There are several places the hard-coded value is used.
-
-Third, modify the variable `SSHDIR` and set it to `/opt/ssh/etc`.
-
-Fourth, modify the variable `KEYGEN` and set it to `/opt/ssh/bin/ssh-keygen -q`.
-
-Fifth, locate references to `ssh_host_rsa_key`. At each location, add references to `ssh_host_ecdsa_key` and `ssh_host_ed25519_key`.
-
-Sixth, in the `start` command, have the scripts call `/opt/ssh/sbin/sshd` instead of `/usr/lib/ssh/sshd`.
-
-Finally, reboot the machine with the `reboot` command.
-
-Note: if you see two Message of the Day messages with the new OpenSSH, then add `PrintMotd no` to `/opt/ssh/etc/sshd_config`.
-
-## /lib/svc/method/sshd
-
-After the changes your modified `/lib/svc/method/sshd` should look similar to below.
-
-```
-# cat /lib/svc/method/sshd
-#!/usr/sbin/sh
-#
-# Copyright (c) 2001, 2013, Oracle and/or its affiliates.
-#
-
-. /lib/svc/share/smf_include.sh
-. /lib/svc/share/ipf_include.sh
-
-# SSHDIR=/etc/ssh
-SSHDIR=/opt/ssh/etc
-
-# KEYGEN="/usr/bin/ssh-keygen -q"
-KEYGEN="/opt/ssh/bin/ssh-keygen -q"
-
-PIDFILE=$SMF_SYSVOL_FS/sshd.pid
-
-# Checks to see if RSA, and DSA host keys are available
-# if any of these keys are not present, the respective keys are created.
-create_key()
-{
-        keypath=$1
-        keytype=$2
-
-        if [ ! -f $keypath ]; then
-                #
-                # HostKey keywords in sshd_config may be preceded or
-                # followed by a mix of any number of space or tabs,
-                # and optionally have an = between keyword and
-                # argument.  We use two grep invocations such that we
-                # can match HostKey case insensitively but still have
-                # the case of the path name be significant, keeping
-                # the pattern somewhat more readable.
-                #
-                # The character classes below contain one literal
-                # space and one literal tab.
-                #
-                grep -i "^[     ]*HostKey[      ]*=\{0,1\}[     ]*$keypath" \
-                    $SSHDIR/sshd_config | grep "$keypath" > /dev/null 2>&1
-
-                if [ $? -eq 0 ]; then
-                        echo Creating new $keytype public/private host key pair
-                        $KEYGEN -f $keypath -t $keytype -N ''
-                        if [ $? -ne 0 ]; then
-                                echo "Could not create $keytype key: $keypath"
-                                exit $SMF_EXIT_ERR_CONFIG
-                        fi
-                fi
-        fi
-}
-
-create_ipf_rules()
-{
-        FMRI=$1
-        ipf_file=`fmri_to_file ${FMRI} $IPF_SUFFIX`
-        policy=`get_policy ${FMRI}`
-
-        #
-        # Get port from sshd_config
-        #
-        tports=`grep "^Port" "$SSHDIR/sshd_config" 2>/dev/null | \
-            awk '{print $2}'`
-
-        echo "# $FMRI" >$ipf_file
-        for port in $tports; do
-                generate_rules $FMRI $policy "tcp" "any" $port $ipf_file
-        done
-}
-
-remove_key()
-{
-        keypath=$1
-        if [ -f $keypath ]; then
-                grep -i "^[     ]*HostKey[      ]*=\{0,1\}[     ]*$keypath" \
-                    $SSHDIR/sshd_config | grep "$keypath" > /dev/null 2>&1
-                if [ $? -eq 0 ]; then
-                        rm -f ${keypath} ${keypath}.pub
-                fi
-        fi
-}
-
-#
-# Makes sure, that sshd_config does not contain single line
-# 'ListenAddress ::'.
-#
-# This used to be part of default SunSSH sshd_config and instructed SunSSH
-# to listen on all interfaces. For OpenSSH, the same line means listen on all
-# IPv6 interfaces.
-#
-fix_listenaddress()
-{
-        fbackup="$SSHDIR/sshd_config.pre_listenaddress_fix"
-        reason4change="#\n\
-# Historically default sshd_config was shipped with 'ListenAddress ::',\n\
-# which means 'listen on all interfaces' in SunSSH.\n\
-# In OpenSSH this setting means 'listen on all IPv6 interfaces'.\n\
-# To avoid loss of service after transitioning to OpenSSH, the following\n\
-# line was commented out by the network/ssh service method script on\n\
-#     $(date).\n\
-# Original file was backed up to $fbackup\n\
-#\n\
-# "
-        expl4log="Historically default sshd_config was shipped with \
-'ListenAddress ::', which means 'listen on all interfaces' in SunSSH. \
-In OpenSSH this setting means 'listen on all IPv6 interfaces'. \
-For both SunSSH and OpenSSH the default behavior when no ListenAddress \
-is specified is to listen on all interfaces (both IPv4 and IPv6)."
-        msg_not_removed="Custom ListenAddress setting detected in \
-$SSHDIR/sshd_config, the file will not be modified. Please, check your \
-ListenAddress settings. $expl4log"
-        msg_removed="Removing 'ListenAddress ::'. $expl4log Original file has \
-been backed up to $fbackup"
-
-        # only modify sshd_config, if ssh implementation is OpenSSH
-        if [[ "$(ssh -V 2>&1)" == Sun_SSH_* ]]; then
-                return 0;
-        fi
-
-        # comment '# IPv4 & IPv6' indicates an old default sshd_config
-        grep -q '^# IPv4 & IPv6$' $SSHDIR/sshd_config || return 0;
-
-        # backup
-        cp $SSHDIR/sshd_config $fbackup
-
-        # if 'ListenAddress ::' is the only ListenAddress line, comment it out
-        listen_address=$(grep -i '^[ \t]*ListenAddress' $SSHDIR/sshd_config)
-        if [[ "$listen_address" == 'ListenAddress ::' ]]; then
-                echo $msg_removed
-                awk_prog="/^ListenAddress ::$/ {printf(\"$reason4change\")}\
-                          !/^# IPv4 & IPv6$/   {print}"
-        else
-                # send warning message both to log and console
-                echo $msg_not_removed | smf_console
-                awk_prog="!/^# IPv4 & IPv6$/   {print}"
-        fi;
-
-        sshd_config=$(nawk "$awk_prog" $SSHDIR/sshd_config)
-        if [[ $? -ne 0 ]]; then
-                echo "Update error! Check your ListenAddress settings."
-                return 1;
-        else
-                # write the fixed content to the file
-                echo "$sshd_config" > $SSHDIR/sshd_config
-                return 0;
-        fi
-
-}
-
-# This script is being used for two purposes: as part of an SMF
-# start/stop/refresh method, and as a sysidconfig(1M)/sys-unconfig(1M)
-# application.
-#
-# Both, the SMF methods and sysidconfig/sys-unconfig use different
-# arguments..
-
-case $1 in
-        # sysidconfig/sys-unconfig arguments (-c and -u)
-'-c')
-        create_key "$SSHDIR/ssh_host_rsa_key" rsa
-        create_key "$SSHDIR/ssh_host_dsa_key" dsa
-        create_key "$SSHDIR/ssh_host_ecdsa_key" ecdsa
-        create_key "$SSHDIR/ssh_host_ed25519_key" ed25519
-        ;;
-
-'-u')
-        # sysconfig unconfigure to remove the sshd host keys
-        remove_key "$SSHDIR/ssh_host_rsa_key"
-        remove_key "$SSHDIR/ssh_host_dsa_key"
-        remove_key "$SSHDIR/ssh_host_ecdsa_key"
-        remove_key "$SSHDIR/ssh_host_ed25519_key"
-        ;;
-
-        # SMF arguments (start and restart [really "refresh"])
-
-'ipfilter')
-        create_ipf_rules $2
-        ;;
-
-'start')
-        #
-        # If host keys don't exist when the service is started, create
-        # them; sysidconfig is not run in every situation (such as on
-        # the install media).
-        #
-        create_key "$SSHDIR/ssh_host_rsa_key" rsa
-        create_key "$SSHDIR/ssh_host_dsa_key" dsa
-        create_key "$SSHDIR/ssh_host_ecdsa_key" ecdsa
-        create_key "$SSHDIR/ssh_host_ed25519_key" ed25519
-
-        #
-        # Make sure, that sshd_config does not contain single line
-        # 'ListenAddress ::'.
-        #
-        fix_listenaddress
-
-        # /usr/lib/ssh/sshd
-        /opt/ssh/sbin/sshd
-
-        ;;
-
-'restart')
-        if [ -f "$PIDFILE" ]; then
-                /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE`
-        fi
-        ;;
-
-*)
-        echo "Usage: $0 { start | restart }"
-        exit 1
-        ;;
-esac
-
-exit $?
-```
diff --git a/README.md b/README.md
index 12ab0b150..21df0343f 100644
--- a/README.md
+++ b/README.md
@@ -1,284 +1,2 @@
-# Build-Scripts
-
-This GitHub is a collection of build scripts useful for building and testing programs and libraries on downlevel clients and clients where program updates are not freely available. It should result in working SSH, Wget, cURL and Git clients on systems like PowerMac G5, Fedora 1, Ubuntu 4, CentOS 5 and Solaris 11.
-
-The general idea of the scripts are, you run `./build-wget.sh`, `./build-ssh.sh`, `./build-git.sh` or some other script to get a fresh tool. The script for the program will download and build the dependent libraries for the program. When the script completes you have a working tool in `/usr/local` or `/opt/local` on the BSDs.
-
-Some recipes only work on modern platforms. For example, GNU SIP Witch may not build on a PowerMac G5. It is a small loss since most organizations will not run a SIP server on antique hardware.
-
-## Setup
-
-Once you clone the repo you should perform a one-time setup. The setup installs updated CA certificates and builds a modern Wget. `setup-cacerts.sh` installs a local copy of 11 CA certificates in `$HOME/.build-scripts/cacerts`. They are used to download source code packages for programs and libraries. `setup-wget.sh` installs a local copy of `wget` in `$HOME/.build-scripts/wget`. It is a reduced-functionality version of Wget with only HTTPS, IPv4, IPv6 and large-file support. It is anemic but functional enough to download packages over HTTPS.
-
-```
-$ ./setup-cacerts.sh
-...
-
-$ ./setup-wget.sh
-...
-```
-
-You can verify Wget bootstrap with the following commands.
-
-```
-$ $HOME/.build-scripts/wget/bin/openssl version
-OpenSSL 1.0.2u  20 Dec 2019
-
-$ $HOME/.build-scripts/wget/bin/wget --version
-GNU Wget 1.20.3 built on solaris2.11.
-```
-
-The bootstrap version of Wget uses OpenSSL 1.0.2. OpenSSL 1.0.2 is now end-of-life and will accumulate unfixed bugs. We cannot upgrade to OpenSSL 1.1.x because of a Perl dependency. OpenSSL 1.1.x requires Perl 5.24, and Perl 5.24 is too new for some of the older systems.
-
-On ancient systems, like Fedora 1 and Ubuntu 4, you will need to build Bash immediately. Run `setup-bash.sh` for a reduced functionality Bash. Nearly all other systems have a new enough version of Bash.
-
-## Output Artifacts
-
-Artifacts are placed in `/usr/local` by default with runtime paths and dtags set to the proper library location. The library location on 32-bit machines is `/usr/local/lib`. 64-bit systems use `/usr/local/lib` (Debian and derivatives) or `/usr/local/lib64` (Red Hat and derivatives). The BSDs use `/opt/local` by default to avoid mixing libraries with system libraries in `/usr/local`.
-
-You can override the install locations with `INSTX_PREFIX` and `INSTX_LIBDIR`. `INSTX_PREFIX` is passed as `--prefix` to Autotools projects, and `INSTX_LIBDIR` is passed as `--libdir` to Autotools projects. Non-Autotools projects get patched after unpacking (see `build-bzip.sh` for an example).
-
-Examples of running the scripts and changing variables are shown below:
-
-```
-# Build and install using the directories described above
-./build-wget.sh
-
-# Build and install in a temp directory
-INSTX_PREFIX="$HOME/tmp" ./build-wget.sh
-```
-
-## Runtime Paths
-
-The build scripts attempt to set runtime paths in everything it builds. For example, on Fedora x86_64 the `LDFLAGS` include `-L/usr/local/lib64 -Wl,-R,/usr/local/lib64 -Wl,--enable-new-dtags`. `new-dtags` ensures a `RUNPATH` is used (as opposed to `RPATH`), and `RUNPATH` allows `LD_LIBRARY_PATH` overrides at runtime. The `LD_LIBRARY_PATH` support is important so self tests can run during `make check`.
-
-If all goes well you will not suffer the stupid path problems that have plagued Linux for the last 25 years or so.
-
-## Dependencies
-
-Dependent libraries are minimally tracked. Once a library is built a file with the library name is `touch`'d in `$HOME/.build-scripts/$prefix`. Use of `$prefix` allows tracking of multiple installs. If the file is older than 7 days then the library is automatically rebuilt. Automatic rebuilding ensures newer versions of a library are used when available and sidesteps problems with trying to track version numbers.
-
-Rebuilding after 7 days avoids a lot of package database bloat. As an example, MacPorts `registry.db` have been reported with sizes of 658,564,096, 744,112,128, 62,558,208 and 59,329,536. Also see [registry.db getting rather obese and updates very slow](https://lists.macports.org/pipermail/macports-users/2020-June/048510.html) on the MacPorts mailing list.
-
-Programs are not tracked. When a script like `build-git.sh` or `build-ssh.sh` is run then the program is always built or rebuilt. The dependently libraries may (or may not) be built based the age, but the program is always rebuilt.
-
-You can delete `$HOME/.build-scripts/$prefix` and all dependent libraries will be rebuilt on the next run of a build script.
-
-## Source Code
-
-The source code for a package can be installed if you need to perform debugging after installation. However, most recipes do not install the source code.
-
-If you wish to install the source code for a package, then follow the `build-bash.sh` recipe. The script adds `-fdebug-prefix-map` to `CFLAGS` and `CXXFLAGS`, and then calls `copy-sources.sh` during install. `copy-sources.sh` copies headers and source files into `$INSTX_PREFIX/src`, and the script preserves the destination directory structure.
-
-Once the sources are installed, the debugger works as expected.
-
-## Authenticity
-
-The scripts do not check signatures on tarballs with GnuPG. Its non-trivial to build and install GnuPG for some of these machines. Instead, the scripts rely on a trusted distribution channel to deliver authentic tarballs. `setup-cacerts.sh` and `setup-wget.sh` are enough to ensure the correct CAs and Wget are available to bootstrap the process with minimal risk.
-
-It is unfortunate GNU does not run their own PKI and have their own CA. More risk could be eliminated if we only needed to trust the GNU organization and their root certificate.
-
-## Build tools
-
-In addition to a compiler, just about every package uses Autotools. Be sure to install autoconf, automake, libtool and pkg-config. And install Perl and Python if possible since many test suites use them.
-
-The pkg-config package has several names, depending on the operating system. On Linux the package is `pkg-config` and sometimes `pkgconfig`. On other operating it may use the same name, or may use `pkgconf`.
-
-## Sudo
-
-If you want to install into a location like `/usr/local`, then you will need to provide your password. If you want to install into a location like `$HOME`, then you do not need to provide your password. Just press `ENTER` at the password prompt.
-
-If you don't trust the code with your password then audit `setup-password.sh` and the use of `SUDO_PASSWORD`.
-
-One thing the code does is the following, which could make the password available to programs like `ps`. The pattern is needed because `sudo -S` reads from `stdin` and requires a newline, but `echo` does not provide a newline on all platforms. Getting the newline with `printf` is the standard workaround on platforms like Solaris.
-
-```
-MAKE_FLAGS=("install")
-if [[ -n "$SUDO_PASSWORD" ]]; then
-    printf "%s\n" "$SUDO_PASSWORD" | sudo -E -S "$MAKE" "${MAKE_FLAGS[@]}"
-else
-    "$MAKE" "${MAKE_FLAGS[@]}"
-fi
-```
-
-## Boehm GC
-
-If you are building a program that requires Boehm GC then you need to install it from the distribution. Boehm GC is trickier than other packages because the correct version of the package for a particular distro must be downloaded. C++11 and libatomics further complicates the selection process. And an additional complication is alternate stacks and signals.
-
-On Red Hat based systems you should install `gc-devel`. On Debian based systems you should install `libgc-dev`. If a package is not available then you should manually build the garbage collector.
-
-If you attempt a manual build then `build-boehm-gc.sh` may work for you. But the script is pinned at Boehm-GC 7.2k to avoid C++11 dependencies. And the manual build may not integrate well if a program uses alternate stacks and signals.
-
-## Documentation
-
-The scripts avoid building documentation. If you need documentation then use the package's online documentation.
-
-Documentation is avoided for several reasons. First, the documentation adds extra dependencies, like makeinfo, html2pdf, gtk and even Perl libraries. It is not easy to satisfy some dependencies, like those on a CentOS 5, Fedora 15 or Solaris system. The older systems, CentOS 5 and Fedora 15, don't even have working repos.
-
-Second, the documentation wastes processing time. Low-end devices like ARM dev-boards can spend their compute cycles on more important things like compiling source code. Third, the documentation wastes space. Low-end devices like ARM dev-boards need to save space on their SDcards for more important things, like programs and libraires.
-
-Fourth, and most importantly, the documentation complicates package building. Many packages assume a maintainer is building for a desktop system with repos packed full of everything needed. And reconfiguring with `--no-docs` or `--no-gtk-doc` often requires a `bootstrap` or `autoreconf` which requires additional steps and additional dependencies.
-
-## Sanitizers
-
-One of the benefits of using the build scripts is, you can somewhat easily build programs and dependent libraries using tools like Address Sanitizer (Asan), Undefined Behavior Sanitizer (UBsan) and GCC 10's Analyzer. Only minor modifications are necessary.
-
-First, decide on a directory to sandbox the build. As an example, `/var/sanitize`:
-
-```
-INSTX_PREFIX=/var/sanitize
-```
-
-Second, use one of the following variables to enable a sanitizer:
-
-* `INSTX_UBSAN=1`
-* `INSTX_ASAN=1`
-* `INSTX_MSAN=1`
-* `INSTX_ANALYZE=1`
-
-Finally, build and test the program or library as usual. For example, to build OpenSSL, perform:
-
-```
-INSTX_UBSAN=1 INSTX_PREFIX=/var/sanitize ./build-openssl.sh
-```
-
-Many programs and libraries feel it is OK to leak resources, and it screws up a lot testing. If you are using Asan or Msan and encounter too many `ERROR: LeakSanitizer: detected memory leaks`, then you may need `LSAN_OPTIONS=detect_leaks=0`. Also see [Issue 719, Suppress leak checking on exit](https://github.com/google/sanitizers/issues/719).
-
-Once finished with testing perform `rm -rf /var/sanitize` so everything is deleted.
-
-## Self Tests
-
-The scripts attempt to run the program's or library's self tests. Usually the recipe is `make check`, but it is `make test` on occasion.
-
-Previous versions of the scripts: If the self tests are run and fail, then the script stops before installation. This is no longer the case because GNU Software has so many problems it is impossible to build some tools.
-
-Current versions of the scripts: If the self tests are run and fail, then the script collects the log files and continues the installation. You can find the log files by performing `ls *.log.zip`. After a failure start sending bug reports to the project.
-
-## Git History
-
-This GitHub does not aim to provide a complete history of changes from Commit 0. Part of the reason is, `bootstrap/` has binary files and the history and objects gets rather large. When a tarball is updated in `bootstrap/` we try to reset history according to [How to squash all git commits into one?](https://stackoverflow.com/a/24154149).
-
-Resetting history may result in errors like the one below.
-
-```
-$ git checkout master -f && git pull
-Already on 'master'
-Your branch and 'origin/master' have diverged,
-and have 1338 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-fatal: refusing to merge unrelated histories
-```
-
-If you encounter it, then run `reset-repo.sh` or perform the following.
-
-```
-$ git fetch
-$ git reset --hard origin/master
-HEAD is now at 9a50195 Reset repository after OpenSSL 1.1.1d bump
-```
-
-## Problems
-
-This section details some known problems and problem packages.
-
-### Cruft over Time
-
-Linux systems do not operate well with multiple versions of a library installed. For example, suppose you install a program in 2019, and the program installs Ncurses 6.0, Readline 7.0 and GetText 1.20. By the time 2020 or 2021 rolls around, Ncurses 6.1, Readline 8.0 and GetText 1.21 are built and installed. So you have new headers, new libraries and old libraries.
-
-Programs and libraries will effectively stop building due to compile and link errors because Linux does not know how to manage side-by-side installations, like OS X, Solaris or Windows. Shared objects get moved to libmylibrary.so.old, and then links like libmylibrary.so are pointed at the old library even though new headers are present for the new library.
-
-The fix is to delete the install directory and start over. A `rm -rf /usr/local/*` usually works well to reset things.
-
-### Autogen
-
-It appears Autogen is no longer being maintained. It uses libraries that are no longer present, like `libintl_dgettext` and `libintl_gettext`. Expect about 20/24 self test failures.
-
-We don't know if Autogen actually works in practice.
-
-### Autotools
-
-Autotools is its own special kind of hell. Autotools is a place where progammers get sent when they have behaved badly.
-
-On new distros you should install Autotools from the distribution. The packages in the Autotools collection which should be installed through the distribution include:
-
-* Aclocal
-* Autoconf
-* Automake
-* Autopoint
-* Libtool
-
-The build scripts include `build-autotools.sh` but you should use it sparingly on old distros. Attempting to update Autotools creates a lot of incompatibility problems. For example, Aclocal and Acheader will complain about wrong versions. Autoconf won't be able to find its M4 macros even though M4, Autoconf, Automake and Libtool are freshly installed in `$prefix`. Libtool will fail to link a library that is present in the expected location. Etc, etc, etc.
-
-### GhostScript
-
-GhostScript is probably not going to build properly. The package needs its `configure.ac` and `Makefile.am` rewritten to handle user flags properly.
-
-### Gnulib
-
-Some older versions of system header files cause a broken compile due to `__THROW` on C functions. The system headers are actually OK, the problem is Gnulib. Gnulib sets `__THROW` to the unsupported `__attribute__ ((__nothrow__))` and it breaks the compile. Affected versions include the header supplied with Fedora 1 and Ubuntu 4.
-
-If you encounter a build error *"error: parse error before '{' token"*, then open the header and add the following after the last include. The last include should be `<features.h>`, give or take.
-
-```
-#include <features.h>
-
-/* Gnulib redefines __THROW to __attribute__ ((__nothrow__)) */
-/* This GCC compiler cannot handle the attribute.            */
-#ifndef __cplusplus
-# undef __THROW
-# define __THROW
-#endif
-```
-
-The system headers that are affected include:
-
-* ctype.h
-* stdio.h
-* wchar.h
-* sysmacros.h
-
-### GnuPG
-
-GnuPG may break Git and code signing. There seems to be an incompatibility in the way GnuPG prompts for a password and the way Git expects a user to provide a password.
-
-### GnuTLS
-
-GnuTLS may or may not build and install correctly. It is a big recipe and Guile causes a fair amount of trouble on many systems.
-
-GnuTLS uses private headers from libraries like Nettle, so things can go sideways if the wrong libraries are loaded at runtime.
-
-### OpenSSL
-
-OpenSSL 1.1.x has a lot of problems on older systems due to a dependency on Perl 5.24 and above. On modern systems with adequate Perl the OpenSSL recipe will build and install OpenSSL 1.1.x. On older systems with an old version of Perl, the OpenSSL recipe will build and install OpenSSL 1.0.2.
-
-OpenSSL 1.0.2u was last maintained on December 2019. It is now end-of-life. OpenSSL 1.0.2 from December 2019 is a lot better than the OpenSSL version on older systems, like OpenSSL 0.9.8 through 1.0.1.
-
-### Nettle
-
-Nettle is a constant source of problems. It is not well tested. It has chronic configuration problems and the self tests usually fail to run. Things only get worse on non-Linux systems.
-
-Note to future maintainers: test your shit.
-
-### OpenBSD
-
-OpenBSD has an annoyance:
-
-```
-Provide an AUTOCONF_VERSION environment variable, please
-```
-
-If you encounter the annoyance then set the variables to `*`:
-
-```
-AUTOCONF_VERSION=* AUTOMAKE_VERSION=* ./build-package.sh
-```
-
-### Perl
-
-Perl is a constant source of problems, but it is needed by OpenSSL 1.1.x. Perl's build system does not honor our flags, removes hardening flags, does not handle runpaths properly, uses incorrect directories in its configuration, builds packages as root during `make install`, and fails to run due to missing `libperl.so`. Perl is mostly a lost cause.
-
-Note to future maintainers: honor the user's flags. Never build shit during `make install`.
-
-## Bugs
-
-If you find a bug then submit a patch or raise a bug report.
+# Build-Scripts
+This GitHub is a collection of build scripts useful when testing on downlevel and unique clients. It should result in working SSH, cURL and Git clients on systems like Fedora 10, CentOS 5 and Solaris 11.
diff --git a/audit-checksec-bins.sh b/audit-checksec-bins.sh
deleted file mode 100755
index 20026cec1..000000000
--- a/audit-checksec-bins.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-# Download and install checksec:
-#   wget https://raw.githubusercontent.com/slimm609/checksec.sh/master/checksec
-#   xattr -r -d com.apple.quarantine checksec
-#   chmod a+x checksec
-#   sudo mv checksec /usr/bin
-
-dir="$1"
-
-# Ensure a directory is specified
-if [[ -z "${dir}" ]]; then
-    echo "Please specify a directory"
-    exit 1
-fi
-
-if [[ ! -d "${dir}" ]]; then
-    echo "Please specify a real directory"
-    exit 1
-fi
-
-# Find a non-anemic grep
-GREP=$(command -v grep 2>/dev/null)
-if [[ -d /usr/gnu/bin ]]; then
-    GREP=/usr/gnu/bin/grep
-fi
-
-# Ensure checksec is available
-if [[ -z "${CHECKSEC}" ]]; then
-    if [[ -e ./checksec ]]; then
-        CHECKSEC=./checksec
-    elif [[ $(command -v checksec 2>/dev/null) ]]; then
-        CHECKSEC=$(command -v checksec 2>/dev/null)
-    fi
-fi
-
-if [[ -z "${CHECKSEC}" ]]
-then
-    echo "Installing checksec"
-
-    wget -q -O checksec 'https://raw.githubusercontent.com/slimm609/checksec.sh/master/checksec'
-    chmod +x checksec
-
-    if [[ $(uname -s | ${GREP} -i 'darwin') ]] ;then
-        xattr -r -d com.apple.quarantine checksec
-    fi
-
-    CHECKSEC=./checksec
-fi
-
-# Find someprog files using the shell wildcard. Some programs
-# are _not_ executable and get missed in the do loop.
-IFS= find "${dir}" -type f -name '*' -print | while read -r file
-do
-    if [[ ! $(file -ibh "${file}" | ${GREP} -E "application/x-sharedlib") ]]; then continue; fi
-
-    echo "****************************************"
-    echo "${file}:"
-    echo ""
-
-    ${CHECKSEC} --file="${file}"
-
-done
-echo "****************************************"
-
-exit 0
diff --git a/audit-checksec-libs.sh b/audit-checksec-libs.sh
deleted file mode 100755
index b20a36f33..000000000
--- a/audit-checksec-libs.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-# Download and install checksec:
-#   wget https://raw.githubusercontent.com/slimm609/checksec.sh/master/checksec
-#   xattr -r -d com.apple.quarantine checksec
-#   chmod a+x checksec
-#   sudo mv checksec /usr/bin
-
-dir="$1"
-
-# Ensure a directory is specified
-if [[ -z "${dir}" ]]; then
-    echo "Please specify a directory"
-    exit 1
-fi
-
-if [[ ! -d "${dir}" ]]; then
-    echo "Please specify a real directory"
-    exit 1
-fi
-
-# Find a non-anemic grep
-GREP=$(command -v grep 2>/dev/null)
-if [[ -d /usr/gnu/bin ]]; then
-    GREP=/usr/gnu/bin/grep
-fi
-
-# Ensure checksec is available
-if [[ -z "${CHECKSEC}" ]]; then
-    if [[ -e ./checksec ]]; then
-        CHECKSEC=./checksec
-    elif [[ $(command -v checksec 2>/dev/null) ]]; then
-        CHECKSEC=$(command -v checksec 2>/dev/null)
-    fi
-fi
-
-if [[ -z "${CHECKSEC}" ]]
-then
-    echo "Installing checksec"
-
-    wget -q -O checksec 'https://raw.githubusercontent.com/slimm609/checksec.sh/master/checksec'
-    chmod +x checksec
-
-    if [[ $(uname -s | ${GREP} -i 'darwin') ]] ;then
-        xattr -r -d com.apple.quarantine checksec
-    fi
-
-    CHECKSEC=./checksec
-fi
-
-if [[ $(uname -s | ${GREP} -i 'darwin') ]]; then
-    LIB_EXT='*\.dylib*'
-else
-    LIB_EXT='*\.so*'
-fi
-
-# Find libfoo.so* files using the shell wildcard. Some libraries
-# are _not_ executable and get missed in the do loop.
-IFS= find "${dir}" -type f -name "$LIB_EXT" -print | while read -r file
-do
-    if [[ ! $(file -ibh "${file}" | ${GREP} -E "application/x-sharedlib") ]]; then continue; fi
-
-    echo "****************************************"
-    echo "${file}:"
-    echo ""
-
-    ${CHECKSEC} --file="${file}"
-
-done
-echo "****************************************"
-
-exit 0
diff --git a/audit-rpath-bins.sh b/audit-rpath-bins.sh
deleted file mode 100755
index 50d4b8414..000000000
--- a/audit-rpath-bins.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-dir="$1"
-
-if [[ -z "$dir" ]]; then
-    echo "Please specify a directory"
-    exit 1
-fi
-
-if [[ ! -d "${dir}" ]]; then
-    echo "Please specify a real directory"
-    exit 1
-fi
-
-# Find a non-anemic grep
-GREP=$(command -v grep 2>/dev/null)
-if [[ -d /usr/gnu/bin ]]; then
-    GREP=/usr/gnu/bin/grep
-fi
-
-# Find someprog files using the shell wildcard. Some programs
-# are _not_ executable and get missed in the do loop.
-IFS= find "$dir" -type f -name '*' -print | while read -r file
-do
-    if [[ ! $(file -i "$file" | $GREP -E "regular|application") ]]; then continue; fi
-
-    echo "****************************************"
-    echo "$file:"
-    echo ""
-
-    if [[ $(command -v readelf 2>/dev/null) ]]; then
-        readelf -d "$file" | $GREP -E 'RPATH|RUNPATH' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 3,6
-    elif [[ $(command -v otool 2>/dev/null) ]]; then
-        otool -l "$file" | $GREP -A 2 -E 'RPATH|RUNPATH' | $GREP -E 'RPATH|RUNPATH|path' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 3
-    elif [[ $(command -v dump 2>/dev/null) ]]; then
-        dump -Lv "$file" | $GREP -E 'RPATH|RUNPATH' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 2,3
-    elif [[ $(command -v elfdump 2>/dev/null) ]]; then
-        elfdump "$file" | $GREP -E 'RPATH|RUNPATH' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 3,5
-    fi
-
-done
-echo "****************************************"
-
-exit 0
diff --git a/audit-rpath-libs.sh b/audit-rpath-libs.sh
deleted file mode 100755
index 34b712275..000000000
--- a/audit-rpath-libs.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-dir="$1"
-
-if [[ -z "$dir" ]]; then
-    echo "Please specify a directory"
-    exit 1
-fi
-
-if [[ ! -d "${dir}" ]]; then
-    echo "Please specify a real directory"
-    exit 1
-fi
-
-# Find a non-anemic grep
-GREP=$(command -v grep 2>/dev/null)
-if [[ -d /usr/gnu/bin ]]; then
-    GREP=/usr/gnu/bin/grep
-fi
-
-if [[ $(uname -s | $GREP Darwin) ]]; then
-    LIB_EXT='*\.dylib*'
-else
-    LIB_EXT='*\.so*'
-fi
-
-# Find libfoo.so* files using the shell wildcard. Some libraries
-# are _not_ executable and get missed in the do loop.
-IFS= find "$dir" -type f -name "$LIB_EXT" -print | while read -r file
-do
-    if [[ ! $(file -i "$file" | $GREP -E "regular|application") ]]; then continue; fi
-
-    echo "****************************************"
-    echo "$file:"
-    echo ""
-
-    if [[ $(command -v readelf 2>/dev/null) ]]; then
-        readelf -d "$file" | $GREP -E 'RPATH|RUNPATH' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 3,6
-    elif [[ $(command -v otool 2>/dev/null) ]]; then
-        otool -l "$file" | $GREP -A 2 -E 'RPATH|RUNPATH' | $GREP -E 'RPATH|RUNPATH|path' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 3
-    elif [[ $(command -v dump 2>/dev/null) ]]; then
-        dump -Lv "$file" | $GREP -E 'RPATH|RUNPATH' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 2,3
-    elif [[ $(command -v elfdump 2>/dev/null) ]]; then
-        elfdump "$file" | $GREP -E 'RPATH|RUNPATH' | tr '\t' ' ' | sed 's/  */ /g' | cut -d ' ' -f 3,5
-    fi
-
-done
-echo "****************************************"
-
-exit 0
diff --git a/bootstrap/bitness.c b/bootstrap/bitness.c
deleted file mode 100644
index 3ceb1d343..000000000
--- a/bootstrap/bitness.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stddef.h>
-int main(int argc, char* argv[])
-{
-  enum {N = (sizeof(size_t) == 8 ? 8 : -1)};
-  int x[N];
-  return 0;
-}
diff --git a/bootstrap/bootstrap-wget.sh b/bootstrap/bootstrap-wget.sh
deleted file mode 100755
index 72b08f38c..000000000
--- a/bootstrap/bootstrap-wget.sh
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton.
-# This script builds Wget, Unistring and OpenSSL from sources.
-# This Wget is crippled, but allows bootstrapping a full Wget build.
-
-# Binaries
-WGET_TAR=wget-1.21.3.tar.gz
-UNISTR_TAR=libunistring-1.1.tar.gz
-SSL_TAR=openssl-1.0.2u.tar.gz
-
-# Directories
-BOOTSTRAP_DIR=$(pwd)
-PATCH_DIR="$(pwd)/../patch"
-
-WGET_DIR=wget-1.21.3
-UNISTR_DIR=libunistring-1.1
-SSL_DIR=openssl-1.0.2u
-
-# Install location
-PREFIX="$HOME/.build-scripts/wget"
-BINDIR="$PREFIX/bin"
-LIBDIR="$PREFIX/lib"
-CACERTDIR="$PREFIX/cacert"
-CACERTFILE="$CACERTDIR/cacert.pem"
-
-# Sets the number of make jobs if not set in environment
-: "${INSTX_JOBS:=2}"
-
-# Make the directories
-mkdir -p "$PREFIX" "$BINDIR" "$LIBDIR" "$CACERTDIR"
-
-###############################################################################
-
-# Autotools on Solaris has an implied requirement for GNU gear. Things fall apart without it.
-# Also see https://blogs.oracle.com/partnertech/entry/preparing_for_the_upcoming_removal.
-if [[ -d "/usr/gnu/bin" ]]; then
-    if [[ ! ("$PATH" == *"/usr/gnu/bin"*) ]]; then
-        echo
-        echo "Adding /usr/gnu/bin to PATH for Solaris"
-        export PATH="/usr/gnu/bin:$PATH"
-    fi
-elif [[ -d "/usr/swf/bin" ]]; then
-    if [[ ! ("$PATH" == *"/usr/sfw/bin"*) ]]; then
-        echo
-        echo "Adding /usr/sfw/bin to PATH for Solaris"
-        export PATH="/usr/sfw/bin:$PATH"
-    fi
-elif [[ -d "/usr/ucb/bin" ]]; then
-    if [[ ! ("$PATH" == *"/usr/ucb/bin"*) ]]; then
-        echo
-        echo "Adding /usr/ucb/bin to PATH for Solaris"
-        export PATH="/usr/ucb/bin:$PATH"
-    fi
-fi
-
-############################## Misc ##############################
-
-if [[ -z "$(command -v patch 2>/dev/null)" ]]
-then
-    echo "Please install patch program"
-    exit 1
-fi
-
-if [[ -z "$CC" ]]
-then
-    if [[ -n "$(command -v gcc 2>/dev/null)" ]]; then
-        CC=gcc; CXX=g++
-    elif [[ -n "$(command -v clang 2>/dev/null)" ]]; then
-        CC=clang; CXX=clang++
-    elif [[ -n "$(command -v cc 2>/dev/null)" && -n "$(command -v CC 2>/dev/null)" ]]; then
-        CC=cc; CXX=CC
-    fi
-fi
-
-if $CC $CFLAGS bitness.c -o /dev/null &>/dev/null; then
-    OPT_BITS=64
-else
-    OPT_BITS=32
-fi
-
-if $CC $CFLAGS comptest.c -fPIC -o /dev/null &>/dev/null; then
-    OPT_PIC=-fPIC
-elif $CC $CFLAGS comptest.c -kPIC -o /dev/null &>/dev/null; then
-    OPT_PIC=-kPIC
-fi
-
-# Needed for Solaris
-if $CC $CFLAGS comptest.c -lresolv -lsocket -lnsl -o /dev/null &>/dev/null; then
-    OPT_SOCKET="-lresolv -lsocket -lnsl"
-elif $CC $CFLAGS comptest.c -lsocket -lnsl -o /dev/null &>/dev/null; then
-    OPT_SOCKET="-lsocket -lnsl"
-elif $CC $CFLAGS comptest.c -lsocket -o /dev/null &>/dev/null; then
-    OPT_SOCKET="-lsocket"
-fi
-
-# Needed for some BSDs
-if $CC $CFLAGS comptest.c -ldl -o /dev/null &>/dev/null; then
-    OPT_LDL=-ldl
-fi
-
-echo
-echo "*************************************************"
-echo Bootstrap options:
-echo "  OPT_BITS: $OPT_BITS"
-echo "  OPT_PIC: $OPT_PIC"
-echo "  OPT_LDL: $OPT_LDL"
-echo "  OPT_SOCKET: $OPT_SOCKET"
-echo "*************************************************"
-
-IS_DARWIN=$(grep -i -c 'darwin' <<< "$(uname -s 2>&1)")
-IS_LINUX=$(grep -i -c 'linux' <<< "$(uname -s 2>&1)")
-IS_SOLARIS=$(grep -i -c 'sunos' <<< "$(uname -s 2>&1)")
-IS_AMD64=$(grep -i -c -E 'x86_64|amd64' <<< "$(uname -m 2>&1)")
-IS_ARM64=$(grep -i -c -E 'aarch64|arm64' <<< "$(uname -m 2>&1)")
-
-# DH is 2x to 4x faster with ec_nistp_64_gcc_128, but it is
-# only available on x64 machines with uint128 available.
-HAVE_INT128=$($CC $CFLAGS -dM -E - </dev/null | grep -i -c "__SIZEOF_INT128__")
-
-if [[ "$IS_AMD64" -ne 0 && "$HAVE_INT128" -ne 0 ]]; then
-    OPT_INT128="enable-ec_nistp_64_gcc_128"
-fi
-
-# OpenSSL does not honor no-dso. Needed by Unistring and Wget.
-OPENSSL_LIBS="$LIBDIR/libssl.a $LIBDIR/libcrypto.a"
-UNISTRING_LIBS="$LIBDIR/libunistring.a"
-
-############################## CA Certs ##############################
-
-echo
-echo "*************************************************"
-echo "Configure CA certs"
-echo "*************************************************"
-echo
-
-# Copy our copy of cacerts to bootstrap
-mkdir -p "$CACERTDIR"
-if ! cp cacert.pem "$CACERTDIR"; then
-    echo "Failed to install cacert.pem"
-    exit 1
-fi
-
-echo "Copy cacert.pem to $CACERTFILE"
-echo "Done."
-
-############################## OpenSSL ##############################
-
-echo
-echo "*************************************************"
-echo "Building OpenSSL"
-echo "*************************************************"
-echo
-
-rm -rf "$SSL_DIR" &>/dev/null
-gzip -d < "$SSL_TAR" | tar xf -
-cd "$BOOTSTRAP_DIR/$SSL_DIR" || exit 1
-
-cp "${PATCH_DIR}/openssl-1.0.2.patch" .
-
-if ! patch -p0 < openssl-1.0.2.patch;
-then
-    echo "Failed to patch OpenSSL"
-    exit 1
-fi
-
-    KERNEL_BITS="$OPT_BITS" \
-./config \
-    --prefix="$PREFIX" \
-    --openssldir="$PREFIX" \
-    "$OPT_INT128" "$OPT_PIC" -DPEDANTIC \
-    no-ssl2 no-ssl3 no-comp no-zlib no-zlib-dynamic \
-    no-threads no-shared no-dso no-engine
-
-# This will need to be fixed for BSDs and PowerMac
-if ! make depend; then
-    echo "Failed to update OpenSSL dependencies"
-    exit 1
-fi
-
-if ! make -j "$INSTX_JOBS"; then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-rm -f "$PREFIX/openssl.cnf"
-
-if ! make install_sw; then
-    echo "Failed to install OpenSSL"
-    exit 1
-fi
-
-# OpenSSL does not honor no-engines
-rm -rf "$LIBDIR/engines"
-
-# Write essential values
-{
-    echo "RANDFILE = \$ENV::HOME/.rand"
-    echo "certificate = $CACERTDIR/cacert.pem"
-
-} >> "$PREFIX/openssl.cnf"
-
-############################## Unistring ##############################
-
-cd "$BOOTSTRAP_DIR" || exit 1
-
-echo
-echo "*************************************************"
-echo "Building Unistring"
-echo "*************************************************"
-echo
-
-rm -rf "$UNISTR_DIR" &>/dev/null
-gzip -d < "$UNISTR_TAR" | tar xf -
-cd "$BOOTSTRAP_DIR/$UNISTR_DIR" || exit 1
-
-    CFLAGS="$CFLAGS" \
-    LDFLAGS="$LDFLAGS" \
-    PKG_CONFIG_PATH="$LIBDIR/pkgconfig/" \
-    OPENSSL_LIBS="$OPENSSL_LIBS" \
-    LIBS="$OPT_SOCKET $OPT_LDL" \
-./configure \
-    --prefix="$PREFIX" \
-    --sysconfdir="$PREFIX/etc" \
-    --disable-shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Unistring"
-    exit 1
-fi
-
-if ! make -j "$INSTX_JOBS" V=1; then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-if ! make install; then
-    echo "Failed to install Unistring"
-    exit 1
-fi
-
-############################## Wget ##############################
-
-cd "$BOOTSTRAP_DIR" || exit 1
-
-echo
-echo "*************************************************"
-echo "Building Wget"
-echo "*************************************************"
-echo
-
-rm -rf "$WGET_DIR" &>/dev/null
-gzip -d < "$WGET_TAR" | tar xf -
-cd "$BOOTSTRAP_DIR/$WGET_DIR" || exit 1
-
-cp "${PATCH_DIR}/wget.patch" .
-
-if ! patch -p0 < wget.patch;
-then
-    echo "Failed to patch Wget"
-    exit 1
-fi
-
-# Install recipe does not overwrite a config, if present.
-if [[ -f "$PREFIX/etc/wgetrc" ]]; then
-    rm "$PREFIX/etc/wgetrc"
-fi
-
-# Alpine Linux loader sucks...
-lib_crypto=$(echo "$LIBDIR/libcrypto.a" | sed 's/\//\\\//g')
-lib_ssl=$(echo "$LIBDIR/libssl.a" | sed 's/\//\\\//g')
-lib_unistring=$(echo "$LIBDIR/libunistring.a" | sed 's/\//\\\//g')
-
-sed -e "s/-lcrypto/$lib_crypto/g" \
-    -e "s/-lssl/$lib_ssl/g" \
-    -e "s/-lunistring/$lib_unistring/g" \
-    configure > configure.fixed
-mv configure.fixed configure && chmod +x configure
-
-    CFLAGS="$CFLAGS" \
-    LDFLAGS="$LDFLAGS" \
-    PKG_CONFIG_PATH="$LIBDIR/pkgconfig/" \
-    OPENSSL_LIBS="$OPENSSL_LIBS" \
-    LIBS="$OPT_SOCKET $OPT_LDL" \
-./configure \
-    --prefix="$PREFIX" \
-    --sysconfdir="$PREFIX/etc" \
-    --with-libunistring-prefix="${PREFIX}" \
-    --with-libssl-prefix="${PREFIX}" \
-    --with-ssl=openssl \
-    --with-openssl=yes \
-    --without-zlib \
-    --without-libpsl \
-    --without-libuuid \
-    --without-libidn \
-    --without-cares \
-    --disable-pcre \
-    --disable-pcre2 \
-    --disable-nls \
-    --disable-iri \
-    --disable-ntlm \
-    --disable-opie
-
-if [[ "$?" -ne "0" ]]; then
-    echo "Failed to configure Wget"
-    exit 1
-fi
-
-# Fix makefiles. No shared objects.
-IFS= find "$PWD" -iname 'Makefile' -print | while read -r file
-do
-    sed -e "s/-lcrypto/$lib_crypto/g" \
-        -e "s/-lssl/$lib_ssl/g" \
-        -e "s/-lunistring/$lib_unistring/g" \
-        "${file}" > "${file}.fixed"
-    mv "${file}.fixed" "${file}"
-done
-
-# Fix lib/malloc/dynarray-skeleton.c
-file=lib/malloc/dynarray-skeleton.c
-sed -e 's/__nonnull ((1))//g' \
-    -e 's/__nonnull ((1, 2))//g' \
-    "${file}" > "${file}.fixed"
-mv "${file}.fixed" "${file}"
-
-if ! make -j "$INSTX_JOBS" V=1; then
-    echo "Failed to build Wget"
-    exit 1
-fi
-
-# Remove old rc file.
-rm -f "$PREFIX/etc/wgetrc"
-
-if ! make install; then
-    echo "Failed to install Wget"
-    exit 1
-fi
-
-# Wget configuration file
-{
-    echo ""
-    echo "# cacert.pem location"
-    echo "ca_directory = $PREFIX/cacert/"
-    echo "ca_certificate = $PREFIX/cacert/cacert.pem"
-    echo ""
-} >> "$PREFIX/etc/wgetrc"
-
-# Cleanup
-if true; then
-    cd "$BOOTSTRAP_DIR" || exit 1
-    rm -rf "$WGET_DIR"
-    rm -rf "$UNISTR_DIR"
-    rm -rf "$SSL_DIR"
-    rm -f openssl-1.0.2.patch
-    rm -f wget.patch
-fi
-
-exit 0
diff --git a/bootstrap/cacert.pem b/bootstrap/cacert.pem
deleted file mode 100644
index f78a6101a..000000000
--- a/bootstrap/cacert.pem
+++ /dev/null
@@ -1,3581 +0,0 @@
-##
-## Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Mon Mar 11 15:25:27 2024 GMT
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 4d96bd539f4719e9ace493757afbe4a23ee8579de1c97fbebc50bba3c12e8c1e
-##
-
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
-KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
-T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
-J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
-nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-========================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-Actalis Authentication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
-BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
-AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
-MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
-IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
-wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
-by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
-zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
-YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
-oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
-EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
-hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
-EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
-jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
-iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
-WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
-JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
-K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
-Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
-4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
-2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
-lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
-OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
-vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-Buypass Class 2 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
-DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
-g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
-9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
-/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
-CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
-awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
-zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
-Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
-Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
-M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
-osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
-aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
-DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
-LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
-oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
-wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
-CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
-rJgWVqA=
------END CERTIFICATE-----
-
-Buypass Class 3 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
-DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
-sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
-5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
-7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
-ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
-2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
-/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
-RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
-Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
-j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
-uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
-Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
-ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
-KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
-6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
-UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
-eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
-Cp/HuZc=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 3
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
-MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
-9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
-NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
-iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
-0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
-AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
-fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
-ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
-P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
-Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
-LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
-ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
-BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
-KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
-p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
-AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
-4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
-eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
-MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
-PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
-OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
-2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
-dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
-X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 EV 2009
-=================================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
-egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
-zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
-7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
-sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
-11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
-cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
-ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
-MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
-b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
-c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
-PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
-ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
-NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
-w9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-CA Disig Root R2
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
-w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
-xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
-A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
-GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
-g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
-5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
-koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
-Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
-Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
-Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
-sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
-dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
-1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
-mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
-utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
-sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
-UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
-7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-ACCVRAIZ1
-=========
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
-SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
-MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
-UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
-jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
-RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
-aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
-0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
-WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
-8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
-5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
-9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
-Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
-Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
-Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
-Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
-QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
-AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
-YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
-AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
-IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
-aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
-dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
-MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
-hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
-R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
-YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
-nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
-TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
-sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
-Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
-3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
-EfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-TWCA Global Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
-CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
-QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
-EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
-nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
-r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
-Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
-tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
-KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
-sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
-yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
-kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
-zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
-cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
-8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
-/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
-lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
-A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
-i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
-EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
-zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
------END CERTIFICATE-----
-
-TeliaSonera Root CA v1
-======================
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
-CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
-MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
-VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
-6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
-3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
-B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
-Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
-oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
-F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
-oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
-gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
-TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
-AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
-DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
-zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
-pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
-G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
-c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
-JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
-qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
-Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
-WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 2
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
-MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
-SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
-vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
-2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
-WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
-YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
-r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
-vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
-3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
------END CERTIFICATE-----
-
-Atos TrustedRoot 2011
-=====================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
-cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
-MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
-A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
-hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
-54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
-DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
-HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
-z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
-l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
-bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
-k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
-TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
-61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
-3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
-
-QuoVadis Root CA 1 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
-PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
-PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
-Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
-ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
-g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
-7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
-9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
-iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
-t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
-hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
-GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
-Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
-+V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
-3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
-wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
-O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
-FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
-hMJKzRwuJIczYOXD
------END CERTIFICATE-----
-
-QuoVadis Root CA 2 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
-ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
-NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
-oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
-MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
-V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
-L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
-sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
-6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
-lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
-hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
-pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
-x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
-dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
-U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
-mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
-zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
-JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
-O3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-QuoVadis Root CA 3 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
-IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
-Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
-6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
-I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
-VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
-5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
-Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
-dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
-rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
-hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
-t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
-TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
-DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
-Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
-hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
-0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
-dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
-PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G2
-===========================
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
-MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
-35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
-bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
-VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
-YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
-lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
-w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
-0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
-d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
-hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
-jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G3
-===========================
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
-VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
-RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
-KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
-UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
-YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
-1vUhZscv6pZjamVFkpUBtA==
------END CERTIFICATE-----
-
-DigiCert Global Root G2
-=======================
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
-MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
-kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
-3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
-BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
-UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
-o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
-5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
-F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
-WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
-QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
-iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
-
-DigiCert Global Root G3
-=======================
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
-VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
-MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
-aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
-AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
-YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
-Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
-3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
-VOKa5Vt8sycX
------END CERTIFICATE-----
-
-DigiCert Trusted Root G4
-========================
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
-HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
-pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
-k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
-vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
-QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
-MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
-mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
-f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
-dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
-oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
-ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
-yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
-7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
-ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
-5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
-/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
-5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
-G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
-82Z+
------END CERTIFICATE-----
-
-COMODO RSA Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
-dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
-FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
-5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
-x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
-2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
-OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
-sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
-GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
-WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
-rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
-nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
-tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
-sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
-pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
-zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
-ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
-7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
-LaZRfyHBNVOFBkpdn627G190
------END CERTIFICATE-----
-
-USERTrust RSA Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
-0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
-Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
-RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
-+T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
-/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
-Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
-lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
-yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
-eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
-FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
-7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
-Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
-8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
-FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
-yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
-J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
-sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
-Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
-
-USERTrust ECC Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
-0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
-nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
-HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
-HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
-9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R5
-===========================
------BEGIN CERTIFICATE-----
-MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
-SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
-h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
-uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
-yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
------END CERTIFICATE-----
-
-IdenTrust Commercial Root CA 1
-==============================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
-b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
-IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
-hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
-mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
-1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
-XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
-3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
-NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
-WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
-xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
-uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
-hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
-6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
-ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
-ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
-YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
-feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
-kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
-2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
-Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
-cGzM7vRX+Bi6hG6H
------END CERTIFICATE-----
-
-IdenTrust Public Sector Root CA 1
-=================================
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
-ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
-UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
-b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
-P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
-Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
-rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
-qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
-mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
-ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
-LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
-iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
-4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
-Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
-DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
-t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
-mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
-GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
-m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
-NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
-Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
-ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
-ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
-3Wl9af0AVqW3rLatt8o+Ae+c
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
-bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
-HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
-DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
-OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
-/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
-HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
-s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
-TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
-AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
-0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
-iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
-nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
-vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
-e4pIb4tF9g==
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - EC1
-==========================================
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
-FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
-YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
-FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
-LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
-dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
-AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
-9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
-vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
-kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
-CFCA EV ROOT
-============
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
-CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
-IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
-MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
-DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
-BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
-7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
-uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
-ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
-xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
-py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
-gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
-hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
-tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
-ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
-ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
-4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
-E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
-BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
-aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
-PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
-kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
-ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GB CA
-===============================
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
-EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
-MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
-b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
-scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
-rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
-9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
-Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
-GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
-hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
-dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
-VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
-HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
-Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
------END CERTIFICATE-----
-
-SZAFIR ROOT CA2
-===============
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
-A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
-BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
-BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
-VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
-qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
-DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
-2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
-ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
-ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
-AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
-O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
-oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
-4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
-+/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
------END CERTIFICATE-----
-
-Certum Trusted Network CA 2
-===========================
------BEGIN CERTIFICATE-----
-MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
-BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
-bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
-ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
-TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
-IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
-7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
-CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
-Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
-uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
-GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
-9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
-Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
-hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
-BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
-hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
-Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
-L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
-clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
-pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
-w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
-J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
-ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
-is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
-zAYspsbiDrW5viSP
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2015
-=======================================================
------BEGIN CERTIFICATE-----
-MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
-BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
-aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
-YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
-MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
-QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
-BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
-MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
-bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
-iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
-6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
-FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
-i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
-GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
-fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
-iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
-Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
-hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
-D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
-d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
-d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
-82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
-davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
-Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
-J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
-JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
-p/UsQu0yrbYhnr68
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions ECC RootCA 2015
-===========================================================
------BEGIN CERTIFICATE-----
-MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
-aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
-cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
-aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
-MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
-IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
-VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
-Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
-dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
-Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
-GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
-dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
------END CERTIFICATE-----
-
-ISRG Root X1
-============
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
-BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
-EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
-EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
-DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
-Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
-3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
-b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
-Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
-4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
-1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
-hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
-usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
-OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
-A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
-9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
-0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
-hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
-TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
-e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
-JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
-YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
-JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
-m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----
-
-AC RAIZ FNMT-RCM
-================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
-AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
-MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
-TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
-qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
-btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
-j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
-08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
-WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
-tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
-47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
-ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
-i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
-dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
-nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
-D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
-j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
-Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
-+YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
-Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
-8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
-5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
-rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
------END CERTIFICATE-----
-
-Amazon Root CA 1
-================
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
-MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
-FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
-gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
-dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
-VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
-DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
-CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
-8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
-2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
-xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
------END CERTIFICATE-----
-
-Amazon Root CA 2
-================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
-MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
-kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
-N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
-AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
-fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
-kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
-btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
-Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
-c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
-3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
-DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
-A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
-+gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
-YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
-xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
-gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
-aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
-Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
-KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
-JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
------END CERTIFICATE-----
-
-Amazon Root CA 3
-================
------BEGIN CERTIFICATE-----
-MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
-f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
-Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
-rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
-eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
------END CERTIFICATE-----
-
-Amazon Root CA 4
-================
------BEGIN CERTIFICATE-----
-MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
-/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
-83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
-MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
-AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
------END CERTIFICATE-----
-
-TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
-D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
-IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
-TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
-ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
-VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
-c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
-bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
-IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
-6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
-wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
-3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
-WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
-ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
-KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
-AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
-lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
-e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
-q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
------END CERTIFICATE-----
-
-GDCA TrustAUTH R5 ROOT
-======================
------BEGIN CERTIFICATE-----
-MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
-BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
-DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
-YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
-IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
-AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
-OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
-pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
-9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
-xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
-R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
-D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
-oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
-9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
-p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
-H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
-6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
-+PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
-HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
-F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
-8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
-/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
-aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority RSA
-========================================
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
-BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
-MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
-MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
-LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
-Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
-P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
-oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
-k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
-fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
-gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
-UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
-1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
-bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
-dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
-ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
-u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
-erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
-MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
-vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
-Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
-wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
-WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority ECC
-========================================
------BEGIN CERTIFICATE-----
-MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
-BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
-MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
-BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
-bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
-8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
-hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
-jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
-e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
-5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority RSA R2
-==============================================
------BEGIN CERTIFICATE-----
-MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
-DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
-MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
-MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
-DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
-VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
-hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
-cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
-Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
-B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
-CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
-9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
-RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
-JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
-+qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
-HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
-qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
-++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
-Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
-guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
-OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
-CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
-lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
-rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
-hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
-9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority ECC
-===========================================
------BEGIN CERTIFICATE-----
-MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
-BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
-MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
-LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
-3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
-BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
-5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
-N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
-m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R6
-=======================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
-R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
-b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
-YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
-U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
-grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
-3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
-vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
-PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
-azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
-WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
-CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
-0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
-b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
-HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
-nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
-lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
-BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
-Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
-3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
-0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
-uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
-oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
-JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GC CA
-===============================
------BEGIN CERTIFICATE-----
-MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
-SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
-MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
-Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
-ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
-bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
-VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
-NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
-AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
-AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
------END CERTIFICATE-----
-
-UCA Global G2 Root
-==================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
-NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
-cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
-oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
-8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
-h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
-LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
-R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
-KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
-4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
-OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
-8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
-5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
-1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
-Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
-yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
-c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
-jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
-bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
-ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
-RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
------END CERTIFICATE-----
-
-UCA Extended Validation Root
-============================
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
-IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
-A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
-iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
-Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
-eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
-59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
-0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
-el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
-B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
-WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
-NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
-3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
-ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
-aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
-dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
-+7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
-F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
-GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
-GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
-djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
-dhh2n1ax
------END CERTIFICATE-----
-
-Certigna Root CA
-================
------BEGIN CERTIFICATE-----
-MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
-BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
-MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
-MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
-MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
-stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
-KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
-JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
-XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
-4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
-wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
-lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
-jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
-/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
-1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
-dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
-LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
-cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
-OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
-TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
-7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
-4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
-8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
-6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
-tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
-aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
-E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
------END CERTIFICATE-----
-
-emSign Root CA - G1
-===================
------BEGIN CERTIFICATE-----
-MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJJTjET
-MBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
-ZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgx
-ODMwMDBaMGcxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVk
-aHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQzf2N4aLTN
-LnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO8oG0x5ZOrRkVUkr+PHB1
-cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aqd7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHW
-DV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhMtTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ
-6DqS0hdW5TUaQBw+jSztOd9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrH
-hQIDAQABo0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQDAgEG
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31xPaOfG1vR2vjTnGs2
-vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjMwiI/aTvFthUvozXGaCocV685743Q
-NcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6dGNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q
-+Mri/Tm3R7nrft8EI6/6nAYH6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeih
-U80Bv2noWgbyRQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
-iN66zB+Afko=
------END CERTIFICATE-----
-
-emSign ECC Root CA - G3
-=======================
------BEGIN CERTIFICATE-----
-MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQGEwJJTjETMBEG
-A1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
-MB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4
-MTgzMDAwWjBrMQswCQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11
-ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
-RzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0WXTsuwYc
-58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xySfvalY8L1X44uT6EYGQIr
-MgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuBzhccLikenEhjQjAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+D
-CBeQyh+KTOgNG3qxrdWBCUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7
-jHvrZQnD+JbNR6iC8hZVdyR+EhCVBCyj
------END CERTIFICATE-----
-
-emSign Root CA - C1
-===================
------BEGIN CERTIFICATE-----
-MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCVVMx
-EzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNp
-Z24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQD
-ExNlbVNpZ24gUm9vdCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+up
-ufGZBczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZHdPIWoU/
-Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH3DspVpNqs8FqOp099cGX
-OFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvHGPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4V
-I5b2P/AgNBbeCsbEBEV5f6f9vtKppa+cxSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleooms
-lMuoaJuvimUnzYnu3Yy1aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+
-XJGFehiqTbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
-ggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87/kOXSTKZEhVb3xEp
-/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4kqNPEjE2NuLe/gDEo2APJ62gsIq1
-NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrGYQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9
-wC68AivTxEDkigcxHpvOJpkT+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQ
-BmIMMMAVSKeoWXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
------END CERTIFICATE-----
-
-emSign ECC Root CA - C3
-=======================
------BEGIN CERTIFICATE-----
-MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQGEwJVUzETMBEG
-A1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMxIDAeBgNVBAMTF2VtU2lnbiBF
-Q0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UE
-BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQD
-ExdlbVNpZ24gRUNDIFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd
-6bciMK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4OjavtisIGJAnB9
-SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0OBBYEFPtaSNCAIEDyqOkA
-B2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gA
-MGUCMQC02C8Cif22TGK6Q04ThHK1rt0c3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwU
-ZOR8loMRnLDRWmFLpg9J0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 3
-=======================
------BEGIN CERTIFICATE-----
-MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQELBQAwbzELMAkG
-A1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJSG9uZyBLb25nMRYwFAYDVQQK
-Ew1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25na29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2
-MDMwMjI5NDZaFw00MjA2MDMwMjI5NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtv
-bmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMX
-SG9uZ2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz
-iNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFOdem1p+/l6TWZ5Mwc50tf
-jTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mIVoBc+L0sPOFMV4i707mV78vH9toxdCim
-5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOe
-sL4jpNrcyCse2m5FHomY2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj
-0mRiikKYvLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+TtbNe/
-JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZbx39ri1UbSsUgYT2u
-y1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+l2oBlKN8W4UdKjk60FSh0Tlxnf0h
-+bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YKTE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsG
-xVd7GYYKecsAyVKvQv83j+GjHno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwID
-AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
-i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEwDQYJKoZIhvcN
-AQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG7BJ8dNVI0lkUmcDrudHr9Egw
-W62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCkMpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWld
-y8joRTnU+kLBEUx3XZL7av9YROXrgZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov
-+BS5gLNdTaqX4fnkGMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDc
-eqFS3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJmOzj/2ZQw
-9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+l6mc1X5VTMbeRRAc6uk7
-nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6cJfTzPV4e0hz5sy229zdcxsshTrD3mUcY
-hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
-60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq
-dBb9HxEGmpv0
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - G4
-=========================================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAwgb4xCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu
-bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1
-dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSAtIEc0MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYT
-AlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
-L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEc0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3D
-umSXbcr3DbVZwbPLqGgZ2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV
-3imz/f3ET+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j5pds
-8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAMC1rlLAHGVK/XqsEQ
-e9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73TDtTUXm6Hnmo9RR3RXRv06QqsYJn7
-ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNXwbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5X
-xNMhIWNlUpEbsZmOeX7m640A2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV
-7rtNOzK+mndmnqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
-dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwlN4y6mACXi0mW
-Hv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNjc0kCAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9n
-MA0GCSqGSIb3DQEBCwUAA4ICAQAS5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4Q
-jbRaZIxowLByQzTSGwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht
-7LGrhFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/B7NTeLUK
-YvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uIAeV8KEsD+UmDfLJ/fOPt
-jqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbwH5Lk6rWS02FREAutp9lfx1/cH6NcjKF+
-m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKW
-RGhXxNUzzxkvFMSUHHuk2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjA
-JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G
-+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT
-kcpG2om3PVODLAgfi49T3f+sHw==
------END CERTIFICATE-----
-
-Microsoft ECC Root Certificate Authority 2017
-=============================================
------BEGIN CERTIFICATE-----
-MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
-UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNyb3NvZnQgRUND
-IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4
-MjMxNjA0WjBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw
-NAYDVQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZRogPZnZH6
-thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYbhGBKia/teQ87zvH2RPUB
-eMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTIy5lycFIM
-+Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlf
-Xu5gKcs68tvWMoQZP3zVL8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaR
-eNtUjGUBiudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M=
------END CERTIFICATE-----
-
-Microsoft RSA Root Certificate Authority 2017
-=============================================
------BEGIN CERTIFICATE-----
-MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBlMQswCQYDVQQG
-EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNyb3NvZnQg
-UlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIw
-NzE4MjMwMDIzWjBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u
-MTYwNAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZNt9GkMml
-7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0ZdDMbRnMlfl7rEqUrQ7e
-S0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw7
-1VdyvD/IybLeS2v4I2wDwAW9lcfNcztmgGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+
-dkC0zVJhUXAoP8XFWvLJjEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49F
-yGcohJUcaDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaGYaRS
-MLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6W6IYZVcSn2i51BVr
-lMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4KUGsTuqwPN1q3ErWQgR5WrlcihtnJ
-0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH+FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJ
-ClTUFLkqqNfs+avNJVgyeY+QW5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZCLgLNFgVZJ8og
-6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OCgMNPOsduET/m4xaRhPtthH80
-dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk
-+ONVFT24bcMKpBLBaYVu32TxU5nhSnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex
-/2kskZGT4d9Mozd2TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDy
-AmH3pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGRxpl/j8nW
-ZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiAppGWSZI1b7rCoucL5mxAyE
-7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKT
-c0QWbej09+CVgI+WXTik9KveCjCHk9hNAHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D
-5KbvtwEwXlGjefVwaaZBRA+GsCyRxj3qrg+E
------END CERTIFICATE-----
-
-e-Szigno Root CA 2017
-=====================
------BEGIN CERTIFICATE-----
-MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNVBAYTAkhVMREw
-DwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUt
-MjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJvb3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZa
-Fw00MjA4MjIxMjA3MDZaMHExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UE
-CgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3pp
-Z25vIFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtvxie+RJCx
-s1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+HWyx7xf58etqjYzBhMA8G
-A1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSHERUI0arBeAyxr87GyZDv
-vzAEwDAfBgNVHSMEGDAWgBSHERUI0arBeAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEA
-tVfd14pVCzbhhkT61NlojbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxO
-svxyqltZ+efcMQ==
------END CERTIFICATE-----
-
-certSIGN Root CA G2
-===================
------BEGIN CERTIFICATE-----
-MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNVBAYTAlJPMRQw
-EgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04gUk9PVCBDQSBHMjAeFw0xNzAy
-MDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lH
-TiBTQTEcMBoGA1UECxMTY2VydFNJR04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAMDFdRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05
-N0IwvlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZuIt4Imfk
-abBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhpn+Sc8CnTXPnGFiWeI8Mg
-wT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKscpc/I1mbySKEwQdPzH/iV8oScLumZfNp
-dWO9lfsbl83kqK/20U6o2YpxJM02PbyWxPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91Qqh
-ngLjYl/rNUssuHLoPj1PrCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732
-jcZZroiFDsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fxDTvf
-95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgyLcsUDFDYg2WD7rlc
-z8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6CeWRgKRM+o/1Pcmqr4tTluCRVLERL
-iohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1Ud
-DgQWBBSCIS1mxteg4BXrzkwJd8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOB
-ywaK8SJJ6ejqkX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC
-b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQlqiCA2ClV9+BB
-/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0OJD7uNGzcgbJceaBxXntC6Z5
-8hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+cNywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5
-BiKDUyUM/FHE5r7iOZULJK2v0ZXkltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklW
-atKcsWMy5WHgUyIOpwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tU
-Sxfj03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZkPuXaTH4M
-NMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE1LlSVHJ7liXMvGnjSG4N
-0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MXQRBdJ3NghVdJIgc=
------END CERTIFICATE-----
-
-Trustwave Global Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIF2jCCA8KgAwIBAgIMBfcOhtpJ80Y1LrqyMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJV
-UzERMA8GA1UECAwISWxsaW5vaXMxEDAOBgNVBAcMB0NoaWNhZ28xITAfBgNVBAoMGFRydXN0d2F2
-ZSBIb2xkaW5ncywgSW5jLjExMC8GA1UEAwwoVHJ1c3R3YXZlIEdsb2JhbCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0xNzA4MjMxOTM0MTJaFw00MjA4MjMxOTM0MTJaMIGIMQswCQYDVQQGEwJV
-UzERMA8GA1UECAwISWxsaW5vaXMxEDAOBgNVBAcMB0NoaWNhZ28xITAfBgNVBAoMGFRydXN0d2F2
-ZSBIb2xkaW5ncywgSW5jLjExMC8GA1UEAwwoVHJ1c3R3YXZlIEdsb2JhbCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALldUShLPDeS0YLOvR29
-zd24q88KPuFd5dyqCblXAj7mY2Hf8g+CY66j96xz0XznswuvCAAJWX/NKSqIk4cXGIDtiLK0thAf
-LdZfVaITXdHG6wZWiYj+rDKd/VzDBcdu7oaJuogDnXIhhpCujwOl3J+IKMujkkkP7NAP4m1ET4Bq
-stTnoApTAbqOl5F2brz81Ws25kCI1nsvXwXoLG0R8+eyvpJETNKXpP7ScoFDB5zpET71ixpZfR9o
-WN0EACyW80OzfpgZdNmcc9kYvkHHNHnZ9GLCQ7mzJ7Aiy/k9UscwR7PJPrhq4ufogXBeQotPJqX+
-OsIgbrv4Fo7NDKm0G2x2EOFYeUY+VM6AqFcJNykbmROPDMjWLBz7BegIlT1lRtzuzWniTY+HKE40
-Cz7PFNm73bZQmq131BnW2hqIyE4bJ3XYsgjxroMwuREOzYfwhI0Vcnyh78zyiGG69Gm7DIwLdVcE
-uE4qFC49DxweMqZiNu5m4iK4BUBjECLzMx10coos9TkpoNPnG4CELcU9402x/RpvumUHO1jsQkUm
-+9jaJXLE9gCxInm943xZYkqcBW89zubWR2OZxiRvchLIrH+QtAuRcOi35hYQcRfO3gZPSEF9NUqj
-ifLJS3tBEW1ntwiYTOURGa5CgNz7kAXU+FDKvuStx8KU1xad5hePrzb7AgMBAAGjQjBAMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFJngGWcNYtt2s9o9uFvo/ULSMQ6HMA4GA1UdDwEB/wQEAwIB
-BjANBgkqhkiG9w0BAQsFAAOCAgEAmHNw4rDT7TnsTGDZqRKGFx6W0OhUKDtkLSGm+J1WE2pIPU/H
-PinbbViDVD2HfSMF1OQc3Og4ZYbFdada2zUFvXfeuyk3QAUHw5RSn8pk3fEbK9xGChACMf1KaA0H
-ZJDmHvUqoai7PF35owgLEQzxPy0QlG/+4jSHg9bP5Rs1bdID4bANqKCqRieCNqcVtgimQlRXtpla
-4gt5kNdXElE1GYhBaCXUNxeEFfsBctyV3lImIJgm4nb1J2/6ADtKYdkNy1GTKv0WBpanI5ojSP5R
-vbbEsLFUzt5sQa0WZ37b/TjNuThOssFgy50X31ieemKyJo90lZvkWx3SD92YHJtZuSPTMaCm/zjd
-zyBP6VhWOmfD0faZmZ26NraAL4hHT4a/RDqA5Dccprrql5gR0IRiR2Qequ5AvzSxnI9O4fKSTx+O
-856X3vOmeWqJcU9LJxdI/uz0UA9PSX3MReO9ekDFQdxhVicGaeVyQYHTtgGJoC86cnn+OjC/QezH
-Yj6RS8fZMXZC+fc8Y+wmjHMMfRod6qh8h6jCJ3zhM0EPz8/8AKAigJ5Kp28AsEFFtyLKaEjFQqKu
-3R3y4G5OBVixwJAWKqQ9EEC+j2Jjg6mcgn0tAumDMHzLJ8n9HmYAsC7TIS+OMxZsmO0QqAfWzJPP
-29FpHOTKyeC2nOnOcXHebD8WpHk=
------END CERTIFICATE-----
-
-Trustwave Global ECC P256 Certification Authority
-=================================================
------BEGIN CERTIFICATE-----
-MIICYDCCAgegAwIBAgIMDWpfCD8oXD5Rld9dMAoGCCqGSM49BAMCMIGRMQswCQYDVQQGEwJVUzER
-MA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBI
-b2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDI1NiBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MjMxOTM1MTBaFw00MjA4MjMxOTM1MTBaMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRy
-dXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDI1
-NiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH77bOYj
-43MyCMpg5lOcunSNGLB4kFKA3TjASh3RqMyTpJcGOMoNFWLGjgEqZZ2q3zSRLoHB5DOSMcT9CTqm
-P62jQzBBMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0PAQH/BAUDAwcGADAdBgNVHQ4EFgQUo0EGrJBt
-0UrrdaVKEJmzsaGLSvcwCgYIKoZIzj0EAwIDRwAwRAIgB+ZU2g6gWrKuEZ+Hxbb/ad4lvvigtwjz
-RM4q3wghDDcCIC0mA6AFvWvR9lz4ZcyGbbOcNEhjhAnFjXca4syc4XR7
------END CERTIFICATE-----
-
-Trustwave Global ECC P384 Certification Authority
-=================================================
------BEGIN CERTIFICATE-----
-MIICnTCCAiSgAwIBAgIMCL2Fl2yZJ6SAaEc7MAoGCCqGSM49BAMDMIGRMQswCQYDVQQGEwJVUzER
-MA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBI
-b2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDM4NCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MjMxOTM2NDNaFw00MjA4MjMxOTM2NDNaMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRy
-dXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDM4
-NCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTB2MBAGByqGSM49AgEGBSuBBAAiA2IABGvaDXU1CDFH
-Ba5FmVXxERMuSvgQMSOjfoPTfygIOiYaOs+Xgh+AtycJj9GOMMQKmw6sWASr9zZ9lCOkmwqKi6vr
-/TklZvFe/oyujUF5nQlgziip04pt89ZF1PKYhDhloKNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNV
-HQ8BAf8EBQMDBwYAMB0GA1UdDgQWBBRVqYSJ0sEyvRjLbKYHTsjnnb6CkDAKBggqhkjOPQQDAwNn
-ADBkAjA3AZKXRRJ+oPM+rRk6ct30UJMDEr5E0k9BpIycnR+j9sKS50gU/k6bpZFXrsY3crsCMGcl
-CrEMXu6pY5Jv5ZAL/mYiykf9ijH3g/56vxC+GCsej/YpHpRZ744hN8tRmKVuSw==
------END CERTIFICATE-----
-
-NAVER Global Root Certification Authority
-=========================================
------BEGIN CERTIFICATE-----
-MIIFojCCA4qgAwIBAgIUAZQwHqIL3fXFMyqxQ0Rx+NZQTQ0wDQYJKoZIhvcNAQEMBQAwaTELMAkG
-A1UEBhMCS1IxJjAkBgNVBAoMHU5BVkVSIEJVU0lORVNTIFBMQVRGT1JNIENvcnAuMTIwMAYDVQQD
-DClOQVZFUiBHbG9iYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MTgwODU4
-NDJaFw0zNzA4MTgyMzU5NTlaMGkxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVT
-UyBQTEFURk9STSBDb3JwLjEyMDAGA1UEAwwpTkFWRVIgR2xvYmFsIFJvb3QgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC21PGTXLVAiQqrDZBb
-UGOukJR0F0Vy1ntlWilLp1agS7gvQnXp2XskWjFlqxcX0TM62RHcQDaH38dq6SZeWYp34+hInDEW
-+j6RscrJo+KfziFTowI2MMtSAuXaMl3Dxeb57hHHi8lEHoSTGEq0n+USZGnQJoViAbbJAh2+g1G7
-XNr4rRVqmfeSVPc0W+m/6imBEtRTkZazkVrd/pBzKPswRrXKCAfHcXLJZtM0l/aM9BhK4dA9WkW2
-aacp+yPOiNgSnABIqKYPszuSjXEOdMWLyEz59JuOuDxp7W87UC9Y7cSw0BwbagzivESq2M0UXZR4
-Yb8ObtoqvC8MC3GmsxY/nOb5zJ9TNeIDoKAYv7vxvvTWjIcNQvcGufFt7QSUqP620wbGQGHfnZ3z
-VHbOUzoBppJB7ASjjw2i1QnK1sua8e9DXcCrpUHPXFNwcMmIpi3Ua2FzUCaGYQ5fG8Ir4ozVu53B
-A0K6lNpfqbDKzE0K70dpAy8i+/Eozr9dUGWokG2zdLAIx6yo0es+nPxdGoMuK8u180SdOqcXYZai
-cdNwlhVNt0xz7hlcxVs+Qf6sdWA7G2POAN3aCJBitOUt7kinaxeZVL6HSuOpXgRM6xBtVNbv8ejy
-YhbLgGvtPe31HzClrkvJE+2KAQHJuFFYwGY6sWZLxNUxAmLpdIQM201GLQIDAQABo0IwQDAdBgNV
-HQ4EFgQU0p+I36HNLL3s9TsBAZMzJ7LrYEswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMB
-Af8wDQYJKoZIhvcNAQEMBQADggIBADLKgLOdPVQG3dLSLvCkASELZ0jKbY7gyKoNqo0hV4/GPnrK
-21HUUrPUloSlWGB/5QuOH/XcChWB5Tu2tyIvCZwTFrFsDDUIbatjcu3cvuzHV+YwIHHW1xDBE1UB
-jCpD5EHxzzp6U5LOogMFDTjfArsQLtk70pt6wKGm+LUx5vR1yblTmXVHIloUFcd4G7ad6Qz4G3bx
-hYTeodoS76TiEJd6eN4MUZeoIUCLhr0N8F5OSza7OyAfikJW4Qsav3vQIkMsRIz75Sq0bBwcupTg
-E34h5prCy8VCZLQelHsIJchxzIdFV4XTnyliIoNRlwAYl3dqmJLJfGBs32x9SuRwTMKeuB330DTH
-D8z7p/8Dvq1wkNoL3chtl1+afwkyQf3NosxabUzyqkn+Zvjp2DXrDige7kgvOtB5CTh8piKCk5XQ
-A76+AqAF3SAi428diDRgxuYKuQl1C/AH6GmWNcf7I4GOODm4RStDeKLRLBT/DShycpWbXgnbiUSY
-qqFJu3FS8r/2/yehNq+4tneI3TqkbZs0kNwUXTC/t+sX5Ie3cdCh13cV1ELX8vMxmV2b3RZtP+oG
-I/hGoiLtk/bdmuYqh7GYVPEi92tF4+KOdh2ajcQGjTa3FPOdVGm3jjzVpG2Tgbet9r1ke8LJaDmg
-kpzNNIaRkPpkUZ3+/uul9XXeifdy
------END CERTIFICATE-----
-
-AC RAIZ FNMT-RCM SERVIDORES SEGUROS
-===================================
------BEGIN CERTIFICATE-----
-MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQswCQYDVQQGEwJF
-UzERMA8GA1UECgwIRk5NVC1SQ00xDjAMBgNVBAsMBUNlcmVzMRgwFgYDVQRhDA9WQVRFUy1RMjgy
-NjAwNEoxLDAqBgNVBAMMI0FDIFJBSVogRk5NVC1SQ00gU0VSVklET1JFUyBTRUdVUk9TMB4XDTE4
-MTIyMDA5MzczM1oXDTQzMTIyMDA5MzczM1oweDELMAkGA1UEBhMCRVMxETAPBgNVBAoMCEZOTVQt
-UkNNMQ4wDAYDVQQLDAVDZXJlczEYMBYGA1UEYQwPVkFURVMtUTI4MjYwMDRKMSwwKgYDVQQDDCNB
-QyBSQUlaIEZOTVQtUkNNIFNFUlZJRE9SRVMgU0VHVVJPUzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BPa6V1PIyqvfNkpSIeSX0oNnnvBlUdBeh8dHsVnyV0ebAAKTRBdp20LHsbI6GA60XYyzZl2hNPk2
-LEnb80b8s0RpRBNm/dfF/a82Tc4DTQdxz69qBdKiQ1oKUm8BA06Oi6NCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFAG5L++/EYZg8k/QQW6rcx/n0m5JMAoGCCqG
-SM49BAMDA2kAMGYCMQCuSuMrQMN0EfKVrRYj3k4MGuZdpSRea0R7/DjiT8ucRRcRTBQnJlU5dUoD
-zBOQn5ICMQD6SmxgiHPz7riYYqnOK8LZiqZwMR2vsJRM60/G49HzYqc8/5MuB1xJAWdpEgJyv+c=
------END CERTIFICATE-----
-
-GlobalSign Root R46
-===================
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUAMEYxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJv
-b3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAX
-BgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08Es
-CVeJOaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQGvGIFAha/
-r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud316HCkD7rRlr+/fKYIje
-2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo0q3v84RLHIf8E6M6cqJaESvWJ3En7YEt
-bWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSEy132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvj
-K8Cd+RTyG/FWaha/LIWFzXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD4
-12lPFzYE+cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCNI/on
-ccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzsx2sZy/N78CsHpdls
-eVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqaByFrgY/bxFn63iLABJzjqls2k+g9
-vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEM
-BQADggIBAHx47PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
-JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti2kM3S+LGteWy
-gxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIkpnnpHs6i58FZFZ8d4kuaPp92
-CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRFFRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZm
-OUdkLG5NrmJ7v2B0GbhWrJKsFjLtrWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qq
-JZ4d16GLuc1CLgSkZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwye
-qiv5u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP4vkYxboz
-nxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6N3ec592kD3ZDZopD8p/7
-DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3vouXsXgxT7PntgMTzlSdriVZzH81Xwj3
-QEUxeCp6
------END CERTIFICATE-----
-
-GlobalSign Root E46
-===================
------BEGIN CERTIFICATE-----
-MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYxCzAJBgNVBAYT
-AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3Qg
-RTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNV
-BAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkB
-jtjqR+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGddyXqBPCCj
-QjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQxCpCPtsad0kRL
-gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk
-vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
-CAezNIm8BZ/3Hobui3A=
------END CERTIFICATE-----
-
-GLOBALTRUST 2020
-================
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
-IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
-VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
-BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
-MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
-D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
-VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
-CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
-fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
-A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
-JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
-DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
-clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
-mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
-IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
-4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
-iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
-8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
-HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
-vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
-oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
-YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
-gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
-ANF Secure Server Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNVBAUTCUc2MzI4
-NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lv
-bjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNVBAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3Qg
-Q0EwHhcNMTkwOTA0MTAwMDM4WhcNMzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEw
-MQswCQYDVQQGEwJFUzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQw
-EgYDVQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9vdCBDQTCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCjcqQZAZ2cC4Ffc0m6p6zz
-BE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9qyGFOtibBTI3/TO80sh9l2Ll49a2pcbnv
-T1gdpd50IJeh7WhM3pIXS7yr/2WanvtH2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcv
-B2VSAKduyK9o7PQUlrZXH1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXse
-zx76W0OLzc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyRp1RM
-VwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQzW7i1o0TJrH93PB0j
-7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/SiOL9V8BY9KHcyi1Swr1+KuCLH5z
-JTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJnLNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe
-8TZBAQIvfXOn3kLMTOmJDVb3n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVO
-Hj1tyRRM4y5Bu8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj
-o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAOBgNVHQ8BAf8E
-BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEATh65isagmD9uw2nAalxJ
-UqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzx
-j6ptBZNscsdW699QIyjlRRA96Gejrw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDt
-dD+4E5UGUcjohybKpFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM
-5gf0vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjqOknkJjCb
-5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ/zo1PqVUSlJZS2Db7v54
-EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ92zg/LFis6ELhDtjTO0wugumDLmsx2d1H
-hk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI+PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGy
-g77FGr8H6lnco4g175x2MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3
-r5+qPeoott7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
------END CERTIFICATE-----
-
-Certum EC-384 CA
-================
------BEGIN CERTIFICATE-----
-MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ
-TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2
-MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh
-dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
-GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq
-vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn
-iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo
-ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0
-QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
------END CERTIFICATE-----
-
-Certum Trusted Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQG
-EwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0Ew
-HhcNMTgwMzE2MTIxMDEzWhcNNDMwMzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMY
-QXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZn0EGze2jusDbCSzBfN8p
-fktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/qp1x4EaTByIVcJdPTsuclzxFUl6s1wB52
-HO8AU5853BSlLCIls3Jy/I2z5T4IHhQqNwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2
-fJmItdUDmj0VDT06qKhF8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGt
-g/BKEiJ3HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGamqi4
-NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi7VdNIuJGmj8PkTQk
-fVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSFytKAQd8FqKPVhJBPC/PgP5sZ0jeJ
-P/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0PqafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSY
-njYJdmZm/Bo/6khUHL4wvYBQv3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHK
-HRzQ+8S1h9E6Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
-vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAEii1QAL
-LtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4WxmB82M+w85bj/UvXgF2Ez8s
-ALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvozMrnadyHncI013nR03e4qllY/p0m+jiGPp2K
-h2RX5Rc64vmNueMzeMGQ2Ljdt4NR5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8
-CYyqOhNf6DR5UMEQGfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA
-4kZf5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq0Uc9Nneo
-WWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7DP78v3DSk+yshzWePS/Tj
-6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTMqJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmT
-OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck
-bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
------END CERTIFICATE-----
-
-TunTrust Root CA
-================
------BEGIN CERTIFICATE-----
-MIIFszCCA5ugAwIBAgIUEwLV4kBMkkaGFmddtLu7sms+/BMwDQYJKoZIhvcNAQELBQAwYTELMAkG
-A1UEBhMCVE4xNzA1BgNVBAoMLkFnZW5jZSBOYXRpb25hbGUgZGUgQ2VydGlmaWNhdGlvbiBFbGVj
-dHJvbmlxdWUxGTAXBgNVBAMMEFR1blRydXN0IFJvb3QgQ0EwHhcNMTkwNDI2MDg1NzU2WhcNNDQw
-NDI2MDg1NzU2WjBhMQswCQYDVQQGEwJUTjE3MDUGA1UECgwuQWdlbmNlIE5hdGlvbmFsZSBkZSBD
-ZXJ0aWZpY2F0aW9uIEVsZWN0cm9uaXF1ZTEZMBcGA1UEAwwQVHVuVHJ1c3QgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMPN0/y9BFPdDCA61YguBUtB9YOCfvdZn56eY+hz
-2vYGqU8ftPkLHzmMmiDQfgbU7DTZhrx1W4eI8NLZ1KMKsmwb60ksPqxd2JQDoOw05TDENX37Jk0b
-bjBU2PWARZw5rZzJJQRNmpA+TkBuimvNKWfGzC3gdOgFVwpIUPp6Q9p+7FuaDmJ2/uqdHYVy7BG7
-NegfJ7/Boce7SBbdVtfMTqDhuazb1YMZGoXRlJfXyqNlC/M4+QKu3fZnz8k/9YosRxqZbwUN/dAd
-gjH8KcwAWJeRTIAAHDOFli/LQcKLEITDCSSJH7UP2dl3RxiSlGBcx5kDPP73lad9UKGAwqmDrViW
-VSHbhlnUr8a83YFuB9tgYv7sEG7aaAH0gxupPqJbI9dkxt/con3YS7qC0lH4Zr8GRuR5KiY2eY8f
-Tpkdso8MDhz/yV3A/ZAQprE38806JG60hZC/gLkMjNWb1sjxVj8agIl6qeIbMlEsPvLfe/ZdeikZ
-juXIvTZxi11Mwh0/rViizz1wTaZQmCXcI/m4WEEIcb9PuISgjwBUFfyRbVinljvrS5YnzWuioYas
-DXxU5mZMZl+QviGaAkYt5IPCgLnPSz7ofzwB7I9ezX/SKEIBlYrilz0QIX32nRzFNKHsLA4KUiwS
-VXAkPcvCFDVDXSdOvsC9qnyW5/yeYa1E0wCXAgMBAAGjYzBhMB0GA1UdDgQWBBQGmpsfU33x9aTI
-04Y+oXNZtPdEITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFAaamx9TffH1pMjThj6hc1m0
-90QhMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAqgVutt0Vyb+zxiD2BkewhpMl
-0425yAA/l/VSJ4hxyXT968pk21vvHl26v9Hr7lxpuhbI87mP0zYuQEkHDVneixCwSQXi/5E/S7fd
-Ao74gShczNxtr18UnH1YeA32gAm56Q6XKRm4t+v4FstVEuTGfbvE7Pi1HE4+Z7/FXxttbUcoqgRY
-YdZ2vyJ/0Adqp2RT8JeNnYA/u8EH22Wv5psymsNUk8QcCMNE+3tjEUPRahphanltkE8pjkcFwRJp
-adbGNjHh/PqAulxPxOu3Mqz4dWEX1xAZufHSCe96Qp1bWgvUxpVOKs7/B9dPfhgGiPEZtdmYu65x
-xBzndFlY7wyJz4sfdZMaBBSSSFCp61cpABbjNhzI+L/wM9VBD8TMPN3pM0MBkRArHtG5Xc0yGYuP
-jCB31yLEQtyEFpslbei0VXF/sHyz03FJuc9SpAQ/3D2gu68zngowYI7bnV2UqL1g52KAdoGDDIzM
-MEZJ4gzSqK/rYXHv5yJiqfdcZGyfFoxnNidF9Ql7v/YQCvGwjVRDjAS6oz/v4jXH+XTgbzRB0L9z
-ZVcg+ZtnemZoJE6AZb0QmQZZ8mWvuMZHu/2QeItBcy6vVR/cO5JyboTT0GFMDcx2V+IthSIVNg3r
-AZ3r2OvEhJn7wAzMMujjd9qDRIueVSjAi1jTkD5OGwDxFa2DK5o=
------END CERTIFICATE-----
-
-HARICA TLS RSA Root CA 2021
-===========================
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
-EwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
-cyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUz
-OFoXDTQ1MDIxMzEwNTUzN1owbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRl
-bWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNB
-IFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569lmwVnlskN
-JLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE4VGC/6zStGndLuwRo0Xu
-a2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uva9of08WRiFukiZLRgeaMOVig1mlDqa2Y
-Ulhu2wr7a89o+uOkXjpFc5gH6l8Cct4MpbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K
-5FrZx40d/JiZ+yykgmvwKh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEv
-dmn8kN3bLW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcYAuUR
-0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqBAGMUuTNe3QvboEUH
-GjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYqE613TBoYm5EPWNgGVMWX+Ko/IIqm
-haZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHrW2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQ
-CPxrvrNQKlr9qEgYRtaQQJKQCoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8G
-A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAUX15QvWiWkKQU
-EapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3f5Z2EMVGpdAgS1D0NTsY9FVq
-QRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxajaH6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxD
-QpSbIPDRzbLrLFPCU3hKTwSUQZqPJzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcR
-j88YxeMn/ibvBZ3PzzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5
-vZStjBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0/L5H9MG0
-qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pTBGIBnfHAT+7hOtSLIBD6
-Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79aPib8qXPMThcFarmlwDB31qlpzmq6YR/
-PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YWxw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnn
-kf3/W9b3raYvAwtt41dU63ZTGI0RmLo=
------END CERTIFICATE-----
-
-HARICA TLS ECC Root CA 2021
-===========================
------BEGIN CERTIFICATE-----
-MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQswCQYDVQQGEwJH
-UjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBD
-QTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoX
-DTQ1MDIxMzExMDEwOVowbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWlj
-IGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJv
-b3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7KKrxcm1l
-AEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9YSTHMmE5gEYd103KUkE+b
-ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW
-0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAi
-rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw
-CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1Ud
-DgQWBBRlzeurNR4APn7VdMActHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4w
-gZswgZgGBFUdIAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
-b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABCAG8AbgBhAG4A
-bwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAwADEANzAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9miWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL
-4QjbEwj4KKE1soCzC1HA01aajTNFSa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDb
-LIpgD7dvlAceHabJhfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1il
-I45PVf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZEEAEeiGaP
-cjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV1aUsIC+nmCjuRfzxuIgA
-LI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2tCsvMo2ebKHTEm9caPARYpoKdrcd7b/+A
-lun4jWq9GJAd/0kakFI3ky88Al2CdgtR5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH
-9IBk9W6VULgRfhVwOEqwf9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpf
-NIbnYrX9ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNKGbqE
-ZycPvEJdvSRUDewdcAZfpLz6IHxV
------END CERTIFICATE-----
-
-vTrus ECC Root CA
-=================
------BEGIN CERTIFICATE-----
-MIICDzCCAZWgAwIBAgIUbmq8WapTvpg5Z6LSa6Q75m0c1towCgYIKoZIzj0EAwMwRzELMAkGA1UE
-BhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBS
-b290IENBMB4XDTE4MDczMTA3MjY0NFoXDTQzMDczMTA3MjY0NFowRzELMAkGA1UEBhMCQ04xHDAa
-BgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBSb290IENBMHYw
-EAYHKoZIzj0CAQYFK4EEACIDYgAEZVBKrox5lkqqHAjDo6LN/llWQXf9JpRCux3NCNtzslt188+c
-ToL0v/hhJoVs1oVbcnDS/dtitN9Ti72xRFhiQgnH+n9bEOf+QP3A2MMrMudwpremIFUde4BdS49n
-TPEQo0IwQDAdBgNVHQ4EFgQUmDnNvtiyjPeyq+GtJK97fKHbH88wDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwMDaAAwZQIwV53dVvHH4+m4SVBrm2nDb+zDfSXkV5UT
-QJtS0zvzQBm8JsctBp61ezaf9SXUY2sAAjEA6dPGnlaaKsyh2j/IZivTWJwghfqrkYpwcBE4YGQL
-YgmRWAD5Tfs0aNoJrSEGGJTO
------END CERTIFICATE-----
-
-vTrus Root CA
-=============
------BEGIN CERTIFICATE-----
-MIIFVjCCAz6gAwIBAgIUQ+NxE9izWRRdt86M/TX9b7wFjUUwDQYJKoZIhvcNAQELBQAwQzELMAkG
-A1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xFjAUBgNVBAMTDXZUcnVzIFJv
-b3QgQ0EwHhcNMTgwNzMxMDcyNDA1WhcNNDMwNzMxMDcyNDA1WjBDMQswCQYDVQQGEwJDTjEcMBoG
-A1UEChMTaVRydXNDaGluYSBDby4sTHRkLjEWMBQGA1UEAxMNdlRydXMgUm9vdCBDQTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL1VfGHTuB0EYgWgrmy3cLRB6ksDXhA/kFocizuwZots
-SKYcIrrVQJLuM7IjWcmOvFjai57QGfIvWcaMY1q6n6MLsLOaXLoRuBLpDLvPbmyAhykUAyyNJJrI
-ZIO1aqwTLDPxn9wsYTwaP3BVm60AUn/PBLn+NvqcwBauYv6WTEN+VRS+GrPSbcKvdmaVayqwlHeF
-XgQPYh1jdfdr58tbmnDsPmcF8P4HCIDPKNsFxhQnL4Z98Cfe/+Z+M0jnCx5Y0ScrUw5XSmXX+6KA
-YPxMvDVTAWqXcoKv8R1w6Jz1717CbMdHflqUhSZNO7rrTOiwCcJlwp2dCZtOtZcFrPUGoPc2BX70
-kLJrxLT5ZOrpGgrIDajtJ8nU57O5q4IikCc9Kuh8kO+8T/3iCiSn3mUkpF3qwHYw03dQ+A0Em5Q2
-AXPKBlim0zvc+gRGE1WKyURHuFE5Gi7oNOJ5y1lKCn+8pu8fA2dqWSslYpPZUxlmPCdiKYZNpGvu
-/9ROutW04o5IWgAZCfEF2c6Rsffr6TlP9m8EQ5pV9T4FFL2/s1m02I4zhKOQUqqzApVg+QxMaPnu
-1RcN+HFXtSXkKe5lXa/R7jwXC1pDxaWG6iSe4gUH3DRCEpHWOXSuTEGC2/KmSNGzm/MzqvOmwMVO
-9fSddmPmAsYiS8GVP1BkLFTltvA8Kc9XAgMBAAGjQjBAMB0GA1UdDgQWBBRUYnBj8XWEQ1iO0RYg
-scasGrz2iTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
-AgEAKbqSSaet8PFww+SX8J+pJdVrnjT+5hpk9jprUrIQeBqfTNqK2uwcN1LgQkv7bHbKJAs5EhWd
-nxEt/Hlk3ODg9d3gV8mlsnZwUKT+twpw1aA08XXXTUm6EdGz2OyC/+sOxL9kLX1jbhd47F18iMjr
-jld22VkE+rxSH0Ws8HqA7Oxvdq6R2xCOBNyS36D25q5J08FsEhvMKar5CKXiNxTKsbhm7xqC5PD4
-8acWabfbqWE8n/Uxy+QARsIvdLGx14HuqCaVvIivTDUHKgLKeBRtRytAVunLKmChZwOgzoy8sHJn
-xDHO2zTlJQNgJXtxmOTAGytfdELSS8VZCAeHvsXDf+eW2eHcKJfWjwXj9ZtOyh1QRwVTsMo554Wg
-icEFOwE30z9J4nfrI8iIZjs9OXYhRvHsXyO466JmdXTBQPfYaJqT4i2pLr0cox7IdMakLXogqzu4
-sEb9b91fUlV1YvCXoHzXOP0l382gmxDPi7g4Xl7FtKYCNqEeXxzP4padKar9mK5S4fNBUvupLnKW
-nyfjqnN9+BojZns7q2WwMgFLFT49ok8MKzWixtlnEjUwzXYuFrOZnk1PTi07NEPhmg4NpGaXutIc
-SkwsKouLgU9xGqndXHt7CMUADTdA43x7VF8vhV929vensBxXVsFy6K2ir40zSbofitzmdHxghm+H
-l3s=
------END CERTIFICATE-----
-
-ISRG Root X2
-============
------BEGIN CERTIFICATE-----
-MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJV
-UzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElT
-UkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVT
-MSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNS
-RyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H
-ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppb
-d9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtF
-cP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5
-U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn
------END CERTIFICATE-----
-
-HiPKI Root CA - G1
-==================
------BEGIN CERTIFICATE-----
-MIIFajCCA1KgAwIBAgIQLd2szmKXlKFD6LDNdmpeYDANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xGzAZBgNVBAMMEkhpUEtJ
-IFJvb3QgQ0EgLSBHMTAeFw0xOTAyMjIwOTQ2MDRaFw0zNzEyMzExNTU5NTlaME8xCzAJBgNVBAYT
-AlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEbMBkGA1UEAwwSSGlQS0kg
-Um9vdCBDQSAtIEcxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9B5/UnMyDHPkvRN0
-o9QwqNCuS9i233VHZvR85zkEHmpwINJaR3JnVfSl6J3VHiGh8Ge6zCFovkRTv4354twvVcg3Px+k
-wJyz5HdcoEb+d/oaoDjq7Zpy3iu9lFc6uux55199QmQ5eiY29yTw1S+6lZgRZq2XNdZ1AYDgr/SE
-YYwNHl98h5ZeQa/rh+r4XfEuiAU+TCK72h8q3VJGZDnzQs7ZngyzsHeXZJzA9KMuH5UHsBffMNsA
-GJZMoYFL3QRtU6M9/Aes1MU3guvklQgZKILSQjqj2FPseYlgSGDIcpJQ3AOPgz+yQlda22rpEZfd
-hSi8MEyr48KxRURHH+CKFgeW0iEPU8DtqX7UTuybCeyvQqww1r/REEXgphaypcXTT3OUM3ECoWqj
-1jOXTyFjHluP2cFeRXF3D4FdXyGarYPM+l7WjSNfGz1BryB1ZlpK9p/7qxj3ccC2HTHsOyDry+K4
-9a6SsvfhhEvyovKTmiKe0xRvNlS9H15ZFblzqMF8b3ti6RZsR1pl8w4Rm0bZ/W3c1pzAtH2lsN0/
-Vm+h+fbkEkj9Bn8SV7apI09bA8PgcSojt/ewsTu8mL3WmKgMa/aOEmem8rJY5AIJEzypuxC00jBF
-8ez3ABHfZfjcK0NVvxaXxA/VLGGEqnKG/uY6fsI/fe78LxQ+5oXdUG+3Se0CAwEAAaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ncX+l6o/vY9cdVouslGDDjYr7AwDgYDVR0PAQH/BAQD
-AgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBQUfB13HAE4/+qddRxosuej6ip0691x1TPOhwEmSKsxBHi
-7zNKpiMdDg1H2DfHb680f0+BazVP6XKlMeJ45/dOlBhbQH3PayFUhuaVevvGyuqcSE5XCV0vrPSl
-tJczWNWseanMX/mF+lLFjfiRFOs6DRfQUsJ748JzjkZ4Bjgs6FzaZsT0pPBWGTMpWmWSBUdGSquE
-wx4noR8RkpkndZMPvDY7l1ePJlsMu5wP1G4wB9TcXzZoZjmDlicmisjEOf6aIW/Vcobpf2Lll07Q
-JNBAsNB1CI69aO4I1258EHBGG3zgiLKecoaZAeO/n0kZtCW+VmWuF2PlHt/o/0elv+EmBYTksMCv
-5wiZqAxeJoBF1PhoL5aPruJKHJwWDBNvOIf2u8g0X5IDUXlwpt/L9ZlNec1OvFefQ05rLisY+Gpz
-jLrFNe85akEez3GoorKGB1s6yeHvP2UEgEcyRHCVTjFnanRbEEV16rCf0OY1/k6fi8wrkkVbbiVg
-hUbN0aqwdmaTd5a+g744tiROJgvM7XpWGuDpWsZkrUx6AEhEL7lAuxM+vhV4nYWBSipX3tUZQ9rb
-yltHhoMLP7YNdnhzeSJesYAfz77RP1YQmCuVh6EfnWQUYDksswBVLuT1sw5XxJFBAJw/6KXf6vb/
-yPCtbVKoF6ubYfwSUTXkJf2vqmqGOQ==
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R4
-===========================
------BEGIN CERTIFICATE-----
-MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYDVQQLExtHbG9i
-YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
-b2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgwMTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9i
-YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
-b2JhbFNpZ24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkW
-ymOxuYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNVHQ8BAf8E
-BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/+wpu+74zyTyjhNUwCgYI
-KoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147bmF0774BxL4YSFlhgjICICadVGNA3jdg
-UM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
------END CERTIFICATE-----
-
-GTS Root R1
-===========
------BEGIN CERTIFICATE-----
-MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaM
-f/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7raKb0
-xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnWr4+w
-B7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqMLnXW
-nOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk
-9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zq
-kUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92wO1A
-K/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om3xPX
-V2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNuJLDW
-cfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQAD
-ggIBAJ+qQibbC5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
-QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuyh6f88/qBVRRi
-ClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM47HLwEXWdyzRSjeZ2axfG34ar
-J45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8JZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYci
-NuaCp+0KueIHoI17eko8cdLiA6EfMgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5me
-LMFrUKTX5hgUvYU/Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJF
-fbdT6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ0E6yove+
-7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm2tIMPNuzjsmhDYAPexZ3
-FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bbbP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3
-gm3c
------END CERTIFICATE-----
-
-GTS Root R2
-===========
------BEGIN CERTIFICATE-----
-MIIFVzCCAz+gAwIBAgINAgPlrsWNBCUaqxElqjANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTukk3Lv
-CvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo7JUl
-e3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWIm8Wb
-a96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5GmdFrS
-+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbuak7M
-kogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscszcTJG
-r61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RWIr9q
-S34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73VululycslaVNV
-J1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy5okL
-dWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEMBQAD
-ggIBAB/Kzt3HvqGf2SdMC9wXmBFqiN495nFWcrKeGk6c1SuYJF2ba3uwM4IJvd8lRuqYnrYb/oM8
-0mJhwQTtzuDFycgTE1XnqGOtjHsB/ncw4c5omwX4Eu55MaBBRTUoCnGkJE+M3DyCB19m3H0Q/gxh
-swWV7uGugQ+o+MePTagjAiZrHYNSVc61LwDKgEDg4XSsYPWHgJ2uNmSRXbBoGOqKYcl3qJfEycel
-/FVL8/B/uWU9J2jQzGv6U53hkRrJXRqWbTKH7QMgyALOWr7Z6v2yTcQvG99fevX4i8buMTolUVVn
-jWQye+mew4K6Ki3pHrTgSAai/GevHyICc/sgCq+dVEuhzf9gR7A/Xe8bVr2XIZYtCtFenTgCR2y5
-9PYjJbigapordwj6xLEokCZYCDzifqrXPW+6MYgKBesntaFJ7qBFVHvmJ2WZICGoo7z7GJa7Um8M
-7YNRTOlZ4iBgxcJlkoKM8xAfDoqXvneCbT+PHV28SSe9zE8P4c52hgQjxcCMElv924SgJPFI/2R8
-0L5cFtHvma3AH/vLrrw4IgYmZNralw4/KBVEqE8AyvCazM90arQ+POuV7LXTWtiBmelDGDfrs7vR
-WGJB82bSj6p4lVQgw1oudCvV0b4YacCs1aTPObpRhANl6WLAYv7YTVWW4tAR+kg0Eeye7QUd5MjW
-HYbL
------END CERTIFICATE-----
-
-GTS Root R3
-===========
------BEGIN CERTIFICATE-----
-MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
-MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMw
-HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
-R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjO
-PQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout
-736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24CejQjBA
-MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP0/Eq
-Er24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azT
-L818+FsuVbu/3ZL3pAzcMeGiAjEA/JdmZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV
-11RZt+cRLInUue4X
------END CERTIFICATE-----
-
-GTS Root R4
-===========
------BEGIN CERTIFICATE-----
-MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
-MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQw
-HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
-R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjO
-PQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzu
-hXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqjQjBA
-MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV2Py1
-PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/C
-r8deVl5c1RxYIigL9zC2L7F8AjEA8GE8p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh
-4rsUecrNIdSUtUlD
------END CERTIFICATE-----
-
-Telia Root CA v2
-================
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
-AkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2
-MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQK
-DBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ7
-6zBqAMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9vVYiQJ3q
-9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9lRdU2HhE8Qx3FZLgmEKn
-pNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTODn3WhUidhOPFZPY5Q4L15POdslv5e2QJl
-tI5c0BE0312/UqeBAMN/mUWZFdUXyApT7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW
-5olWK8jjfN7j/4nlNW4o6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNr
-RBH0pUPCTEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6WT0E
-BXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63RDolUK5X6wK0dmBR4
-M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZIpEYslOqodmJHixBTB0hXbOKSTbau
-BcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGjYzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7W
-xy+G2CQ5MB0GA1UdDgQWBBRyrOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
-8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi0f6X+J8wfBj5
-tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMMA8iZGok1GTzTyVR8qPAs5m4H
-eW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBSSRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+C
-y748fdHif64W1lZYudogsYMVoe+KTTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygC
-QMez2P2ccGrGKMOF6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15
-h2Er3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMtTy3EHD70
-sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pTVmBds9hCG1xLEooc6+t9
-xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAWysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQ
-raVplI/owd8k+BsHMYeB2F326CjYSlKArBPuUBQemMc=
------END CERTIFICATE-----
-
-D-TRUST BR Root CA 1 2020
-=========================
------BEGIN CERTIFICATE-----
-MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0EgMSAy
-MDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
-BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAG
-ByqGSM49AgEGBSuBBAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7
-dPYSzuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0QVK5buXu
-QqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/VbNafAkl1bK6CKBrqx9t
-MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
-bmV0L2NybC9kLXRydXN0X2JyX3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
-dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
-PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
-AwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFWwKrY7RjEsK70Pvom
-AjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHVdWNbFJWcHwHP2NVypw87
------END CERTIFICATE-----
-
-D-TRUST EV Root CA 1 2020
-=========================
------BEGIN CERTIFICATE-----
-MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0EgMSAy
-MDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
-BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAG
-ByqGSM49AgEGBSuBBAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8
-ZRCC/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rDwpdhQntJ
-raOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3OqQo5FD4pPfsazK2/umL
-MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
-bmV0L2NybC9kLXRydXN0X2V2X3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
-dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
-PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
-AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
-AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
------END CERTIFICATE-----
-
-DigiCert TLS ECC P384 Root G5
-=============================
------BEGIN CERTIFICATE-----
-MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURpZ2lDZXJ0IFRMUyBFQ0MgUDM4
-NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQg
-Um9vdCBHNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1Tzvd
-lHJS7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp0zVozptj
-n4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICISB4CIfBFqMA4GA1UdDwEB
-/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQCJao1H5+z8blUD2Wds
-Jk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQLgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIx
-AJSdYsiJvRmEFOml+wG4DXZDjC5Ty3zfDBeWUA==
------END CERTIFICATE-----
-
-DigiCert TLS RSA4096 Root G5
-============================
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBNMQswCQYDVQQG
-EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0
-MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcNNDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2
-IFJvb3QgRzUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS8
-7IE+ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG02C+JFvuU
-AT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgpwgscONyfMXdcvyej/Ces
-tyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZMpG2T6T867jp8nVid9E6P/DsjyG244gXa
-zOvswzH016cpVIDPRFtMbzCe88zdH5RDnU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnV
-DdXifBBiqmvwPXbzP6PosMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9q
-TXeXAaDxZre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cdLvvy
-z6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvXKyY//SovcfXWJL5/
-MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNeXoVPzthwiHvOAbWWl9fNff2C+MIk
-wcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPLtgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4E
-FgQUUTMc7TZArxfTJc1paPKvTiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw
-GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7HPNtQOa27PShN
-lnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLFO4uJ+DQtpBflF+aZfTCIITfN
-MBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQREtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/
-u4cnYiWB39yhL/btp/96j1EuMPikAdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9G
-OUrYU9DzLjtxpdRv/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh
-47a+p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilwMUc/dNAU
-FvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WFqUITVuwhd4GTWgzqltlJ
-yqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCKovfepEWFJqgejF0pW8hL2JpqA15w8oVP
-bEtoL8pU9ozaMv7Da4M/OMZ+
------END CERTIFICATE-----
-
-Certainly Root R1
-=================
------BEGIN CERTIFICATE-----
-MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAwPTELMAkGA1UE
-BhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2VydGFpbmx5IFJvb3QgUjEwHhcN
-MjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2Vy
-dGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBANA21B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O
-5MQTvqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbedaFySpvXl
-8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b01C7jcvk2xusVtyWMOvwl
-DbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGI
-XsXwClTNSaa/ApzSRKft43jvRl5tcdF5cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkN
-KPl6I7ENPT2a/Z2B7yyQwHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQ
-AjeZjOVJ6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA2Cnb
-rlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyHWyf5QBGenDPBt+U1
-VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMReiFPCyEQtkA6qyI6BJyLm4SGcprS
-p6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
-DgQWBBTgqj8ljZ9EXME66C6ud0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAsz
-HQNTVfSVcOQrPbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d
-8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi1wrykXprOQ4v
-MMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrdrRT90+7iIgXr0PK3aBLXWopB
-GsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9ditaY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+
-gjwN/KUD+nsa2UUeYNrEjvn8K8l7lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgH
-JBu6haEaBQmAupVjyTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7
-fpYnKx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLyyCwzk5Iw
-x06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5nwXARPbv0+Em34yaXOp/S
-X3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6OV+KmalBWQewLK8=
------END CERTIFICATE-----
-
-Certainly Root E1
-=================
------BEGIN CERTIFICATE-----
-MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQswCQYDVQQGEwJV
-UzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBFMTAeFw0yMTA0
-MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlu
-bHkxGjAYBgNVBAMTEUNlcnRhaW5seSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4
-fxzf7flHh4axpMCK+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9
-YBk2QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4hevIIgcwCgYIKoZIzj0E
-AwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozmut6Dacpps6kFtZaSF4fC0urQe87YQVt8
-rgIwRt7qy12a7DLCZRawTDBcMPPaTnOGBtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
------END CERTIFICATE-----
-
-Security Communication RootCA3
-==============================
------BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNVBAYTAkpQMSUw
-IwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQDEx5TZWN1cml0eSBD
-b21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQsw
-CQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UE
-AxMeU2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4rCmDvu20r
-hvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzAlrenfna84xtSGc4RHwsE
-NPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MGTfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2
-/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF79+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGm
-npjKIG58u4iFW/vAEGK78vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtY
-XLVqAvO4g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3weGVPK
-p7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst+3A7caoreyYn8xrC
-3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M0V9hvqG8OmpI6iZVIhZdXw3/JzOf
-GAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQT9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0Vcw
-CBEF/VfR2ccCAwEAAaNCMEAwHQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB
-/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
-YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PAFNr0Y/Dq9HHu
-Tofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd9XbXv8S2gVj/yP9kaWJ5rW4O
-H3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQIUYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASx
-YfQAW0q3nHE3GYV5v4GwxxMOdnE+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZ
-XSEIx2C/pHF7uNkegr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml
-+LLfiAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUVnuiZIesn
-KwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD2NCcnWXL0CsnMQMeNuE9
-dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm
-6Vwdp6POXiUyK+OVrCoHzrQoeIY8LaadTdJ0MN1kURXbg4NR16/9M51NZg==
------END CERTIFICATE-----
-
-Security Communication ECC RootCA1
-==================================
------BEGIN CERTIFICATE-----
-MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYTAkpQMSUwIwYD
-VQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTZWN1cml0eSBDb21t
-dW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYxNjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTEL
-MAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNV
-BAMTIlNlY3VyaXR5IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+CnnfdldB9sELLo
-5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpKULGjQjBAMB0GA1UdDgQW
-BBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAK
-BggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3L
-snNdo4gIxwwCMQDAqy0Obe0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70e
-N9k=
------END CERTIFICATE-----
-
-BJCA Global Root CA1
-====================
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQG
-EwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJK
-Q0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAzMTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkG
-A1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQD
-DBRCSkNBIEdsb2JhbCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFm
-CL3ZxRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZspDyRhyS
-sTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O558dnJCNPYwpj9mZ9S1Wn
-P3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgRat7GGPZHOiJBhyL8xIkoVNiMpTAK+BcW
-yqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRj
-eulumijWML3mG90Vr4TqnMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNn
-MoH1V6XKV0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/pj+b
-OT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZOz2nxbkRs1CTqjSSh
-GL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXnjSXWgXSHRtQpdaJCbPdzied9v3pK
-H9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMB
-AAGjQjBAMB0GA1UdDgQWBBTF7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4
-YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3KliawLwQ8hOnThJ
-dMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u+2D2/VnGKhs/I0qUJDAnyIm8
-60Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuh
-TaRjAv04l5U/BXCga99igUOLtFkNSoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW
-4AB+dAb/OMRyHdOoP2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmp
-GQrI+pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRzznfSxqxx
-4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9eVzYH6Eze9mCUAyTF6ps
-3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4S
-SPfSKcOYKMryMguTjClPPGAyzQWWYezyr/6zcCwupvI=
------END CERTIFICATE-----
-
-BJCA Global Root CA2
-====================
------BEGIN CERTIFICATE-----
-MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQswCQYDVQQGEwJD
-TjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJKQ0Eg
-R2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgyMVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UE
-BhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRC
-SkNBIEdsb2JhbCBSb290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jl
-SR9BIgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK++kpRuDCK
-/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJKsVF/BvDRgh9Obl+rg/xI
-1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8
-W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8g
-UXOQwKhbYdDFUDn9hf7B43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w==
------END CERTIFICATE-----
-
-Sectigo Public Server Authentication Root E46
-=============================================
------BEGIN CERTIFICATE-----
-MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQswCQYDVQQGEwJH
-QjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBTZXJ2
-ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5
-WjBfMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0
-aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUr
-gQQAIgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccCWvkEN/U0
-NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+6xnOQ6OjQjBAMB0GA1Ud
-DgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAKBggqhkjOPQQDAwNnADBkAjAn7qRaqCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RH
-lAFWovgzJQxC36oCMB3q4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21U
-SAGKcw==
------END CERTIFICATE-----
-
-Sectigo Public Server Authentication Root R46
-=============================================
------BEGIN CERTIFICATE-----
-MIIFijCCA3KgAwIBAgIQdY39i658BwD6qSWn4cetFDANBgkqhkiG9w0BAQwFADBfMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBT
-ZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwHhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1
-OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1T
-ZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQCTvtU2UnXYASOgHEdCSe5jtrch/cSV1UgrJnwUUxDaef0rty2k
-1Cz66jLdScK5vQ9IPXtamFSvnl0xdE8H/FAh3aTPaE8bEmNtJZlMKpnzSDBh+oF8HqcIStw+Kxwf
-GExxqjWMrfhu6DtK2eWUAtaJhBOqbchPM8xQljeSM9xfiOefVNlI8JhD1mb9nxc4Q8UBUQvX4yMP
-FF1bFOdLvt30yNoDN9HWOaEhUTCDsG3XME6WW5HwcCSrv0WBZEMNvSE6Lzzpng3LILVCJ8zab5vu
-ZDCQOc2TZYEhMbUjUDM3IuM47fgxMMxF/mL50V0yeUKH32rMVhlATc6qu/m1dkmU8Sf4kaWD5Qaz
-Yw6A3OASVYCmO2a0OYctyPDQ0RTp5A1NDvZdV3LFOxxHVp3i1fuBYYzMTYCQNFu31xR13NgESJ/A
-wSiItOkcyqex8Va3e0lMWeUgFaiEAin6OJRpmkkGj80feRQXEgyDet4fsZfu+Zd4KKTIRJLpfSYF
-plhym3kT2BFfrsU4YjRosoYwjviQYZ4ybPUHNs2iTG7sijbt8uaZFURww3y8nDnAtOFr94MlI1fZ
-EoDlSfB1D++N6xybVCi0ITz8fAr/73trdf+LHaAZBav6+CuBQug4urv7qv094PPK306Xlynt8xhW
-6aWWrL3DkJiy4Pmi1KZHQ3xtzwIDAQABo0IwQDAdBgNVHQ4EFgQUVnNYZJX5khqwEioEYnmhQBWI
-IUkwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAC9c
-mTz8Bl6MlC5w6tIyMY208FHVvArzZJ8HXtXBc2hkeqK5Duj5XYUtqDdFqij0lgVQYKlJfp/imTYp
-E0RHap1VIDzYm/EDMrraQKFz6oOht0SmDpkBm+S8f74TlH7Kph52gDY9hAaLMyZlbcp+nv4fjFg4
-exqDsQ+8FxG75gbMY/qB8oFM2gsQa6H61SilzwZAFv97fRheORKkU55+MkIQpiGRqRxOF3yEvJ+M
-0ejf5lG5Nkc/kLnHvALcWxxPDkjBJYOcCj+esQMzEhonrPcibCTRAUH4WAP+JWgiH5paPHxsnnVI
-84HxZmduTILA7rpXDhjvLpr3Etiga+kFpaHpaPi8TD8SHkXoUsCjvxInebnMMTzD9joiFgOgyY9m
-pFuiTdaBJQbpdqQACj7LzTWb4OE4y2BThihCQRxEV+ioratF4yUQvNs+ZUH7G6aXD+u5dHn5Hrwd
-Vw1Hr8Mvn4dGp+smWg9WY7ViYG4A++MnESLn/pmPNPW56MORcr3Ywx65LvKRRFHQV80MNNVIIb/b
-E/FmJUNS0nAiNs2fxBx1IK1jcmMGDw4nztJqDby1ORrp0XZ60Vzk50lJLVU3aPAaOpg+VBeHVOmm
-J1CJeyAvP/+/oYtKR5j/K3tJPsMpRmAYQqszKbrAKbkTidOIijlBO8n9pu0f9GBj39ItVQGL
------END CERTIFICATE-----
-
-SSL.com TLS RSA Root CA 2022
-============================
------BEGIN CERTIFICATE-----
-MIIFiTCCA3GgAwIBAgIQb77arXO9CEDii02+1PdbkTANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQG
-EwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxTU0wuY29tIFRMUyBSU0Eg
-Um9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzQyMloXDTQ2MDgxOTE2MzQyMVowTjELMAkGA1UEBhMC
-VVMxGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgUlNBIFJv
-b3QgQ0EgMjAyMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANCkCXJPQIgSYT41I57u
-9nTPL3tYPc48DRAokC+X94xI2KDYJbFMsBFMF3NQ0CJKY7uB0ylu1bUJPiYYf7ISf5OYt6/wNr/y
-7hienDtSxUcZXXTzZGbVXcdotL8bHAajvI9AI7YexoS9UcQbOcGV0insS657Lb85/bRi3pZ7Qcac
-oOAGcvvwB5cJOYF0r/c0WRFXCsJbwST0MXMwgsadugL3PnxEX4MN8/HdIGkWCVDi1FW24IBydm5M
-R7d1VVm0U3TZlMZBrViKMWYPHqIbKUBOL9975hYsLfy/7PO0+r4Y9ptJ1O4Fbtk085zx7AGL0SDG
-D6C1vBdOSHtRwvzpXGk3R2azaPgVKPC506QVzFpPulJwoxJF3ca6TvvC0PeoUidtbnm1jPx7jMEW
-TO6Af77wdr5BUxIzrlo4QqvXDz5BjXYHMtWrifZOZ9mxQnUjbvPNQrL8VfVThxc7wDNY8VLS+YCk
-8OjwO4s4zKTGkH8PnP2L0aPP2oOnaclQNtVcBdIKQXTbYxE3waWglksejBYSd66UNHsef8JmAOSq
-g+qKkK3ONkRN0VHpvB/zagX9wHQfJRlAUW7qglFA35u5CCoGAtUjHBPW6dvbxrB6y3snm/vg1UYk
-7RBLY0ulBY+6uB0rpvqR4pJSvezrZ5dtmi2fgTIFZzL7SAg/2SW4BCUvAgMBAAGjYzBhMA8GA1Ud
-EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU+y437uOEeicuzRk1sTN8/9REQrkwHQYDVR0OBBYEFPsu
-N+7jhHonLs0ZNbEzfP/UREK5MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAjYlt
-hEUY8U+zoO9opMAdrDC8Z2awms22qyIZZtM7QbUQnRC6cm4pJCAcAZli05bg4vsMQtfhWsSWTVTN
-j8pDU/0quOr4ZcoBwq1gaAafORpR2eCNJvkLTqVTJXojpBzOCBvfR4iyrT7gJ4eLSYwfqUdYe5by
-iB0YrrPRpgqU+tvT5TgKa3kSM/tKWTcWQA673vWJDPFs0/dRa1419dvAJuoSc06pkZCmF8NsLzjU
-o3KUQyxi4U5cMj29TH0ZR6LDSeeWP4+a0zvkEdiLA9z2tmBVGKaBUfPhqBVq6+AL8BQx1rmMRTqo
-ENjwuSfr98t67wVylrXEj5ZzxOhWc5y8aVFjvO9nHEMaX3cZHxj4HCUp+UmZKbaSPaKDN7Egkaib
-MOlqbLQjk2UEqxHzDh1TJElTHaE/nUiSEeJ9DU/1172iWD54nR4fK/4huxoTtrEoZP2wAgDHbICi
-vRZQIA9ygV/MlP+7mea6kMvq+cYMwq7FGc4zoWtcu358NFcXrfA/rs3qr5nsLFR+jM4uElZI7xc7
-P0peYNLcdDa8pUNjyw9bowJWCZ4kLOGGgYz+qxcs+sjiMho6/4UIyYOf8kpIEFR3N+2ivEC+5BB0
-9+Rbu7nzifmPQdjH5FCQNYA+HLhNkNPU98OwoX6EyneSMSy4kLGCenROmxMmtNVQZlR4rmA=
------END CERTIFICATE-----
-
-SSL.com TLS ECC Root CA 2022
-============================
------BEGIN CERTIFICATE-----
-MIICOjCCAcCgAwIBAgIQFAP1q/s3ixdAW+JDsqXRxDAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
-UzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxTU0wuY29tIFRMUyBFQ0MgUm9v
-dCBDQSAyMDIyMB4XDTIyMDgyNTE2MzM0OFoXDTQ2MDgxOTE2MzM0N1owTjELMAkGA1UEBhMCVVMx
-GDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgRUNDIFJvb3Qg
-Q0EgMjAyMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABEUpNXP6wrgjzhR9qLFNoFs27iosU8NgCTWy
-JGYmacCzldZdkkAZDsalE3D07xJRKF3nzL35PIXBz5SQySvOkkJYWWf9lCcQZIxPBLFNSeR7T5v1
-5wj4A4j3p8OSSxlUgaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSJjy+j6CugFFR7
-81a4Jl9nOAuc0DAdBgNVHQ4EFgQUiY8vo+groBRUe/NWuCZfZzgLnNAwDgYDVR0PAQH/BAQDAgGG
-MAoGCCqGSM49BAMDA2gAMGUCMFXjIlbp15IkWE8elDIPDAI2wv2sdDJO4fscgIijzPvX6yv/N33w
-7deedWo1dlJF4AIxAMeNb0Igj762TVntd00pxCAgRWSGOlDGxK0tk/UYfXLtqc/ErFc2KAhl3zx5
-Zn6g6g==
------END CERTIFICATE-----
-
-Atos TrustedRoot Root CA ECC TLS 2021
-=====================================
------BEGIN CERTIFICATE-----
-MIICFTCCAZugAwIBAgIQPZg7pmY9kGP3fiZXOATvADAKBggqhkjOPQQDAzBMMS4wLAYDVQQDDCVB
-dG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgRUNDIFRMUyAyMDIxMQ0wCwYDVQQKDARBdG9zMQswCQYD
-VQQGEwJERTAeFw0yMTA0MjIwOTI2MjNaFw00MTA0MTcwOTI2MjJaMEwxLjAsBgNVBAMMJUF0b3Mg
-VHJ1c3RlZFJvb3QgUm9vdCBDQSBFQ0MgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYT
-AkRFMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEloZYKDcKZ9Cg3iQZGeHkBQcfl+3oZIK59sRxUM6K
-DP/XtXa7oWyTbIOiaG6l2b4siJVBzV3dscqDY4PMwL502eCdpO5KTlbgmClBk1IQ1SQ4AjJn8ZQS
-b+/Xxd4u/RmAo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR2KCXWfeBmmnoJsmo7jjPX
-NtNPojAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMDaAAwZQIwW5kp85wxtolrbNa9d+F851F+
-uDrNozZffPc8dz7kUK2o59JZDCaOMDtuCCrCp1rIAjEAmeMM56PDr9NJLkaCI2ZdyQAUEv049OGY
-a3cpetskz2VAv9LcjBHo9H1/IISpQuQo
------END CERTIFICATE-----
-
-Atos TrustedRoot Root CA RSA TLS 2021
-=====================================
------BEGIN CERTIFICATE-----
-MIIFZDCCA0ygAwIBAgIQU9XP5hmTC/srBRLYwiqipDANBgkqhkiG9w0BAQwFADBMMS4wLAYDVQQD
-DCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgUlNBIFRMUyAyMDIxMQ0wCwYDVQQKDARBdG9zMQsw
-CQYDVQQGEwJERTAeFw0yMTA0MjIwOTIxMTBaFw00MTA0MTcwOTIxMDlaMEwxLjAsBgNVBAMMJUF0
-b3MgVHJ1c3RlZFJvb3QgUm9vdCBDQSBSU0EgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNV
-BAYTAkRFMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtoAOxHm9BYx9sKOdTSJNy/BB
-l01Z4NH+VoyX8te9j2y3I49f1cTYQcvyAh5x5en2XssIKl4w8i1mx4QbZFc4nXUtVsYvYe+W/CBG
-vevUez8/fEc4BKkbqlLfEzfTFRVOvV98r61jx3ncCHvVoOX3W3WsgFWZkmGbzSoXfduP9LVq6hdK
-ZChmFSlsAvFr1bqjM9xaZ6cF4r9lthawEO3NUDPJcFDsGY6wx/J0W2tExn2WuZgIWWbeKQGb9Cpt
-0xU6kGpn8bRrZtkh68rZYnxGEFzedUlnnkL5/nWpo63/dgpnQOPF943HhZpZnmKaau1Fh5hnstVK
-PNe0OwANwI8f4UDErmwh3El+fsqyjW22v5MvoVw+j8rtgI5Y4dtXz4U2OLJxpAmMkokIiEjxQGMY
-sluMWuPD0xeqqxmjLBvk1cbiZnrXghmmOxYsL3GHX0WelXOTwkKBIROW1527k2gV+p2kHYzygeBY
-Br3JtuP2iV2J+axEoctr+hbxx1A9JNr3w+SH1VbxT5Aw+kUJWdo0zuATHAR8ANSbhqRAvNncTFd+
-rrcztl524WWLZt+NyteYr842mIycg5kDcPOvdO3GDjbnvezBc6eUWsuSZIKmAMFwoW4sKeFYV+xa
-fJlrJaSQOoD0IJ2azsct+bJLKZWD6TWNp0lIpw9MGZHQ9b8Q4HECAwEAAaNCMEAwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUdEmZ0f+0emhFdcN+tNzMzjkz2ggwDgYDVR0PAQH/BAQDAgGGMA0G
-CSqGSIb3DQEBDAUAA4ICAQAjQ1MkYlxt/T7Cz1UAbMVWiLkO3TriJQ2VSpfKgInuKs1l+NsW4AmS
-4BjHeJi78+xCUvuppILXTdiK/ORO/auQxDh1MoSf/7OwKwIzNsAQkG8dnK/haZPso0UvFJ/1TCpl
-Q3IM98P4lYsU84UgYt1UU90s3BiVaU+DR3BAM1h3Egyi61IxHkzJqM7F78PRreBrAwA0JrRUITWX
-AdxfG/F851X6LWh3e9NpzNMOa7pNdkTWwhWaJuywxfW70Xp0wmzNxbVe9kzmWy2B27O3Opee7c9G
-slA9hGCZcbUztVdF5kJHdWoOsAgMrr3e97sPWD2PAzHoPYJQyi9eDF20l74gNAf0xBLh7tew2Vkt
-afcxBPTy+av5EzH4AXcOPUIjJsyacmdRIXrMPIWo6iFqO9taPKU0nprALN+AnCng33eU0aKAQv9q
-TFsR0PXNor6uzFFcw9VUewyu1rkGd4Di7wcaaMxZUa1+XGdrudviB0JbuAEFWDlN5LuYo7Ey7Nmj
-1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5dDTedk+SKlOxJTnbPP/l
-PqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcEoji2jbDwN/zIIX8/syQbPYtuzE2wFg2W
-HYMfRsCbvUOZ58SWLs5fyQ==
------END CERTIFICATE-----
-
-TrustAsia Global Root CA G3
-===========================
------BEGIN CERTIFICATE-----
-MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEMBQAwWjELMAkG
-A1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xJDAiBgNVBAMM
-G1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAeFw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEw
-MTlaMFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMu
-MSQwIgYDVQQDDBtUcnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNST1QY4Sxz
-lZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqKAtCWHwDNBSHvBm3dIZwZ
-Q0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/V
-P68czH5GX6zfZBCK70bwkPAPLfSIC7Epqq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1Ag
-dB4SQXMeJNnKziyhWTXAyB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm
-9WAPzJMshH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gXzhqc
-D0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAvkV34PmVACxmZySYg
-WmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msTf9FkPz2ccEblooV7WIQn3MSAPmea
-mseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jAuPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCF
-TIcQcf+eQxuulXUtgQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj
-7zjKsK5Xf/IhMBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E
-BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4wM8zAQLpw6o1
-D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2XFNFV1pF1AWZLy4jVe5jaN/T
-G3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNj
-duMNhXJEIlU/HHzp/LgV6FL6qj6jITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstl
-cHboCoWASzY9M/eVVHUl2qzEc4Jl6VL1XP04lQJqaTDFHApXB64ipCz5xUG3uOyfT0gA+QEEVcys
-+TIxxHWVBqB/0Y0n3bOppHKH/lmLmnp0Ft0WpWIp6zqW3IunaFnT63eROfjXy9mPX1onAX1daBli
-2MjN9LdyR75bl87yraKZk62Uy5P2EgmVtqvXO9A/EcswFi55gORngS1d7XB4tmBZrOFdRWOPyN9y
-aFvqHbgB8X7754qz41SgOAngPN5C8sLtLpvzHzW2NtjjgKGLzZlkD8Kqq7HK9W+eQ42EVJmzbsAS
-ZthwEPEGNTNDqJwuuhQxzhB/HIbjj9LV+Hfsm6vxL2PZQl/gZ4FkkfGXL/xuJvYz+NO1+MRiqzFR
-JQJ6+N1rZdVtTTDIZbpoFGWsJwt0ivKH
------END CERTIFICATE-----
-
-TrustAsia Global Root CA G4
-===========================
------BEGIN CERTIFICATE-----
-MIICVTCCAdygAwIBAgIUTyNkuI6XY57GU4HBdk7LKnQV1tcwCgYIKoZIzj0EAwMwWjELMAkGA1UE
-BhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xJDAiBgNVBAMMG1Ry
-dXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHNDAeFw0yMTA1MjAwMjEwMjJaFw00NjA1MTkwMjEwMjJa
-MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQw
-IgYDVQQDDBtUcnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
-AATxs8045CVD5d4ZCbuBeaIVXxVjAd7Cq92zphtnS4CDr5nLrBfbK5bKfFJV4hrhPVbwLxYI+hW8
-m7tH5j/uqOFMjPXTNvk4XatwmkcN4oFBButJ+bAp3TPsUKV/eSm4IJijYzBhMA8GA1UdEwEB/wQF
-MAMBAf8wHwYDVR0jBBgwFoAUpbtKl86zK3+kMd6Xg1mDpm9xy94wHQYDVR0OBBYEFKW7SpfOsyt/
-pDHel4NZg6ZvccveMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjBe8usGzEkxn0AA
-bbd+NvBNEU/zy4k6LHiRUKNbwMp1JvK/kF0LgoxgKJ/GcJpo5PECMFxYDlZ2z1jD1xCMuo6u47xk
-dUfFVZDj/bpV6wfEU6s3qe4hsiFbYI89MvHVI5TWWA==
------END CERTIFICATE-----
-
-CommScope Public Trust ECC Root-01
-==================================
------BEGIN CERTIFICATE-----
-MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMwTjELMAkGA1UE
-BhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29tbVNjb3BlIFB1YmxpYyBUcnVz
-dCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNaFw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYT
-AlVTMRIwEAYDVQQKDAlDb21tU2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3Qg
-RUNDIFJvb3QtMDEwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLx
-eP0CflfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJEhRGnSjot
-6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggqhkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2
-Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liW
-pDVfG2XqYZpwI7UNo5uSUm9poIyNStDuiw7LR47QjRE=
------END CERTIFICATE-----
-
-CommScope Public Trust ECC Root-02
-==================================
------BEGIN CERTIFICATE-----
-MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMwTjELMAkGA1UE
-BhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29tbVNjb3BlIFB1YmxpYyBUcnVz
-dCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRaFw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYT
-AlVTMRIwEAYDVQQKDAlDb21tU2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3Qg
-RUNDIFJvb3QtMDIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/M
-MDALj2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmUv4RDsNuE
-SgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggqhkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9
-Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/nich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs7
-3u1Z/GtMMH9ZzkXpc2AVmkzw5l4lIhVtwodZ0LKOag==
------END CERTIFICATE-----
-
-CommScope Public Trust RSA Root-01
-==================================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQELBQAwTjELMAkG
-A1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29tbVNjb3BlIFB1YmxpYyBU
-cnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNV
-BAYTAlVTMRIwEAYDVQQKDAlDb21tU2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1
-c3QgUlNBIFJvb3QtMDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45Ft
-nYSkYZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslhsuitQDy6
-uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0alDrJLpA6lfO741GIDuZNq
-ihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3OjWiE260f6GBfZumbCk6SP/F2krfxQapWs
-vCQz0b2If4b19bJzKo98rwjyGpg/qYFlP8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/c
-Zip8UlF1y5mO6D1cv547KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTif
-BSeolz7pUcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/kQO9
-lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JOHg9O5j9ZpSPcPYeo
-KFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkBEa801M/XrmLTBQe0MXXgDW1XT2mH
-+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6UCBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm4
-5P3luG0wDQYJKoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6
-NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQnmhUQo8mUuJM
-3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+QgvfKNmwrZggvkN80V4aCRck
-jXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2vtrV0KnahP/t1MJ+UXjulYPPLXAziDslg+Mkf
-Foom3ecnf+slpoq9uC02EJqxWE2aaE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/W
-NyVntHKLr4W96ioDj8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+
-o/E4Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0wlREQKC6/
-oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHnYfkUyq+Dj7+vsQpZXdxc
-1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVocicCMb3SgazNNtQEo/a2tiRc7ppqEvOuM
-6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw
------END CERTIFICATE-----
-
-CommScope Public Trust RSA Root-02
-==================================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQELBQAwTjELMAkG
-A1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29tbVNjb3BlIFB1YmxpYyBU
-cnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNV
-BAYTAlVTMRIwEAYDVQQKDAlDb21tU2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1
-c3QgUlNBIFJvb3QtMDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3V
-rCLENQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0kyI9p+Kx
-7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1CrWDaSWqVcN3SAOLMV2MC
-e5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxzhkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2W
-Wy09X6GDRl224yW4fKcZgBzqZUPckXk2LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rp
-M9kzXzehxfCrPfp4sOcsn/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIf
-hs1w/tkuFT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5kQMr
-eyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3wNemKfrb3vOTlycE
-VS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6vwQcQeKwRoi9C8DfF8rhW3Q5iLc4t
-Vn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7Gx
-cJXvYXowDQYJKoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB
-KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3+VGXu6TwYofF
-1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbymeAPnCKfWxkxlSaRosTKCL4BWa
-MS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3NyqpgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xd
-gSGn2rtO/+YHqP65DSdsu3BaVXoT6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2O
-HG1QAk8mGEPej1WFsQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+Nm
-YWvtPjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2dlklyALKr
-dVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670v64fG9PiO/yzcnMcmyiQ
-iRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17Org3bhzjlP1v9mxnhMUF6cKojawHhRUzN
-lM47ni3niAIi9G7oyOzWPPO5std3eqx7
------END CERTIFICATE-----
-
-Telekom Security TLS ECC Root 2020
-==================================
------BEGIN CERTIFICATE-----
-MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQswCQYDVQQGEwJE
-RTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMSswKQYDVQQDDCJUZWxl
-a29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIwMB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIz
-NTk1OVowYzELMAkGA1UEBhMCREUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkg
-R21iSDErMCkGA1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqG
-SM49AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/OtdKPD/M1
-2kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDPf8iAC8GXs7s1J8nCG6NC
-MEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6fMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMAoGCCqGSM49BAMDA2cAMGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZ
-Mo7k+5Dck2TOrbRBR2Diz6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdU
-ga/sf+Rn27iQ7t0l
------END CERTIFICATE-----
-
-Telekom Security TLS RSA Root 2023
-==================================
------BEGIN CERTIFICATE-----
-MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBjMQswCQYDVQQG
-EwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMSswKQYDVQQDDCJU
-ZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAyMDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMy
-NzIzNTk1OVowYzELMAkGA1UEBhMCREUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJp
-dHkgR21iSDErMCkGA1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9cUD/h3VC
-KSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHVcp6R+SPWcHu79ZvB7JPP
-GeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMAU6DksquDOFczJZSfvkgdmOGjup5czQRx
-UX11eKvzWarE4GC+j4NSuHUaQTXtvPM6Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWo
-l8hHD/BeEIvnHRz+sTugBTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9
-FIS3R/qy8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73Jco4v
-zLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg8qKrBC7m8kwOFjQg
-rIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8rFEz0ciD0cmfHdRHNCk+y7AO+oML
-KFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7S
-WWO/gLCMk3PLNaaZlSJhZQNg+y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUtqeXgj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2
-p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQpGv7qHBFfLp+
-sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm9S3ul0A8Yute1hTWjOKWi0Fp
-kzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErwM807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy
-/SKE8YXJN3nptT+/XOR0so8RYgDdGGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4
-mZqTuXNnQkYRIer+CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtz
-aL1txKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+w6jv/naa
-oqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aKL4x35bcF7DvB7L6Gs4a8
-wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+ljX273CXE2whJdV/LItM3z7gLfEdxquVeE
-HVlNjM7IDiPCtyaaEBRx/pOyiriA8A4QntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0
-o82bNSQ3+pCTE4FCxpgmdTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
------END CERTIFICATE-----
diff --git a/bootstrap/comptest.c b/bootstrap/comptest.c
deleted file mode 100644
index 50ba25b5e..000000000
--- a/bootstrap/comptest.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stddef.h>
-int main(int argc, char* argv[])
-{
-  return 0;
-}
diff --git a/bootstrap/db-6.2.32.tar.gz b/bootstrap/db-6.2.32.tar.gz
deleted file mode 100644
index 80380b32f..000000000
Binary files a/bootstrap/db-6.2.32.tar.gz and /dev/null differ
diff --git a/bootstrap/dnsrootkey.pem b/bootstrap/dnsrootkey.pem
deleted file mode 100644
index 26edaf68e..000000000
--- a/bootstrap/dnsrootkey.pem
+++ /dev/null
@@ -1,9 +0,0 @@
-; autotrust trust anchor file
-;;id: . 1
-;;last_queried: 1711832485 ;;Sat Mar 30 17:01:25 2024
-;;last_success: 1711832485 ;;Sat Mar 30 17:01:25 2024
-;;next_probe_time: 1711873462 ;;Sun Mar 31 04:24:22 2024
-;;query_failed: 0
-;;query_interval: 43200
-;;retry_time: 8640
-.	86400	IN	DNSKEY	257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} ;;state=2 [  VALID  ] ;;count=0 ;;lastchange=1711832485 ;;Sat Mar 30 17:01:25 2024
diff --git a/bootstrap/icannbundle.pem b/bootstrap/icannbundle.pem
deleted file mode 100644
index ceeef5b0b..000000000
--- a/bootstrap/icannbundle.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBATANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO
-TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV
-BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA0MTkxMloX
-DTI5MTIxODA0MTkxMlowXTEOMAwGA1UEChMFSUNBTk4xJjAkBgNVBAsTHUlDQU5O
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1JQ0FOTiBSb290IENB
-MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKDb
-cLhPNNqc1NB+u+oVvOnJESofYS9qub0/PXagmgr37pNublVThIzyLPGCJ8gPms9S
-G1TaKNIsMI7d+5IgMy3WyPEOECGIcfqEIktdR1YWfJufXcMReZwU4v/AdKzdOdfg
-ONiwc6r70duEr1IiqPbVm5T05l1e6D+HkAvHGnf1LtOPGs4CHQdpIUcy2kauAEy2
-paKcOcHASvbTHK7TbbvHGPB+7faAztABLoneErruEcumetcNfPMIjXKdv1V1E3C7
-MSJKy+jAqqQJqjZoQGB0necZgUMiUv7JK1IPQRM2CXJllcyJrm9WFxY0c1KjBO29
-iIKK69fcglKcBuFShUECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAf4wHQYDVR0OBBYEFLpS6UmDJIZSL8eZzfyNa2kITcBQMA0GCSqGSIb3
-DQEBCwUAA4IBAQAP8emCogqHny2UYFqywEuhLys7R9UKmYY4suzGO4nkbgfPFMfH
-6M+Zj6owwxlwueZt1j/IaCayoKU3QsrYYoDRolpILh+FPwx7wseUEV8ZKpWsoDoD
-2JFbLg2cfB8u/OlE4RYmcxxFSmXBg0yQ8/IoQt/bxOcEEhhiQ168H2yE5rxJMt9h
-15nu5JBSewrCkYqYYmaxyOC3WrVGfHZxVI7MpIFcGdvSb2a1uyuua8l0BKgk3ujF
-0/wsHNeP22qNyVO+XVBzrM8fk8BSUFuiT/6tZTYXRtEt5aKQZgXbKU5dUF3jT9qg
-j/Br5BZw3X/zd325TvnswzMC1+ljLzHnQGGk
------END CERTIFICATE-----
diff --git a/bootstrap/libunistring-1.1.tar.gz b/bootstrap/libunistring-1.1.tar.gz
deleted file mode 100644
index b5ff1a067..000000000
Binary files a/bootstrap/libunistring-1.1.tar.gz and /dev/null differ
diff --git a/bootstrap/openssl-1.0.2u.tar.gz b/bootstrap/openssl-1.0.2u.tar.gz
deleted file mode 100644
index e0dd09137..000000000
Binary files a/bootstrap/openssl-1.0.2u.tar.gz and /dev/null differ
diff --git a/bootstrap/wget-1.21.3.tar.gz b/bootstrap/wget-1.21.3.tar.gz
deleted file mode 100644
index 84879dfd3..000000000
Binary files a/bootstrap/wget-1.21.3.tar.gz and /dev/null differ
diff --git a/build-acl.sh b/build-acl.sh
deleted file mode 100755
index 05053aa32..000000000
--- a/build-acl.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libacl from sources.
-
-ACL_VER=2.2.53
-ACL_TAR=acl-${ACL_VER}.tar.gz
-ACL_DIR=acl-${ACL_VER}
-PKG_NAME=acl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-attr.sh
-then
-    echo "Failed to build libattr"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libacl ================"
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-echo ""
-echo "libacl ${ACL_VER}..."
-
-if ! "${WGET}" -q -O "$ACL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://download.savannah.nongnu.org/releases/acl/$ACL_TAR"
-then
-    echo "Failed to download libacl"
-    exit 1
-fi
-
-rm -rf "$ACL_DIR" &>/dev/null
-gzip -d < "$ACL_TAR" | tar xf -
-cd "$ACL_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/acl.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/acl.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure libacl"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build libacl"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test libacl"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ACL_TAR" "$ACL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-apg.sh b/build-apg.sh
deleted file mode 100755
index a86de1e4c..000000000
--- a/build-apg.sh
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds APG from sources. APG is treated
-# like a library rather then a program to avoid rebuilding
-# it in other recipes like Curl and Wget.
-
-APG_VER=2.2.3
-APG_TAR="v${APG_VER}.tar.gz"
-APG_DIR="apg-${APG_VER}"
-PKG_NAME=apg
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= APG ================="
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-echo ""
-echo "libapg ${APG_VER}..."
-
-if ! "${WGET}" -q -O "$APG_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/jabenninghoff/apg/archive/$APG_TAR"
-then
-    echo "Failed to download APG"
-    exit 1
-fi
-
-rm -rf "$APG_DIR" &>/dev/null
-gzip -d < "$APG_TAR" | tar xf -
-cd "$APG_DIR" || exit 1
-
-#cp Makefile Makefile.orig
-#cp apg.c apg.c.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/apg.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
-
-    patch -u -p0 < ../patch/apg.patch
-fi
-
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LDLIBS="${INSTX_LDLIBS}"
-LIBS="${INSTX_LDLIBS}"
-
-if [[ "$IS_LINUX" -ne 0 ]]; then
-    LIBS="-lcrypt ${LIBS}"
-fi
-
-MAKE_FLAGS=("standalone" "-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure APG"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-echo ""
-echo "***********************"
-echo "Package not tested"
-echo "***********************"
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Installing anyways..."
-echo "***********************"
-
-MAKE_FLAGS=("install" "APG_PREFIX=${INSTX_PREFIX}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$APG_TAR" "$APG_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-attr.sh b/build-attr.sh
deleted file mode 100755
index 658e79837..000000000
--- a/build-attr.sh
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libattr from sources.
-
-# This library has both compile, link errors and failed self tests.
-# https://lists.nongnu.org/archive/html/acl-devel/2020-11/msg00007.html
-# https://lists.nongnu.org/archive/html/acl-devel/2020-11/msg00005.html
-# https://lists.nongnu.org/archive/html/acl-devel/2020-11/msg00003.html
-
-ATTR_VER=2.4.48
-ATTR_TAR=attr-${ATTR_VER}.tar.gz
-ATTR_DIR=attr-${ATTR_VER}
-PKG_NAME=attr
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libattr ================"
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "libattr ${ATTR_VER}..."
-
-if ! "${WGET}" -q -O "$ATTR_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://download.savannah.nongnu.org/releases/attr/$ATTR_TAR"
-then
-    echo "Failed to download libattr"
-    exit 1
-fi
-
-rm -rf "$ATTR_DIR" &>/dev/null
-gzip -d < "$ATTR_TAR" | tar xf -
-cd "$ATTR_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/attr.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/attr.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure libattr"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build libattr"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test libattr"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ATTR_TAR" "$ATTR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-autoconf.sh b/build-autoconf.sh
deleted file mode 100755
index f4fa1851b..000000000
--- a/build-autoconf.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds autoconf from sources. A separate
-# script is available for Autotools for brave souls.
-
-AUTOCONF_VER=2.71
-AUTOCONF_TAR=autoconf-${AUTOCONF_VER}.tar.gz
-AUTOCONF_DIR=autoconf-${AUTOCONF_VER}
-PKG_NAME=autoconf
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Autoconf ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Autoconf ${AUTOCONF_VER}..."
-
-if ! "${WGET}" -q -O "$AUTOCONF_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/autoconf/$AUTOCONF_TAR"
-then
-    echo "Failed to download Autoconf"
-    exit 1
-fi
-
-rm -rf "$AUTOCONF_DIR" &>/dev/null
-gzip -d < "$AUTOCONF_TAR" | tar xf -
-cd "$AUTOCONF_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-CONFIG_M4=$(command -v m4 2>/dev/null)
-if [[ -e "${INSTX_PREFIX}/bin/m4" ]]; then
-    CONFIG_M4="${INSTX_PREFIX}/bin/m4"
-fi
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-    M4="${CONFIG_M4}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure Autoconf"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Autoconf"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$AUTOCONF_TAR" "$AUTOCONF_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-autogen.sh b/build-autogen.sh
deleted file mode 100755
index 35638ebfd..000000000
--- a/build-autogen.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Autogen from sources.
-
-AUTOGEN_VER=5.18.16
-AUTOGEN_TAR="autogen-${AUTOGEN_VER}.tar.gz"
-AUTOGEN_DIR="autogen-${AUTOGEN_VER}"
-PKG_NAME=autogen
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Autogen ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Autogen ${AUTOGEN_VER}..."
-
-if ! "${WGET}" -q -O "$AUTOGEN_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/autogen/rel${AUTOGEN_VER}/$AUTOGEN_TAR"
-then
-    echo "Failed to download Autogen"
-    exit 1
-fi
-
-rm -rf "$AUTOGEN_DIR" &>/dev/null
-gzip -d < "$AUTOGEN_TAR" | tar xf -
-cd "$AUTOGEN_DIR" || exit 1
-
-# cp configure.ac configure.ac.orig
-# cp configure configure.orig
-# cp agen5/guile-iface.h agen5/guile-iface.h.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/autogen.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/autogen.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libxml2="${INSTX_PREFIX}" \
-    --disable-dependency-tracking
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure Autogen"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build Autogen"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test Autogen"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$AUTOGEN_TAR" "$AUTOGEN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-automake.sh b/build-automake.sh
deleted file mode 100755
index 373742503..000000000
--- a/build-automake.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Automake from sources. A separate
-# script is available for Autotools for brave souls.
-
-AUTOMAKE_VER=1.16.5
-AUTOMAKE_TAR="automake-${AUTOMAKE_VER}.tar.gz"
-AUTOMAKE_DIR="automake-${AUTOMAKE_VER}"
-PKG_NAME=automake
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Automake ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Automake ${AUTOMAKE_VER}..."
-
-if ! "${WGET}" -q -O "$AUTOMAKE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/automake/$AUTOMAKE_TAR"
-then
-    echo "Failed to download Automake"
-    exit 1
-fi
-
-rm -rf "$AUTOMAKE_DIR" &>/dev/null
-gzip -d < "$AUTOMAKE_TAR" | tar xf -
-cd "$AUTOMAKE_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure Automake"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-sed -e 's|^MAKEINFO =.*|MAKEINFO = true|g' Makefile > Makefile.fixed
-mv Makefile.fixed Makefile
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Automake"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$AUTOMAKE_TAR" "$AUTOMAKE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-autotools.sh b/build-autotools.sh
deleted file mode 100755
index 962967793..000000000
--- a/build-autotools.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Autotools from sources. A separate
-# script is available for Libtool for brave souls.
-
-# Trying to update Autotools may be more trouble than it is
-# worth. If the upgrade goes bad, then you can uninstall
-# it with the script clean-autotools.sh
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-m4.sh
-then
-    echo "Failed to build M4"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-autoconf.sh
-then
-    echo "Failed to build Autoconf"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-automake.sh
-then
-    echo "Failed to build Automake"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libtool.sh
-then
-    echo "Failed to build Libtool"
-    exit 1
-fi
-
-###############################################################################
-
-exit 0
diff --git a/build-b2sum.sh b/build-b2sum.sh
deleted file mode 100755
index 6b7bbfb22..000000000
--- a/build-b2sum.sh
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds b2sum from sources.
-
-B2SUM_VER=20190724
-B2SUM_TAR=${B2SUM_VER}.tar.gz
-B2SUM_DIR=BLAKE2-${B2SUM_VER}
-PKG_NAME=blake2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-# BLAKE2 only has benchmarks for Intel machines
-if [ "$IS_IA32" -ne 0 ]
-then
-    if ! ./build-openssl.sh
-    then
-        echo "Failed to build OpenSSL"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= b2sum ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "b2sum ${B2SUM_VER}..."
-
-if ! "${WGET}" -q -O "$B2SUM_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/BLAKE2/BLAKE2/archive/$B2SUM_TAR"
-then
-    echo "Failed to download b2sum"
-    exit 1
-fi
-
-rm -rf "$B2SUM_DIR" &>/dev/null
-gzip -d < "$B2SUM_TAR" | tar xf -
-cd "$B2SUM_DIR"
-
-if [[ -e ../patch/b2sum.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/b2sum.patch
-    echo ""
-fi
-
-# The Makefiles needed so much work it was easier to provide Autotools for them.
-# The files were offered to BLAKE2 at https://github.com/BLAKE2/BLAKE2/pull/63.
-if [[ -e ../patch/b2sum-autotools.zip ]]; then
-    cp ../patch/b2sum-autotools.zip .
-    unzip -oq b2sum-autotools.zip
-fi
-
-echo "**********************"
-echo "Bootstrapping package"
-echo "**********************"
-
-if ! autoreconf --install --force 1>/dev/null
-then
-    echo "***************************"
-    echo "Failed to bootstrap package"
-    echo "***************************"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure b2sum"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=()
-MAKE_FLAGS+=("-f" "Makefile" "V=1")
-MAKE_FLAGS+=("-j" "${INSTX_JOBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build b2sum"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test b2sum"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install" "PREFIX=${INSTX_PREFIX}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$B2SUM_TAR" "$B2SUM_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-base.sh b/build-base.sh
deleted file mode 100755
index f6e587ad3..000000000
--- a/build-base.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-
-# This script builds a handful of packages that are used by most GNU packages.
-# The primary packages built by this script are Patchelf, Ncurses, Readline,
-# iConvert and GetText.
-#
-# The primary packages have prerequisites, so secondary packages include
-# libunistring, libxml2, PCRE2 and IDN2. GetText is rebuilt a final time
-# after libunitstring and libxml2 are ready.
-#
-# GetText is the real focus of this script. GetText is built in two stages.
-# First, the iConv/GetText pair is built due to circular dependency. Second,
-# the final GetText is built which includes libunistring and libxml2.
-#
-# Most GNU packages will just call build-base.sh to get the common packages
-# out of the way. Non-GNU packages can call the script, too.
-
-PKG_NAME=gnu-base
-
-###############################################################################
-
-# PKG_NAME trick does not work here... Export INSTX_BASE_RECURSION_GUARD
-# to avoid reentering this script for recipes like IDN2 and PCRE2.
-# INSTX_BASE_RECURSION_GUARD goes out of scope when this shell dies.
-
-if [[ "$INSTX_BASE_RECURSION_GUARD" == "yes" ]]; then
-    exit 0
-else
-    INSTX_BASE_RECURSION_GUARD=yes
-    export INSTX_BASE_RECURSION_GUARD
-fi
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-# GetText will be checked in build-gettext-final.sh
-export INSTX_DISABLE_GETTEXT_CHECK=1
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-iconv-gettext.sh
-then
-    echo "Failed to build iConv and GetText"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-# GetText is checked in build-gettext-final.sh
-unset INSTX_DISABLE_GETTEXT_CHECK
-
-if ! ./build-gettext-final.sh
-then
-    echo "Failed to build GetText final"
-    exit 1
-fi
-
-###############################################################################
-
-# Trigger a rebuild of PCRE2
-
-rm -f "${INSTX_PKG_CACHE}/pcre2"
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-# Trigger a rebuild of IDN2
-
-rm -f "${INSTX_PKG_CACHE}/idn2"
-
-if ! ./build-idn2.sh
-then
-    echo "Failed to build IDN2"
-    exit 1
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-exit 0
diff --git a/build-bash.sh b/build-bash.sh
deleted file mode 100755
index 8b35f5c19..000000000
--- a/build-bash.sh
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Bash from sources.
-
-BASH_VER=5.2.15
-BASH_TAR="bash-${BASH_VER}.tar.gz"
-BASH_DIR="bash-${BASH_VER}"
-PKG_NAME=bash
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Bash ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Bash ${BASH_VER}..."
-
-if ! "${WGET}" -q -O "$BASH_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/bash/$BASH_TAR"
-then
-    echo "Failed to download Bash"
-    echo "Maybe Wget is too old. Perhaps run setup-wget.sh?"
-    exit 1
-fi
-
-rm -rf "$BASH_DIR" &>/dev/null
-gzip -d < "$BASH_TAR" | tar xf -
-cd "$BASH_DIR"
-
-if [[ -e ../patch/bash.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/bash.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Bash has lots of other options. We should use what a distro uses.
-# TODO: figure out the options a distro like Debian or Red Hat uses...
-# https://www.gnu.org/software/bash/manual/html_node/Optional-Features.html
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    bash_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BASH_DIR}"
-    bash_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BASH_DIR}"
-else
-    bash_cflags="${INSTX_CFLAGS}"
-    bash_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${bash_cflags}" \
-    CXXFLAGS="${bash_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-curses --enable-multibyte \
-    --enable-largefile \
-    --enable-history \
-    --with-installed-readline="${INSTX_PREFIX}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Bash"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Bash"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-echo ""
-echo "**********************"
-echo "Bash not tested"
-echo "**********************"
-
-# https://git.savannah.gnu.org/cgit/bash.git/tree/INSTALL
-# MAKE_FLAGS=("PERL_USE_UNSAFE_INC=1" "tests")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "************************"
-#    echo "Failed to test Bash"
-#    echo "************************"
-#
-#    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing anyways..."
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BASH_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BASH_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BASH_TAR" "$BASH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-bayonne.sh b/build-bayonne.sh
deleted file mode 100755
index c861f5b8e..000000000
--- a/build-bayonne.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds SIP Witch from sources.
-
-SIPW_VER=1.9.15
-SIPW_TAR=sipwitch-${SIPW_VER}.tar.gz
-SIPW_DIR=sipwitch-${SIPW_VER}
-PKG_NAME=sipwitch
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexosip2-rc.sh
-then
-    echo "Failed to build libosip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ucommon.sh
-then
-    echo "Failed to build ucommon"
-    exit 1
-fi
-
-###############################################################################
-
-echo
-echo "********** SIP Witch **********"
-echo
-
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "SIP Witch ${SIPW_VER}..."
-
-if ! "${WGET}" -q -O "$SIPW_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/sipwitch/$SIPW_TAR"
-then
-    echo "Failed to download SIP Witch"
-    exit 1
-fi
-
-rm -rf "$SIPW_DIR" &>/dev/null
-gzip -d < "$SIPW_TAR" | tar xf -
-cd "$SIPW_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/sipwitch.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/sipwitch.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --sysconfdir="${INSTX_PREFIX}/etc" \
-    --localstatedir="${INSTX_PREFIX}/var" \
-    --with-pkg-config \
-    --with-libeXosip2=libeXosip2
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure SIP Witch"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# Fix makefiles again
-IFS="" find "./" -iname 'Makefile' -print | while read -r file
-do
-    echo "$file" | sed 's/^\.\///g'
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed -e "s/ libosip2/ -leXosip2/g" \
-        -e "s/ libeXosip2/ -leXosip2/g" \
-        "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build SIP Witch"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test SIP Witch"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo -E -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$SIPW_TAR" "$SIPW_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-bc.sh b/build-bc.sh
deleted file mode 100755
index 3a96c2d32..000000000
--- a/build-bc.sh
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds BC from sources.
-
-BC_VER=1.07.1
-BC_TAR=bc-${BC_VER}.tar.gz
-BC_DIR=bc-${BC_VER}
-PKG_NAME=bc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== BC =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "BC ${BC_VER}..."
-
-if ! "${WGET}" -q -O "$BC_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/bc/$BC_TAR"
-then
-    echo "Failed to download BC"
-    exit 1
-fi
-
-rm -rf "$BC_DIR" &>/dev/null
-gzip -d < "$BC_TAR" | tar xf -
-cd "$BC_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/bc.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/bc.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure BC"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build BC"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test BC"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BC_TAR" "$BC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-bdb.sh b/build-bdb.sh
deleted file mode 100755
index c5f49a1f8..000000000
--- a/build-bdb.sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Berkeley DB from sources.
-
-# Note: we do not build with OpenSSL. There is a circular
-# dependency between Berkeley DB, OpenSSL and Perl.
-# The loss of SSL/TLS in Berkeley DB means the Replication
-# Manager does not have SSL/TLS support.
-
-BDB_VER=6.2.32
-BDB_TAR=db-${BDB_VER}.tar.gz
-BDB_DIR=db-${BDB_VER}
-PKG_NAME=bdb
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Berkeley DB ============="
-echo "========================================"
-
-echo ""
-echo "Berkeley DB ${BDB_VER}..."
-
-echo ""
-echo "*******************************"
-echo "Copying package"
-echo "*******************************"
-
-cp "bootstrap/$BDB_TAR" "$PWD"
-rm -rf "$BDB_DIR" &>/dev/null
-gzip -d < "$BDB_TAR" | tar xf -
-
-cd "$BDB_DIR" || exit 1
-
-if [[ -e ../patch/db.patch ]]; then
-    echo ""
-    echo "*******************************"
-    echo "Patching package"
-    echo "*******************************"
-
-    patch -u -p0 < ../patch/db.patch
-fi
-
-cd "${CURR_DIR}" || exit 1
-cd "$BDB_DIR/dist" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-cd "${CURR_DIR}" || exit 1
-cd "$BDB_DIR" || exit 1
-
-echo ""
-echo "*******************************"
-echo "Configuring package"
-echo "*******************************"
-
-CONFIG_OPTS=()
-if [[ "${INSTX_CXX11_ATOMIC}" -eq 1 ]];then
-    CONFIG_OPTS+=("--enable-cxx")
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./dist/configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-tls=openssl \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*******************************"
-    echo "Failed to configure Berkeley DB"
-    echo "*******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*******************************"
-echo "Building package"
-echo "*******************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*******************************"
-    echo "Failed to build Berkeley DB"
-    echo "*******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*******************************"
-echo "Testing package"
-echo "*******************************"
-
-echo ""
-echo "*******************************"
-echo "Unable to test Berkeley DB"
-echo "*******************************"
-
-# No check or test recipes
-#MAKE_FLAGS=("check" "-k" "V=1")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "*******************************"
-#    echo "Failed to test Berkeley DB"
-#    echo "*******************************"
-#
-#    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*******************************"
-echo "Installing anyways..."
-echo "*******************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-# Write the *.pc file
-{
-    echo ""
-    echo "prefix=${INSTX_PREFIX}"
-    echo "exec_prefix=\${prefix}"
-    echo "libdir=${INSTX_LIBDIR}"
-    echo "sharedlibdir=\${libdir}"
-    echo "includedir=\${prefix}/include"
-    echo ""
-    echo "Name: Berkeley DB"
-    echo "Description: Berkeley DB client library"
-    echo "Version: 6.2"
-    echo ""
-    echo "Requires:"
-    echo "Libs: -L\${libdir} -ldb"
-    echo "Cflags: -I\${includedir}"
-} > libdb.pc
-
-# Install the pc file
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "./libdb.pc" "${INSTX_PKGCONFIG}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S chmod u=rw,go=r "${INSTX_PKGCONFIG}/libdb.pc"
-else
-    cp "./libdb.pc" "${INSTX_PKGCONFIG}"
-    chmod u=rw,go=r "${INSTX_PKGCONFIG}/libdb.pc"
-fi
-
-# Fix permissions once
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BDB_TAR" "$BDB_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-bison-rc.sh b/build-bison-rc.sh
deleted file mode 100755
index 3bec886d5..000000000
--- a/build-bison-rc.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Bison from sources.
-
-# The Bison recipe is broken at the moment. 'make && make check' fails.
-# The 'make check' recipe tries to build the documentation even when the
-# tools are missing. Derp...
-
-BISON_VER=3.7.4.254
-BISON_TAR=bison-${BISON_VER}-d85e.tar.gz
-BISON_DIR=bison-${BISON_VER}-a0905
-PKG_NAME=bison-rc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Bison ================"
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "Bison ${BISON_VER}..."
-
-if ! "${WGET}" -q -O "$BISON_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://www.lrde.epita.fr/~akim/private/bison/bison-3.7.4.254-a0905.tar.gz"
-then
-    echo "Failed to download Bison"
-    exit 1
-fi
-
-rm -rf "$BISON_DIR" &>/dev/null
-gzip -d < "$BISON_TAR" | tar xf -
-cd "$BISON_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/bison-rc.patch ]]; then
-    echo ""
-    echo "*************************"
-    echo "Patching package"
-    echo "*************************"
-
-    patch -u -p0 < ../patch/bison-rc.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    bison_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BISON_DIR}"
-    bison_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BISON_DIR}"
-else
-    bison_cflags="${INSTX_CFLAGS}"
-    bison_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${bison_cflags}" \
-    CXXFLAGS="${bison_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Bison"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "HELP2MAN=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Bison"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Bison"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BISON_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BISON_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BISON_TAR" "$BISON_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-bison.sh b/build-bison.sh
deleted file mode 100755
index 901695197..000000000
--- a/build-bison.sh
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Bison from sources.
-
-# The Bison recipe is broken at the moment. 'make && make check' fails.
-# The 'make check' recipe tries to build the documentation even when the
-# tools are missing. Derp...
-
-BISON_VER=3.8.2
-BISON_TAR=bison-${BISON_VER}.tar.gz
-BISON_DIR=bison-${BISON_VER}
-PKG_NAME=bison
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# Autotools on Solaris is broken. Bison 3.7.1 and above fails to configure due
-# to a buggy strstr(). The rub is, Bison does not use the function. WTF???
-if [[ "${IS_SOLARIS}" -eq 1 ]]; then
-    BISON_VER=3.7
-    BISON_TAR=bison-${BISON_VER}.tar.gz
-    BISON_DIR=bison-${BISON_VER}
-fi
-
-# Bison 3.0, and 3.2 through 3.7 fail to compile on OS X 10.5.
-# https://lists.gnu.org/archive/html/bug-bison/2021-03/msg00005.html
-if [[ "${OSX_10p5_OR_BELOW}" -eq 1 ]]; then
-    BISON_VER=3.1
-    BISON_TAR=bison-${BISON_VER}.tar.gz
-    BISON_DIR=bison-${BISON_VER}
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Bison ================"
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "Bison ${BISON_VER}..."
-
-if ! "${WGET}" -q -O "$BISON_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://ftp.gnu.org/gnu/bison/$BISON_TAR"
-then
-    echo "Failed to download Bison"
-    exit 1
-fi
-
-rm -rf "$BISON_DIR" &>/dev/null
-gzip -d < "$BISON_TAR" | tar xf -
-cd "$BISON_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/bison.patch ]]; then
-    echo ""
-    echo "*************************"
-    echo "Patching package"
-    echo "*************************"
-
-    patch -u -p0 < ../patch/bison.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    bison_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BISON_DIR}"
-    bison_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BISON_DIR}"
-else
-    bison_cflags="${INSTX_CFLAGS}"
-    bison_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${bison_cflags}" \
-    CXXFLAGS="${bison_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libreadline-prefix="${INSTX_PREFIX}" \
-    --with-libtextstyle-prefix="${INSTX_PREFIX}" \
-    --disable-assert
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Bison"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "HELP2MAN=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Bison"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Bison"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BISON_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BISON_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BISON_TAR" "$BISON_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-boehm-gc-7.2k.sh b/build-boehm-gc-7.2k.sh
deleted file mode 100755
index 8ec1b7133..000000000
--- a/build-boehm-gc-7.2k.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Boehm GC from sources. The version is
-# pinned at Boehm-GC 7.2k to avoid the libatomics. Many
-# C++ compilers claim to be C++11 but lack the features.
-
-BGC_VER=7.2k
-BGC_TAR=gc-7.2k.tar.gz
-BGC_DIR=gc-7.2
-PKG_NAME=boehm-gc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Boehm GC ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Boehm GC ${BGC_VER}..."
-
-if ! "${WGET}" -q -O "$BGC_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/ivmai/bdwgc/releases/download/v${BGC_VER}/$BGC_TAR"
-then
-    echo "Failed to download Boehm GC"
-    exit 1
-fi
-
-rm -rf "$BGC_DIR" &>/dev/null
-gzip -d < "$BGC_TAR" | tar xf -
-cd "$BGC_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure Boehm GC"
-    echo "****************************"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Boehm GC"
-    echo "****************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to test Boehm GC"
-    echo "****************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BGC_TAR" "$BGC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-boehm-gc.sh b/build-boehm-gc.sh
deleted file mode 100755
index c8f092040..000000000
--- a/build-boehm-gc.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Boehm GC from sources.
-
-BGC_VER=8.0.4
-BGC_TAR=gc-${BGC_VER}.tar.gz
-BGC_DIR=gc-${BGC_VER}
-PKG_NAME=boehm-gc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Boehm GC ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Boehm GC ${BGC_VER}..."
-
-if ! "${WGET}" -q -O "$BGC_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/ivmai/bdwgc/releases/download/v${BGC_VER}/$BGC_TAR"
-then
-    echo "Failed to download Boehm GC"
-    exit 1
-fi
-
-rm -rf "$BGC_DIR" &>/dev/null
-gzip -d < "$BGC_TAR" | tar xf -
-cd "$BGC_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo "****************************"
-    echo "Failed to configure Boehm GC"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "****************************"
-    echo "Failed to build Boehm GC"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "****************************"
-    echo "Failed to test Boehm GC"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BGC_TAR" "$BGC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-botan.sh b/build-botan.sh
deleted file mode 100755
index 0c94179f1..000000000
--- a/build-botan.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Botan library from sources.
-
-# https://botan.randombit.net/releases/Botan-2.17.3.tar.xz
-
-BOTAN_VER=2.19.1
-BOTAN_XZ=Botan-${BOTAN_VER}.tar.xz
-BOTAN_TAR=Botan-${BOTAN_VER}.tar
-BOTAN_DIR=Botan-${BOTAN_VER}
-PKG_NAME=botan
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Botan ================="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "Botan ${BOTAN_VER}..."
-
-if ! "${WGET}" -q -O "$BOTAN_XZ" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://botan.randombit.net/releases/$BOTAN_XZ"
-then
-    echo "Failed to download Botan"
-    exit 1
-fi
-
-rm -rf "$BOTAN_TAR" "$BOTAN_DIR" &>/dev/null
-unxz "$BOTAN_XZ" && tar -xf "$BOTAN_TAR"
-cd "$BOTAN_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/botan.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/botan.patch
-fi
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--libdir=${INSTX_LIBDIR}")
-CONFIG_OPTS+=("--cc-bin=${CXX}")
-CONFIG_OPTS+=("--cxxflags=${INSTX_CPPFLAGS} ${INSTX_CXXFLAGS}")
-CONFIG_OPTS+=("--ldflags=${INSTX_LDFLAGS}")
-CONFIG_OPTS+=("--system-cert-bundle=${INSTX_CACERT_FILE}")
-CONFIG_OPTS+=("--with-bzip2")
-CONFIG_OPTS+=("--with-zlib")
-
-if ! ./configure.py "${CONFIG_OPTS[@]}";
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Botan"
-    echo "*************************"
-    exit 1
-fi
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Botan"
-    echo "*************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("check" "-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Botan"
-    echo "*************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BOTAN_XZ" "$BOTAN_TAR" "$BOTAN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-bzip.sh b/build-bzip.sh
deleted file mode 100755
index 66029915d..000000000
--- a/build-bzip.sh
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Bzip2 from sources.
-
-# shellcheck disable=SC2191
-
-# Bzip lost its website. It is now located on Sourceware.
-# https://sourceware.org/bzip2/downloads.html
-
-BZIP2_VER=1.0.8
-BZIP2_TAR=bzip2-${BZIP2_VER}.tar.gz
-BZIP2_DIR=bzip2-${BZIP2_VER}
-PKG_NAME=bzip2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# Needed to unpack the new Makefiles
-if [[ -z "$(command -v unzip 2>/dev/null)" ]]; then
-    echo ""
-    echo "Please install unzip command."
-    exit 1
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Bzip2 ================"
-echo "========================================"
-
-echo ""
-echo "****************************"
-echo "Downloading package"
-echo "****************************"
-
-echo ""
-echo "Bzip2 ${BZIP2_VER}..."
-
-if ! "${WGET}" -q -O "$BZIP2_TAR" \
-     "ftp://sourceware.org/pub/bzip2/$BZIP2_TAR"
-then
-    echo "Failed to download Bzip"
-    exit 1
-fi
-
-rm -rf "$BZIP2_DIR" &>/dev/null
-gzip -d < "$BZIP2_TAR" | tar xf -
-cd "$BZIP2_DIR" || exit 1
-
-# The Makefiles needed so much work it was easier to rewrite them.
-if [[ -e ../patch/bzip-makefiles.zip ]]; then
-    echo ""
-    echo "****************************"
-    echo "Updating makefiles"
-    echo "****************************"
-
-    cp ../patch/bzip-makefiles.zip .
-    unzip -oq bzip-makefiles.zip
-fi
-
-# Now, patch them for this script.
-if [[ -e ../patch/bzip.patch ]]; then
-    echo ""
-    echo "****************************"
-    echo "Patching package"
-    echo "****************************"
-
-    patch -u -p0 < ../patch/bzip.patch
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "****************************"
-echo "Building package"
-echo "****************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LDLIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=()
-MAKE_FLAGS+=("-f" "Makefile")
-MAKE_FLAGS+=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("CC=${CC}")
-MAKE_FLAGS+=("CPPFLAGS=${CPPFLAGS} -I.")
-MAKE_FLAGS+=("ASFLAGS=${ASFLAGS}")
-MAKE_FLAGS+=("CFLAGS=${CFLAGS}")
-MAKE_FLAGS+=("CXXFLAGS=${CXXFLAGS}")
-MAKE_FLAGS+=("LDFLAGS=${LDFLAGS}")
-MAKE_FLAGS+=("LIBS=${LDLIBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Bzip archive"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Testing package"
-echo "****************************"
-
-MAKE_FLAGS=()
-MAKE_FLAGS+=("-f" "Makefile" "check")
-MAKE_FLAGS+=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("CC=${CC}")
-MAKE_FLAGS+=("CPPFLAGS=${CPPFLAGS} -I.")
-MAKE_FLAGS+=("ASFLAGS=${ASFLAGS}")
-MAKE_FLAGS+=("CFLAGS=${CFLAGS}")
-MAKE_FLAGS+=("CXXFLAGS=${CXXFLAGS}")
-MAKE_FLAGS+=("LDFLAGS=${LDFLAGS}")
-MAKE_FLAGS+=("LIBS=${LDLIBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to test Bzip"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Installing package"
-echo "****************************"
-
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    echo "Installing static archive..."
-    MAKE_FLAGS=("-f" "Makefile" installdirs
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-
-    MAKE_FLAGS=("-f" "Makefile" install
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    echo "Installing static archive..."
-    MAKE_FLAGS=("-f" "Makefile" installdirs
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-
-    MAKE_FLAGS=("-f" "Makefile" install
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-# Clean old artifacts
-"${MAKE}" clean 2>/dev/null
-
-###############################################################################
-
-echo ""
-echo "****************************"
-echo "Building package"
-echo "****************************"
-
-if [[ "$IS_DARWIN" -ne 0 ]]; then
-    MAKEFILE=Makefile-libbz2_dylib
-else
-    MAKEFILE=Makefile-libbz2_so
-fi
-
-MAKE_FLAGS=()
-MAKE_FLAGS+=("-f" "$MAKEFILE")
-MAKE_FLAGS+=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("CC=${CC}")
-MAKE_FLAGS+=("CPPFLAGS=${CPPFLAGS} -I.")
-MAKE_FLAGS+=("ASFLAGS=${ASFLAGS}")
-MAKE_FLAGS+=("CFLAGS=${CFLAGS}")
-MAKE_FLAGS+=("CXXFLAGS=${CXXFLAGS}")
-MAKE_FLAGS+=("LDFLAGS=${LDFLAGS}")
-MAKE_FLAGS+=("LIBS=${LDLIBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Bzip library"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-echo ""
-echo "****************************"
-echo "Installing package"
-echo "****************************"
-
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    echo "Installing shared object..."
-    MAKE_FLAGS=("-f" "$MAKEFILE" install
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-
-    MAKE_FLAGS=("-f" "$MAKEFILE" installdirs
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    echo "Installing shared object..."
-    MAKE_FLAGS=("-f" "$MAKEFILE" installdirs
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-
-    MAKE_FLAGS=("-f" "$MAKEFILE" install
-                PREFIX="${INSTX_PREFIX}" LIBDIR="${INSTX_LIBDIR}")
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-###############################################################################
-
-# Write the *.pc file
-{
-    echo ""
-    echo "prefix=${INSTX_PREFIX}"
-    echo "exec_prefix=\${prefix}"
-    echo "libdir=${INSTX_LIBDIR}"
-    echo "sharedlibdir=\${libdir}"
-    echo "includedir=\${prefix}/include"
-    echo ""
-    echo "Name: Bzip2"
-    echo "Description: Bzip2 compression library"
-    echo "Version: $BZIP2_VER"
-    echo ""
-    echo "Requires:"
-    echo "Libs: -L\${libdir} -lbz2"
-    echo "Cflags: -I\${includedir}"
-} > libbz2.pc
-
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp ./libbz2.pc "${INSTX_PKGCONFIG}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S chmod u=rw,go=r "${INSTX_PKGCONFIG}/libbz2.pc"
-else
-    cp ./libbz2.pc "${INSTX_PKGCONFIG}"
-    chmod u=rw,go=r "${INSTX_PKGCONFIG}/libbz2.pc"
-fi
-
-# Fix permissions once
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BZIP2_TAR" "$BZIP2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-cacert.sh b/build-cacert.sh
deleted file mode 100755
index 9db881398..000000000
--- a/build-cacert.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script writes several Root CA certifcates needed
-# for other scripts and wget downloads over HTTPS.
-
-PKG_NAME=cacert
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# setup-cacert.sh writes the certs locally for the user so we
-# can download cacerts.pem using cURL or Wget. build-cacert.sh
-# installs cacerts.pem in ${INSTX_CACERT_PATH}. Programs like
-# cURL, Git and Wget use cacerts.pem.
-if [[ ! -e "$HOME/.build-scripts/cacert/cacert.pem" ]]; then
-    # Hide output to cut down on noise.
-    ./setup-cacerts.sh &>/dev/null
-fi
-
-# Line 4 is a date/time stamp
-bootstrap_cacert="$(sed '4!d' "bootstrap/cacert.pem" 2>/dev/null | cut -b 40- | awk '$1=$1')"
-installed_cacert="$(sed '4!d' "$INSTX_CACERT_FILE" 2>/dev/null | cut -b 40- | awk '$1=$1')"
-
-# Wipe installed if the key is not present
-if [[ ! -f "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    installed_cacert=""
-fi
-
-if [[ -z "${installed_cacert}" ]]; then
-    installed_cacert="Not available"
-fi
-
-# The bootstrap cacert.pem is the latest
-if [[ "$bootstrap_cacert" == "$installed_cacert" ]]; then
-    #echo ""
-    #echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=========== Mozilla Root CAs ==========="
-echo "========================================"
-
-echo ""
-echo "Installing cacert.pem"
-echo "  installed: ${installed_cacert}"
-echo "  available: ${bootstrap_cacert}"
-
-BOOTSTRAP_CACERT_FILE="${INSTX_TOPDIR}/bootstrap/cacert.pem"
-FIX_PERMISSIONS="${INSTX_TOPDIR}/fix-permissions.sh"
-
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "$INSTX_CACERT_PATH"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "$BOOTSTRAP_CACERT_FILE" "$INSTX_CACERT_FILE"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S chmod u=rw,go=r "$INSTX_CACERT_FILE"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash ${FIX_PERMISSIONS} "${INSTX_PREFIX}"
-else
-    mkdir -p "$INSTX_CACERT_PATH"
-    cp "$BOOTSTRAP_CACERT_FILE" "$INSTX_CACERT_FILE"
-    chmod u=rw,go=r "$INSTX_CACERT_FILE"
-    bash ${FIX_PERMISSIONS} "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-###############################################################################
-
-exit 0
diff --git a/build-cares.sh b/build-cares.sh
deleted file mode 100755
index 206f1f3d3..000000000
--- a/build-cares.sh
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds c-ares from sources. c-ares causes
-# a fair amount of trouble. It is on a backslide since
-# Daniel turned over reigns to other developers.
-
-CARES_VER=1.18.1
-CARES_TAR=c-ares-${CARES_VER}.tar.gz
-CARES_DIR=c-ares-${CARES_VER}
-PKG_NAME=c-ares
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ C-ares ================"
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-echo ""
-echo "C-ares ${CARES_VER}..."
-
-if ! "${WGET}" -q -O "$CARES_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://c-ares.haxx.se/download/$CARES_TAR"
-then
-    echo "Failed to download c-ares"
-    exit 1
-fi
-
-rm -rf "$CARES_DIR" &>/dev/null
-gzip -d < "$CARES_TAR" | tar xf -
-cd "$CARES_DIR" || exit 1
-
-if [[ -e ../patch/cares.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/cares.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    cares_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CARES_DIR}"
-    cares_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CARES_DIR}"
-else
-    cares_cflags="${INSTX_CFLAGS}"
-    cares_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${cares_cflags}" \
-    CXXFLAGS="${cares_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --enable-tests
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure c-ares"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build c-ares"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test c-ares"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "**************************"
-    echo "Installing anyways..."
-    echo "**************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${CARES_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${CARES_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CARES_TAR" "$CARES_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-clamav.sh b/build-clamav.sh
deleted file mode 100755
index a845b2854..000000000
--- a/build-clamav.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds ClamAV and its dependencies from sources.
-# Also see https://bugzilla.clamav.net/show_bug.cgi?id=11929
-
-CLAMAV_VER=1.2.0
-CLAMAV_TAR=clamav-${CLAMAV_VER}.tar.gz
-CLAMAV_DIR=clamav-${CLAMAV_VER}
-PKG_NAME=clamav
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ ClamAV ================"
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-echo ""
-echo "ClamAV ${CLAMAV_VER}..."
-
-if ! "${WGET}" -q -O "$CLAMAV_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://www.clamav.net/downloads/production/$CLAMAV_TAR"
-then
-    echo "Failed to download ClamAV"
-    exit 1
-fi
-
-rm -rf "$CLAMAV_DIR" &>/dev/null
-gzip -d < "$CLAMAV_TAR" | tar xf -
-cd "$CLAMAV_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-openssl-dir="${INSTX_PREFIX}" \
-    --with-zlib="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure ClamAV"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build ClamAV"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test ClamAV"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CLAMAV_TAR" "$CLAMAV_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-cmake-3.0.sh b/build-cmake-3.0.sh
deleted file mode 100755
index 839966379..000000000
--- a/build-cmake-3.0.sh
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds CMake and its dependencies from sources.
-
-CMAKE_VER=3.0.0
-CMAKE_TAR=cmake-${CMAKE_VER}.tar.gz
-CMAKE_DIR=cmake-${CMAKE_VER}
-PKG_NAME=cmake
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./setup-cacerts.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Cmake ================="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "CMake ${CMAKE_VER}..."
-
-if ! "${WGET}" -q -O "$CMAKE_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/Kitware/CMake/releases/download/v$CMAKE_VER/$CMAKE_TAR"
-then
-    echo "Failed to download CMake"
-    exit 1
-fi
-
-rm -rf "$CMAKE_DIR" &>/dev/null
-gzip -d < "$CMAKE_TAR" | tar xf -
-
-cd "$CMAKE_DIR" || exit 1
-
-echo ""
-echo "*************************"
-echo "Bootstrapping package"
-echo "*************************"
-
-if [[ "$IS_AIX" -ne 0 ]]; then
-  AIX_TOC=-Wl,-bbigtoc
-else
-  AIX_TOC=
-fi
-
-# Bootstrap does not honor these, but we need to try...
-export CPPFLAGS="${INSTX_CPPFLAGS}"
-export ASFLAGS="${INSTX_ASFLAGS}"
-export CFLAGS="${INSTX_CFLAGS}"
-export CXXFLAGS="${INSTX_CXXFLAGS}"
-export LDFLAGS="${INSTX_LDFLAGS} ${AIX_TOC}"
-export LDLIBS="${INSTX_LDLIBS}"
-export LIBS="${INSTX_LDLIBS}"
-
-# This is the CMake build command per https://cmake.org/install/
-if ! ./bootstrap --no-system-libs --prefix="${INSTX_PREFIX}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to bootstrap CMake"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build CMake"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("test" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test CMake"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "************************"
-    echo "Installing anyways..."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CMAKE_TAR" "$CMAKE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-cmake.sh b/build-cmake.sh
deleted file mode 100755
index 82ea789d0..000000000
--- a/build-cmake.sh
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds CMake and its dependencies from sources.
-
-CMAKE_VER=3.27.7
-CMAKE_TAR=cmake-${CMAKE_VER}.tar.gz
-CMAKE_DIR=cmake-${CMAKE_VER}
-PKG_NAME=cmake
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./setup-cacerts.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Cmake ================="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "CMake ${CMAKE_VER}..."
-
-if ! "${WGET}" -q -O "$CMAKE_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/Kitware/CMake/releases/download/v$CMAKE_VER/$CMAKE_TAR"
-then
-    echo "Failed to download CMake"
-    exit 1
-fi
-
-rm -rf "$CMAKE_DIR" &>/dev/null
-gzip -d < "$CMAKE_TAR" | tar xf -
-
-cd "$CMAKE_DIR" || exit 1
-
-echo ""
-echo "*************************"
-echo "Bootstrapping package"
-echo "*************************"
-
-if [[ "$IS_AIX" -ne 0 ]]; then
-  AIX_TOC=-Wl,-bbigtoc
-else
-  AIX_TOC=
-fi
-
-# Bootstrap does not honor these, but we need to try...
-export CPPFLAGS="${INSTX_CPPFLAGS}"
-export ASFLAGS="${INSTX_ASFLAGS}"
-export CFLAGS="${INSTX_CFLAGS}"
-export CXXFLAGS="${INSTX_CXXFLAGS}"
-export LDFLAGS="${INSTX_LDFLAGS} ${AIX_TOC}"
-export LDLIBS="${INSTX_LDLIBS}"
-export LIBS="${INSTX_LDLIBS}"
-
-# This is the CMake build command per https://cmake.org/install/
-if ! ./bootstrap --no-system-libs --prefix="${INSTX_PREFIX}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to bootstrap CMake"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build CMake"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("test" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test CMake"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "************************"
-    echo "Installing anyways..."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CMAKE_TAR" "$CMAKE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-coreutils.sh b/build-coreutils.sh
deleted file mode 100755
index a7ee7f605..000000000
--- a/build-coreutils.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds coreutils from sources.
-
-CORE_VER=9.0
-CORE_TAR=coreutils-${CORE_VER}.tar
-CORE_DIR=coreutils-${CORE_VER}
-PKG_NAME=coreutils
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre.sh
-then
-    echo "Failed to build PCRE"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Coreutils ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$CORE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/coreutils/$CORE_TAR"
-then
-    echo "Failed to download Core Utilities"
-    exit 1
-fi
-
-rm -rf "$CORE_DIR" &>/dev/null
-gzip -d < "$CORE_TAR" | tar xf -
-cd "$CORE_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --enable-install-program=hostname \
-    --with-openssl=yes
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Coreutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build Coreutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Coreutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CORE_TAR" "$CORE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-cpuid.sh b/build-cpuid.sh
deleted file mode 100755
index bdc0730ee..000000000
--- a/build-cpuid.sh
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Cpuid from sources.
-
-CPUID_VER=20180519
-CPUID_TAR=cpuid-${CPUID_VER}.src.tar.gz
-CPUID_DIR=cpuid-${CPUID_VER}
-PKG_NAME=cpuid
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# Bail early
-if [[ $(uname -m 2>/dev/null | grep -i -c -E 'i86pc|i.86|amd64|x86_64') -eq 0 ]]
-then
-    echo "Failed to build cpuid. The program is only valid for x86 platforms."
-    exit 1
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ CPUID ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Cpuid ${CPUID_VER}..."
-
-if ! "${WGET}" -q -O "$CPUID_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "http://www.etallen.com/cpuid/$CPUID_TAR"
-then
-    echo "Failed to download Cpuid"
-    exit 1
-fi
-
-rm -rf "$CPUID_DIR" &>/dev/null
-gzip -d < "$CPUID_TAR" | tar xf -
-cd "$CPUID_DIR"
-
-if [[ -e ../patch/cpuid.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/cpuid.patch
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=()
-MAKE_FLAGS+=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("CPPFLAGS=${CPPFLAGS} -I.")
-MAKE_FLAGS+=("ASFLAGS=${ASFLAGS}")
-MAKE_FLAGS+=("CFLAGS=${CFLAGS}")
-MAKE_FLAGS+=("CXXFLAGS=${CXXFLAGS}")
-MAKE_FLAGS+=("LDFLAGS=${LDFLAGS}")
-MAKE_FLAGS+=("LIBS=${LIBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build cpuid"
-    echo "**********************"
-    exit 1
-fi
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-#echo ""
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-# No make check program
-#MAKE_FLAGS=("check")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "Failed to test Cpuid"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install" "PREFIX=${INSTX_PREFIX}" "LIBDIR=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CPUID_TAR" "$CPUID_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-cryptlib.sh b/build-cryptlib.sh
deleted file mode 100755
index 0c72458f4..000000000
--- a/build-cryptlib.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Cryptlib library from sources.
-
-CRYPTLIB_VER=345
-CRYPTLIB_ZIP=cryptlib${CRYPTLIB_VER}.zip
-CRYPTLIB_DIR=cryptlib${CRYPTLIB_VER}
-PKG_NAME=cryptlib
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Cryptlib ================"
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "Cryptlib ${CRYPTLIB_VER}..."
-
-if ! "${WGET}" -q -O "$CRYPTLIB_ZIP" --ca-certificate="${THE_CA_ZOO}" \
-     "https://cryptlib-release.s3-ap-southeast-1.amazonaws.com/$CRYPTLIB_ZIP"
-then
-    echo "Failed to download Cryptlib"
-    exit 1
-fi
-
-rm -rf "$CRYPTLIB_DIR" &>/dev/null
-unzip -aoq "$CRYPTLIB_ZIP" -d "$CRYPTLIB_DIR"
-cd "$CRYPTLIB_DIR"
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/cryptlib.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/cryptlib.patch
-fi
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "$INSTX_CPPFLAGS" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "$INSTX_ASFLAGS" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS} -lz"
-LDLIBS="${INSTX_LDLIBS} -lz"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Cryptlib"
-    echo "************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("testlib" "-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Cryptlib"
-    echo "************************"
-    exit 1
-fi
-
-echo ""
-echo "************************"
-echo "Running test"
-echo "************************"
-if ! ./testlib
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Cryptlib"
-    echo "************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install" "PREFIX=${INSTX_PREFIX}" "LIBDIR=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CRYPTLIB_ZIP" "$CRYPTLIB_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-cryptopp.sh b/build-cryptopp.sh
deleted file mode 100755
index 4767d824c..000000000
--- a/build-cryptopp.sh
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Crypto++ library from sources.
-
-CRYPTOPP_VER=850
-CRYPTOPP_ZIP=cryptopp${CRYPTOPP_VER}.zip
-CRYPTOPP_DIR=cryptopp${CRYPTOPP_VER}
-PKG_NAME=cryptopp
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Crypto++ ================"
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$CRYPTOPP_ZIP" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.cryptopp.com/$CRYPTOPP_ZIP"
-then
-    echo "Failed to download Crypto++"
-    exit 1
-fi
-
-rm -rf "$CRYPTOPP_DIR" &>/dev/null
-unzip -aoq "$CRYPTOPP_ZIP" -d "$CRYPTOPP_DIR"
-cd "$CRYPTOPP_DIR"
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    cryptopp_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CRYPTOPP_DIR}"
-    cryptopp_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CRYPTOPP_DIR}"
-else
-    cryptopp_cflags="${INSTX_CFLAGS}"
-    cryptopp_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "$INSTX_CPPFLAGS" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "$INSTX_ASFLAGS" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${cryptopp_cflags}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${cryptopp_cxxflags}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("all" "libcryptopp.pc" "-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="-I. ${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Crypto++"
-    echo "************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-if ! ./cryptest.exe v
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Crypto++"
-    echo "************************"
-    exit 1
-fi
-
-if ! ./cryptest.exe tv all
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Crypto++"
-    echo "************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install" "PREFIX=${INSTX_PREFIX}" "LIBDIR=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${CRYPTOPP_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${CRYPTOPP_DIR}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-# Test from install directory
-if ! "${INSTX_PREFIX}/bin/cryptest.exe" v
-then
-    echo "Failed to test Crypto++"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CRYPTOPP_ZIP" "$CRYPTOPP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-curl.sh b/build-curl.sh
deleted file mode 100755
index 2331a7cc6..000000000
--- a/build-curl.sh
+++ /dev/null
@@ -1,351 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds cURL from sources.
-
-CURL_VER=8.4.0"
-CURL_TAR="curl-${CURL_VER}.tar.gz"
-CURL_DIR="curl-${CURL_VER}"
-PKG_NAME=curl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-idn2.sh
-then
-    echo "Failed to build IDN2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-# Needs real C++14 support
-if [[ "$INSTX_CXX14" -eq 1 ]]
-then
-    if ! ./build-nghttp2.sh
-    then
-        echo "Failed to build NGHTTP2"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-openldap.sh
-then
-    echo "Failed to build OpenLDAP"
-    exit 1
-fi
-
-###############################################################################
-
-# PSL may be skipped if Python is too old. libpsl requires Python 2.7
-# Also see https://stackoverflow.com/a/40950971/608639
-if [[ -n "$(command -v python 2>/dev/null)" ]]
-then
-    ver=$(python -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]\).*/\1\2/')
-    if [ "$ver" -ge 27 ]
-    then
-        if ! ./build-libpsl.sh
-        then
-            echo "Failed to build Public Suffix List library"
-            exit 1
-        fi
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ cURL =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$CURL_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://curl.se/download/$CURL_TAR"
-then
-    echo "Failed to download cURL"
-    echo "Maybe Wget is too old. Perhaps run setup-wget.sh?"
-    exit 1
-fi
-
-rm -rf "$CURL_DIR" &>/dev/null
-gzip -d < "$CURL_TAR" | tar xf -
-cd "$CURL_DIR" || exit 1
-
-if [[ -e ../patch/curl.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/curl.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    curl_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CURL_DIR}"
-    curl_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CURL_DIR}"
-else
-    curl_cflags="${INSTX_CFLAGS}"
-    curl_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--enable-optimize")
-CONFIG_OPTS+=("--enable-symbol-hiding")
-CONFIG_OPTS+=("--enable-http")
-CONFIG_OPTS+=("--enable-ftp")
-CONFIG_OPTS+=("--enable-file")
-CONFIG_OPTS+=("--enable-ldap")
-CONFIG_OPTS+=("--enable-ldaps")
-CONFIG_OPTS+=("--enable-rtsp")
-CONFIG_OPTS+=("--enable-proxy")
-CONFIG_OPTS+=("--enable-dict")
-CONFIG_OPTS+=("--enable-telnet")
-CONFIG_OPTS+=("--enable-tftp")
-CONFIG_OPTS+=("--enable-pop3")
-CONFIG_OPTS+=("--enable-imap")
-CONFIG_OPTS+=("--enable-smb")
-CONFIG_OPTS+=("--enable-smtp")
-CONFIG_OPTS+=("--enable-gopher")
-CONFIG_OPTS+=("--enable-cookies")
-CONFIG_OPTS+=("--enable-ipv6")
-CONFIG_OPTS+=("--with-zlib=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-ssl=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libidn2=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--without-gnutls")
-CONFIG_OPTS+=("--without-polarssl")
-CONFIG_OPTS+=("--without-mbedtls")
-CONFIG_OPTS+=("--without-cyassl")
-CONFIG_OPTS+=("--without-nss")
-CONFIG_OPTS+=("--without-libssh2")
-CONFIG_OPTS+=("--with-ca-bundle=$INSTX_CACERT_FILE")
-
-if [[ "$INSTX_CXX14" -eq 1 ]]; then
-    CONFIG_OPTS+=("--with-nghttp2")
-else
-    CONFIG_OPTS+=("--without-nghttp2")
-fi
-
-# OpenSSL 1.1.x does not have RAND_egd, but curl lacks --without-egd
-# We also want to disable the SSLv2 code paths. Hack it by providing
-# ac_cv_func_RAND_egd=no and ac_cv_func_SSLv2_client_method=no.
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${curl_cflags}" \
-    CXXFLAGS="${curl_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    ac_cv_func_RAND_egd=no \
-    ac_cv_func_SSLv2_client_method=no \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "************************"
-    echo "Failed to configure cURL"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build cURL"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-# Disable Valgrind with "TFLAGS=-n". Too many findings due
-# to -march=native. We also want the sanitizers since others
-# are doing the Valgrind testing.
-MAKE_FLAGS=("test" "TFLAGS=-n" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test cURL"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    #exit 1
-
-    echo ""
-    echo "**********************"
-    echo "Installing anyways..."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${CURL_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${CURL_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$CURL_TAR" "$CURL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-datefudge.sh b/build-datefudge.sh
deleted file mode 100755
index d15617234..000000000
--- a/build-datefudge.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Datefudge from sources.
-
-DATEFUDGE_VER=1.24
-DATEFUDGE_XZ=datefudge_${DATEFUDGE_VER}.tar.xz
-DATEFUDGE_TAR=datefudge_${DATEFUDGE_VER}.tar
-DATEFUDGE_DIR=datefudge-${DATEFUDGE_VER}
-PKG_NAME=datefudge
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Datefudge ==============="
-echo "========================================"
-
-echo ""
-echo "*****************************"
-echo "Downloading package"
-echo "*****************************"
-
-echo ""
-echo "Datefudge ${DATEFUDGE_VER}..."
-
-if ! "${WGET}" -q -O "$DATEFUDGE_XZ" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "http://deb.debian.org/debian/pool/main/d/datefudge/$DATEFUDGE_XZ"
-then
-    echo "Failed to download Datefudge"
-    exit 1
-fi
-
-rm -rf "$DATEFUDGE_TAR" "$DATEFUDGE_DIR" &>/dev/null
-unxz "$DATEFUDGE_XZ" && tar -xf "$DATEFUDGE_TAR"
-cd "$DATEFUDGE_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-if [[ "$IS_SOLARIS" -ne 0 ]]; then
-    if [[ -e ../patch/datefudge-solaris.patch ]]; then
-        echo ""
-        echo "*****************************"
-        echo "Patching package"
-        echo "*****************************"
-
-        patch -u -p0 < ../patch/datefudge-solaris.patch
-    fi
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*****************************"
-echo "Building package"
-echo "*****************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! CC="${CC}" \
-     CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Datefudge"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Testing package"
-echo "*****************************"
-
-MAKE_FLAGS=("test" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Datefudge"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Installing package"
-echo "*****************************"
-
-MAKE_FLAGS=("install" "prefix=${INSTX_PREFIX}" "libdir=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$DATEFUDGE_XZ" "$DATEFUDGE_TAR" "$DATEFUDGE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-dejagnu.sh b/build-dejagnu.sh
deleted file mode 100755
index 1ff0e534f..000000000
--- a/build-dejagnu.sh
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds DejaGNU test framework from sources.
-
-DEJAGNU_VER=1.6.2
-DEJAGNU_TAR=dejagnu-${DEJAGNU_VER}.tar.gz
-DEJAGNU_DIR=dejagnu-${DEJAGNU_VER}
-PKG_NAME=dejagnu
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-expect.sh
-then
-    echo "Failed to build Expect"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Dejagnu ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Dejagnu ${DEJAGNU_VER}..."
-
-if ! "${WGET}" -q -O "$DEJAGNU_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/dejagnu/$DEJAGNU_TAR"
-then
-    echo "Failed to download DejaGNU"
-    exit 1
-fi
-
-rm -rf "$DEJAGNU_DIR" &>/dev/null
-gzip -d < "$DEJAGNU_TAR" | tar xf -
-cd "$DEJAGNU_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure DejaGNU"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build DejaGNU"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test DejaGNU"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$DEJAGNU_TAR" "$DEJAGNU_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-diffutils.sh b/build-diffutils.sh
deleted file mode 100755
index cb3a6d313..000000000
--- a/build-diffutils.sh
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Diffutils from sources.
-
-DIFFUTILS_VER=3.8
-DIFFUTILS_XZ=diffutils-${DIFFUTILS_VER}.tar.xz
-DIFFUTILS_TAR=diffutils-${DIFFUTILS_VER}.tar
-DIFFUTILS_DIR=diffutils-${DIFFUTILS_VER}
-PKG_NAME=diffutils
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============ GNU Diffutils ============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Diffutils ${DIFFUTILS_VER}..."
-
-if ! "${WGET}" -q -O "$DIFFUTILS_XZ" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/diffutils/$DIFFUTILS_XZ"
-then
-    echo "Failed to download Diffutils"
-    exit 1
-fi
-
-rm -rf "$DIFFUTILS_TAR" "$DIFFUTILS_DIR" &>/dev/null
-unxz "$DIFFUTILS_XZ" && tar -xf "$DIFFUTILS_TAR"
-cd "$DIFFUTILS_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Diffutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build Diffutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Diffutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$DIFFUTILS_XZ" "$DIFFUTILS_TAR" "$DIFFUTILS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-dos2unix.sh b/build-dos2unix.sh
deleted file mode 100755
index e53e0ffb6..000000000
--- a/build-dos2unix.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds dos2unix from sources.
-
-DOS2UNIX_VER=7.4.1
-DOS2UNIX_TAR=dos2unix-${DOS2UNIX_VER}.tar.gz
-DOS2UNIX_DIR=dos2unix-${DOS2UNIX_VER}
-PKG_NAME=dos2unix
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== dos2unix ==============="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "dos2unix ${DOS2UNIX_VER}..."
-
-if ! "${WGET}" -q -O "$DOS2UNIX_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://waterlan.home.xs4all.nl/dos2unix/$DOS2UNIX_TAR"
-then
-    echo "Failed to download dos2unix"
-    exit 1
-fi
-
-rm -rf "$DOS2UNIX_DIR" &>/dev/null
-gzip -d < "$DOS2UNIX_TAR" | tar xf -
-cd "$DOS2UNIX_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/dos2unix.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/dos2unix.patch
-fi
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="-liconv ${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build dos2unix"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test dos2unix"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install" "prefix=${INSTX_PREFIX}" "libdir=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$DOS2UNIX_TAR" "$DOS2UNIX_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ecgen.sh b/build-ecgen.sh
deleted file mode 100755
index 045430cbc..000000000
--- a/build-ecgen.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds ecgen library from sources.
-
-ECGEN_VER=0.7.3
-ECGEN_TAR=${ECGEN_VER}.tar.gz
-ECGEN_DIR=ecgen-${ECGEN_VER}
-PKG_NAME=ecgen
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-parigp.sh
-then
-    echo "Failed to build PARI/GP"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= ecgen ================"
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$ECGEN_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/J08nY/ecgen/archive/refs/tags/$ECGEN_TAR"
-then
-    echo "Failed to download ecgen"
-    exit 1
-fi
-
-rm -rf "$ECGEN_DIR" &>/dev/null
-gzip -d < "$ECGEN_TAR" | tar xf -
-cd "$ECGEN_DIR" || exit 1
-
-if [[ -e ../patch/ecgen.patch ]]; then
-    echo ""
-    echo "*************************"
-    echo "Patching package"
-    echo "*************************"
-
-    patch -u -p0 < ../patch/ecgen.patch
-fi
-
-# find . -type f -name '*.sh' -exec dos2unix {} \;
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    ecgen_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ECGEN_DIR}"
-    ecgen_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ECGEN_DIR}"
-else
-    ecgen_cflags="${INSTX_CFLAGS}"
-    ecgen_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "$INSTX_CPPFLAGS" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "$INSTX_ASFLAGS" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${ecgen_cflags}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${ecgen_cxxflags}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("all" "-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build ecgen"
-    echo "************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("test")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test ecgen"
-    echo "************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ECGEN_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ECGEN_DIR}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ECGEN_TAR" "$ECGEN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-emacs-rc.sh b/build-emacs-rc.sh
deleted file mode 100755
index 114f94ec8..000000000
--- a/build-emacs-rc.sh
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Emacs and its dependencies from sources.
-
-EMACS_VER=28.0
-EMACS_TAR=emacs-${EMACS_VER}-rc1.tar.gz
-EMACS_DIR=emacs-${EMACS_VER}
-PKG_NAME=emacs-rc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libgcrypt.sh
-then
-    echo "Failed to build Libgcrypt"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Emacs ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Emacs ${EMACS_VER}..."
-
-if ! "${WGET}" -q -O "$EMACS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://alpha.gnu.org/gnu/emacs/pretest/$EMACS_TAR"
-then
-    echo "Failed to download Emacs"
-    exit 1
-fi
-
-rm -rf "$EMACS_DIR" &>/dev/null
-gzip -d < "$EMACS_TAR" | tar xf -
-cd "$EMACS_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    emacs_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${EMACS_DIR}"
-    emacs_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${EMACS_DIR}"
-else
-    emacs_cflags="${INSTX_CFLAGS}"
-    emacs_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--without-all")
-CONFIG_OPTS+=("--with-xml2")
-CONFIG_OPTS+=("--with-json")
-CONFIG_OPTS+=("--with-libgmp")
-CONFIG_OPTS+=("--with-zlib")
-
-if [[ "${IS_DARWIN}" -eq 1 ]]; then
-    # Disable NextStep app
-    CONFIG_OPTS+=('--without-ns')
-fi
-if [[ $(command -v gnutls-cli 2>/dev/null) ]]; then
-    CONFIG_OPTS+=('--with-gnutls')
-else
-    CONFIG_OPTS+=('--without-gnutls')
-fi
-if [[ -e "/usr/include/selinux/context.h" ]]; then
-    CONFIG_OPTS+=('--with-selinux')
-else
-    CONFIG_OPTS+=('--without-selinux')
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${emacs_cflags}" \
-    CXXFLAGS="${emacs_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Emacs"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# I'm not sure why we need to set DO_CODESIGN=yes.
-if [[ "${IS_DARWIN}" -eq 1 ]]; then
-    file=src/Makefile
-    sed 's/DO_CODESIGN=.*/DO_CODESIGN=yes/g' "${file}" > "${file}.fixed"
-    mv "${file}.fixed" "${file}"
-    chmod u=rw,go=r "${file}"
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Emacs"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Emacs"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "*************************"
-    echo "Installing anyways..."
-    echo "*************************"
-fi
-
-# Its a RC. Just bail.
-exit 0
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${EMACS_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${EMACS_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$EMACS_TAR" "$EMACS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-emacs.sh b/build-emacs.sh
old mode 100755
new mode 100644
index de055beff..2930459bc
--- a/build-emacs.sh
+++ b/build-emacs.sh
@@ -1,276 +1,294 @@
 #!/usr/bin/env bash
 
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Emacs and its dependencies from sources.
+# See fixup for INSTALL_LIBDIR below
+INSTALL_PREFIX=/usr/local
+INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
 
-EMACS_VER=27.2
-EMACS_TAR=emacs-${EMACS_VER}.tar.gz
-EMACS_DIR=emacs-${EMACS_VER}
-PKG_NAME=emacs
+ZLIB_TAR=zlib-1.2.11.tar.gz
+ZLIB_DIR=zlib-1.2.11
+
+NCURSES_TAR=ncurses-5.9.tar.gz
+NCURSES_DIR=ncurses-5.9
+
+EMACS_TAR=emacs-24.5.tar.gz
+EMACS_DIR=emacs-24.5
 
 ###############################################################################
 
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
+# Autotools on Solaris has an implied requirement for GNU gear. Things fall apart without it.
+# Also see https://blogs.oracle.com/partnertech/entry/preparing_for_the_upcoming_removal.
+if [[ -d "/usr/gnu/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/gnu/bin"*) ]]; then
+        echo
+        echo "Adding /usr/gnu/bin to PATH for Solaris"
+        PATH="/usr/gnu/bin:$PATH"
     fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
+elif [[ -d "/usr/swf/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/sfw/bin"*) ]]; then
+        echo
+        echo "Adding /usr/sfw/bin to PATH for Solaris"
+        PATH="/usr/sfw/bin:$PATH"
+    fi
+elif [[ -d "/usr/ucb/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/ucb/bin"*) ]]; then
+        echo
+        echo "Adding /usr/ucb/bin to PATH for Solaris"
+        PATH="/usr/ucb/bin:$PATH"
     fi
 fi
 
 ###############################################################################
 
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
+#if [[ -z `which autoreconf` ]]; then
+    #echo "Some packages require autoreconf. Please install autoconf or automake."
+    #[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+#fi
 
 ###############################################################################
 
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
+echo
+echo "If you enter a sudo password, then it will be used for installation."
+echo "If you don't enter a password, then ensure INSTALL_PREFIX is writable."
+echo "To avoid sudo and the password, just press ENTER and they won't be used."
+read -s -p "Please enter password for sudo: " SUDO_PASSWWORD
+echo
 
 ###############################################################################
 
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
+THIS_SYSTEM=$(uname -s 2>&1)
+IS_DARWIN=$(echo -n "$THIS_SYSTEM" | grep -i -c darwin)
+IS_LINUX=$(echo -n "$THIS_SYSTEM" | grep -i -c linux)
+IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | grep -i -c cygwin)
+IS_MINGW=$(echo -n "$THIS_SYSTEM" | grep -i -c mingw)
+IS_OPENBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c openbsd)
+IS_DRAGONFLY=$(echo -n "$THIS_SYSTEM" | grep -i -c dragonfly)
+IS_FREEBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c freebsd)
+IS_NETBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c netbsd)
+IS_SOLARIS=$(echo -n "$THIS_SYSTEM" | grep -i -c sunos)
+
+if [[ ("$IS_FREEBSD" -eq "1" || "$IS_OPENBSD" -eq "1" || "$IS_NETBSD" -eq "1" || "$IS_DRAGONFLY" -eq "1" || "$IS_SOLARIS" -eq "1") ]]; then
+    if [[ !(-z `which gmake 2>/dev/null | grep -v 'no gmake'`) ]]; then
+        MAKE=gmake
+    else
+        MAKE=make
+    fi
+else
+    MAKE=make
 fi
 
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
+# Try to determine 32 vs 64-bit, /usr/local/lib, /usr/local/lib32 and /usr/local/lib64
+# The Autoconf programs misdetect Solaris as x86 even though its x64. OpenBSD has
+# getconf, but it does not have LONG_BIT.
+IS_64BIT=$(getconf LONG_BIT 2>&1 | grep -i -c 64)
+if [[ "$IS_64BIT" -eq "0" ]]; then
+    IS_64BIT=$(file /bin/ls 2>&1 | grep -i -c '64-bit')
 fi
 
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
+if [[ "$IS_SOLARIS" -eq "1" ]]; then
+    SH_KBITS=64
+    SH_MARCH=-m64
+    INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+    INSTALL_LIBDIR_DIR="lib64"
+elif [[ "$IS_64BIT" -eq "1" ]]; then
+    if [[ (-d /usr/lib) && (-d /usr/lib32) ]]; then
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+        INSTALL_LIBDIR_DIR="lib"
+    elif [[ (-d /usr/lib) && (-d /usr/lib64) ]]; then
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+        INSTALL_LIBDIR_DIR="lib64"
+    else
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+        INSTALL_LIBDIR_DIR="lib"
+    fi
+else
+    SH_KBITS=32
+    SH_MARCH=-m32
+    INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+    INSTALL_LIBDIR_DIR="lib"
 fi
 
-###############################################################################
+if [[ -z "$CC" ]]; then CC=`which cc`; fi
 
-if ! ./build-libgcrypt.sh
-then
-    echo "Failed to build Libgcrypt"
-    exit 1
+MARCH_ERROR=`$CC $SH_MARCH -x c -c -o /dev/null - </dev/null 2>&1 | grep -i -c error`
+if [[ "$MARCH_ERROR" -ne "0" ]]; then
+	SH_MARCH=
 fi
 
-###############################################################################
+echo
+echo "********** libdir **********"
+echo
+echo "Using libdir $INSTALL_LIBDIR"
 
-echo ""
-echo "========================================"
-echo "================ Emacs ================="
-echo "========================================"
+###############################################################################
 
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
+echo
+echo "********** zLib **********"
+echo
 
-echo ""
-echo "Emacs ${EMACS_VER}..."
+wget "http://www.zlib.net/$ZLIB_TAR" -O "$ZLIB_TAR"
 
-if ! "${WGET}" -q -O "$EMACS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/emacs/$EMACS_TAR"
-then
-    echo "Failed to download Emacs"
-    exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-rm -rf "$EMACS_DIR" &>/dev/null
-gzip -d < "$EMACS_TAR" | tar xf -
-cd "$EMACS_DIR"
+rm -rf "$ZLIB_DIR" &>/dev/null
+tar -xzf "$ZLIB_TAR"
+cd "$ZLIB_DIR"
+
+SH_LDLIBS=("-ldl -lpthread")
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
 
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/emacs.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
 
-    patch -u -p0 < ../patch/emacs.patch
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    emacs_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${EMACS_DIR}"
-    emacs_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${EMACS_DIR}"
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
 else
-    emacs_cflags="${INSTX_CFLAGS}"
-    emacs_cxxflags="${INSTX_CXXFLAGS}"
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--without-all")
-CONFIG_OPTS+=("--with-xml2")
-CONFIG_OPTS+=("--with-json")
-CONFIG_OPTS+=("--with-libgmp")
-CONFIG_OPTS+=("--with-zlib")
+cd ..
 
-if [[ "${IS_DARWIN}" -eq 1 ]]; then
-    # Disable NextStep app
-    CONFIG_OPTS+=('--without-ns')
-fi
-if [[ $(command -v gnutls-cli 2>/dev/null) ]]; then
-    CONFIG_OPTS+=('--with-gnutls')
-else
-    CONFIG_OPTS+=('--without-gnutls')
-fi
-if [[ -e "/usr/include/selinux/context.h" ]]; then
-    CONFIG_OPTS+=('--with-selinux')
-else
-    CONFIG_OPTS+=('--without-selinux')
+###############################################################################
+
+echo
+echo "********** ncurses **********"
+echo
+
+wget "https://ftp.gnu.org/pub/gnu/ncurses/$NCURSES_TAR" --no-check-certificate -O "$NCURSES_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${emacs_cflags}" \
-    CXXFLAGS="${emacs_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Emacs"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
+rm -rf "$NCURSES_DIR" &>/dev/null
+tar -xzf "$NCURSES_TAR"
+cd "$NCURSES_DIR"
+
+SH_LDLIBS=("-ldl -lpthread")
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# I'm not sure why we need to set DO_CODESIGN=yes.
-if [[ "${IS_DARWIN}" -eq 1 ]]; then
-    file=src/Makefile
-    sed 's/DO_CODESIGN=.*/DO_CODESIGN=yes/g' "${file}" > "${file}.fixed"
-    mv "${file}.fixed" "${file}"
-    chmod u=rw,go=r "${file}"
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Emacs"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
+cd ..
 
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
+###############################################################################
 
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
+echo
+echo "********** Emacs **********"
+echo
 
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Emacs"
-    echo "*************************"
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "http://mirrors.syringanetworks.net/gnu/emacs/$EMACS_TAR" --no-check-certificate -O "$EMACS_TAR"
 
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download SSH"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$EMACS_DIR" &>/dev/null
+tar -xzf "$EMACS_TAR"
+cd "$EMACS_DIR"
 
-    echo ""
-    echo "*************************"
-    echo "Installing anyways..."
-    echo "*************************"
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-ldl" "-lpthread")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR" \
+    --with-xml2 --without-x --without-sound --without-xpm \
+    --without-jpeg --without-tiff --without-gif --without-png --without-rsvg \
+    --without-imagemagick --without-xft --without-libotf --without-m17n-flt \
+    --without-xaw3d --without-toolkit-scroll-bars --without-gpm --without-dbus \
+    --without-gconf --without-gsettings --without-makeinfo \
+    --without-compress-install
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure SSH"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
+MAKE_FLAGS=(-j 4 all)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build SSH"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${EMACS_DIR}"
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
 else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${EMACS_DIR}"
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
+cd ..
 
 ###############################################################################
 
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
+echo
+echo "********** Cleanup **********"
+echo
 
-cd "${CURR_DIR}" || exit 1
+# Set to false to retain artifacts
+if true; then
 
-###############################################################################
+    ARTIFACTS=("$ZLIB_TAR" "$ZLIB_DIR" "$NCURSES_TAR" "$NCURSES_DIR" "$EMACS_TAR" "$EMACS_DIR")
 
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$EMACS_TAR" "$EMACS_DIR")
     for artifact in "${ARTIFACTS[@]}"; do
         rm -rf "$artifact"
     done
+
+    # ./build-ssh.sh 2>&1 | tee build-ssh.log
+    if [[ -e build-ssh.log ]]; then
+        rm build-ssh.log
+    fi
 fi
 
-exit 0
+[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0
diff --git a/build-expect.sh b/build-expect.sh
deleted file mode 100755
index a9401884a..000000000
--- a/build-expect.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Expect from sources.
-
-EXPECT_VER=5.45.4
-EXPECT_TAR=expect${EXPECT_VER}.tar.gz
-EXPECT_DIR=expect${EXPECT_VER}
-PKG_NAME=expect
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Expect ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Expect ${EXPECT_VER}..."
-
-if ! "${WGET}" -q -O "$EXPECT_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://downloads.sourceforge.net/project/expect/Expect/$EXPECT_VER/$EXPECT_TAR"
-then
-    echo "Failed to download Expect"
-    exit 1
-fi
-
-rm -rf "$EXPECT_DIR" &>/dev/null
-gzip -d < "$EXPECT_TAR" | tar xf -
-cd "$EXPECT_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure Expect"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build Expect"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test Expect"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$EXPECT_TAR" "$EXPECT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-file-roller.sh b/build-file-roller.sh
deleted file mode 100755
index 8c06c30d7..000000000
--- a/build-file-roller.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds File Roller from sources.
-
-FROLLER_TAR=file-roller-3.36.3.tar.gz
-FROLLER_DIR=file-roller-3.36.3
-PKG_NAME=file-roller
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== File Roller ============="
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-if ! "${WGET}" -q -O "$FROLLER_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gitlab.gnome.org/GNOME/file-roller/-/archive/3.36.3/$FROLLER_TAR"
-then
-    echo "Failed to download File Roller"
-    exit 1
-fi
-
-rm -rf "$FROLLER_DIR" &>/dev/null
-gzip -d < "$FROLLER_TAR" | tar xf -
-cd "$FROLLER_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/froller.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Downloading package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/froller.patch
-fi
-
-if ! mkdir build; then
-    echo "Failed to create build directory"
-    exit 1
-fi
-
-cd build || exit 1
-
-export PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-export CPPFLAGS="${INSTX_CPPFLAGS}"
-export ASFLAGS="${INSTX_ASFLAGS}"
-export CFLAGS="${INSTX_CFLAGS}"
-export CXXFLAGS="${INSTX_CXXFLAGS}"
-export LDFLAGS="${INSTX_LDFLAGS}"
-export LIBS="${INSTX_LDLIBS}"
-
-if ! meson ..; then
-    echo "Failed to run meson"
-    exit 1
-fi
-
-if ! ninja; then
-    echo "Failed to run ninja"
-    exit 1
-fi
-
-if false; then
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure File Roller"
-    exit 1
-fi
-
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build File Roller"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test File Roller"
-    echo "**************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo -E -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true; then
-
-    ARTIFACTS=("$FROLLER_TAR" "$FROLLER_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-
-    # ./build-froller.sh 2>&1 | tee build-froller.log
-    if [[ -e build-froller.log ]]; then
-        rm -f build-froller.log
-    fi
-fi
-
-exit 0
diff --git a/build-findutils.sh b/build-findutils.sh
deleted file mode 100755
index 4a2d3e12c..000000000
--- a/build-findutils.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds findutils from sources.
-
-FIND_VER=4.8.0
-FIND_XZ=findutils-${FIND_VER}.tar.xz
-FIND_TAR=findutils-${FIND_VER}.tar
-FIND_DIR=findutils-${FIND_VER}
-PKG_NAME=findutils
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Findutils ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$FIND_XZ" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/findutils/$FIND_XZ"
-then
-    echo "Failed to download findutils"
-    exit 1
-fi
-
-rm -rf "$FIND_TAR" "$FIND_DIR" &>/dev/null
-unxz "$FIND_XZ" && tar -xf "$FIND_TAR"
-cd "$FIND_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure findutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build findutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" " V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test findutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$FIND_XZ" "$FIND_TAR" "$FIND_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-flex.sh b/build-flex.sh
deleted file mode 100755
index 2368c066b..000000000
--- a/build-flex.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Flex from sources.
-
-FLEX_VER=2.6.4
-FLEX_TAR="flex-${FLEX_VER}.tar.gz"
-FLEX_DIR="flex-${FLEX_VER}"
-PKG_NAME=flex
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-lzip.sh
-then
-    echo "Failed to build Lzip"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Flex ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$FLEX_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/westes/flex/releases/download/v${FLEX_VER}/$FLEX_TAR"
-then
-    echo "Failed to download Flex"
-    exit 1
-fi
-
-rm -rf "$FLEX_DIR" &>/dev/null
-gzip -d < "$FLEX_TAR" | tar xf -
-cd "$FLEX_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/flex.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/flex.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    flex_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${FLEX_DIR}"
-    flex_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${FLEX_DIR}"
-else
-    flex_cflags="${INSTX_CFLAGS}"
-    flex_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    # _GNU_SOURCE due to https://github.com/spack/spack/issues/8152
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS} -D_GNU_SOURCE" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${flex_cflags}" \
-    CXXFLAGS="${flex_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Flex"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Flex"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Flex"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${FLEX_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${FLEX_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$FLEX_TAR" "$FLEX_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gawk.sh b/build-gawk.sh
deleted file mode 100755
index db6c88342..000000000
--- a/build-gawk.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GNU Awk from sources.
-
-GAWK_VER=5.1.0
-GAWK_TAR=gawk-${GAWK_VER}.tar.gz
-GAWK_DIR=gawk-${GAWK_VER}
-PKG_NAME=gawk
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-mpfr.sh
-then
-    echo "Failed to build MPFR"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== GNU Awk ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "GNU Awk ${GAWK_VER}..."
-
-if ! "${WGET}" -q -O "$GAWK_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/pub/gnu/gawk/$GAWK_TAR"
-then
-    echo "Failed to download GNU Awk"
-    exit 1
-fi
-
-rm -rf "$GAWK_DIR" &>/dev/null
-gzip -d < "$GAWK_TAR" | tar xf -
-cd "$GAWK_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gawk.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/gawk.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-mpfr="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure Awk"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build Awk"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test Awk"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GAWK_TAR" "$GAWK_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gdb-7.12.sh b/build-gdb-7.12.sh
deleted file mode 100755
index 7b70b20d2..000000000
--- a/build-gdb-7.12.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GDB from sources.
-
-GDB_VER=7.12.1
-GDB_TAR=gdb-${GDB_VER}.tar.gz
-GDB_DIR=gdb-${GDB_VER}
-PKG_NAME=gdb-7
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-mpfr.sh
-then
-    echo "Failed to build MPFR"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== GDB 7.12 ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "GDB ${GDB_VER}..."
-
-if ! "${WGET}" -q -O "$GDB_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/gdb/$GDB_TAR"
-then
-    echo "Failed to download GDB"
-    exit 1
-fi
-
-rm -rf "$GDB_DIR" &>/dev/null
-gzip -d < "$GDB_TAR" | tar xf -
-cd "$GDB_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gdb.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
-
-    patch -u -p0 < ../patch/gdb.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# GDB must be built in a directory different from its sources
-mkdir -p build || exit 1
-cd build || exit 1
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--with-mpfr=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-gmp=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--disable-lto")
-CONFIG_OPTS+=("--disable-tui")
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-../configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure GDB"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "HELP2MAN=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build GDB"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test GDB"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GDB_TAR" "$GDB_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gdb.sh b/build-gdb.sh
deleted file mode 100755
index 98c248db6..000000000
--- a/build-gdb.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GDB from sources.
-
-GDB_VER=9.2
-GDB_TAR=gdb-${GDB_VER}.tar.gz
-GDB_DIR=gdb-${GDB_VER}
-PKG_NAME=gdb
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-mpfr.sh
-then
-    echo "Failed to build MPFR"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-mpc.sh
-then
-    echo "Failed to build MPC"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= GDB =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "GDB ${GDB_VER}..."
-
-if ! "${WGET}" -q -O "$GDB_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/gdb/$GDB_TAR"
-then
-    echo "Failed to download GDB"
-    exit 1
-fi
-
-rm -rf "$GDB_DIR" &>/dev/null
-gzip -d < "$GDB_TAR" | tar xf -
-cd "$GDB_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gdb.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/gdb.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# GDB must be built in a directory different from its sources
-mkdir -p build || exit 1
-cd build || exit 1
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--disable-lto")
-CONFIG_OPTS+=("--with-mpc-include=${INSTX_PREFIX}/include")
-CONFIG_OPTS+=("--with-mpc-lib=${INSTX_LIBDIR}")
-CONFIG_OPTS+=("--with-mpfr-include=${INSTX_PREFIX}/include")
-CONFIG_OPTS+=("--with-mpfr-lib=${INSTX_LIBDIR}")
-CONFIG_OPTS+=("--with-gmp-include=${INSTX_PREFIX}/include")
-CONFIG_OPTS+=("--with-gmp-lib=${INSTX_LIBDIR}")
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-../configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure GDB"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "HELP2MAN=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build GDB"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test GDB"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GDB_TAR" "$GDB_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gdbm.sh b/build-gdbm.sh
deleted file mode 100755
index 53c295644..000000000
--- a/build-gdbm.sh
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GDBM from sources.
-
-GDBM_VER=1.22
-GDBM_TAR=gdbm-${GDBM_VER}.tar.gz
-GDBM_DIR=gdbm-${GDBM_VER}
-PKG_NAME=gdbm
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/bison" ]]
-then
-    if ! ./build-bison.sh
-    then
-        echo "Failed to build Bison"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= GDBM ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "GDBM ${GDBM_VER}..."
-
-if ! "${WGET}" -q -O "$GDBM_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/gdbm/$GDBM_TAR"
-then
-    echo "Failed to download GDBM"
-    exit 1
-fi
-
-rm -rf "$GDBM_DIR" &>/dev/null
-gzip -d < "$GDBM_TAR" | tar xf -
-cd "$GDBM_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gdbm.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/gdbm.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-# Should we add --enable-libgdbm-compat?
-# https://www.gnu.org.ua/software/gdbm/manual/Compatibility.html
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS} -D_GNU_SOURCE" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --enable-static \
-    --enable-libgdbm-compat \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-readline-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure GDBM"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build GDBM"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test GDBM"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-# No pkgconfig file. Make one.
-{
-    echo "prefix=${INSTX_PREFIX}"
-    echo "exec_prefix=\${prefix}"
-    echo "includedir=\${prefix}/include"
-    echo "libdir=${INSTX_LIBDIR}"
-
-    echo ""
-    echo "Name: GNU dbm library"
-    echo "Description: Database functions similar to UNIX dbm"
-    echo "URL: https://www.gnu.org.ua/software/gdbm/"
-    echo "Documentation: https://www.gnu.org.ua/software/gdbm/manual/index.html"
-    echo "Version: ${GDBM_VER}"
-    echo "Cflags: -I\${includedir}"
-    echo "Libs: -L\${libdir} -lgdbm"
-
-} > ./libgdbm.pc
-
-{
-    echo "prefix=${INSTX_PREFIX}"
-    echo "exec_prefix=\${prefix}"
-    echo "includedir=\${prefix}/include"
-    echo "libdir=${INSTX_LIBDIR}"
-
-    echo ""
-    echo "Name: GNU dbm compatibility library"
-    echo "Description: Database functions for UNIX dbm and ndbm"
-    echo "URL: https://www.gnu.org.ua/software/gdbm/"
-    echo "Documentation: https://www.gnu.org.ua/software/gdbm/manual/index.html"
-    echo "Version: ${GDBM_VER}"
-    echo "Cflags: -I\${includedir}"
-    echo "Libs: -L\${libdir} -lgdbm_compat"
-
-} > ./libgdbm_compat.pc
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Install the pc file
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "./libgdbm.pc" "${INSTX_PKGCONFIG}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "./libgdbm_compat.pc" "${INSTX_PKGCONFIG}"
-else
-    cp "./libgdbm.pc" "${INSTX_PKGCONFIG}"
-    cp "./libgdbm_compat.pc" "${INSTX_PKGCONFIG}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GDBM_TAR" "$GDBM_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gettext-final.sh b/build-gettext-final.sh
deleted file mode 100755
index a1c06906f..000000000
--- a/build-gettext-final.sh
+++ /dev/null
@@ -1,279 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GetText and friends from sources.
-
-# GetText is really unique among packages. It has circular dependencies on
-# iConv, libunistring and libxml2. build-iconv-gettext.sh handles the
-# iConv and GetText dependency. This script, build-gettext-final.sh,
-# handles the libunistring and libxml2 dependencies.
-#
-# The way to run these scripts is, run build-iconv-gettext.sh first.
-# That bootstraps iConv and GetText. Second, run build-gettext-final.sh.
-# That gets the missing pieces, like libunistring and libxml support.
-#
-# For the iConv and GetText recipe, see
-# https://www.gnu.org/software/libiconv/.
-#
-# Here are the interesting dependencies:
-#
-#   libgettextlib.so: libiconv.so
-#   libgettextpo.so:  libiconv.so, libiunistring.so
-#   libgettextsrc.so: libz.so, libiconv.so, libiunistring.so, libxml2.so,
-#                     libgettextlib.so, libtextstyle.so
-#   libiconv.so:      libgettextlib.so
-#   libiunistring.so: libiconv.so
-
-GETTEXT_VER=0.21
-GETTEXT_TAR="gettext-${GETTEXT_VER}.tar.gz"
-GETTEXT_DIR="gettext-${GETTEXT_VER}"
-PKG_NAME=gettext-final
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== GetText ================"
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "GetText ${GETTEXT_VER}..."
-
-if ! "${WGET}" -q -O "$GETTEXT_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/pub/gnu/gettext/$GETTEXT_TAR"
-then
-    echo "Failed to download GetText"
-    exit 1
-fi
-
-rm -rf "$GETTEXT_DIR" &>/dev/null
-gzip -d < "$GETTEXT_TAR" | tar xf -
-cd "$GETTEXT_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gettext.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/gettext.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-# Some non-GNU systems have Gzip, but it is anemic.
-# GZIP_ENV = --best causes an autopoint-3 test failure.
-IFS= find "$PWD" -name 'Makefile.in' -print | while read -r file
-do
-    sed -e 's/GZIP_ENV = --best/GZIP_ENV = -7/g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-done
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gettext_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GETTEXT_DIR}"
-    gettext_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GETTEXT_DIR}"
-else
-    gettext_cflags="${INSTX_CFLAGS}"
-    gettext_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gettext_cflags}" \
-    CXXFLAGS="${gettext_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libncurses-prefix="${INSTX_PREFIX}" \
-    --with-libunistring-prefix="${INSTX_PREFIX}" \
-    --with-libxml2-prefix="${INSTX_PREFIX}"
-
-    # --with-libintl-prefix="${INSTX_PREFIX}" \
-    # --with-libtextstyle-prefix="${INSTX_PREFIX}" \
-    # --with-bison-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure GetText"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build GetText"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test GetText"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-
-    # Solaris and some friends fail lang-gawk
-    # Darwin fails copy-acl-2.sh
-    # https://lists.gnu.org/archive/html/bug-gawk/2018-01/msg00026.html
-    # exit 1
-
-    echo ""
-    echo "***************************"
-    echo "Installing anyways..."
-    echo "***************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GETTEXT_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GETTEXT_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GETTEXT_TAR" "$GETTEXT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gettext.sh b/build-gettext.sh
deleted file mode 100755
index b5dfefe5b..000000000
--- a/build-gettext.sh
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GetText and friends from sources.
-
-# GetText is really unique among packages. It has circular dependencies on
-# iConv, libunistring and libxml2. build-iconv-gettext.sh handles the
-# iConv and GetText dependency. This script, build-gettext-final.sh,
-# handles the libunistring and libxml2 dependencies.
-#
-# The way to run these scripts is, run build-iconv-gettext.sh first.
-# That bootstraps iConv and GetText. Second, run build-gettext-final.sh.
-# That gets the missing pieces, like libunistring and libxml support.
-#
-# For the iConv and GetText recipe, see
-# https://www.gnu.org/software/libiconv/.
-#
-# Here are the interesting dependencies:
-#
-#   libgettextlib.so: libiconv.so
-#   libgettextpo.so:  libiconv.so, libiunistring.so
-#   libgettextsrc.so: libz.so, libiconv.so, libiunistring.so, libxml2.so,
-#                     libgettextlib.so, libtextstyle.so
-#   libiconv.so:      libgettextlib.so
-#   libiunistring.so: libiconv.so
-
-GETTEXT_VER=0.21
-GETTEXT_TAR="gettext-${GETTEXT_VER}.tar.gz"
-GETTEXT_DIR="gettext-${GETTEXT_VER}"
-PKG_NAME=gettext
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== GetText ================"
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "GetText ${GETTEXT_VER}..."
-
-if ! "${WGET}" -q -O "$GETTEXT_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/pub/gnu/gettext/$GETTEXT_TAR"
-then
-    echo "Failed to download GetText"
-    echo "Maybe Wget is too old. Perhaps run setup-wget.sh?"
-    exit 1
-fi
-
-rm -rf "$GETTEXT_DIR" &>/dev/null
-gzip -d < "$GETTEXT_TAR" | tar xf -
-cd "$GETTEXT_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gettext.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/gettext.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-# Some non-GNU systems have Gzip, but it is anemic.
-# GZIP_ENV = --best causes an autopoint-3 test failure.
-IFS= find "$PWD" -name 'Makefile.in' -print | while read -r file
-do
-    sed -e 's/GZIP_ENV = --best/GZIP_ENV = -7/g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-done
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gettext_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GETTEXT_DIR}"
-    gettext_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GETTEXT_DIR}"
-else
-    gettext_cflags="${INSTX_CFLAGS}"
-    gettext_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gettext_cflags}" \
-    CXXFLAGS="${gettext_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --with-pic \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libncurses-prefix="${INSTX_PREFIX}" \
-    --with-libunistring-prefix="${INSTX_PREFIX}" \
-    --with-libxml2-prefix="${INSTX_PREFIX}"
-
-    # --with-libintl-prefix="${INSTX_PREFIX}" \
-    # --with-libtextstyle-prefix="${INSTX_PREFIX}" \
-    # --with-bison-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure GetText"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build GetText"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-if [[ "$INSTX_DISABLE_GETTEXT_CHECK" -ne 1 ]];
-then
-    echo ""
-    echo "***************************"
-    echo "Testing package"
-    echo "***************************"
-
-    MAKE_FLAGS=("check")
-    if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo ""
-        echo "***************************"
-        echo "Failed to test GetText"
-        echo "***************************"
-
-        bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-
-        # Solaris and some friends fail lang-gawk
-        # Darwin fails copy-acl-2.sh
-        # https://lists.gnu.org/archive/html/bug-gawk/2018-01/msg00026.html
-        # exit 1
-
-        echo ""
-        echo "***************************"
-        echo "Installing anyways..."
-        echo "***************************"
-    fi
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GETTEXT_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GETTEXT_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GETTEXT_TAR" "$GETTEXT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ghidra.sh b/build-ghidra.sh
deleted file mode 100755
index 0b4d97316..000000000
--- a/build-ghidra.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds ghidra from sources.
-
-GHIDRA_TAR=Ghidra_9.1.2_build.tar.gz
-GHIDRA_DIR=ghidra-Ghidra_9.1.2_build
-PKG_NAME=ghidra
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Ghidra ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Ghidra ${GHIDRA_VER}..."
-
-if ! "${WGET}" -q -O "$GHIDRA_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://github.com/NationalSecurityAgency/ghidra/archive/$GHIDRA_TAR"
-then
-    echo "Failed to download Ghidra"
-    exit 1
-fi
-
-rm -rf "$GHIDRA_DIR" &>/dev/null
-gzip -d < "$GHIDRA_TAR" | tar xf -
-cd "$GHIDRA_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/ghidra.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/ghidra.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("all" "-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Ghidra"
-    echo "**********************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test Ghidra"
-    echo "**********************"
-
-    # exit 1
-
-    echo ""
-    echo "**********************"
-    echo "Installing anyways..."
-    echo "**********************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install" "PREFIX=${INSTX_PREFIX}" "LIBDIR=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo -E -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true; then
-
-    ARTIFACTS=("$GHIDRA_TAR" "$GHIDRA_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ghostscript.sh b/build-ghostscript.sh
deleted file mode 100755
index 1fa809112..000000000
--- a/build-ghostscript.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GhostScript from sources.
-
-GS_VER=9.55.0
-GS_VER_DL=gs9550
-GS_TAR=ghostpdl-${GS_VER}.tar.gz
-GS_DIR=ghostpdl-${GS_VER}
-PKG_NAME=ghostpdl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-idn.sh
-then
-    echo "Failed to build IDN"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== GhostScript ============="
-echo "========================================"
-
-echo ""
-echo "*******************************"
-echo "Downloading package"
-echo "*******************************"
-
-echo ""
-echo "GhostScript ${GS_VER}..."
-
-if ! "${WGET}" -q -O "$GS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/${GS_VER_DL}/$GS_TAR"
-then
-    echo "Failed to download GhostScript"
-    exit 1
-fi
-
-rm -rf "$GS_DIR" &>/dev/null
-gzip -d < "$GS_TAR" | tar xf -
-cd "$GS_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gs.patch ]]; then
-    echo ""
-    echo "*******************************"
-    echo "Patching package"
-    echo "*******************************"
-
-    patch -u -p0 < ../patch/gs.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*******************************"
-echo "Configuring package"
-echo "*******************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --without-local-zlib \
-    --with-libiconv=native
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*******************************"
-    echo "Failed to configure GhostScript"
-    echo "*******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*******************************"
-echo "Building package"
-echo "*******************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*******************************"
-    echo "Failed to build GhostScript"
-    echo "*******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*******************************"
-echo "Testing package"
-echo "*******************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*******************************"
-    echo "Failed to test GhostScript"
-    echo "*******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*******************************"
-echo "Installing package"
-echo "*******************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GS_TAR" "$GS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-git.sh b/build-git.sh
old mode 100755
new mode 100644
index 7b25e3995..a4e216b30
--- a/build-git.sh
+++ b/build-git.sh
@@ -1,358 +1,824 @@
 #!/usr/bin/env bash
 
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Git and its dependencies from sources.
+# See fixup for INSTALL_LIBDIR below
+INSTALL_PREFIX=/usr/local
+INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
 
-GIT_VER=2.42.0
-GIT_TAR="git-${GIT_VER}.tar.gz"
-GIT_DIR="git-${GIT_VER}"
-PKG_NAME=git
+# OpenSSH can only use OpenSSL 1.0.2 at the moment
+OPENSSL_TAR=openssl-1.0.2l.tar.gz
+OPENSSL_DIR=openssl-1.0.2l
+#OPENSSL_TAR=openssl-1.1.0e.tar.gz
+#OPENSSL_DIR=openssl-1.1.0e
+
+ZLIB_TAR=zlib-1.2.11.tar.gz
+ZLIB_DIR=zlib-1.2.11
+
+BZ2_TAR=bzip2-1.0.6.tar.gz
+BZ2_DIR=bzip2-1.0.6
+
+READLN_TAR=readline-7.0.tar.gz
+READLN_DIR=readline-7.0
+
+UNISTR_TAR=libunistring-0.9.7.tar.gz
+UNISTR_DIR=libunistring-0.9.7
+
+ICONV_TAR=libiconv-1.15.tar.gz
+ICONV_DIR=libiconv-1.15
+
+IDN2_TAR=libidn2-0.16.tar.gz
+IDN2_DIR=libidn2-0.16
+
+PCRE_TAR=pcre-8.40.tar.gz
+PCRE_DIR=pcre-8.40
+
+PCRE2_TAR=pcre2-10.23.tar.gz
+PCRE2_DIR=pcre2-10.23
+
+CURL_TAR=curl-7.54.0.tar.gz
+CURL_DIR=curl-7.54.0
+
+GIT_TAR=v2.13.0.tar.gz
+GIT_DIR=git-2.13.0
+
+# Unset to avoid using an existing trust store when configuring cURL.
+# No trust store will be supplied for some OSes, like Solaris.
+# Also see '/usr/bin/curl-config --ca' and '/usr/bin/curl-config --configure'
+USE_TRUST_STORE=1
 
 ###############################################################################
 
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
+# Autotools on Solaris has an implied requirement for GNU gear. Things fall apart without it.
+# Also see https://blogs.oracle.com/partnertech/entry/preparing_for_the_upcoming_removal.
+if [[ -d "/usr/gnu/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/gnu/bin"*) ]]; then
+        echo
+        echo "Adding /usr/gnu/bin to PATH for Solaris"
+        PATH="/usr/gnu/bin:$PATH"
+    fi
+elif [[ -d "/usr/swf/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/sfw/bin"*) ]]; then
+        echo
+        echo "Adding /usr/sfw/bin to PATH for Solaris"
+        PATH="/usr/sfw/bin:$PATH"
+    fi
+elif [[ -d "/usr/ucb/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/ucb/bin"*) ]]; then
+        echo
+        echo "Adding /usr/ucb/bin to PATH for Solaris"
+        PATH="/usr/ucb/bin:$PATH"
     fi
 fi
 
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
+###############################################################################
+
+if [[ -z `which autoreconf` ]]; then
+    echo "Some packages require autoreconf. Please install autoconf or automake."
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+if [[ -z `which msgfmt` ]]; then
+    echo "Git requires msgfmt. Please install gettext."
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
 ###############################################################################
 
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA certs"
-    exit 1
+echo
+echo "If you enter a sudo password, then it will be used for installation."
+echo "If you don't enter a password, then ensure INSTALL_PREFIX is writable."
+echo "To avoid sudo and the password, just press ENTER and they won't be used."
+read -s -p "Please enter password for sudo: " SUDO_PASSWWORD
+echo
+
+###############################################################################
+
+THIS_SYSTEM=$(uname -s 2>&1)
+IS_DARWIN=$(echo -n "$THIS_SYSTEM" | grep -i -c darwin)
+IS_LINUX=$(echo -n "$THIS_SYSTEM" | grep -i -c linux)
+IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | grep -i -c cygwin)
+IS_MINGW=$(echo -n "$THIS_SYSTEM" | grep -i -c mingw)
+IS_OPENBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c openbsd)
+IS_DRAGONFLY=$(echo -n "$THIS_SYSTEM" | grep -i -c dragonfly)
+IS_FREEBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c freebsd)
+IS_NETBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c netbsd)
+IS_SOLARIS=$(echo -n "$THIS_SYSTEM" | grep -i -c sunos)
+
+if [[ ("$IS_FREEBSD" -eq "1" || "$IS_OPENBSD" -eq "1" || "$IS_NETBSD" -eq "1" || "$IS_DRAGONFLY" -eq "1" || "$IS_SOLARIS" -eq "1") ]]; then
+    if [[ !(-z `which gmake 2>/dev/null | grep -v 'no gmake'`) ]]; then
+        MAKE=gmake
+    else
+        MAKE=make
+    fi
+else
+    MAKE=make
+fi
+
+# Try to determine 32 vs 64-bit, /usr/local/lib, /usr/local/lib32 and /usr/local/lib64
+# The Autoconf programs misdetect Solaris as x86 even though its x64. OpenBSD has
+# getconf, but it does not have LONG_BIT.
+IS_64BIT=$(getconf LONG_BIT 2>&1 | grep -i -c 64)
+if [[ "$IS_64BIT" -eq "0" ]]; then
+    IS_64BIT=$(file /bin/ls 2>&1 | grep -i -c '64-bit')
+fi
+
+if [[ "$IS_SOLARIS" -eq "1" ]]; then
+    SH_KBITS=64
+    SH_MARCH=-m64
+    INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+    INSTALL_LIBDIR_DIR="lib64"
+elif [[ "$IS_64BIT" -eq "1" ]]; then
+    if [[ (-d /usr/lib) && (-d /usr/lib32) ]]; then
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+        INSTALL_LIBDIR_DIR="lib"
+    elif [[ (-d /usr/lib) && (-d /usr/lib64) ]]; then
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+        INSTALL_LIBDIR_DIR="lib64"
+    else
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+        INSTALL_LIBDIR_DIR="lib"
+    fi
+else
+    SH_KBITS=32
+    SH_MARCH=-m32
+    INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+    INSTALL_LIBDIR_DIR="lib"
+fi
+
+if [[ -z "$CC" ]]; then CC=`which cc`; fi
+
+MARCH_ERROR=`$CC $SH_MARCH -x c -c -o /dev/null - </dev/null 2>&1 | grep -i -c error`
+if [[ "$MARCH_ERROR" -ne "0" ]]; then
+	SH_MARCH=
 fi
 
+echo
+echo "********** libdir **********"
+echo
+echo "Using libdir $INSTALL_LIBDIR"
+
 ###############################################################################
 
-if ! ./build-zlib.sh
-then
+echo
+echo "********** zLib **********"
+echo
+
+wget "http://www.zlib.net/$ZLIB_TAR" -O "$ZLIB_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$ZLIB_DIR" &>/dev/null
+tar -xzf "$ZLIB_TAR"
+cd "$ZLIB_DIR"
+
+SH_LDLIBS=("-ldl -lpthread")
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
     echo "Failed to build zLib"
-    exit 1
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
+cd ..
+
 ###############################################################################
 
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
+echo
+echo "********** Bzip **********"
+echo
+
+wget "http://www.bzip.org/1.0.6/$BZ2_TAR" -O "$BZ2_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download Bzip"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-###############################################################################
+rm -rf "$BZ2_DIR" &>/dev/null
+tar -xzf "$BZ2_TAR"
+cd "$BZ2_DIR"
+
+# Fix Bzip install paths
+cp Makefile Makefile.orig
+sed 's|$(PREFIX)/lib|$(LIBDIR)|g' Makefile.orig > Makefile
+rm Makefile.orig
+cp Makefile-libbz2_so Makefile-libbz2_so.orig
+sed 's|$(PREFIX)/lib|$(LIBDIR)|g' Makefile-libbz2_so.orig > Makefile-libbz2_so
+rm Makefile-libbz2_so.orig
+
+# Fix Bzip cpu architecture
+cp Makefile Makefile.orig
+sed "s|CFLAGS=|CFLAGS=$SH_MARCH |g" Makefile.orig > Makefile
+cp Makefile Makefile.orig
+sed "s|CXXFLAGS=|CXXFLAGS=$SH_MARCH |g" Makefile.orig > Makefile
+rm Makefile.orig
+cp Makefile-libbz2_so Makefile-libbz2_so.orig
+sed "s|CFLAGS=|CFLAGS=$SH_MARCH |g" Makefile-libbz2_so.orig > Makefile-libbz2_so
+cp Makefile-libbz2_so Makefile-libbz2_so.orig
+sed "s|CXXFLAGS=|CXXFLAGS=$SH_MARCH |g" Makefile-libbz2_so.orig > Makefile-libbz2_so
+rm Makefile-libbz2_so.orig
+
+# Add RPATH
+cp Makefile Makefile.orig
+sed "s|LDFLAGS=|LDFLAGS=$SH_MARCH -Wl,-rpath,$INSTALL_LIBDIR -L$INSTALL_LIBDIR|g" Makefile.orig > Makefile
+rm Makefile.orig
+cp Makefile-libbz2_so Makefile-libbz2_so.orig
+sed "s|LDFLAGS=|LDFLAGS=$SH_MARCH -Wl,-rpath,$INSTALL_LIBDIR -L$INSTALL_LIBDIR|g" Makefile-libbz2_so.orig > Makefile-libbz2_so
+rm Makefile-libbz2_so.orig
+
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build Bzip"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
+MAKE_FLAGS=(install PREFIX="$INSTALL_PREFIX" LIBDIR="$INSTALL_LIBDIR")
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
+cd ..
+
 ###############################################################################
 
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
+echo
+echo "********** Unistring **********"
+echo
+
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://ftp.gnu.org/gnu/libunistring/$UNISTR_TAR" --no-check-certificate -O "$UNISTR_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download IDN"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-###############################################################################
+rm -rf "$UNISTR_DIR" &>/dev/null
+tar -xzf "$UNISTR_TAR"
+cd "$UNISTR_DIR"
 
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
+SH_LDLIBS=("-ldl -lpthread")
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure IDN"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-###############################################################################
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-if ! ./build-libexpat.sh
-then
-    echo "Failed to build Expat"
-    exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build IDN"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
+
 ###############################################################################
 
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
+echo
+echo "********** Readline **********"
+echo
+
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://ftp.gnu.org/gnu/readline/$READLN_TAR" --no-check-certificate -O "$READLN_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download Readline"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-###############################################################################
+rm -rf "$READLN_DIR" &>/dev/null
+tar -xzf "$READLN_TAR"
+cd "$READLN_DIR"
 
-if ! ./build-curl.sh
-then
-    echo "Failed to build cURL"
-    exit 1
+SH_LDLIBS=("-ldl" "-lpthread")
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure Readline"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-###############################################################################
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-# Needed for the pager used with 'git diff'
-if ! ./build-less.sh
-then
-    echo "Failed to build less"
-    exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build Readline"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
+
 ###############################################################################
 
-echo ""
-echo "========================================"
-echo "================= Git =================="
-echo "========================================"
+echo
+echo "********** iConvert **********"
+echo
+
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://ftp.gnu.org/pub/gnu/libiconv/$ICONV_TAR" --no-check-certificate -O "$ICONV_TAR"
 
-# Required. For Solaris see https://community.oracle.com/thread/1915569.
-if ! perl -MExtUtils::MakeMaker -e1 2>/dev/null
-then
-    echo ""
-    echo "Git requires Perl's ExtUtils::MakeMaker."
-    echo "To fix this issue, please install ExtUtils-MakeMaker."
-    exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download iConvert"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
+rm -rf "$ICONV_DIR" &>/dev/null
+tar -xzf "$ICONV_TAR"
+cd "$ICONV_DIR"
+
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-ldl" "-lpthread")
 
-echo ""
-echo "Git ${GIT_VER}..."
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
 
-if ! "${WGET}" -q -O "$GIT_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://mirrors.edge.kernel.org/pub/software/scm/git/$GIT_TAR"
-then
-    echo "Failed to download Git."
-    exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure iConvert"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-rm -rf "$GIT_DIR" &>/dev/null
-gzip -d < "$GIT_TAR" | tar xf -
-cd "$GIT_DIR" || exit 1
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/git.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build iConvert"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-    patch -u -p0 < ../patch/git.patch
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
+cd ..
 
-echo ""
-echo "***********************"
-echo "Configuring package"
-echo "***********************"
+###############################################################################
 
-# Solaris 11.3 no longer has /usr/ucb/install
-if [[ "$IS_SOLARIS" -ne 0 ]]
-then
+echo
+echo "********** IDN2 **********"
+echo
 
-    IFS= find "$PWD" -type f -iname 'config*' -print | while read -r file
-    do
-        touch -a -m -r "$file" "$file.timestamp"
-        chmod u+w "$file" && cp -p "$file" "$file.fixed"
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://alpha.gnu.org/gnu/libidn/$IDN2_TAR" --no-check-certificate -O "$IDN2_TAR"
 
-        sed -e 's/\/usr\/ucb\///g' "$file" > "$file.fixed"
-        mv "$file.fixed" "$file"
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download IDN"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-        chmod a+x "$file" && chmod go-w "$file"
-        touch -a -m -r "$file.timestamp" "$file"
-        rm "$file.timestamp"
-    done
+rm -rf "$IDN2_DIR" &>/dev/null
+tar -xzf "$IDN2_TAR"
+cd "$IDN2_DIR"
+
+if [[ "$IS_SOLARIS" -eq "1" ]]; then
+    cp src/idn2.c src/idn2.c.orig
+    sed '/^#include "error.h"/d' src/idn2.c.orig > src/idn2.c
+    cp src/idn2.c src/idn2.c.orig
+    sed '43istatic void error (int status, int errnum, const char *format, ...);' src/idn2.c.orig > src/idn2.c
+    rm src/idn2.c.orig
+
+    echo "" >> src/idn2.c
+    echo "static void" >> src/idn2.c
+    echo "error (int status, int errnum, const char *format, ...)" >> src/idn2.c
+    echo "{" >> src/idn2.c
+    echo "  va_list args;" >> src/idn2.c
+    echo "  va_start(args, format);" >> src/idn2.c
+    echo "  vfprintf(stderr, format, args);" >> src/idn2.c
+    echo "  va_end(args);" >> src/idn2.c
+    echo "  exit(status);" >> src/idn2.c
+    echo "}" >> src/idn2.c
+    echo "" >> src/idn2.c
 fi
 
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    git_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GIT_DIR}"
-    git_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GIT_DIR}"
-else
-    git_cflags="${INSTX_CFLAGS}"
-    git_cxxflags="${INSTX_CXXFLAGS}"
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-ldl" "-lpthread")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure IDN"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-if [[ -e /usr/local/bin/perl ]]; then
-    GIT_PERL=/usr/local/bin/perl
-elif [[ -e /usr/bin/perl ]]; then
-    GIT_PERL=/usr/bin/perl
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build IDN"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
 else
-    GIT_PERL=perl
-fi
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-pthreads")
-CONFIG_OPTS+=("--without-tcltk")
-
-if [[ "${IS_SOLARIS}" -eq 1 ]]; then
-    CONFIG_OPTS+=("ac_cv_func_inet_ntop=yes")
-    CONFIG_OPTS+=("ac_cv_func_inet_pton=yes")
-fi
-
-    CURLDIR="${INSTX_PREFIX}" \
-    CURL_CONFIG="${INSTX_PREFIX}/bin/curl-config" \
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS} -DNO_UNALIGNED_LOADS=1" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${git_cflags}" \
-    CXXFLAGS="${git_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="-lssl -lcrypto -lz ${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-lib="$(basename "${INSTX_LIBDIR}")" \
-    --with-sane-tool-path="${INSTX_PREFIX}/bin" \
-    --with-openssl="${INSTX_PREFIX}" \
-    --with-curl="${INSTX_PREFIX}" \
-    --with-libpcre="${INSTX_PREFIX}" \
-    --with-zlib="${INSTX_PREFIX}" \
-    --with-iconv="${INSTX_PREFIX}" \
-    --with-expat="${INSTX_PREFIX}" \
-    --with-perl="$GIT_PERL" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure Git"
-    echo "***********************"
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
 
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
+###############################################################################
+
+echo
+echo "********** OpenSSL **********"
+echo
+
+# wget on Ubuntu 16 cannot validate against Let's Encrypt certificate
+wget "https://www.openssl.org/source/$OPENSSL_TAR" --no-check-certificate -O "$OPENSSL_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download OpenSSL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Fix LD_LIBRARY_PATH and DYLD_LIBRARY_PATH
-bash ../fix-library-path.sh
+rm -rf "$OPENSSL_DIR" &>/dev/null
+tar -xzf "$OPENSSL_TAR"
+cd "$OPENSSL_DIR"
 
-# See INSTALL for the formats and the requirements
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
+# OpenSSL and enable-ec_nistp_64_gcc_128 option
+IS_X86_64=$(uname -m 2>&1 | egrep -i -c "(amd64|x86_64)")
+if [[ "$SH_KBITS" -eq "32" ]]; then IS_X86_64=0; fi
+
+CONFIG=./config
+CONFIG_FLAGS=("no-ssl2" "no-ssl3" "no-comp" "shared" "-DNDEBUG" "-Wl,-rpath,$INSTALL_LIBDIR"
+        "--prefix=$INSTALL_PREFIX" "--openssldir=$INSTALL_PREFIX" "--libdir=$INSTALL_LIBDIR_DIR")
+if [[ "$IS_X86_64" -eq "1" ]]; then
+    CONFIG_FLAGS+=("enable-ec_nistp_64_gcc_128")
+fi
+
+KERNEL_BITS="$SH_KBITS" "$CONFIG" "${CONFIG_FLAGS[@]}"
 
-# Disables GUI if TCL is missing.
-if [[ -z "$(command -v tclsh 2>/dev/null)" ]]; then
-   MAKE_FLAGS+=("NO_TCLTK=Yes")
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure OpenSSL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
+MAKE_FLAGS=(-j 4 depend)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
 
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build Git"
-    echo "***********************"
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build OpenSSL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
+MAKE_FLAGS=(install_sw)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
+cd ..
 
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
+###############################################################################
 
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
+echo
+echo "********** PCRE **********"
+echo
 
-MAKE_FLAGS=("test" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test Git"
-    echo "***********************"
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://ftp.pcre.org/pub/pcre/$PCRE_TAR" --no-check-certificate -O "$PCRE_TAR"
 
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download PCRE"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
+rm -rf "$PCRE_DIR" &>/dev/null
+tar -xzf "$PCRE_TAR"
+cd "$PCRE_DIR"
 
-echo ""
-echo "***********************"
-echo "Installing package"
-echo "***********************"
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-lz" "-ldl" "-lpthread")
 
-# See INSTALL for the formats and the requirements
-MAKE_FLAGS=("install")
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --enable-pcregrep-libz --enable-pcregrep-libbz2 \
+    --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure PCRE"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4 all)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build PCRE"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
 
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GIT_DIR}"
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
 else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GIT_DIR}"
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
+cd ..
+
 ###############################################################################
 
-if [[ -z "$(git config --get http.sslCAInfo)" ]];
-then
-    echo ""
-    echo "*****************************************************************************"
-    echo "Configuring Git to use CA store at $INSTX_CACERT_FILE"
-    echo "*****************************************************************************"
+echo
+echo "********** PCRE2 **********"
+echo
+
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://ftp.pcre.org/pub/pcre/$PCRE2_TAR" --no-check-certificate -O "$PCRE2_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download PCRE2"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$PCRE2_DIR" &>/dev/null
+tar -xzf "$PCRE2_TAR"
+cd "$PCRE2_DIR"
 
-    git config --global http.sslCAInfo "$INSTX_CACERT_FILE"
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-lz" "-ldl" "-lpthread")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --enable-pcre2-8 --enable-pcre2-16 --enable-pcre2-32 \
+    --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure PCRE2"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4 all)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build PCRE2"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
 else
-    echo ""
-    echo "*****************************************************************************"
-    echo "Git already configured to use CA store at $(git config --get http.sslCAInfo)"
-    echo "*****************************************************************************"
+    "$MAKE" "${MAKE_FLAGS[@]}"
 fi
 
+cd ..
+
 ###############################################################################
 
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
+echo
+echo "********** cURL **********"
+echo
+
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "https://curl.haxx.se/download/$CURL_TAR" --no-check-certificate -O "$CURL_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download cURL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$CURL_DIR" &>/dev/null
+tar -xzf "$CURL_TAR"
+cd "$CURL_DIR"
+
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-lidn2" "-lssl" "-lcrypto" "-lz" "-ldl" "-lpthread")
+
+if [[ ("$IS_SOLARIS" -ne ")" && "$USE_TRUST_STORE" -ne "0") ]]; then
+  CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --without-ca-bundle --with-ca-path=/etc/openssl/certs --enable-ipv6 \
+	--with-nghttp2 --with-ssl="$INSTALL_PREFIX" \
+    --with-libidn2="$INSTALL_PREFIX" --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+else
+  CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --enable-ipv6 --with-nghttp2 --with-ssl="$INSTALL_PREFIX" \
+    --with-libidn2="$INSTALL_PREFIX" --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+fi
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure cURL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build cURL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
 
 ###############################################################################
 
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
+echo
+echo "********** Git **********"
+echo
+
+# wget on Ubuntu 16 cannot validate against DigiCert certificate
+wget "https://github.com/git/git/archive/$GIT_TAR" --no-check-certificate -O "$GIT_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download Git"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$GIT_DIR" &>/dev/null
+tar -xzf "$GIT_TAR"
+cd "$GIT_DIR"
+
+"$MAKE" configure
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to make configure Git"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+# "Instruct Git to use pthread library?", http://stackoverflow.com/q/43080417/
+for file in $(find `pwd` -iname 'Makefile*')
+do 
+    cp "$file" "$file.orig"
+    sed 's|-lrt|-lrt -lpthread|g' "$file.orig" > "$file"
+    rm "$file.orig"
+done
+
+# Various Solaris 11 workarounds
+if [[ "$IS_SOLARIS" -eq "1" ]]; then
+    for file in $(find `pwd` -iname 'Makefile*')
+    do 
+        cp "$file" "$file.orig"
+        sed 's|-lsocket|-lnsl -lsocket|g' "$file.orig" > "$file"
+        cp "$file" "$file.orig"
+        sed 's|/usr/ucb/install|install|g' "$file.orig" > "$file"
+        rm "$file.orig"
+    done
+    for file in $(find `pwd` -iname 'config*')
+    do 
+        cp "$file" "$file.orig"
+        sed 's|-lsocket|-lnsl -lsocket|g' "$file.orig" > "$file"
+        cp "$file" "$file.orig"
+        sed 's|/usr/ucb/install|install|g' "$file.orig" > "$file"
+        rm "$file.orig"
+    done
+fi
+
+if [[ -e /usr/local/bin/perl ]]; then
+    SH_PERL=/usr/local/bin/perl
+elif [[ -e /usr/bin/perl ]]; then
+    SH_PERL=/usr/bin/perl
+else
+    SH_PERL=perl
+fi
+
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-lssl" "-lcrypto" "-lz" "-ldl" "-lpthread")
 
-cd "${CURR_DIR}" || exit 1
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-pthreads --with-lib="$INSTALL_LIBDIR" --with-openssl="$INSTALL_PREFIX" \
+    --with-curl="$INSTALL_PREFIX" --with-libpcre="$INSTALL_PREFIX" --with-zlib="$INSTALL_PREFIX" \
+    --with-iconv="$INSTALL_PREFIX" --with-perl="$SH_PERL" --prefix="$INSTALL_PREFIX"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure Git"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+# See INSTALL for the formats and the requirements
+MAKE_FLAGS=(-j 4 all)
+if [[ ! -z `which asciidoc 2>/dev/null | grep -v 'no asciidoc'` ]]; then
+    if [[ ! -z `which makeinfo 2>/dev/null | grep -v 'no makeinfo'` ]]; then
+        MAKE_FLAGS+=("man")
+    fi
+    if [[ ! -z `which xmlto 2>/dev/null | grep -v 'no xmlto'` ]]; then
+        MAKE_FLAGS+=("info" "html")
+    fi
+fi
+
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -eq "1" ]]; then
+    echo "Failed to build Git"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+# See INSTALL for the formats and the requirements
+MAKE_FLAGS=(install)
+if [[ ! -z `which asciidoc 2>/dev/null | grep -v 'no asciidoc'` ]]; then
+    if [[ ! -z `which makeinfo 2>/dev/null | grep -v 'no makeinfo'` ]]; then
+        MAKE_FLAGS+=("install-man")
+    fi
+    if [[ ! -z `which xmlto 2>/dev/null | grep -v 'no xmlto'` ]]; then
+        MAKE_FLAGS+=("install-info" "install-html")
+    fi
+fi
+
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
 
 ###############################################################################
 
+echo
+echo "********** Cleanup **********"
+echo
+
 # Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GIT_TAR" "$GIT_DIR")
+if true; then
+
+    ARTIFACTS=("$OPENSSL_TAR" "$OPENSSL_DIR" "$UNISTR_TAR" "$UNISTR_DIR" "$READLN_TAR" "$READLN_DIR"
+            "$PCRE_TAR" "$PCRE_DIR" "$PCRE2_TAR" "$PCRE2_DIR" "$ZLIB_TAR" "$ZLIB_DIR"  "$BZ2_TAR" "$BZ2_DIR"
+            "$IDN2_TAR" "$IDN2_DIR" "$ICONV_TAR" "$ICONV_DIR" "$CURL_TAR" "$CURL_DIR" "$GIT_TAR" "$GIT_DIR")
+
     for artifact in "${ARTIFACTS[@]}"; do
         rm -rf "$artifact"
     done
+
+    # ./build-git.sh 2>&1 | tee build-git.log
+    if [[ -e build-git.log ]]; then
+        rm build-git.log
+    fi
 fi
 
-exit 0
+[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0
diff --git a/build-gmake381.sh b/build-gmake381.sh
deleted file mode 100755
index 3006701f3..000000000
--- a/build-gmake381.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Make from sources.
-
-MAKE_VER=3.81
-MAKE_TAR=make-${MAKE_VER}.tar.gz
-MAKE_DIR=make-${MAKE_VER}
-PKG_NAME=make-381
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Make ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$MAKE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/make/$MAKE_TAR"
-then
-    echo "Failed to download Make"
-    exit 1
-fi
-
-rm -rf "$MAKE_DIR" &>/dev/null
-gzip -d < "$MAKE_TAR" | tar xf -
-cd "$MAKE_DIR"
-
-if [[ -e ../patch/gmake381.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/gmake381.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --program-prefix=g \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Make"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Make"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-# Can't pass self tests...
-MAKE_FLAGS=("PERL_USE_UNSAFE_INC=1" "check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Make"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    #exit 1
-
-    echo ""
-    echo "************************"
-    echo "Installing anyways..."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MAKE_TAR" "$MAKE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gmp.sh b/build-gmp.sh
deleted file mode 100755
index 734f88319..000000000
--- a/build-gmp.sh
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GMP from sources.
-
-GMP_VER=6.2.1
-GMP_TAR="gmp-${GMP_VER}.tar.bz2"
-GMP_DIR="gmp-${GMP_VER}"
-PKG_NAME=gmp
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= GMP =================="
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-echo ""
-echo "GMP ${GMP_VER}..."
-
-if ! "${WGET}" -q -O "$GMP_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/gmp/$GMP_TAR"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to download GMP"
-    echo "***********************"
-    exit 1
-fi
-
-rm -rf "$GMP_DIR" &>/dev/null
-bzip2 -d < "$GMP_TAR" | tar xf -
-cd "$GMP_DIR" || exit 1
-
-if [[ -e ../patch/gmp.patch ]]; then
-    echo ""
-    echo "*************************"
-    echo "Patching package"
-    echo "*************************"
-
-    patch -u -p0 < ../patch/gmp.patch
-fi
-
-# Fix decades old compile and link errors on early Darwin.
-# https://gmplib.org/list-archives/gmp-bugs/2009-May/001423.html
-if [[ "$OSX_10p5_OR_BELOW" -ne 0 ]]; then
-    if [[ -e ../patch/gmp-darwin.patch ]]; then
-        echo ""
-        echo "*************************"
-        echo "Patching package (Darwin)"
-        echo "*************************"
-
-        patch -u -p0 < ../patch/gmp-darwin.patch
-    fi
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-# Fix FreeBSD configure test
-if true; then
-    file=configure
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed 's/__builtin_clzl//g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    chmod a+x "$file"; chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm -f "$file.timestamp" "$file.fixed"
-fi
-
-echo ""
-echo "***********************"
-echo "Configuring package"
-echo "***********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gmp_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GMP_DIR}"
-    gmp_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GMP_DIR}"
-else
-    gmp_cflags="${INSTX_CFLAGS}"
-    gmp_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--enable-assert=no")
-CONFIG_OPTS+=("ABI=$INSTX_BITNESS")
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gmp_cflags}" \
-    CXXFLAGS="${gmp_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure GMP"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build GMP"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test GMP"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Installing package"
-echo "***********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GMP_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GMP_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GMP_TAR" "$GMP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gnucobol-rc.sh b/build-gnucobol-rc.sh
deleted file mode 100755
index 7bfd76b86..000000000
--- a/build-gnucobol-rc.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GnuCOBOL from sources.
-#
-# The script has to disable libxml2 and ncurses. Both
-# have build problems that surface under GnuCOBOL.
-
-COBOL_VER=3.1
-COBOL_TAR=gnucobol-${COBOL_VER}-rc1.tar.gz
-COBOL_DIR=gnucobol-${COBOL_VER}-rc1
-PKG_NAME=gnucobol-rc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bdb.sh
-then
-    echo "Failed to build Berkeley DB"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================="
-echo "============= GnuCOBOL (RC) ============="
-echo "========================================="
-
-echo ""
-echo "****************************"
-echo "Downloading package"
-echo "****************************"
-
-echo ""
-echo "GnuCOBOL (RC) ${COBOL_VER}..."
-
-if ! "${WGET}" -q -O "$COBOL_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://alpha.gnu.org/gnu/gnucobol/$COBOL_TAR"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to download GnuCOBOL"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-rm -rf "$COBOL_DIR" &>/dev/null
-gzip -d < "$COBOL_TAR" | tar xf -
-cd "$COBOL_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "****************************"
-echo "Configuring package"
-echo "****************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --enable-static \
-    --with-math=gmp \
-    --without-curses \
-    --with-xml2 \
-    --with-libiconv-prefix="${INSTX_LIBDIR}" \
-    --with-libintl-prefix="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure GnuCOBOL"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "****************************"
-echo "Building package"
-echo "****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "****************************"
-    echo "Failed to build GnuCOBOL"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Testing package"
-echo "****************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to test GnuCOBOL"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Installing package"
-echo "****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-# Collect test logs for error reporting
-bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$COBOL_TAR" "$COBOL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gnulib.sh b/build-gnulib.sh
deleted file mode 100755
index 180a47ca0..000000000
--- a/build-gnulib.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Gnulib from sources.
-
-# Gnulib is distributed as source from GitHub. No packages
-# are available for download. Also see
-# https://www.linux.com/news/using-gnulib-improve-software-portability
-
-# Testing Gnulib is detailed at https://lists.gnu.org/archive/html/bug-gnulib/2017-05/msg00118.html.
-
-GNULIB_VER=unknown
-GNULIB_DIR=gnulib
-GNULIB_TEST_DIR=gnulib_test
-PKG_NAME=gnulib
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Gnulib ================"
-echo "========================================"
-
-echo ""
-echo "Gnulib ${GNULIB_VER}..."
-
-# Cleanup old artifacts in case of early out
-rm -rf "$GNULIB_DIR" "$GNULIB_TEST_DIR" 2>/dev/null
-
-echo ""
-echo "*****************************"
-echo "Cloning package"
-echo "*****************************"
-
-if ! git clone --depth=3 git://git.savannah.gnu.org/gnulib.git "$GNULIB_DIR"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to clone Gnulib"
-    echo "*****************************"
-    exit 1
-fi
-
-cd "$GNULIB_DIR" || exit 1
-
-echo "Copying Gnulib sources"
-if ! ./gnulib-tool --create-testdir --dir=../"$GNULIB_TEST_DIR" --avoid=gettext --single-configure --without-privileged-tests;
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to copy Gnulib sources"
-    echo "*****************************"
-    exit 1
-fi
-
-cd "${CURR_DIR}" || exit 1
-cd "$GNULIB_TEST_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*****************************"
-echo "Configuring package"
-echo "*****************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Gnulib"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*****************************"
-echo "Building package"
-echo "*****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build Gnulib"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Testing package"
-echo "*****************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Gnulib"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GNULIB_DIR" "$GNULIB_TEST_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gnupg.sh b/build-gnupg.sh
deleted file mode 100755
index 55ee3d565..000000000
--- a/build-gnupg.sh
+++ /dev/null
@@ -1,290 +0,0 @@
-
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GnuPG and its dependencies from sources.
-
-GNUPG_VER=2.4.3
-GNUPG_TAR="gnupg-${GNUPG_VER}.tar.bz2"
-GNUPG_DIR="gnupg-${GNUPG_VER}"
-PKG_NAME=gnupg
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libtasn1.sh
-then
-    echo "Failed to build libtasn1"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gpgerror.sh
-then
-    echo "Failed to build Libgpg-error"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libksba.sh
-then
-    echo "Failed to build Libksba"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libassuan.sh
-then
-    echo "Failed to build Libassuan"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libgcrypt.sh
-then
-    echo "Failed to build Libgcrypt"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ntbTLS.sh
-then
-    echo "Failed to build ntbTLS"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-nPth.sh
-then
-    echo "Failed to build nPth"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ GnuPG ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "GnuPG ${GNUPG_VER}..."
-
-if ! "${WGET}" -q -O "$GNUPG_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gnupg.org/ftp/gcrypt/gnupg/$GNUPG_TAR"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to download GnuPG"
-    echo "***************************"
-    exit 1
-fi
-
-rm -rf "$GNUPG_DIR" &>/dev/null
-tar xjf "$GNUPG_TAR"
-cd "$GNUPG_DIR"
-
-if [[ -e ../patch/gnupg.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/gnupg.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gnupg_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GNUPG_DIR}"
-    gnupg_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GNUPG_DIR}"
-else
-    gnupg_cflags="${INSTX_CFLAGS}"
-    gnupg_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gnupg_cflags}" \
-    CXXFLAGS="${gnupg_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --disable-scdaemon \
-    --disable-dirmngr \
-    --disable-wks-tools \
-    --disable-doc \
-    --with-zlib="${INSTX_PREFIX}" \
-    --with-bzip2="${INSTX_PREFIX}" \
-    --with-libgpg-error-prefix="${INSTX_PREFIX}" \
-    --with-libgcrypt-prefix="${INSTX_PREFIX}" \
-    --with-libassuan-prefix="${INSTX_PREFIX}" \
-    --with-ksba-prefix="${INSTX_PREFIX}" \
-    --with-npth-prefix="${INSTX_PREFIX}" \
-    --with-ntbtls-prefix="${INSTX_PREFIX}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure GnuPG"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build GnuPG"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test GnuPG"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GNUPG_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GNUPG_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GNUPG_TAR" "$GNUPG_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gnutls.sh b/build-gnutls.sh
deleted file mode 100755
index bd1187338..000000000
--- a/build-gnutls.sh
+++ /dev/null
@@ -1,442 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GnuTLS and its dependencies from sources.
-
-GNUTLS_VER=3.7.10
-GNUTLS_XZ=gnutls-${GNUTLS_VER}.tar.xz
-GNUTLS_TAR=gnutls-${GNUTLS_VER}.tar
-GNUTLS_DIR=gnutls-${GNUTLS_VER}
-PKG_NAME=gnutls
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libtasn1.sh
-then
-    echo "Failed to build libtasn1"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-idn2.sh
-then
-    echo "Failed to build IDN2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexpat.sh
-then
-    echo "Failed to build Expat"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-nettle.sh
-then
-    echo "Failed to build Nettle"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unbound.sh
-then
-    echo "Failed to build Unbound"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-p11kit.sh
-then
-    echo "Failed to build P11-Kit"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if [[ "${IS_LINUX}" -eq 1 ]]
-then
-    if ! ./build-datefudge.sh
-    then
-        echo "Failed to build datefudge"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ GnuTLS ================"
-echo "========================================"
-
-if [[ -z "$(command -v datefudge 2>/dev/null)" ]]
-then
-    echo ""
-    echo "datefudge not found. Some tests will be skipped."
-    echo "To fix this issue, please install datefudge."
-fi
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "GnuTLS ${GNUTLS_VER}..."
-
-if ! "${WGET}" -q -O "$GNUTLS_XZ" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/$GNUTLS_XZ"
-then
-    echo "Failed to download GnuTLS"
-    exit 1
-fi
-
-rm -rf "$GNUTLS_TAR" "$GNUTLS_DIR" &>/dev/null
-unxz "$GNUTLS_XZ" && tar -xf "$GNUTLS_TAR"
-cd "$GNUTLS_DIR"
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gnutls.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/gnutls.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-IFS= find . -name 'Makefile.in' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    touch -a -m -r "$file" "$file.timestamp"
-    cp -p "$file" "$file.fixed"
-    sed -e 's/ -Wno-pedantic//g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm -f "$file.timestamp"
-done
-
-IFS= find . -name 'Makefile.am' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    touch -a -m -r "$file" "$file.timestamp"
-    cp -p "$file" "$file.fixed"
-    sed -e 's/ -Wno-pedantic//g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm -f "$file.timestamp"
-done
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gnutls_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GNUTLS_DIR}"
-    gnutls_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GNUTLS_DIR}"
-    gnutls_ldflags="${INSTX_LDFLAGS}"
-else
-    gnutls_cflags="${INSTX_CFLAGS}"
-    gnutls_cxxflags="${INSTX_CXXFLAGS}"
-    gnutls_ldflags="${INSTX_LDFLAGS}"
-fi
-
-# Solaris is a tab bit stricter than libc
-if [[ "$IS_SOLARIS" -ne 0 ]]; then
-    # Don't use CPPFLAGS. Options will cross-pollinate into CXXFLAGS.
-    gnutls_cflags="${gnutls_cflags} -D_XOPEN_SOURCE=600 -std=gnu99"
-fi
-
-# Old VIA cpu's with Padlock Security Extensions.
-have_padlock=0
-if [[ -d /proc/cpuinfo ]]; then
-    have_padlock=$(grep -i -c -E 'rng_en|ace_en|ace2_en|phe_en|pmm_en' /proc/cpuinfo)
-fi
-
-CONFIG_OPTS=()
-if [[ "$have_padlock" -eq 0 ]]; then
-    CONFIG_OPTS+=("--disable-padlock")
-fi
-
-# gnutls.patch un-defines _Thread_local in random.c due to
-# PowerPC and old GCC. We need to disable threads here, too.
-if [[ "${OSX_10p5_OR_BELOW}" -eq 1 ]]; then
-    CONFIG_OPTS+=("--disable-threads")
-fi
-
-# We should probably include --disable-anon-authentication below
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gnutls_cflags}" \
-    CXXFLAGS="${gnutls_cxxflags}" \
-    LDFLAGS="${gnutls_ldflags}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --enable-seccomp-tests \
-    --enable-sha1-support \
-    --disable-guile \
-    --disable-ssl2-support \
-    --disable-ssl3-support \
-    --disable-doc \
-    --disable-full-test-suite \
-    --with-p11-kit \
-    --with-libregex \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libseccomp-prefix="${INSTX_PREFIX}" \
-    --with-libcrypto-prefix="${INSTX_PREFIX}" \
-    --with-unbound-root-key-file="$INSTX_ROOTKEY_FILE" \
-    --with-default-trust-store-file="$INSTX_CACERT_FILE" \
-    --with-default-trust-store-dir="$INSTX_CACERT_PATH" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure GnuTLS"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-IFS= find . -name 'Makefile' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    cp -p "$file" "$file.fixed"
-    sed -e 's/-Wtype-limits .*/-fno-common -Wall /g' \
-        -e 's/-fno-common .*/-fno-common -Wall /g' \
-        -e 's/ -Wno-pedantic//g' \
-        "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-done
-
-IFS= find ./tests -name 'Makefile' -print | while read -r file
-do
-    # Test suite does not compile with NDEBUG defined.
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    cp -p "$file" "$file.fixed"
-    sed -e 's/ -DNDEBUG//g' \
-        -e 's/ -Wno-pedantic//g' \
-        "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-done
-
-IFS= find . -name '*.la' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    cp -p "$file" "$file.fixed"
-    sed -e 's/-Wtype-limits .*/-fno-common -Wall /g' \
-        -e 's/-fno-common .*/-fno-common -Wall /g' \
-        -e 's/ -Wno-pedantic//g' \
-        "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-done
-
-IFS= find . -name '*.sh' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    cp -p "$file" "$file.fixed"
-    sed -e 's|#!/bin/sh|#!/usr/bin/env bash|g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-done
-
-if [[ "$IS_SOLARIS" -ne 0 ]]
-then
-    # Solaris netstat is different then GNU netstat
-    echo "patching common.sh..."
-    file=tests/scripts/common.sh
-
-    cp -p "$file" "$file.fixed"
-    sed -e 's/PFCMD -anl/PFCMD -an/g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-fi
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build GnuTLS"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test GnuTLS"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "**********************"
-    echo "Installing anyways..."
-    echo "**********************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GNUTLS_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GNUTLS_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GNUTLS_XZ" "$GNUTLS_TAR" "$GNUTLS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gpgerror.sh b/build-gpgerror.sh
deleted file mode 100755
index 946e16973..000000000
--- a/build-gpgerror.sh
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libgpg-error from sources.
-
-GPGERR_VER=1.47
-GPGERR_TAR="libgpg-error-${GPGERR_VER}.tar.bz2"
-GPGERR_DIR="libgpg-error-${GPGERR_VER}"
-PKG_NAME=gpgerror
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============= libgpg-error ============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "libgpg-error ${GPGERR_VER}..."
-
-if ! "${WGET}" -q -O "$GPGERR_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gnupg.org/ftp/gcrypt/libgpg-error/$GPGERR_TAR"
-then
-    echo "Failed to download libgpg-error"
-    exit 1
-fi
-
-rm -rf "$GPGERR_DIR" &>/dev/null
-tar xjf "$GPGERR_TAR"
-cd "$GPGERR_DIR"
-
-#cp src/argparse.c src/argparse.c.orig
-#cp tests/Makefile.in tests/Makefile.in.orig
-#cp tests/t-logging.c tests/t-logging.c.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/gpgerror.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/gpgerror.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "********************************"
-    echo "Failed to configure libgpg-error"
-    echo "********************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "********************************"
-    echo "Failed to build libgpg-error"
-    echo "********************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "********************************"
-    echo "Failed to test libgpg-error"
-    echo "********************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GPGERR_TAR" "$GPGERR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-grep.sh b/build-grep.sh
deleted file mode 100755
index bf7a94d40..000000000
--- a/build-grep.sh
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds grep from sources.
-
-GREP_VER=3.7
-GREP_XZ=grep-${GREP_VER}.tar.xz
-GREP_TAR=grep-${GREP_VER}.tar
-GREP_DIR=grep-${GREP_VER}
-PKG_NAME=grep
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre.sh
-then
-    echo "Failed to build PCRE"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Grep ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "Grep ${GREP_VER}..."
-
-if ! "${WGET}" -q -O "$GREP_XZ" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/grep/$GREP_XZ"
-then
-    echo "Failed to download Grep"
-    exit 1
-fi
-
-rm -rf "$GREP_TAR" "$GREP_DIR" &>/dev/null
-unxz "$GREP_XZ" && tar -xf "$GREP_TAR"
-cd "$GREP_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/grep.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/grep.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    grep_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GREP_DIR}"
-    grep_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GREP_DIR}"
-else
-    grep_cflags="${INSTX_CFLAGS}"
-    grep_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${grep_cflags}" \
-    CXXFLAGS="${grep_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libpcre-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Grep"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Grep"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Grep"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GREP_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GREP_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GREP_XZ" "$GREP_TAR" "$GREP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-groff.sh b/build-groff.sh
deleted file mode 100755
index 325f4aca8..000000000
--- a/build-groff.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Groff from sources.
-
-GROFF_VER=1.22.3
-GROFF_TAR=groff-${GROFF_VER}.tar.gz
-GROFF_DIR=groff-${GROFF_VER}
-PKG_NAME=groff
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Groff ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Groff ${GROFF_VER}..."
-
-if ! "${WGET}" -q -O "$GROFF_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/groff/$GROFF_TAR"
-then
-    echo "Failed to download Groff"
-    exit 1
-fi
-
-rm -rf "$GROFF_DIR" &>/dev/null
-gzip -d < "$GROFF_TAR" | tar xf -
-cd "$GROFF_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/groff.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/groff.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    groff_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GROFF_DIR}"
-    groff_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GROFF_DIR}"
-else
-    groff_cflags="${INSTX_CFLAGS}"
-    groff_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${groff_cflags}" \
-    CXXFLAGS="${groff_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure Groff"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Groff"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test Groff"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GROFF_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GROFF_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GROFF_TAR" "$GROFF_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-guile2.sh b/build-guile2.sh
deleted file mode 100755
index 22093a5c5..000000000
--- a/build-guile2.sh
+++ /dev/null
@@ -1,293 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Guile from sources. Guile has a lot of issues
-# and I am not sure all of them can be worked around.
-#
-# Guile 2.2.7 is the last of the 2.2.x series. Use Guile 3.x if
-# something more recent is needed.
-#
-# Requires libtool-ltdl-devel on Fedora.
-
-GUILE_VER=2.2.7
-GUILE_TAR=guile-${GUILE_VER}.tar.gz
-GUILE_DIR=guile-${GUILE_VER}
-PKG_NAME=guile2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# Boehm garbage collector. Look in /usr/lib and /usr/lib64
-if [[ "$IS_DEBIAN" -ne 0 ]]; then
-    if [[ -z $(find /usr -maxdepth 2 -name libgc.so 2>/dev/null) ]]; then
-        echo "Guile requires Boehm garbage collector. Please install libgc-dev."
-        exit 1
-    fi
-elif [[ "$IS_FEDORA" -ne 0 ]]; then
-    if [[ -z $(find /usr -maxdepth 2 -name libgc.so 2>/dev/null) ]]; then
-        echo "Guile requires Boehm garbage collector. Please install gc-devel."
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-# Solaris is missing the Boehm GC. We have to build it. Ugh...
-if [[ "$IS_SOLARIS" -eq 1 ]]; then
-    if ! ./build-boehm-gc.sh
-    then
-        echo "Failed to build Boehm GC"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-libffi.sh
-then
-    echo "Failed to build libffi"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Guile ================="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "Guile ${GUILE_VER}..."
-
-if ! "${WGET}" -q -O "$GUILE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/guile/$GUILE_TAR"
-then
-    echo "Failed to download Guile"
-    exit 1
-fi
-
-rm -rf "$GUILE_DIR" &>/dev/null
-gzip -d < "$GUILE_TAR" | tar xf -
-cd "$GUILE_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/guile2.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
-
-    patch -u -p0 < ../patch/guile2.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--with-pic")
-CONFIG_OPTS+=("--disable-deprecated")
-CONFIG_OPTS+=("--with-libgmp-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libunistring-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libiconv-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libltdl-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libintl-prefix=${INSTX_PREFIX}")
-
-# Maybe?
-#   --with-bdw-gc="${INSTX_PKGCONFIG}"
-#   --disable-posix --disable-networking
-
-# Disable JIT for Apple M1's. The Guile devs need to port it.
-# https://www.wwdcnotes.com/notes/wwdc20/10686/
-apple_silicon=$(sysctl machdep.cpu.brand_string 2>/dev/null | grep -i -c "Apple M1")
-if [[ "${apple_silicon}" -eq 1 ]]; then
-    CONFIG_OPTS+=("--enable-jit=no")
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    guile_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GUILE_DIR}"
-    guile_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GUILE_DIR}"
-else
-    guile_cflags="${INSTX_CFLAGS}"
-    guile_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${guile_cflags}" \
-    CXXFLAGS="${guile_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Guile"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Guile"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-# https://lists.gnu.org/archive/html/guile-devel/2017-10/msg00009.html
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Guile"
-    echo "*************************"
-
-    # We can't install. Installing Guile results in errors like
-    #   Throw to key misc-error with args ("primitive-load-path" "Unable
-    #   to find file ~S in load path" ("ice-9/boot-9") #f)
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-
-    echo ""
-    echo "*************************"
-    echo "Installing anyways..."
-    echo "*************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GUILE_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GUILE_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GUILE_TAR" "$GUILE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-guile3.sh b/build-guile3.sh
deleted file mode 100755
index 585062917..000000000
--- a/build-guile3.sh
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Guile from sources. Guile has a lot of issues
-# and I am not sure all of them can be worked around.
-#
-# Requires libtool-ltdl-devel on Fedora.
-
-GUILE_VER=3.0.5
-GUILE_TAR=guile-${GUILE_VER}.tar.gz
-GUILE_DIR=guile-${GUILE_VER}
-PKG_NAME=guile3
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# Boehm garbage collector. Look in /usr/lib and /usr/lib64
-if [[ "$IS_DEBIAN" -ne 0 ]]; then
-    if [[ -z $(find /usr -maxdepth 2 -name libgc.so 2>/dev/null) ]]; then
-        echo "Guile requires Boehm garbage collector. Please install libgc-dev."
-        exit 1
-    fi
-elif [[ "$IS_FEDORA" -ne 0 ]]; then
-    if [[ -z $(find /usr -maxdepth 2 -name libgc.so 2>/dev/null) ]]; then
-        echo "Guile requires Boehm garbage collector. Please install gc-devel."
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-# Solaris is missing the Boehm GC. We have to build it. Ugh...
-if [[ "$IS_SOLARIS" -eq 1 ]]; then
-    if ! ./build-boehm-gc.sh
-    then
-        echo "Failed to build Boehm GC"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-libffi.sh
-then
-    echo "Failed to build libffi"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Guile ================="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "Guile ${GUILE_VER}..."
-
-if ! "${WGET}" -q -O "$GUILE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/guile/$GUILE_TAR"
-then
-    echo "Failed to download Guile"
-    exit 1
-fi
-
-rm -rf "$GUILE_DIR" &>/dev/null
-gzip -d < "$GUILE_TAR" | tar xf -
-cd "$GUILE_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/guile3.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
-
-    patch -u -p0 < ../patch/guile3.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--with-pic")
-CONFIG_OPTS+=("--disable-deprecated")
-CONFIG_OPTS+=("--with-libgmp-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libunistring-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libiconv-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libltdl-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libintl-prefix=${INSTX_PREFIX}")
-
-# Maybe?
-#   --with-bdw-gc="${INSTX_PKGCONFIG}"
-#   --disable-posix --disable-networking
-
-# Disable JIT for Apple M1's. The Guile devs need to port it.
-# https://www.wwdcnotes.com/notes/wwdc20/10686/
-apple_silicon=$(sysctl machdep.cpu.brand_string 2>/dev/null | grep -i -c "Apple M1")
-if [[ "${apple_silicon}" -eq 1 ]]; then
-    CONFIG_OPTS+=("--enable-jit=no")
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    guile_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GUILE_DIR}"
-    guile_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GUILE_DIR}"
-else
-    guile_cflags="${INSTX_CFLAGS}"
-    guile_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${guile_cflags}" \
-    CXXFLAGS="${guile_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Guile"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Guile"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-# https://lists.gnu.org/archive/html/guile-devel/2017-10/msg00009.html
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test Guile"
-    echo "*************************"
-
-    # We can't install. Installing Guile results in errors like
-    #   Throw to key misc-error with args ("primitive-load-path" "Unable
-    #   to find file ~S in load path" ("ice-9/boot-9") #f)
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-
-    echo ""
-    echo "*************************"
-    echo "Installing anyways..."
-    echo "*************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GUILE_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GUILE_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GUILE_TAR" "$GUILE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-gzip.sh b/build-gzip.sh
deleted file mode 100755
index d2368aa1a..000000000
--- a/build-gzip.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Gzip from sources.
-
-GZIP_VER=1.12
-GZIP_TAR=gzip-${GZIP_VER}.tar.gz
-GZIP_DIR=gzip-${GZIP_VER}
-PKG_NAME=gzip
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "Gzip is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Gzip ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "Gzip ${GZIP_VER}..."
-
-if ! "${WGET}" -q -O "$GZIP_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://ftp.gnu.org/gnu/gzip/$GZIP_TAR"
-then
-    echo "Failed to download Gzip"
-    exit 1
-fi
-
-rm -rf "$GZIP_DIR" &>/dev/null
-gzip -d < "$GZIP_TAR" | tar xf -
-cd "$GZIP_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gzip_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GZIP_DIR}"
-    gzip_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GZIP_DIR}"
-else
-    gzip_cflags="${INSTX_CFLAGS}"
-    gzip_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gzip_cflags}" \
-    CXXFLAGS="${gzip_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Gzip"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Gzip"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-# https://github.com/gzip/gzip/issues/160
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Gzip"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GZIP_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GZIP_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GZIP_TAR" "$GZIP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-hfsplustools-git.sh b/build-hfsplustools-git.sh
deleted file mode 100755
index 276cbece2..000000000
--- a/build-hfsplustools-git.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds HFS+ Tools from sources.
-
-HFSPLUSTOOLS_VER=master
-HFSPLUSTOOLS_DIR=hsfplustools-${HFSPLUSTOOLS_VER}
-PKG_NAME=hsfplustools
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== HFS+ Tools =============="
-echo "========================================"
-
-echo ""
-echo "HFS+ Tools ${HFSPLUSTOOLS_VER}..."
-
-rm -rf "$HFSPLUSTOOLS_DIR" 2>/dev/null
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-if ! git clone --depth=3 https://github.com/miniupnp/hfsplustools.git "$HFSPLUSTOOLS_DIR";
-then
-    echo "Failed to checkout HFS+ Tools"
-    exit 1
-fi
-
-cd "$HFSPLUSTOOLS_DIR"
-git checkout master &>/dev/null
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-export CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-export ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-export CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-export CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-export LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-export LIBS="${INSTX_LDLIBS}"
-
-export PREFIX="${INSTX_PREFIX}"
-export LIBDIR="${INSTX_LIBDIR}"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build HFS+ Tools"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-#echo ""
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-# Man, Valgirnd is awful when it comes to trying to build self tests.
-# MAKE_FLAGS=("check" "-k" "V=1")
-# if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-# then
-#    echo "Failed to test HFS+ Tools"
-#    exit 1
-# fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$HFSPLUSTOOLS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-hiredis.sh b/build-hiredis.sh
deleted file mode 100755
index db3febea2..000000000
--- a/build-hiredis.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Hiredis from sources.
-
-HIREDIS_VER=1.0.0
-HIREDIS_TAR=v${HIREDIS_VER}.tar.gz
-HIREDIS_DIR=hiredis-${HIREDIS_VER}
-PKG_NAME=hiredis
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexpat.sh
-then
-    echo "Failed to build Expat"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Hiredis ================"
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-echo ""
-echo "Hiredis ${HIREDIS_VER}..."
-
-if ! "${WGET}" -q -O "$HIREDIS_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/redis/hiredis/archive/$HIREDIS_TAR"
-then
-    echo "Failed to download Hiredis"
-    exit 1
-fi
-
-rm -rf "$HIREDIS_DIR" &>/dev/null
-gzip -d < "$HIREDIS_TAR" | tar xf -
-cd "$HIREDIS_DIR"
-
-if [[ -e ../patch/hiredis.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
-
-    patch -u -p0 < ../patch/hiredis.patch
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# Awful Solaris 64-bit hack. Use -G for SunC, and -shared for GCC
-if [[ "$IS_SOLARIS" -ne 0 && "$IS_SUNC" -eq 0 ]]; then
-    sed 's/ -G / -shared /g' Makefile > Makefile.fixed
-    mv Makefile.fixed Makefile; chmod +x Makefile
-fi
-
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=()
-MAKE_FLAGS+=("-f" "Makefile")
-MAKE_FLAGS+=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("PREFIX=${INSTX_PREFIX}")
-MAKE_FLAGS+=("LIBRARY_PATH=${INSTX_LIBDIR}")
-MAKE_FLAGS+=("PKGCONF_PATH=${INSTX_PKGCONFIG}")
-
-    CPPFLAGS="${CPPFLAGS}" \
-    ASFLAGS="${ASFLAGS}" \
-    CFLAGS="${CFLAGS}" \
-    CXXFLAGS="${CXXFLAGS}" \
-    LDFLAGS="${LDFLAGS}" \
-    LDLIBS="${LIBS}" \
-    LIBS="${LIBS}" \
-"${MAKE}" "${MAKE_FLAGS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to build Hiredis"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-echo ""
-echo "***********************"
-echo "Unable to test Hiredis"
-echo "***********************"
-
-# Need redis-server
-#MAKE_FLAGS=("check" "-k" "V=1")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "Failed to test Hidredis"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Installing package"
-echo "***********************"
-
-MAKE_FLAGS=("install")
-MAKE_FLAGS+=("PREFIX=${INSTX_PREFIX}")
-MAKE_FLAGS+=("LIBDIR=${INSTX_LIBDIR}")
-MAKE_FLAGS+=("PKGLIBDIR=${INSTX_PKGCONFIG}")
-
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$HIREDIS_TAR" "$HIREDIS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-iconv-gettext.sh b/build-iconv-gettext.sh
deleted file mode 100755
index de8fd309e..000000000
--- a/build-iconv-gettext.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GetText and friends from sources.
-
-# GetText is really unique among packages. It has circular dependencies on
-# iConv, libunistring and libxml2. build-iconv-gettext.sh handles the
-# iConv and GetText dependency. This script, build-gettext-final.sh,
-# handles the libunistring and libxml2 dependencies.
-#
-# The way to run these scripts is, run build-iconv-gettext.sh first.
-# That bootstraps iConv and GetText. Second, run build-gettext-final.sh.
-# That gets the missing pieces, like libunistring and libxml support.
-#
-# For the iConv and GetText recipe, see
-# https://www.gnu.org/software/libiconv/.
-#
-# Here are the interesting dependencies:
-#
-#   libgettextlib.so: libiconv.so
-#   libgettextpo.so:  libiconv.so, libiunistring.so
-#   libgettextsrc.so: libz.so, libiconv.so, libiunistring.so, libxml2.so,
-#                     libgettextlib.so, libtextstyle.so
-#   libiconv.so:      libgettextlib.so
-#   libiunistring.so: libiconv.so
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/iconv" ]] && [[ -e "${INSTX_PKG_CACHE}/gettext" ]]; then
-    echo ""
-    echo "iConv and GetText are already installed."
-    exit 0
-fi
-
-###############################################################################
-
-# Rebuild them as a pair
-rm -f "${INSTX_PKG_CACHE}/iconv"
-rm -f "${INSTX_PKG_CACHE}/gettext"
-
-###############################################################################
-
-# pkg-config is special
-export INSTX_DISABLE_ICONV_TEST=1
-
-if [[ "$IS_DARWIN" -ne 0 ]]
-then
-    if ! ./build-iconv-utf8mac.sh
-    then
-        echo "Failed to build iConv and GetText (1st time)"
-        exit 1
-    fi
-else
-    if ! ./build-iconv.sh
-    then
-        echo "Failed to build iConv and GetText (1st time)"
-        exit 1
-    fi
-fi
-
-unset INSTX_DISABLE_ICONV_TEST
-
-###############################################################################
-
-if ! ./build-gettext.sh
-then
-    echo "Failed to build GetText"
-    exit 1
-fi
-
-###############################################################################
-
-# Due to circular dependency. Once GetText is built, we need
-# to build iConvert again so it picks up the new GetText.
-rm "${INSTX_PKG_CACHE}/iconv"
-
-if [[ "$IS_DARWIN" -ne 0 ]]
-then
-    if ! ./build-iconv-utf8mac.sh
-    then
-        echo "Failed to build iConv and GetText (2nd time)"
-        exit 1
-    fi
-else
-    if ! ./build-iconv.sh
-    then
-        echo "Failed to build iConv and GetText (2nd time)"
-        exit 1
-    fi
-fi
-
-exit 0
diff --git a/build-iconv-utf8mac.sh b/build-iconv-utf8mac.sh
deleted file mode 100755
index 41503fc3f..000000000
--- a/build-iconv-utf8mac.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds iConv from sources.
-
-# iConv and GetText are unique among packages. They have circular
-# dependencies on one another. We have to build iConv, then GetText,
-# and iConv again. Also see https://www.gnu.org/software/libiconv/.
-# The script that builds iConvert and GetText in accordance to specs
-# is build-iconv-gettext.sh. You should use build-iconv-gettext.sh
-# instead of build-iconv.sh directly
-
-# iConv has additional hardships. The maintainers don't approve of
-# Apple's UTF-8-Mac so they don't support it. Lack of UTF-8-Mac support
-# on OS X causes other programs to fail, like Git. Also see
-# https://marc.info/?l=git&m=158857581228100. That leaves two choices.
-# First, use a GitHub like https://github.com/fumiyas/libiconv-utf8mac.
-# Second, use Apple's sources at http://opensource.apple.com/tarballs/.
-# Apple's libiconv-59 is really libiconv 1.11 in disguise. So we use
-# the first method, clone libiconv-utf8mac, build a release tarball,
-# and then use it in place of the GNU package.
-
-ICONV_VER=1.16
-ICONV_TAR="libiconv-utf8mac-${ICONV_VER}.tar.gz"
-ICONV_DIR="libiconv-utf8mac-${ICONV_VER}"
-PKG_NAME=iconv
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============ iConv utf8mac ============="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "iConv-utf8mac ${ICONV_VER}..."
-
-if ! "${WGET}" -q -O "$ICONV_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/noloader/libiconv-utf8mac/releases/download/v1_16/$ICONV_TAR"
-then
-    echo "Failed to download iConv-utf8mac"
-    exit 1
-fi
-
-rm -rf "$ICONV_DIR" &>/dev/null
-gzip -d < "$ICONV_TAR" | tar xf -
-cd "$ICONV_DIR" || exit 1
-
-# libiconv-utf8mac already has patch applied
-# libiconv still needs the patch
-#if [[ -e ../patch/iconv.patch ]]; then
-#    patch -u -p0 < ../patch/iconv.patch
-#    echo ""
-#fi
-
-# https://github.com/fumiyas/libiconv-utf8mac/commit/561d8c83506f
-if ! "${WGET}" -q -O lib/utf8mac.h --ca-certificate="${GITHUB_CA_ZOO}" \
-    https://raw.githubusercontent.com/fumiyas/libiconv-utf8mac/utf-8-mac-51.200.6.libiconv-${ICONV_VER}/lib/utf8mac.h
-then
-    echo "Failed to patch iConv-utf8mac"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    iconv_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ICONV_DIR}"
-    iconv_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ICONV_DIR}"
-else
-    iconv_cflags="${INSTX_CFLAGS}"
-    iconv_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${iconv_cflags}" \
-    CXXFLAGS="${iconv_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo "*************************"
-    echo "Failed to configure iConv-utf8mac"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "*************************"
-    echo "Failed to build iConv-utf8mac"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-# build-iconv-gettext has a circular dependency.
-# The first build of iConv does not need 'make check'.
-if [[ "${INSTX_DISABLE_ICONV_TEST:-0}" -ne 1 ]]
-then
-    echo "*************************"
-    echo "Testing package"
-    echo "*************************"
-
-    MAKE_FLAGS=("check" "-k" "V=1")
-    if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo "*************************"
-        echo "Failed to test iConv-utf8mac"
-        echo "*************************"
-
-        bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-        exit 1
-    fi
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ICONV_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ICONV_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ICONV_TAR" "$ICONV_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-iconv.sh b/build-iconv.sh
deleted file mode 100755
index 87297e540..000000000
--- a/build-iconv.sh
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GetText and friends from sources.
-
-# GetText is really unique among packages. It has circular dependencies on
-# iConv, libunistring and libxml2. build-iconv-gettext.sh handles the
-# iConv and GetText dependency. This script, build-gettext-final.sh,
-# handles the libunistring and libxml2 dependencies.
-#
-# The way to run these scripts is, run build-iconv-gettext.sh first.
-# That bootstraps iConv and GetText. Second, run build-gettext-final.sh.
-# That gets the missing pieces, like libunistring and libxml support.
-#
-# For the iConv and GetText recipe, see
-# https://www.gnu.org/software/libiconv/.
-#
-# Here are the interesting dependencies:
-#
-#   libgettextlib.so: libiconv.so
-#   libgettextpo.so:  libiconv.so, libiunistring.so
-#   libgettextsrc.so: libz.so, libiconv.so, libiunistring.so, libxml2.so,
-#                     libgettextlib.so, libtextstyle.so
-#   libiconv.so:      libgettextlib.so
-#   libiunistring.so: libiconv.so
-
-# iConv has additional hardships. The maintainers don't approve of
-# Apple's UTF-8-Mac so they don't support it. Lack of UTF-8-Mac support
-# on OS X causes other programs to fail, like Git. Also see
-# https://marc.info/?l=git&m=158857581228100. That leaves two choices.
-# First, use a GitHub like https://github.com/fumiyas/libiconv.
-# Second, use Apple's sources at http://opensource.apple.com/tarballs/.
-# Apple's libiconv-59 is really libiconv 1.11 in disguise. So we use
-# the first method, clone libiconv, build a release tarball,
-# and then use it in place of the GNU package.
-
-ICONV_VER=1.17
-ICONV_TAR=libiconv-${ICONV_VER}.tar.gz
-ICONV_DIR=libiconv-${ICONV_VER}
-PKG_NAME=iconv
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ iConv ================="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "iConv ${ICONV_VER}..."
-
-if ! "${WGET}" -q -O "$ICONV_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/pub/gnu/libiconv/$ICONV_TAR"
-then
-    echo "Failed to download iConv"
-    exit 1
-fi
-
-rm -rf "$ICONV_DIR" &>/dev/null
-gzip -d < "$ICONV_TAR" | tar xf -
-cd "$ICONV_DIR" || exit 1
-
-# libiconv-utf8mac already has patch applied
-# libiconv still needs the patch
-if [[ -e ../patch/iconv.patch ]]; then
-    echo ""
-    echo "*************************"
-    echo "Downloading package"
-    echo "*************************"
-
-    patch -u -p0 < ../patch/iconv.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    iconv_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ICONV_DIR}"
-    iconv_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ICONV_DIR}"
-else
-    iconv_cflags="${INSTX_CFLAGS}"
-    iconv_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${iconv_cflags}" \
-    CXXFLAGS="${iconv_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure iConv"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build iConv"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-# build-iconv-gettext has a circular dependency.
-# The first build of iConv does not need 'make check'.
-if [[ "${INSTX_DISABLE_ICONV_TEST:-0}" -ne 1 ]]
-then
-    echo ""
-    echo "*************************"
-    echo "Testing package"
-    echo "*************************"
-
-    MAKE_FLAGS=("check" "-k" "V=1")
-    if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo "*************************"
-        echo "Failed to test iConv"
-        echo "*************************"
-
-        bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-        exit 1
-    fi
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ICONV_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ICONV_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ICONV_TAR" "$ICONV_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-icu.sh b/build-icu.sh
deleted file mode 100755
index b9e50f9f9..000000000
--- a/build-icu.sh
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds ICU from sources.
-
-# Formerly 66_1
-ICU_VER=68_1
-ICU_DVER=68.1
-ICU_TAR="cu4c-${ICU_VER}-src.tgz"
-ICU_DIR=icu
-PKG_NAME=icu
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libicu ================"
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-echo ""
-echo "libicu ${ICU_DVER}..."
-
-if ! "${WGET}" -q -O "$ICU_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/unicode-org/icu/releases/download/release-${ICU_DVER}/${ICU_TAR}"
-then
-    echo "Failed to download libicu"
-    exit 1
-fi
-
-rm -rf "$ICU_DIR" &>/dev/null
-gzip -d < "$ICU_TAR" | tar xf -
-cd "$ICU_DIR" || exit 1
-
-if [[ -e ../patch/icu.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/icu.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-cd "source" || exit 1
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared --enable-static \
-    --with-library-bits="$INSTX_BITNESS" \
-    --with-data-packaging=auto
-
-if [[ "$?" -ne 0 ]]; then
-    echo "**************************"
-    echo "Failed to configure libicu"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build libicu"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test libicu"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-
-    echo "**************************"
-    echo "Installing anyways..."
-    echo "**************************"
-    # exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ICU_TAR" "$ICU_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-idn.sh b/build-idn.sh
deleted file mode 100755
index e872dc997..000000000
--- a/build-idn.sh
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds IDN from sources.
-
-IDN_VER=1.37
-IDN_TAR="libidn-${IDN_VER}.tar.gz"
-IDN_DIR="libidn-${IDN_VER}"
-PKG_NAME=libidn
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== IDN ================="
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-echo ""
-echo "IDN ${IDN_VER}..."
-
-if ! "${WGET}" -q -O "$IDN_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/libidn/$IDN_TAR"
-then
-    echo "Failed to download IDN"
-    exit 1
-fi
-
-rm -rf "$IDN_DIR" &>/dev/null
-gzip -d < "$IDN_TAR" | tar xf -
-cd "$IDN_DIR" || exit 1
-
-if [[ -e ../patch/idn.patch ]]; then
-    echo ""
-    echo "***********************"
-    echo "Patching package"
-    echo "***********************"
-
-    patch -u -p0 < ../patch/idn.patch
-fi
-
-# https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/1340250
-if [[ -n "$opt_no_as_needed" ]]; then
-    INSTX_LDLIBS+=("$opt_no_as_needed")
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***********************"
-echo "Configuring package"
-echo "***********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    idn_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${IDN_DIR}"
-    idn_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${IDN_DIR}"
-else
-    idn_cflags="${INSTX_CFLAGS}"
-    idn_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${idn_cflags}" \
-    CXXFLAGS="${idn_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --disable-rpath \
-    --disable-doc \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libunistring-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure IDN"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build IDN"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test IDN"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Installing package"
-echo "***********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${IDN_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${IDN_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$IDN_TAR" "$IDN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-idn2.sh b/build-idn2.sh
deleted file mode 100755
index 0f2f79637..000000000
--- a/build-idn2.sh
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds IDN2 from sources.
-
-IDN2_VER=2.3.4
-IDN2_TAR=libidn2-${IDN2_VER}.tar.gz
-IDN2_DIR=libidn2-${IDN2_VER}
-PKG_NAME=libidn2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= IDN2 ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "IDN2 ${IDN2_VER}..."
-
-if ! "${WGET}" -q -O "$IDN2_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/libidn/$IDN2_TAR"
-then
-    echo "Failed to download IDN2"
-    exit 1
-fi
-
-rm -rf "$IDN2_DIR" &>/dev/null
-gzip -d < "$IDN2_TAR" | tar xf -
-cd "$IDN2_DIR" || exit 1
-
-if [[ -e ../patch/idn2.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/idn2.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    idn2_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${IDN2_DIR}"
-    idn2_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${IDN2_DIR}"
-else
-    idn2_cflags="${INSTX_CFLAGS}"
-    idn2_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${idn2_cflags}" \
-    CXXFLAGS="${idn2_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --disable-doc \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libunistring-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure IDN2"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build IDN2"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test IDN2"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    #exit 1
-
-    echo ""
-    echo "************************"
-    echo "Installing anyways..."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${IDN2_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${IDN2_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$IDN2_TAR" "$IDN2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-jansson.sh b/build-jansson.sh
deleted file mode 100755
index 37f4d5841..000000000
--- a/build-jansson.sh
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Jansson from sources.
-
-JANSSON_VER=2.13.1
-JANSSON_TAR=jansson-$JANSSON_VER.tar.gz
-JANSSON_DIR=jansson-$JANSSON_VER
-PKG_NAME=jansson
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Jansson ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Jansson ${JANSSON_VER}..."
-
-if ! "${WGET}" -q -O "$JANSSON_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/akheron/jansson/archive/v$JANSSON_VER.tar.gz"
-then
-    echo "Failed to download Jansson"
-    exit 1
-fi
-
-rm -rf "$JANSSON_DIR" &>/dev/null
-gzip -d < "$JANSSON_TAR" | tar xf -
-cd "$JANSSON_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/jansson.patch ]]; then
-    patch -u -p0 < ../patch/jansson.patch
-    echo ""
-fi
-
-if [[ ! -f configure ]]
-then
-    if command -v autoreconf 2>/dev/null ; then
-        if ! autoreconf -i; then
-            echo "Failed to bootstrap Jansson"
-            exit 1
-        fi
-    else
-        echo "Failed to bootstrap Jansson"
-        exit 1
-    fi
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --disable-assert \
-    --with-libxml2 \
-    # --enable-lib-only
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Jansson"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build Jansson"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test Jansson"
-    echo "**********************"
-    #exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$JANSSON_TAR" "$JANSSON_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ldns-git.sh b/build-ldns-git.sh
deleted file mode 100755
index 3320f63ba..000000000
--- a/build-ldns-git.sh
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds LDNS from sources.
-# Also see https://github.com/NLnetLabs/ldns/commit/3373aa99
-
-LDNS_DIR=ldns-master
-LDNS_TAG=devel
-PKG_NAME=ldns-rc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unbound.sh
-then
-    echo "Failed to build Unbound"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= LDNS ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-rm -rf "$LDNS_DIR" &>/dev/null
-
-if ! git clone https://github.com/NLnetLabs/ldns.git "$LDNS_DIR"
-then
-    echo "Failed to clone LDNS"
-    exit 1
-fi
-
-cd "$LDNS_DIR"
-git checkout "$LDNS_TAG" &>/dev/null
-
-if [[ "$OSX_10p5_OR_BELOW" -ne 0 ]]; then
-    if [[ -e ../patch/ldns-darwin.patch ]]; then
-        patch -u -p0 < ../patch/ldns-darwin.patch
-        echo ""
-    fi
-fi
-
-sed '11iAM_INIT_AUTOMAKE' configure.ac > configure.ac.fixed
-mv configure.ac.fixed configure.ac
-
-if ! mkdir -p m4/ || ! libtoolize -ci || ! autoreconf -fi
-then
-    echo "Failed to bootstrap LDNS"
-    exit 1
-fi
-
-if [[ ! -f ./configure ]]
-then
-    echo "Failed to bootstrap LDNS"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-ed25519 \
-    --enable-ed448 \
-    --enable-rrtype-avc \
-    --enable-rrtype-svcb-https \
-    --with-ssl="${INSTX_PREFIX}" \
-    --with-ca-file="$INSTX_ICANN_FILE" \
-    --with-ca-path="$INSTX_ICANN_PATH" \
-    --with-trust-anchor="$INSTX_ROOTKEY_FILE" \
-    --disable-dane-ta-usage
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure LDNS"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build LDNS"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-echo
-echo "Unable to test ldns"
-echo
-
-# 'make test' fails. The tarball is missing the test framework.
-# Master is missing the source code for tpkg, and the test script
-# accesses internal company URLs.
-# https://github.com/NLnetLabs/ldns/issues/8
-# https://github.com/NLnetLabs/ldns/issues/13
-#MAKE_FLAGS=("test")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "Failed to test LDNS"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LDNS_TAR" "$LDNS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ldns.sh b/build-ldns.sh
deleted file mode 100755
index d1398c83a..000000000
--- a/build-ldns.sh
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds LDNS from sources.
-
-LDNS_TAR=ldns-1.8.1.tar.gz
-LDNS_DIR=ldns-1.8.1
-PKG_NAME=ldns
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unbound.sh
-then
-    echo "Failed to build Unbound"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= LDNS ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$LDNS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.nlnetlabs.nl/downloads/ldns/$LDNS_TAR"
-then
-    echo "Failed to download LDNS"
-    exit 1
-fi
-
-rm -rf "$LDNS_DIR" &>/dev/null
-gzip -d < "$LDNS_TAR" | tar xf -
-cd "$LDNS_DIR" || exit 1
-
-if [[ -e ../patch/ldns.patch ]]; then
-    patch -u -p0 < ../patch/ldns.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# OpenSSL 1.0.2 is missing these
-if "${INSTX_PREFIX}/bin/openssl" version | grep -q '1.0.2'; then
-    ldns_dane_verify=--disable-dane-verify
-    ldns_dane_ta_usage=--disable-dane-ta-usage
-else
-    ldns_ed25519=--enable-ed25519
-    ldns_ed448=--enable-ed448
-fi
-
-# https://github.com/NLnetLabs/ldns/issues/153
-# https://github.com/NLnetLabs/ldns/issues/154
-# https://github.com/NLnetLabs/ldns/issues/155
-if [[ "$IS_SOLARIS" -ne 0 ]]; then
-    ldns_inet_ntop="ac_cv_func_inet_ntop=yes"
-    ldns_inet_pton="ac_cv_func_inet_pton=yes"
-    ldns_b64_ntop="ac_cv_func_b64_ntop=no"
-    ldns_b64_pton="ac_cv_func_b64_pton=no"
-    ldns_ldlibs="-lresolv -lsocket -lnsl"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${ldns_ldlibs} ${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    ${ldns_ed25519} \
-    ${ldns_ed448} \
-    ${ldns_dane_verify} \
-    ${ldns_dane_ta_usage} \
-    ${ldns_inet_ntop} \
-    ${ldns_inet_pton} \
-    ${ldns_b64_ntop} \
-    ${ldns_b64_pton} \
-    --enable-rrtype-avc \
-    --with-drill \
-    --with-ssl="${INSTX_PREFIX}" \
-    --with-ca-file="$INSTX_ICANN_FILE" \
-    --with-ca-path="$INSTX_ICANN_PATH" \
-    --with-trust-anchor="$INSTX_ROOTKEY_FILE"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure LDNS"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build LDNS"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-echo
-echo "Unable to test ldns"
-echo
-
-# 'make test' fails. The tarball is missing the test framework.
-# Master is missing the source code for tpkg, and the test script
-# accesses internal company URLs.
-# https://github.com/NLnetLabs/ldns/issues/8
-# https://github.com/NLnetLabs/ldns/issues/13
-#MAKE_FLAGS=("test")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "Failed to test LDNS"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LDNS_TAR" "$LDNS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-less.sh b/build-less.sh
deleted file mode 100755
index 044fd8960..000000000
--- a/build-less.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Less from sources.
-
-LESS_TAR=less-590.tar.gz
-LESS_DIR=less-590
-PKG_NAME=less
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre.sh
-then
-    echo "Failed to build PCRE"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Less ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$LESS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/less/$LESS_TAR"
-then
-    echo "Failed to download Less"
-    exit 1
-fi
-
-rm -rf "$LESS_DIR" &>/dev/null
-gzip -d < "$LESS_TAR" | tar xf -
-cd "$LESS_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_CXXFLAGS} ${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-regex=pcre
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Less"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build Less"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test Less"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LESS_TAR" "$LESS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libassuan.sh b/build-libassuan.sh
deleted file mode 100755
index 6fadf1ef5..000000000
--- a/build-libassuan.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libassuan from sources.
-
-LIBASSUAN_VER=2.5.6
-LIBASSUAN_TAR="libassuan-${LIBASSUAN_VER}.tar.bz2"
-LIBASSUAN_DIR="libassuan-${LIBASSUAN_VER}"
-PKG_NAME=libassuan
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gpgerror.sh
-then
-    echo "Failed to build libgpg-error"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libassuan =============="
-echo "========================================"
-
-echo ""
-echo "*****************************"
-echo "Downloading package"
-echo "*****************************"
-
-if ! "${WGET}" -q -O "$LIBASSUAN_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gnupg.org/ftp/gcrypt/libassuan/$LIBASSUAN_TAR"
-then
-    echo "*****************************"
-    echo "Failed to download libassuan"
-    echo "*****************************"
-    exit 1
-fi
-
-rm -rf "$LIBASSUAN_DIR" &>/dev/null
-tar xjf "$LIBASSUAN_TAR"
-cd "$LIBASSUAN_DIR"
-
-# cp tests/Makefile.in tests/Makefile.in.orig
-
-if [[ -e ../patch/libassuan.patch ]]; then
-    patch -u -p0 < ../patch/libassuan.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "*****************************"
-echo "Configuring package"
-echo "*****************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --with-libgpg-error-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "*****************************"
-    echo "Failed to configure libassuan"
-    echo "*****************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "*****************************"
-echo "Building package"
-echo "*****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "*****************************"
-    echo "Failed to build libassuan"
-    echo "*****************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*****************************"
-echo "Testing package"
-echo "*****************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "*****************************"
-    echo "Failed to test libassuan"
-    echo "*****************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*****************************"
-echo "Installing package"
-echo "*****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LIBASSUAN_TAR" "$LIBASSUAN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libedit.sh b/build-libedit.sh
deleted file mode 100755
index 1a75631d1..000000000
--- a/build-libedit.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libedit from sources.
-
-LIBEDIT_TAR=libedit-20191231-3.1.tar.gz
-LIBEDIT_DIR=libedit-20191231-3.1
-PKG_NAME=libedit
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libedit ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$LIBEDIT_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.thrysoee.dk/editline/$LIBEDIT_TAR"
-then
-    echo "Failed to download libedit"
-    exit 1
-fi
-
-rm -rf "$LIBEDIT_DIR" &>/dev/null
-gzip -d < "$LIBEDIT_TAR" | tar xf -
-cd "$LIBEDIT_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libedit.patch ]]; then
-    patch -u -p0 < ../patch/libedit.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libedit"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libedit"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test libedit"
-    echo "**********************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LIBEDIT_TAR" "$LIBEDIT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libexosip2-rc.sh b/build-libexosip2-rc.sh
deleted file mode 100755
index 41e2482ee..000000000
--- a/build-libexosip2-rc.sh
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libexosip2 from sources.
-
-# Sources available at
-# http://download.savannah.nongnu.org/releases/exosip
-
-OSIP2_TAR=libexosip2-5.1.2.tar.gz
-OSIP2_DIR=libexosip2-5.1.2
-PKG_NAME=libexosip2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# c-ares needs a C++11 compiler
-if [[ "$INSTX_CXX11" -ne 0 ]]
-then
-    ENABLE_CARES=1
-else
-    ENABLE_CARES=0
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "$ENABLE_CARES" -eq 1 ]]
-then
-    if ! ./build-cares.sh
-    then
-        echo "Failed to build c-ares"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-ucommon.sh
-then
-    echo "Failed to build uCommon"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libosip2-rc.sh
-then
-    echo "Failed to build libosip2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== libeXosip2 =============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$OSIP2_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://sip.antisip.com/tmp//$OSIP2_TAR"
-then
-    echo "Failed to download libeXosip2"
-    exit 1
-fi
-
-rm -rf "$OSIP2_DIR" &>/dev/null
-gzip -d < "$OSIP2_TAR" | tar xf -
-cd "$OSIP2_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libexosip2-rc.patch ]]; then
-    patch -u -p0 < ../patch/libexosip2-rc.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-openssl
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libeXosip2"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-k" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libeXosip2"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to test libeXosip2"
-    echo "***************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install" "V=1")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OSIP2_TAR" "$OSIP2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libexosip2.sh b/build-libexosip2.sh
deleted file mode 100755
index ccb7a6f98..000000000
--- a/build-libexosip2.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libexosip2 from sources.
-
-# Sources available at
-# http://download.savannah.nongnu.org/releases/exosip
-
-OSIP2_TAR=libexosip2-5.1.1.tar.gz
-OSIP2_DIR=libexosip2-5.1.1
-PKG_NAME=libexosip2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# c-ares needs a C++11 compiler
-if [[ "$INSTX_CXX11" -ne 0 ]]
-then
-    ENABLE_CARES=1
-else
-    ENABLE_CARES=0
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "$ENABLE_CARES" -eq 1 ]]
-then
-    if ! ./build-cares.sh
-    then
-        echo "Failed to build c-ares"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-ucommon.sh
-then
-    echo "Failed to build uCommon"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libosip2.sh
-then
-    echo "Failed to build libosip2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== libeXosip2 =============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$OSIP2_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "http://download.savannah.nongnu.org/releases/exosip/$OSIP2_TAR"
-then
-    echo "Failed to download libeXosip2"
-    exit 1
-fi
-
-rm -rf "$OSIP2_DIR" &>/dev/null
-gzip -d < "$OSIP2_TAR" | tar xf -
-cd "$OSIP2_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libexosip2.patch ]]; then
-    patch -u -p0 < ../patch/libexosip2.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-openssl
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libeXosip2"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libeXosip2"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to test libeXosip2"
-    echo "***************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install" "V=1")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OSIP2_TAR" "$OSIP2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libexpat.sh b/build-libexpat.sh
deleted file mode 100755
index 40edcc7a7..000000000
--- a/build-libexpat.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Expat from sources.
-
-EXPAT_VER=2.4.6
-EXPAT_GH_VER=R_2_4_6
-EXPAT_TAR=expat-${EXPAT_VER}.tar.bz2
-EXPAT_DIR=expat-${EXPAT_VER}
-PKG_NAME=expat
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libexpat ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$EXPAT_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/libexpat/libexpat/releases/download/$EXPAT_GH_VER/$EXPAT_TAR"
-then
-    echo "Failed to download libexpat"
-    exit 1
-fi
-
-rm -rf "$EXPAT_DIR" &>/dev/null
-bzip2 -dk < "$EXPAT_TAR" | tar xf -
-cd "$EXPAT_DIR" || exit 1
-
-if [[ -e ../patch/expat.patch ]]; then
-    patch -u -p0 < ../patch/expat.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${IS_SOLARIS}" -ne 0 ]]; then
-    # Needed for INFINITY and NAN in test suite; see isinf(3m) man page.
-    expat_cflags="${INSTX_CFLAGS} -std=c99"
-else
-    expat_cflags="${INSTX_CFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${expat_cflags}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure --enable-shared \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --without-docbook \
-    --without-xmlwf
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libexpat"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libexpat"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test libexpat"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$EXPAT_TAR" "$EXPAT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libffi.sh b/build-libffi.sh
deleted file mode 100755
index d7ca0edc8..000000000
--- a/build-libffi.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Libffi from sources.
-
-LIBFFI_VER=3.2.1
-LIBFFI_TAR=libffi-${LIBFFI_VER}.tar.gz
-LIBFFI_DIR=libffi-${LIBFFI_VER}
-PKG_NAME=libffi
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libffi ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$LIBFFI_TAR" --ca-certificate="${DIGICERT_ROOT}" \
-     "ftp://sourceware.org/pub/libffi/$LIBFFI_TAR"
-then
-    echo "Failed to download libffi"
-    exit 1
-fi
-
-rm -rf "$LIBFFI_DIR" &>/dev/null
-gzip -d < "$LIBFFI_TAR" | tar xf -
-cd "$LIBFFI_DIR"
-
-# cp src/x86/ffi64.c src/x86/ffi64.c.old
-
-if [[ -e ../patch/libffi.patch ]]; then
-    patch -u -p0 < ../patch/libffi.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libffi"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libffi"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-   echo "Failed to test libffi"
-   exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LIBFFI_TAR" "$LIBFFI_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libgcrypt.sh b/build-libgcrypt.sh
deleted file mode 100755
index 2b7ca5690..000000000
--- a/build-libgcrypt.sh
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libgcrypt from sources.
-
-GCRYPT_VER=1.10.2
-GCRYPT_TAR="libgcrypt-${GCRYPT_VER}.tar.bz2"
-GCRYPT_DIR="libgcrypt-${GCRYPT_VER}"
-GCRYPT_LOG="libgcrypt.log"
-PKG_NAME=libgcrypt
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gpgerror.sh
-then
-    echo "Failed to build Libgpg-error"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-nPth.sh
-then
-    echo "Failed to build nPth"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libgcrypt =============="
-echo "========================================"
-
-echo ""
-echo "*****************************"
-echo "Downloading package"
-echo "*****************************"
-
-echo ""
-echo "libgcrypt ${GCRYPT_VER}..."
-
-if ! "${WGET}" -q -O "$GCRYPT_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gnupg.org/ftp/gcrypt/libgcrypt/$GCRYPT_TAR"
-then
-    echo "Failed to download libgcrypt"
-    exit 1
-fi
-
-rm -rf "$GCRYPT_DIR" &>/dev/null
-tar xjf "$GCRYPT_TAR"
-cd "$GCRYPT_DIR"
-
-if [[ -e ../patch/libgcrypt.patch ]]; then
-    echo ""
-    echo "****************************"
-    echo "Patching package"
-    echo "****************************"
-
-    patch -u -p0 < ../patch/libgcrypt.patch
-fi
-
-is_apple_m1=$(sysctl machdep.cpu.brand_string 2>&1 | grep -i -c 'Apple M1')
-if [[ "${is_apple_m1}" -eq 1 ]]; then
-    if [[ -e ../patch/libgcrypt-darwin.patch ]]; then
-        echo ""
-        echo "****************************"
-        echo "Patching package (Darwin)"
-        echo "****************************"
-
-        patch -u -p0 < ../patch/libgcrypt-darwin.patch
-    fi
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*****************************"
-echo "Configuring package"
-echo "*****************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    gcrypt_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GCRYPT_DIR}"
-    gcrypt_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${GCRYPT_DIR}"
-else
-    gcrypt_cflags="${INSTX_CFLAGS}"
-    gcrypt_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${gcrypt_cflags}" \
-    CXXFLAGS="${gcrypt_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --with-libgpg-error-prefix="${INSTX_PREFIX}" \
-    --with-pth-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure libgcrypt"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*****************************"
-echo "Building package"
-echo "*****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build libgcrypt"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Testing package"
-echo "*****************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}" 2>&1 | tee "${GCRYPT_LOG}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test libgcrypt"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Installing package"
-echo "*****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GCRYPT_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${GCRYPT_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GCRYPT_LOG" "$GCRYPT_TAR" "$GCRYPT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libgsl-git.sh b/build-libgsl-git.sh
deleted file mode 100755
index 1b2c027b0..000000000
--- a/build-libgsl-git.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GSL from sources.
-
-GSL_TAR=gsl-2.6.tar.gz
-GSL_DIR=gsl-2.6
-PKG_NAME=libgsl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== GSL ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-rm -rf "$GSL_DIR" &>/dev/null
-
-if ! git clone git://git.savannah.gnu.org/gsl.git "$GSL_DIR"
-then
-    echo "Failed to clone GSL"
-    exit 1
-fi
-
-cd "$GSL_DIR"
-git checkout master &>/dev/null
-
-if ! ./autogen.sh
-then
-    echo "Failed to generate GSL build files"
-    exit 1
-fi
-
-if [[ ! -f ./configure ]]
-then
-    echo "Failed to autoreconf GSL"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="-lm ${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure GSL"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build GSL"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test GSL"
-    echo "**********************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GSL_TAR" "$GSL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libgsl.sh b/build-libgsl.sh
deleted file mode 100755
index 33492d753..000000000
--- a/build-libgsl.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds GSL from sources.
-
-GSL_VER=2.7.1
-GSL_TAR=gsl-${GSL_VER}.tar.gz
-GSL_DIR=gsl-${GSL_VER}
-PKG_NAME=libgsl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== GSL ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$GSL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/gsl/$GSL_TAR"
-then
-    echo "Failed to download GSL"
-    exit 1
-fi
-
-rm -rf "$GSL_DIR" &>/dev/null
-gzip -d < "$GSL_TAR" | tar xf -
-cd "$GSL_DIR" || exit 1
-
-# cp spmatrix/test_complex_source.c spmatrix/test_complex_source.c.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libgsl.patch ]]; then
-    patch -u -p0 < ../patch/libgsl.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="-lm ${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure GSL"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build GSL"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test GSL"
-    echo "**********************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$GSL_TAR" "$GSL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libhsts.sh b/build-libhsts.sh
deleted file mode 100755
index b054dff60..000000000
--- a/build-libhsts.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libhsts from sources.
-
-HSTS_VER=0.1.0
-HSTS_TAR=libhsts-${HSTS_VER}.tar.gz
-HSTS_DIR=libhsts-${HSTS_VER}
-PKG_NAME=libhsts
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "======================================="
-echo "=============== libhsts ==============="
-echo "======================================="
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "libhsts ${HSTS_VER}..."
-
-if ! "${WGET}" -q -O "$HSTS_TAR" --ca-certificate="${GITLAB_ROOT}" \
-     "https://gitlab.com/rockdaboot/libhsts/uploads/4753f61b5a3c6253acf4934217816e3f/$HSTS_TAR"
-then
-    echo "Failed to download libhsts"
-    exit 1
-fi
-
-rm -rf "$HSTS_DIR" &>/dev/null
-gzip -d < "$HSTS_TAR" | tar xf -
-cd "$HSTS_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/hsts.patch ]]; then
-    patch -u -p0 < ../patch/hsts.patch
-    echo ""
-fi
-
-# This command fails, but downloads the data???
-# https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00055.html
-if "${WGET}" --debug -O hsts.json "$HSTS_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-   'https://raw.github.com/chromium/chromium/master/net/http/transport_security_state_static.json'
-then
-    sed 's/^ *\/\/.*$//g' hsts.json > hsts.json.fixed
-    mv hsts.json.fixed hsts.json
-else
-    echo "Failed to download hsts.json"
-    exit 1
-fi
-
-# This command fails, too
-if ! src/hsts-make-dafsa --output-format=binary hsts.json hsts.dafsa
-then
-    echo "Failed to transform hsts.json"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "**********************"
-    echo "Failed to configure libhsts"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to build libhsts"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test libhsts"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$HSTS_TAR" "$HSTS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libksba.sh b/build-libksba.sh
deleted file mode 100755
index ee1724d02..000000000
--- a/build-libksba.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libksba from sources.
-
-LIBKSBA_VER=1.6.4
-LIBKSBA_TAR="libksba-${LIBKSBA_VER}.tar.bz2"
-LIBKSBA_DIR="libksba-${LIBKSBA_VER}"
-PKG_NAME=libksba
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gpgerror.sh
-then
-    echo "Failed to build libgpg-error"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libksba ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "libksba ${LIBKSBA_VER}..."
-
-if ! "${WGET}" -q -O "$LIBKSBA_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.gnupg.org/ftp/gcrypt/libksba/$LIBKSBA_TAR"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to download libksba"
-    echo "***************************"
-    exit 1
-fi
-
-rm -rf "$LIBKSBA_DIR" &>/dev/null
-tar xjf "$LIBKSBA_TAR"
-cd "$LIBKSBA_DIR"
-
-#cp tests/Makefile.in tests/Makefile.in.orig
-
-if [[ -e ../patch/libksba.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/libksba.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --with-libgpg-error-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure libksba"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build libksba"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test libksba"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LIBKSBA_TAR" "$LIBKSBA_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libosip2-rc.sh b/build-libosip2-rc.sh
deleted file mode 100755
index a5c0d807f..000000000
--- a/build-libosip2-rc.sh
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libosip2 from sources.
-
-OSIP2_TAR=libosip2-5.1.2.tar.gz
-OSIP2_DIR=libosip2-5.1.2
-PKG_NAME=libosip2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ucommon.sh
-then
-    echo "Failed to build uCommon"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libosip2 ==============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$OSIP2_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://sip.antisip.com/tmp/$OSIP2_TAR"
-then
-    echo "Failed to download libosip2"
-    exit 1
-fi
-
-rm -rf "$OSIP2_DIR" &>/dev/null
-gzip -d < "$OSIP2_TAR" | tar xf -
-cd "$OSIP2_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libosip2-rc.patch ]]; then
-    patch -u -p0 < ../patch/libosip2-rc.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-test
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libosip2"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-k" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libosip2"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to test libosip2"
-    echo "***************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OSIP2_TAR" "$OSIP2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libosip2.sh b/build-libosip2.sh
deleted file mode 100755
index 58a959547..000000000
--- a/build-libosip2.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libosip2 from sources.
-
-OSIP2_TAR=libosip2-5.1.1.tar.gz
-OSIP2_DIR=libosip2-5.1.1
-PKG_NAME=libosip2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ucommon.sh
-then
-    echo "Failed to build uCommon"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libosip2 ==============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$OSIP2_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/osip/$OSIP2_TAR"
-then
-    echo "Failed to download libosip2"
-    exit 1
-fi
-
-rm -rf "$OSIP2_DIR" &>/dev/null
-gzip -d < "$OSIP2_TAR" | tar xf -
-cd "$OSIP2_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libosip2.patch ]]; then
-    patch -u -p0 < ../patch/libosip2.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-test
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libosip2"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libosip2"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to test libosip2"
-    echo "***************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OSIP2_TAR" "$OSIP2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libpsl.sh b/build-libpsl.sh
deleted file mode 100755
index c846bb6ec..000000000
--- a/build-libpsl.sh
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds PSL from sources.
-
-PSL_VER=0.21.1
-PSL_TAR=libpsl-${PSL_VER}.tar.gz
-PSL_DIR=libpsl-${PSL_VER}
-PKG_NAME=libpsl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-idn2.sh
-then
-    echo "Failed to build IDN2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libpsl ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$PSL_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/rockdaboot/libpsl/releases/download/$PSL_VER/$PSL_TAR"
-then
-    echo "Failed to download libpsl"
-    exit 1
-fi
-
-rm -rf "$PSL_DIR" &>/dev/null
-gzip -d < "$PSL_TAR" | tar xf -
-cd "$PSL_DIR"
-
-if [[ -e ../patch/libpsl.patch ]]; then
-    patch -u -p0 < ../patch/libpsl.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Solaris is a tab bit stricter than libc
-if [[ "$IS_SOLARIS" -eq 1 ]]; then
-    # Don't use CPPFLAGS. _XOPEN_SOURCE will cross-pollinate into CXXFLAGS.
-    INSTX_CFLAGS+=("-D_XOPEN_SOURCE=600 -std=gnu99")
-    # INSTX_CXXFLAGS+=("-std=c++03")
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --enable-runtime=libidn2 \
-    --enable-builtin=libidn2 \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libpsl"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Updating package"
-echo "**********************"
-
-# Update the PSL data file
-echo "Updating Public Suffix List (PSL) data file"
-mkdir -p list
-
-# Per the comments at publicsuffix.org/:
-#   Please pull this list from, and only from
-#   https://publicsuffix.org/list/public_suffix_list.dat,
-#   rather than any other VCS sites. Pulling from any other
-#   URL is not guaranteed to be supported.
-if ! "${WGET}" -q -O "list/public_suffix_list.dat" --ca-certificate="${THE_CA_ZOO}" \
-     "https://publicsuffix.org/list/public_suffix_list.dat"
-then
-    echo "Failed to update Public Suffix List (PSL)"
-    exit 1
-fi
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libpsl"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Fixing LD_LIBRARY_PATH"
-echo "**********************"
-
-# The self tests fail if the old libpsl is loaded
-LD_LIBRARY_PATH="$PWD/src/.libs:$LD_LIBRARY_PATH"
-DYLD_LIBRARY_PATH="$PWD/src/.libs:$DYLD_LIBRARY_PATH"
-
-LD_LIBRARY_PATH=$(echo "$LD_LIBRARY_PATH" | tr -s ':' | sed -e 's/^:\(.*\)/\1/' | sed -e 's/:$//g')
-DYLD_LIBRARY_PATH=$(echo "$DYLD_LIBRARY_PATH" | tr -s ':' | sed -e 's/^:\(.*\)/\1/' | sed -e 's/:$//g')
-
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test libpsl"
-    echo ""
-    echo "If you have existing libpsl libraries at ${INSTX_LIBDIR}"
-    echo "then you should manually delete them and run this script again."
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PSL_TAR" "$PSL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libtasn1.sh b/build-libtasn1.sh
deleted file mode 100755
index 2c9eead0d..000000000
--- a/build-libtasn1.sh
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libtasn1 from sources.
-
-TASN1_VER=4.19.0
-TASN1_TAR=libtasn1-${TASN1_VER}.tar.gz
-TASN1_DIR=libtasn1-${TASN1_VER}
-PKG_NAME=libtasn1
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== libtasn1 ==============="
-echo "========================================"
-
-echo ""
-echo "****************************"
-echo "Downloading package"
-echo "****************************"
-
-if ! "${WGET}" -q -O "$TASN1_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/libtasn1/$TASN1_TAR"
-then
-    echo "Failed to download libtasn1"
-    exit 1
-fi
-
-rm -rf "$TASN1_DIR" &>/dev/null
-gzip -d < "$TASN1_TAR" | tar xf -
-cd "$TASN1_DIR" || exit 1
-
-# cp lib/decoding.c lib/decoding.c.orig
-# cp src/Makefile.am src/Makefile.am.orig
-
-if [[ -e ../patch/libtasn1.patch ]]; then
-    patch -u -p0 < ../patch/libtasn1.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "****************************"
-echo "Configuring package"
-echo "****************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    tasn1_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${TASN1_DIR}"
-    tasn1_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${TASN1_DIR}"
-else
-    tasn1_cflags="${INSTX_CFLAGS}"
-    tasn1_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${tasn1_cflags}" \
-    CXXFLAGS="${tasn1_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --disable-doc
-
-if [[ "$?" -ne 0 ]]; then
-    echo "****************************"
-    echo "Failed to configure libtasn1"
-    echo "****************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "****************************"
-echo "Building package"
-echo "****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build libtasn1"
-    echo "****************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Testing package"
-echo "****************************"
-
-# For NetBSD and failed self tests.
-LD_LIBRARY_PATH="$PWD/lib/.libs:$LD_LIBRARY_PATH"
-LD_LIBRARY_PATH=$(echo -n "$LD_LIBRARY_PATH" | sed 's/:$//')
-export LD_LIBRARY_PATH
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build libtasn1"
-    echo "****************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Installing package"
-echo "****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${TASN1_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${TASN1_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$TASN1_TAR" "$TASN1_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libtool.sh b/build-libtool.sh
deleted file mode 100755
index 3997f7b26..000000000
--- a/build-libtool.sh
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Libtool from sources.
-
-LIBTOOL_TAR=libtool-2.4.6.tar.gz
-LIBTOOL_DIR=libtool-2.4.6
-PKG_NAME=libtool
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libtool ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$LIBTOOL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/libtool/$LIBTOOL_TAR"
-then
-    echo "Failed to download libtool and libltdl"
-    exit 1
-fi
-
-rm -rf "$LIBTOOL_DIR" &>/dev/null
-gzip -d < "$LIBTOOL_TAR" | tar xf -
-cd "$LIBTOOL_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--enable-ltdl-install")
-
-if [[ "$IS_DARWIN" -ne 0 ]]; then
-    CONFIG_OPTS+=("--program-prefix=g")
-fi
-
-CONFIG_LIBTOOL=$(command -v glibtool 2>/dev/null)
-if [[ -z "$CONFIG_LIBTOOL" ]]; then
-    CONFIG_LIBTOOL=$(command -v libtool 2>/dev/null)
-fi
-
-CONFIG_M4=$(command -v m4 2>/dev/null)
-if [[ -e "${INSTX_PREFIX}/bin/m4" ]]; then
-    CONFIG_M4="${INSTX_PREFIX}/bin/m4"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-    M4="${CONFIG_M4}" \
-    LIBTOOL="${CONFIG_LIBTOOL}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libtool and libltdl"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build libtool and libltdl"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-# https://lists.gnu.org/archive/html/bug-libtool/2017-10/msg00009.html
-# MAKE_FLAGS=("check" "-k" "V=1")
-# if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-# then
-#     echo "Failed to test libtool and libltdl"
-#     exit 1
-# fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LIBTOOL_TAR" "$LIBTOOL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libxml2.sh b/build-libxml2.sh
deleted file mode 100755
index 30229fbaa..000000000
--- a/build-libxml2.sh
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libxml2 from sources.
-
-# https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.2.tar.xz
-
-XML2_URL=2.11
-XML2_VER=2.11.5
-XML2_XZ=libxml2-${XML2_VER}.tar.xz
-XML2_TAR=libxml2-${XML2_VER}.tar
-XML2_DIR=libxml2-${XML2_VER}
-PKG_NAME=libxml2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-# libxml2 only uses iConvert
-
-if ! ./build-iconv-gettext.sh
-then
-    echo "Failed to build iConv and GetText"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libxml2 ==============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "libxml2 ${XML2_VER}..."
-
-# To view the FTP listing, curl ftp://xmlsoft.org/libxml2/
-# Also see https://mail.gnome.org/archives/xml/2022-January/msg00011.html.
-
-if ! "${WGET}" -q -O "${XML2_XZ}" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://download.gnome.org/sources/libxml2/${XML2_URL}/${XML2_XZ}"
-then
-    echo "Failed to download Grep"
-    exit 1
-fi
-
-rm -rf "${XML2_TAR}" "${XML2_DIR}" &>/dev/null
-unxz "${XML2_XZ}" && tar -xf "${XML2_TAR}"
-cd "${XML2_DIR}" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libxml2.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-    patch -u -p0 < ../patch/libxml2.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    libxml2_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${XML2_DIR}"
-    libxml2_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${XML2_DIR}"
-else
-    libxml2_cflags="${INSTX_CFLAGS}"
-    libxml2_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${libxml2_cflags}" \
-    CXXFLAGS="${libxml2_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --with-fexceptions \
-    --with-iconv="${INSTX_PREFIX}" \
-    --with-zlib="${INSTX_PREFIX}" \
-    --without-legacy \
-    --without-python
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure libxml2"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build libxml2"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-# libxml2 appears to hang on old PowerMacs. Be patient.
-# https://mail.gnome.org/archives/xml/2021-March/msg00013.html
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test libxml2"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${XML2_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${XML2_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("${XML2_TAR}" "${XML2_DIR}")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-libxslt.sh b/build-libxslt.sh
deleted file mode 100755
index 172e642c5..000000000
--- a/build-libxslt.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds libxslt from sources.
-
-XSLT_VER=1.1.34
-XSLT_TAR="libxslt-${XSLT_VER}.tar.gz"
-XSLT_DIR="libxslt-${XSLT_VER}"
-PKG_NAME=libxslt
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libgcrypt.sh
-then
-    echo "Failed to build libgcrypt"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ libxslt ==============="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-# To view the FTP listing, curl ftp://xmlsoft.org/libxml2/
-# Also see https://mail.gnome.org/archives/xml/2022-January/msg00011.html.
-
-if ! "${WGET}" -q -O "$XSLT_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "ftp://xmlsoft.org/libxml2/$XSLT_TAR"
-then
-    echo "Failed to download libxslt"
-    exit 1
-fi
-
-rm -rf "$XSLT_DIR" &>/dev/null
-gzip -d < "$XSLT_TAR" | tar xf -
-cd "$XSLT_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/libxslt.patch ]]; then
-    patch -u -p0 < ../patch/libxslt.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    libxslt_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${XML2_DIR}"
-    libxslt_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${XML2_DIR}"
-else
-    libxslt_cflags="${INSTX_CFLAGS}"
-    libxslt_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${libxslt_cflags}" \
-    CXXFLAGS="${libxslt_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="-lxml2 ${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --with-libxml-prefix="${INSTX_PREFIX}" \
-    --with-crypto \
-    --without-python \
-    --without-profiler
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure libxslt"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "************************"
-    echo "Failed to build libxslt"
-    echo "************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "************************"
-    echo "Failed to test libxslt"
-    echo "************************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${XSLT_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${XSLT_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$XSLT_TAR" "$XSLT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-lz4.sh b/build-lz4.sh
deleted file mode 100755
index cdc8c6c45..000000000
--- a/build-lz4.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds LZ4 from sources.
-
-LZ4_VER=1.9.3
-LZ4_TAR=v${LZ4_VER}.tar.gz
-LZ4_DIR=lz4-${LZ4_VER}
-PKG_NAME=lz4
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== LZ4 ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "LZ4 ${LZ4_VER}..."
-
-# https://github.com/lz4/lz4/archive/refs/tags/v1.9.3.tar.gz
-if ! "${WGET}" -q -O "$LZ4_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/lz4/lz4/archive/refs/tags/$LZ4_TAR"
-then
-    echo "Failed to download LZ4"
-    exit 1
-fi
-
-rm -rf "$LZ4_DIR" &>/dev/null
-gzip -d < "$LZ4_TAR" | tar xf -
-cd "$LZ4_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/lz4.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/lz4.patch
-fi
-
-# Failed 'make check'
-cp -p lib/xxhash.h programs/xxhash.h
-cp -p lib/lz4hc.h programs/lz4hc.h
-cp -p lib/lz4.h programs/lz4.h
-cp -p lib/lz4frame.h programs/lz4frame.h
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    lz4_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CRYPTOPP_DIR}"
-    lz4_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${CRYPTOPP_DIR}"
-else
-    lz4_cflags="${INSTX_CFLAGS}"
-    lz4_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "$INSTX_CPPFLAGS" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "$INSTX_ASFLAGS" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${lz4_cflags}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${lz4_cxxflags}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("allmost" "-j" "${INSTX_JOBS}" "V=1")
-MAKE_FLAGS+=(CPPFLAGS="-I. ${CPPFLAGS}")
-MAKE_FLAGS+=(ASFLAGS="${ASFLAGS}")
-MAKE_FLAGS+=(CFLAGS="${CFLAGS}")
-MAKE_FLAGS+=(CXXFLAGS="${CXXFLAGS}")
-MAKE_FLAGS+=(LDFLAGS="${LDFLAGS}")
-MAKE_FLAGS+=(LIBS="${LIBS}")
-MAKE_FLAGS+=(LDLIBS="${LIBS}")
-
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build LZ4"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test LZ4"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install" PREFIX="${INSTX_PREFIX}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LZ4_TAR" "$LZ4_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-lzip.sh b/build-lzip.sh
deleted file mode 100755
index cfd337f9d..000000000
--- a/build-lzip.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Lzip from sources. Lzip is treated
-# like a library rather then a program to avoid rebuilding
-# it in other recipes like Curl and Wget.
-
-LZIP_VER=1.22
-LZIP_TAR=lzip-${LZIP_VER}.tar.gz
-LZIP_DIR=lzip-${LZIP_VER}
-PKG_NAME=lzip
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= lzip ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Lzip ${LZIP_VER}..."
-
-# Savannah uses a Let's Encrypt certificate. Savannah uses mirrors.sarata.com as a
-# storage backend. Sometimes mirrors.sarata.com uses a Let's Encrypt certificate,
-# other times the mirror use a Go Daddy certificate. Throw the CA Zoo at it...
-if ! "${WGET}" -q -O "$LZIP_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://download.savannah.gnu.org/releases/lzip/$LZIP_TAR"
-then
-    echo "Failed to download Lzip"
-    exit 1
-fi
-
-rm -rf "$LZIP_DIR" &>/dev/null
-gzip -d < "$LZIP_TAR" | tar xf -
-cd "$LZIP_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/lzip.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/lzip.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Lzip"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "********************"
-    echo "Failed to build Lzip"
-    echo "********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*******************"
-    echo "Failed to test Lzip"
-    echo "*******************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LZIP_TAR" "$LZIP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-m4-git.sh b/build-m4-git.sh
deleted file mode 100755
index 36035be42..000000000
--- a/build-m4-git.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds M4 from sources.
-
-M4_DIR=m4-master
-PKG_NAME=m4-master
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ M4 Git ================"
-echo "========================================"
-
-rm -rf "$M4_DIR" 2>/dev/null
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-if ! git clone https://git.savannah.gnu.org/git/m4.git "$M4_DIR";
-then
-    echo "Failed to clone M4"
-    exit 1
-fi
-
-cd "$M4_DIR" || exit 1
-
-if ! git checkout branch-1.4 1>/dev/null;
-then
-    echo "Failed to checkout M4"
-    exit 1
-fi
-
-if ! ./bootstrap
-then
-    echo "Failed to generate M4 build files"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-c++
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure M4"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build M4"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-   echo "Failed to test M4"
-   exit 1
-fi
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$M4_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-m4-rc.sh b/build-m4-rc.sh
deleted file mode 100755
index 9c55f3bab..000000000
--- a/build-m4-rc.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds M4 from sources.
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== M4 =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "M4 rc..."
-
-M4_XZ=m4-1.4.18.22-dfa46.tar.xz
-M4_TAR=m4-1.4.18.22-dfa46.tar
-M4_DIR=m4-1.4.18.22-dfa46
-
-if ! "${WGET}" -q -O "$M4_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.cs.ucla.edu/~eggert/m4-1.4.18.22-dfa46.tar.xz"
-then
-    echo "Failed to download M4"
-    exit 1
-fi
-
-rm -rf "$M4_TAR" "$M4_DIR" &>/dev/null
-unxz "$M4_XZ" && tar -xf "$M4_TAR"
-cd "$M4_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-c++
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure M4"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "m4"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "MAKEINFO=true" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build M4"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "m4"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$M4_TAR" "$M4_DIR")
-
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-m4.sh b/build-m4.sh
deleted file mode 100755
index 83942badd..000000000
--- a/build-m4.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds M4 from sources.
-
-M4_VER=1.4.19
-M4_TAR="m4-${M4_VER}.tar.gz"
-M4_DIR="m4-${M4_VER}"
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== M4 =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "M4 ${M4_VER}..."
-
-if ! "${WGET}" -q -O "$M4_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/m4/$M4_TAR"
-then
-    echo "Failed to download M4"
-    exit 1
-fi
-
-rm -rf "$M4_DIR" &>/dev/null
-gzip -d < "$M4_TAR" | tar xf -
-cd "$M4_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-c++
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure M4"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "m4"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "MAKEINFO=true" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build M4"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "m4"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$M4_TAR" "$M4_DIR")
-
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mailutils.sh b/build-mailutils.sh
deleted file mode 100755
index f6f8e67d1..000000000
--- a/build-mailutils.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Mailutils from sources.
-
-MAILUTILS_VER=3.12
-MAILUTILS_TAR=mailutils-${MAILUTILS_VER}.tar.gz
-MAILUTILS_DIR=mailutils-${MAILUTILS_VER}
-PKG_NAME=mailutils
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gnutls.sh
-then
-    echo "Failed to build GnuTLS"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============ GNU Mailutils ============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Mailutils ${MAILUTILS_VER}..."
-
-if ! "${WGET}" -q -O "$MAILUTILS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/mailutils/$MAILUTILS_TAR"
-then
-    echo "Failed to download Mailutils"
-    exit 1
-fi
-
-rm -rf "$MAILUTILS_DIR" &>/dev/null
-gzip -d < "$MAILUTILS_TAR" | tar xf -
-cd "$MAILUTILS_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-gnutls \
-    --enable-ipv6 \
-    --disable-radius \
-    --disable-python
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Mailutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build Mailutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Mailutils"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MAILUTILS_TAR" "$MAILUTILS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-make.sh b/build-make.sh
deleted file mode 100755
index 7e592857f..000000000
--- a/build-make.sh
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Make from sources.
-
-MAKE_VER=4.2.1
-MAKE_TAR=make-${MAKE_VER}.tar.gz
-MAKE_DIR=make-${MAKE_VER}
-PKG_NAME=make
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Make ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$MAKE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/make/$MAKE_TAR"
-then
-    echo "Failed to download Make"
-    exit 1
-fi
-
-rm -rf "$MAKE_DIR" &>/dev/null
-gzip -d < "$MAKE_TAR" | tar xf -
-cd "$MAKE_DIR"
-
-if [[ -e ../patch/make.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/make.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Make"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Make"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-# Can't pass self tests...
-MAKE_FLAGS=("PERL_USE_UNSAFE_INC=1" "check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Make"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "************************"
-    echo "Installing anyways..."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MAKE_TAR" "$MAKE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-makedepend.sh b/build-makedepend.sh
deleted file mode 100755
index 622ae766f..000000000
--- a/build-makedepend.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds makedepend from sources.
-
-MAKED_VER=1.0.6
-MAKED_TAR=makedepend-${MAKED_VER}.tar.gz
-MAKED_DIR=makedepend-${MAKED_VER}
-PKG_NAME=makedepend
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-xproto.sh
-then
-    echo "Failed to build Xproto"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== makedepend =============="
-echo "========================================"
-
-echo ""
-echo "******************************"
-echo "Downloading package"
-echo "******************************"
-
-echo ""
-echo "makedepend ${MAKED_VER}..."
-
-# https://www.x.org/releases/individual/util/makedepend-1.0.6.tar.gz
-
-if ! "${WGET}" -q -O "$MAKED_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.x.org/releases/individual/util/$MAKED_TAR"
-then
-    echo "Failed to download makedepend"
-    exit 1
-fi
-
-rm -rf "$MAKED_DIR" &>/dev/null
-gzip -d < "$MAKED_TAR" | tar xf -
-cd "$MAKED_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/makedepend.patch ]]; then
-    echo ""
-    echo "******************************"
-    echo "Patching package"
-    echo "******************************"
-
-    patch -u -p0 < ../patch/makedepend.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "******************************"
-echo "Configuring package"
-echo "******************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "******************************"
-    echo "Failed to configure makedepend"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "******************************"
-echo "Building package"
-echo "******************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "******************************"
-    echo "Failed to build makedepend"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "******************************"
-echo "Testing package"
-echo "******************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "******************************"
-    echo "Failed to test makedepend"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "******************************"
-echo "Installing package"
-echo "******************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MAKED_TAR" "$MAKED_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mandoc.sh b/build-mandoc.sh
deleted file mode 100755
index ba3023c24..000000000
--- a/build-mandoc.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds mandoc from sources.
-
-MANDOC_TAR=mandoc-1.14.6.tar.gz
-MANDOC_DIR=mandoc-1.14.6
-PKG_NAME=mandoc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Mandoc ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$MANDOC_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://mandoc.bsd.lv/snapshots/$MANDOC_TAR"
-then
-    echo "Failed to download MANDOC"
-    exit 1
-fi
-
-rm -rf "$MANDOC_DIR" &>/dev/null
-gzip -d < "$MANDOC_TAR" | tar xf -
-cd "$MANDOC_DIR" || exit 1
-
-# cp configure configure.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/mandoc.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/mandoc.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-echo "" > configure.local
-{
-    echo "PREFIX='${INSTX_PREFIX}'"
-    echo "BINDIR='\${PREFIX}/bin'"
-    echo "SBINDIR='\${PREFIX}/sbin'"
-    echo "MANDIR='\${PREFIX}/man'"
-
-    echo "CC='$CC'"
-    echo "ASFLAGS='${ASFLAGS}'"
-    echo "CFLAGS='${CPPFLAGS} ${CFLAGS} -I.'"
-    echo "LDFLAGS='${LDFLAGS}'"
-    echo "LDADD='${LIBS}'"
-
-    echo ""
-}  >> configure.local
-
-# Mandoc uses configure.local
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure MANDOC"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build MANDOC"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MANDOC_TAR" "$MANDOC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mawk.sh b/build-mawk.sh
deleted file mode 100755
index e4d154369..000000000
--- a/build-mawk.sh
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Mawk and its dependencies from sources.
-# It is needed on Debian and Ubuntu, not Fedora, OS X, Solaris or friends
-
-MAWK_TAR=mawk.tar.gz
-MAWK_DIR=mawk-1.3.4-20200120
-PKG_NAME=mawk
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Mawk ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$MAWK_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "http://invisible-island.net/datafiles/release/$MAWK_TAR"
-then
-    echo "Failed to download mawk"
-    exit 1
-fi
-
-rm -rf "$MAWK_DIR" &>/dev/null
-gzip -d < "$MAWK_TAR" | tar xf -
-cd "$MAWK_DIR" || exit 1
-
-if [[ -e ../patch/mawk.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/mawk.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Mawk"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Mawk"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test Mawk"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    #printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S ln -s "${INSTX_PREFIX}/bin/mawk" "${INSTX_PREFIX}/bin/awk" 2>/dev/null
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    #ln -s "${INSTX_PREFIX}/bin/mawk" "${INSTX_PREFIX}/bin/awk" 2>/dev/null
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MAWK_TAR" "$MAWK_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mg.sh b/build-mg.sh
deleted file mode 100755
index 0ed6dd0f9..000000000
--- a/build-mg.sh
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds mg from sources.
-
-MG_TAR=20210609.tar.gz
-MG_DIR=mg-20210609
-PKG_NAME=mg
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libbsd.sh
-then
-    echo "Failed to build libbsd"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== MG =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$MG_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/hboetes/mg/archive/$MG_TAR"
-then
-    echo "Failed to download mg"
-    exit 1
-fi
-
-rm -rf "$MG_DIR" &>/dev/null
-gzip -d < "$MG_TAR" | tar xf -
-cd "$MG_DIR"
-
-if [[ -e ../patch/mg.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/mg.patch
-fi
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build mg"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     ASFLAGS="${ASFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test mg"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo -E -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if false; then
-
-    ARTIFACTS=("$MG_TAR" "$MG_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-
-    # ./build-mg.sh 2>&1 | tee build-mg.log
-    if [[ -e build-mg.log ]]; then
-        rm -f build-mg.log
-    fi
-fi
-
-exit 0
diff --git a/build-microhttpd.sh b/build-microhttpd.sh
deleted file mode 100755
index e0c1a8ce3..000000000
--- a/build-microhttpd.sh
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds MicroHttpd from sources.
-
-HTTPD_VER=0.9.72
-HTTPD_TAR=libmicrohttpd-${HTTPD_VER}.tar.gz
-HTTPD_DIR=libmicrohttpd-${HTTPD_VER}
-PKG_NAME=microhttpd
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libgcrypt.sh
-then
-    echo "Failed to install Libgcrypt"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-curl.sh
-then
-    echo "Failed to install cURL"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gnutls.sh
-then
-    echo "Failed to install GnuTLS"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== MicroHTTPD =============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "MicroHTTPD ${HTTPD_VER}..."
-
-if ! "${WGET}" -q -O "$HTTPD_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/libmicrohttpd/$HTTPD_TAR"
-then
-    echo "Failed to download MicroHttpd"
-    exit 1
-fi
-
-rm -rf "$HTTPD_DIR" &>/dev/null
-gzip -d < "$HTTPD_TAR" | tar xf -
-cd "$HTTPD_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/microhttpd.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/microhttpd.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared=yes \
-    --enable-static=yes \
-    --enable-https \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-gnutls="${INSTX_PREFIX}" \
-    --with-libgcrypt-prefix="${INSTX_PREFIX}" \
-    --with-libcurl="${INSTX_PREFIX}" \
-    --disable-doc \
-    --disable-examples
-
-if [[ "$?" -ne 0 ]]; then
-    echo "******************************"
-    echo "Failed to configure MicroHttpd"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "******************************"
-    echo "Failed to build MicroHttpd"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "******************************"
-    echo "Failed to test MicroHttpd"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$HTTPD_TAR" "$HTTPD_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-moe.sh b/build-moe.sh
deleted file mode 100755
index 1b70ccd41..000000000
--- a/build-moe.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Moe from sources.
-
-MOE_VER=1.11
-MOE_TAR=moe-${MOE_VER}.tar.lz
-MOE_DIR=moe-${MOE_VER}
-PKG_NAME=moe
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-lzip.sh
-then
-    echo "Failed to build lzip"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== Moe ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Moe ${MOE_VER}..."
-
-if ! "${WGET}" -q -O "$MOE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/moe/$MOE_TAR"
-then
-    echo "Failed to download Moe"
-    exit 1
-fi
-
-rm -rf "$MOE_DIR" &>/dev/null
-lzip -cd "$MOE_TAR" | tar -xf -
-cd "$MOE_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/moe.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/moe.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure Moe"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Moe"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test Moe"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MOE_TAR" "$MOE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mpc-rc.sh b/build-mpc-rc.sh
deleted file mode 100755
index 2ed97ce11..000000000
--- a/build-mpc-rc.sh
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds MPC from sources.
-
-MPC_TAR=mpc-1.2.0-rc1.tar.gz
-MPC_DIR=mpc-1.2.0-rc1
-PKG_NAME=mpc-rc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-mpfr.sh
-then
-    echo "Failed to build MPFR"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== MPC ================="
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-if ! "${WGET}" -q -O "$MPC_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "http://www.multiprecision.org/downloads/$MPC_TAR"
-then
-    echo "Failed to download MPC"
-    exit 1
-fi
-
-rm -rf "$MPC_DIR" &>/dev/null
-gzip -d < "$MPC_TAR" | tar xf -
-cd "$MPC_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***********************"
-echo "Configuring package"
-echo "***********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-gmp="${INSTX_PREFIX}" \
-    --with-mpfr="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure MPC"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build MPC"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test MPC"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Installing package"
-echo "***********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MPC_TAR" "$MPC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mpc.sh b/build-mpc.sh
deleted file mode 100755
index bdfb5f610..000000000
--- a/build-mpc.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds MPC from sources.
-
-MPC_VER=1.3.1
-MPC_TAR=mpc-${MPC_VER}.tar.gz
-MPC_DIR=mpc-${MPC_VER}
-PKG_NAME=mpc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-mpfr.sh
-then
-    echo "Failed to build MPFR"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== MPC ================="
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-if ! "${WGET}" -q -O "$MPC_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/mpc/$MPC_TAR"
-then
-    echo ""
-    echo "Failed to download MPC"
-    exit 1
-fi
-
-rm -rf "$MPC_DIR" &>/dev/null
-gzip -d < "$MPC_TAR" | tar xf -
-cd "$MPC_DIR" || exit 1
-
-# Per INSTALL
-if "${WGET}" -q -O allpatches --ca-certificate="${THE_CA_ZOO}" \
-     "https://www.mpc.org/mpc-${MPC_VER}/allpatches"
-then
-    patch -N -Z -p1 < allpatches
-else
-    echo "Failed to download MPC patches"
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***********************"
-echo "Configuring package"
-echo "***********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-gmp="${INSTX_PREFIX}" \
-    --with-mpfr="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***********************"
-    echo "Failed to configure MPC"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to build MPC"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***********************"
-    echo "Failed to test MPC"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***********************"
-echo "Installing package"
-echo "***********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MPC_TAR" "$MPC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mpfr-rc.sh b/build-mpfr-rc.sh
deleted file mode 100755
index 39a5bc952..000000000
--- a/build-mpfr-rc.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds MPFR from sources.
-
-MPFR_TAR=mpfr-4.1.0-rc1.tar.gz
-MPFR_DIR=mpfr-4.1.0-rc1
-PKG_NAME=mpfr-rc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= MPFR ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$MPFR_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://www.mpfr.org/mpfr-4.1.0/$MPFR_TAR"
-then
-    echo "Failed to download MPFR"
-    exit 1
-fi
-
-rm -rf "$MPFR_DIR" &>/dev/null
-gzip -d < "$MPFR_TAR" | tar xf -
-cd "$MPFR_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-gmp-include="${INSTX_PREFIX}/include" \
-    --with-gmp-lib="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure MPFR"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build MPFR"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test MPFR"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MPFR_TAR" "$MPFR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-mpfr.sh b/build-mpfr.sh
deleted file mode 100755
index 8b8d2d919..000000000
--- a/build-mpfr.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds MPFR from sources.
-
-MPFR_VER=4.1.0
-MPFR_TAR=mpfr-${MPFR_VER}.tar.gz
-MPFR_DIR=mpfr-${MPFR_VER}
-PKG_NAME=mpfr
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= MPFR ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$MPFR_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/mpfr/$MPFR_TAR"
-then
-    echo "Failed to download MPFR"
-    exit 1
-fi
-
-rm -rf "$MPFR_DIR" &>/dev/null
-gzip -d < "$MPFR_TAR" | tar xf -
-cd "$MPFR_DIR" || exit 1
-
-# Per INSTALL
-if "${WGET}" -q -O allpatches --ca-certificate="${THE_CA_ZOO}" \
-    "https://www.mpfr.org/mpfr-${MPFR_VER}/allpatches"
-then
-    patch -N -Z -p1 < allpatches
-else
-    echo "Failed to download MPFR patches"
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-gmp-include="${INSTX_PREFIX}/include" \
-    --with-gmp-lib="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure MPFR"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build MPFR"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test MPFR"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$MPFR_TAR" "$MPFR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-nPth.sh b/build-nPth.sh
deleted file mode 100755
index 0da59473c..000000000
--- a/build-nPth.sh
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds nPth from sources.
-
-NPTH_VER=1.6
-NPTH_TAR="npth-${NPTH_VER}.tar.bz2"
-NPTH_DIR="npth-${NPTH_VER}"
-PKG_NAME=npth
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= nPth ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$NPTH_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gnupg.org/ftp/gcrypt/npth/$NPTH_TAR"
-then
-    echo "Failed to download nPth"
-    exit 1
-fi
-
-rm -rf "$NPTH_DIR" &>/dev/null
-tar xjf "$NPTH_TAR"
-cd "$NPTH_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS} $INSTX_STD" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure nPth"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build nPth"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test nPth"
-    echo "**********************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NPTH_TAR" "$NPTH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ncurses-readline.sh b/build-ncurses-readline.sh
deleted file mode 100755
index db87ce77a..000000000
--- a/build-ncurses-readline.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds iConv and Gettext from sources.
-
-# Ncurses and Readline are closely coupled. Whenever
-# Ncurses is built, build Readline, too.
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/ncurses" ]] && [[ -e "${INSTX_PKG_CACHE}/readline" ]]; then
-    echo ""
-    echo "Ncurses and Readline are already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# Rebuild them as a pair
-rm -f "${INSTX_PKG_CACHE}/ncurses"
-rm -f "${INSTX_PKG_CACHE}/readline"
-
-###############################################################################
-
-if ! ./build-ncurses.sh
-then
-    echo "Failed to build Ncurses"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-readline.sh
-then
-    echo "Failed to build Readline"
-    exit 1
-fi
-
-###############################################################################
-
-# Readline renames libraries, including libhistory and libreadline.
-# Delete the old libraries once they are unneeded. Don't delete them
-# in the readline recipe.
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-   printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S rm -f "${INSTX_LIBDIR}/.*.old"
-else
-    rm -rf "${INSTX_LIBDIR}/.*.old"
-fi
-
-exit 0
diff --git a/build-ncurses.sh b/build-ncurses.sh
deleted file mode 100755
index 23229e768..000000000
--- a/build-ncurses.sh
+++ /dev/null
@@ -1,408 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Ncurses from sources. We do not
-# build Termcap, so there is no libtinfo{w}.
-
-# Do NOT use Ncurses 6.2. There are too many problems with the release.
-# Ncurses 6.2 does not build. It ends in a compile error. Additionally,
-# the patches supplied for Ncurses 6.2 do not apply.
-#
-# We must wait for the Ncurses 6.3 release.
-#
-# Linux from Scratch provides a lot of cool hints for building Ncurses.
-# Also see the following for Ncurses 6.1:
-#   http://www.linuxfromscratch.org/lfs/view/9.0-systemd/chapter06/ncurses.html
-# And for Ncurses 6.2:
-#   http://www.linuxfromscratch.org/lfs/view/development/chapter06/ncurses.html
-
-NCURSES_VER=6.3
-NCURSES_TAR="ncurses-${NCURSES_VER}.tar.gz"
-NCURSES_DIR="ncurses-${NCURSES_VER}"
-PKG_NAME=ncurses
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# Remove old Termcap/libtinfo{w}
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S find ${INSTX_LIBDIR} -name 'libtinfo*' -exec rm -f {} \;
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S find ${INSTX_PREFIX}/include -name 'termcap*' -exec rm -f {} \;
-else
-    find ${INSTX_LIBDIR} -name 'libtinfo*' -exec rm -f {} \;
-    find ${INSTX_PREFIX}/include -name 'termcap*' -exec rm -f {} \;
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Ncurses ==============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-# Remove all the old shit from testing
-rm -rf ncurses-6.*
-
-if ! "${WGET}" -q -O "$NCURSES_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/pub/gnu/ncurses/$NCURSES_TAR"
-then
-    echo "Failed to download Ncurses"
-    exit 1
-fi
-
-rm -rf "$NCURSES_DIR" &>/dev/null
-gzip -d < "$NCURSES_TAR" | tar xf -
-cd "$NCURSES_DIR" || exit 1
-
-# Don't attempt to apply patches. They don't apply. Sigh...
-if false; then
-
-# https://invisible-island.net/ncurses/ncurses.faq.html#applying_patches
-if "${WGET}" -q -O dev-patches.zip --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-   "ftp://ftp.invisible-island.net/ncurses/${NCURSES_VER}/dev-patches.zip"
-then
-    if unzip dev-patches.zip -d .
-    then
-        echo "********************************"
-        echo "Applying Ncurses patches"
-        echo "********************************"
-        for p in ncurses-${NCURSES_VER}-*.patch.gz ;
-        do
-            echo "Applying ${p}"
-            zcat "${p}" | patch -s -p1
-        done
-    else
-        echo "********************************"
-        echo "Failed to unpack Ncurses patches"
-        echo "********************************"
-        exit 1
-    fi
-else
-    echo "**********************************"
-    echo "Failed to download Ncurses patches"
-    echo "**********************************"
-    exit 1
-fi
-
-fi
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/ncurses${NCURSES_VER}.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/ncurses${NCURSES_VER}.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-# We always build the wide version of Ncurses via --enable-widec.
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--disable-leaks")
-CONFIG_OPTS+=("--with-shared")
-CONFIG_OPTS+=("--with-cxx-shared")
-CONFIG_OPTS+=("--enable-widec")
-CONFIG_OPTS+=("--without-debug")
-# CONFIG_OPTS+=("--with-termlib")
-CONFIG_OPTS+=("--enable-pc-files")
-CONFIG_OPTS+=("--disable-root-environ")
-CONFIG_OPTS+=("--with-pkg-config-libdir=${INSTX_PKGCONFIG}")
-
-# Distros move this directory around
-if [[ -d "/etc/terminfo" ]]; then
-    CONFIG_OPTS+=("--with-default-terminfo-dir=${INSTX_PREFIX}/etc/terminfo")
-elif [[ -d "/usr/lib64/terminfo" ]]; then
-    CONFIG_OPTS+=("--with-default-terminfo-dir=${INSTX_PREFIX}/lib64/terminfo")
-elif [[ -d "/usr/lib/terminfo" ]]; then
-    CONFIG_OPTS+=("--with-default-terminfo-dir=${INSTX_PREFIX}/lib/terminfo")
-elif [[ -d "/lib64/terminfo" ]]; then
-    CONFIG_OPTS+=("--with-default-terminfo-dir=${INSTX_PREFIX}/lib64/terminfo")
-elif [[ -d "/lib/terminfo" ]]; then
-    CONFIG_OPTS+=("--with-default-terminfo-dir=${INSTX_PREFIX}/lib/terminfo")
-else
-    # This is $DATADIR/terminfo
-    CONFIG_OPTS+=("--with-default-terminfo-dir=${INSTX_PREFIX}/share/terminfo")
-fi
-
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    ncurses_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${NCURSES_DIR}"
-    ncurses_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${NCURSES_DIR}"
-else
-    ncurses_cflags="${INSTX_CFLAGS}"
-    ncurses_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    # Ncurses use PKG_CONFIG_LIBDIR, not PKG_CONFIG_PATH???
-    PKG_CONFIG_LIBDIR="${INSTX_PKGCONFIG}" \
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${ncurses_cflags}" \
-    CXXFLAGS="${ncurses_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure Ncurses"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# Remove unneeded warnings
-IFS= find "$PWD" -name 'Makefile' -print | while read -r file
-do
-    sed -e 's/ --param max-inline-insns-single=1200//g' \
-        -e 's/ -no-cpp-precomp//g' \
-        "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    chmod u=rw,go=r "$file"
-done
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build Ncurses"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("test")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test Ncurses"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${NCURSES_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${NCURSES_DIR}"
-fi
-
-echo ""
-echo "***************************"
-echo "Extra commands"
-echo "***************************"
-
-# Extra commands to provide non-wide names for warez that needs them.
-# Linux uses linker scripts, while non-linux uses soft links.
-# http://www.linuxfromscratch.org/lfs/view/9.0-systemd/chapter06/ncurses.html
-{
-    echo '#!/usr/bin/env bash'
-    echo ''
-
-    echo "include_dir=${INSTX_PREFIX}/include"
-    echo "lib_dir=${INSTX_LIBDIR}"
-
-    echo ''
-    echo 'cd ${lib_dir}'
-    echo ''
-
-# JW added ncurses++ and tinfo
-if [[ "${IS_LINUX}" -eq 1 ]]; then
-
-    echo 'for lib in ncurses ncurses++ form panel menu ; do'
-    echo '    rm -vf                    ${lib_dir}/lib${lib}.so'
-    echo '    rm -vf                    ${lib_dir}/lib${lib}.so.6'
-    echo '    echo "INPUT(-l${lib}w)" > ${lib_dir}/lib${lib}.so'
-    echo '    ln -sfv lib${lib}.so.6    ${lib_dir}/lib${lib}.so.6'
-    echo 'done'
-    echo ''
-
-    echo 'rm -vf                     ${lib_dir}/libcursesw.so'
-    echo 'rm -vf                     ${lib_dir}/libcurses.so'
-    echo 'echo "INPUT(-lncursesw)" > ${lib_dir}/libcursesw.so'
-    echo 'ln -sfv libncurses.so      ${lib_dir}/libcurses.so'
-    echo ''
-
-elif [[ "${IS_DARWIN}" -eq 1 ]]; then
-
-    echo 'for lib in ncurses ncurses++ form panel menu ; do'
-    echo '    rm -vf                       ${lib_dir}/lib${lib}.dylib'
-    echo '    rm -vf                       ${lib_dir}/lib${lib}.6.dylib'
-    echo '    ln -sfv lib${lib}w.dylib     ${lib_dir}/lib${lib}.dylib'
-    echo '    ln -sfv lib${lib}w.6.dylib   ${lib_dir}/lib${lib}.6.dylib'
-    echo 'done'
-    echo ''
-
-    echo 'rm -vf                     ${lib_dir}/libcursesw.dylib'
-    echo 'rm -vf                     ${lib_dir}/libcurses.dylib'
-    echo 'ln -sfv libcursesw.dylib   ${lib_dir}/libcurses.dylib'
-    echo 'ln -sfv libncurses.dylib   ${lib_dir}/libcurses.dylib'
-    echo ''
-
-else
-
-    echo 'for lib in ncurses ncurses++ form panel menu ; do'
-    echo '    rm -vf                    ${lib_dir}/lib${lib}.so'
-    echo '    rm -vf                    ${lib_dir}/lib${lib}.so.6'
-    echo '    ln -sfv lib${lib}w.so     ${lib_dir}/lib${lib}.so'
-    echo '    ln -sfv lib${lib}w.so.6   ${lib_dir}/lib${lib}.so.6'
-    echo 'done'
-    echo ''
-
-    echo 'rm -vf                     ${lib_dir}/libcursesw.so'
-    echo 'rm -vf                     ${lib_dir}/libcurses.so'
-    echo 'ln -sfv libcursesw.so      ${lib_dir}/libcurses.so'
-    echo 'ln -sfv libncurses.so      ${lib_dir}/libcurses.so'
-    echo ''
-fi
-
-    echo ''
-    echo 'cd ${lib_dir}/pkgconfig'
-    echo ''
-
-    echo 'for lib in ncurses ncurses++ form panel menu ; do'
-    echo '    rm -vf                  ${lib_dir}/pkgconfig/${lib}.pc'
-    echo '    ln -sfv ${lib}w.pc      ${lib_dir}/pkgconfig/${lib}.pc'
-    echo 'done'
-    echo ''
-
-    echo ''
-    echo 'cd ${include_dir}'
-    echo ''
-    echo 'ln -sfv ncursesw      ${include_dir}/ncurses'
-
-} > extra-cmds.sh
-
-# Run the extra commands...
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash extra-cmds.sh
-else
-    bash extra-cmds.sh
-fi
-
-# Fix permissions once
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NCURSES_TAR" "$NCURSES_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-nettle.sh b/build-nettle.sh
deleted file mode 100755
index c201af92e..000000000
--- a/build-nettle.sh
+++ /dev/null
@@ -1,317 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Nettle from sources.
-
-# NETTLE_VER=3.7.3
-NETTLE_VERSION=3.8.1
-NETTLE_TAR=nettle-${NETTLE_VER}.tar.gz
-NETTLE_DIR=nettle-${NETTLE_VER}
-PKG_NAME=nettle
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Nettle ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Nettle ${NETTLE_VER}..."
-
-if ! "${WGET}" -q -O "$NETTLE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/nettle/$NETTLE_TAR"
-then
-    echo "Failed to download Nettle"
-    exit 1
-fi
-
-rm -rf "$NETTLE_DIR" &>/dev/null
-gzip -d < "$NETTLE_TAR" | tar xf -
-cd "$NETTLE_DIR" || exit 1
-
-if [[ -e ../patch/nettle.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/nettle.patch
-fi
-
-if [[ -e ../patch/nettle-darwin.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package (Darwin)"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/nettle-darwin.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Awful Solaris 64-bit hack. Use -G for SunC, and -shared for GCC
-if [[ "$IS_SOLARIS" -ne 0 && "$IS_SUNC" -eq 0 ]]; then
-    file=configure
-    chmod +w "$file"
-    sed 's/ -G / -shared /g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    chmod +x "$file"; chmod go-w "$file"
-fi
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--disable-documentation")
-
-# I wish the maintainer would test his shit...
-if [[ "$IS_IA32" -eq 1 ]]
-then
-    have_aes=$(${CC} ${CFLAGS} -maes -dM -E - </dev/null 2>&1 | grep -i -c '__AES__')
-    have_sha=$(${CC} ${CFLAGS} -msha -dM -E - </dev/null 2>&1 | grep -i -c '__SHA__')
-
-    if [[ "$have_aes" -eq 0 && "$have_sha" -eq 0 ]]; then
-        CONFIG_OPTS+=("--disable-fat")
-        CONFIG_OPTS+=("--disable-x86-aesni")
-        CONFIG_OPTS+=("--disable-x86-sha-ni")
-    elif [[ "$have_aes" -eq 0 ]]; then
-        CONFIG_OPTS+=("--disable-fat")
-        CONFIG_OPTS+=("--disable-x86-aesni")
-    elif [[ "$have_sha" -eq 0 ]]; then
-        CONFIG_OPTS+=("--disable-fat")
-        CONFIG_OPTS+=("--disable-x86-sha-ni")
-    fi
-fi
-
-if [[ "$IS_ARM_NEON" -eq 1 ]]
-then
-    have_neon=$(${CC} ${CFLAGS} -dM -E - </dev/null 2>&1 | grep -i -c '__ARM_NEON')
-
-    if [[ "$have_neon" -eq 0 ]]; then
-        CONFIG_OPTS+=("--disable-fat")
-        CONFIG_OPTS+=("--disable-neon")
-    fi
-fi
-
-if [[ "$IS_ARMV8" -eq 1 ]]
-then
-    # ASIMD is part of ARMv8 core ISA
-    if [[ $(false) ]]; then
-        CONFIG_OPTS+=("--disable-fat")
-        CONFIG_OPTS+=("--disable-neon")
-    fi
-fi
-
-if [[ "$IS_ALTIVEC" -eq 1 ]]
-then
-    have_altivec=$(${CC} ${CFLAGS} -maltivec -dM -E - </dev/null 2>&1 | grep -i -c '__ALTIVEC__')
-
-    if [[ "$have_altivec" -eq 0 ]]; then
-        CONFIG_OPTS+=("--disable-fat")
-        CONFIG_OPTS+=("--disable-altivec")
-    fi
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    nettle_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${NETTLE_DIR}"
-    nettle_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${NETTLE_DIR}"
-else
-    nettle_cflags="${INSTX_CFLAGS}"
-    nettle_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-# ac_cv_lib_gmp___gmpn_zero_p=yes due to
-# https://lists.lysator.liu.se/pipermail/nettle-bugs/2021/009469.html
-# I wish the maintainer would test his shit...
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${nettle_cflags}" \
-    CXXFLAGS="${nettle_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    ac_cv_lib_gmp___gmpn_zero_p=yes \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure Nettle"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix LD_LIBRARY_PATH and DYLD_LIBRARY_PATH
-# bash ../fix-library-path.sh
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "all" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build Nettle"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-# I wish the maintainer would test his shit...
-find . -name 'run-tests' -exec chmod +x {} \;
-find . -name '*-test' -exec chmod +x {} \;
-if [[ -n "$(command -v xattr 2>/dev/null)" ]]; then
-    find . -name 'run-tests' -exec xattr -d com.apple.quarantine {} 2>/dev/null \;
-    find . -name '*-test' -exec xattr -d com.apple.quarantine {} 2>/dev/null \;
-fi
-
-# I wish the maintainer would test his shit...
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test Nettle"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    # Known problems on OS X, both old and new.
-    if [[ "${IS_DARWIN}" -ne 1 ]]; then
-        exit 1
-    fi
-
-    echo ""
-    echo "**************************"
-    echo "Installing anyways..."
-    echo "**************************"
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${NETTLE_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${NETTLE_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NETTLE_TAR" "$NETTLE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-nghttp2.sh b/build-nghttp2.sh
deleted file mode 100755
index 0ae7700bf..000000000
--- a/build-nghttp2.sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds NGHTTP2 from sources.
-
-NGHTTP2_VER=1.43.0
-NGHTTP2_TAR=nghttp2-$NGHTTP2_VER.tar.gz
-NGHTTP2_DIR=nghttp2-$NGHTTP2_VER
-PKG_NAME=nghttp2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# c-ares needs a C++11 compiler
-if [[ "$INSTX_CXX11" -ne 0 ]]
-then
-    ENABLE_CARES=1
-else
-    ENABLE_CARES=0
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to install libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-jansson.sh
-then
-    echo "Failed to install Jansson"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "$ENABLE_CARES" -eq 1 ]]
-then
-    if ! ./build-cares.sh
-    then
-        echo "Failed to build c-ares"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ NgHTTP2 ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "NGHTTP2 ${NGHTTP2_VER}..."
-
-if ! "${WGET}" -q -O "$NGHTTP2_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/nghttp2/nghttp2/releases/download/v$NGHTTP2_VER/$NGHTTP2_TAR"
-then
-    echo "Failed to download NGHTTP2"
-    exit 1
-fi
-
-rm -rf "$NGHTTP2_DIR" &>/dev/null
-gzip -d < "$NGHTTP2_TAR" | tar xf -
-cd "$NGHTTP2_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/nghttp2.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/nghttp2.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --disable-assert \
-    --with-libxml2 \
-    --enable-hpack-tools
-    # --enable-app \
-    # --enable-lib-only
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure NGHTTP2"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build NGHTTP2"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test NGHTTP2"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NGHTTP2_TAR" "$NGHTTP2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-nginx.sh b/build-nginx.sh
deleted file mode 100755
index 145c9c596..000000000
--- a/build-nginx.sh
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Nginx from sources.
-
-NGINX_VER=1.20.2
-NGINX_TAR=nginx-${NGINX_VER}.tar.gz
-NGINX_DIR=nginx-${NGINX_VER}
-PKG_NAME=nginx
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre.sh
-then
-    echo "Failed to build PCRE"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Nginx ================="
-echo "========================================"
-
-echo ""
-echo "****************************"
-echo "Downloading package"
-echo "****************************"
-
-echo ""
-echo "Nginx ${NGINX_VER}..."
-
-if ! "${WGET}" -q -O "$NGINX_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://nginx.org/download/$NGINX_TAR"
-then
-    echo "Failed to download Nginx"
-    exit 1
-fi
-
-rm -rf "$NGINX_DIR" &>/dev/null
-gzip -d < "$NGINX_TAR" | tar xf -
-cd "$NGINX_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/nginx.patch ]]; then
-    echo ""
-    echo "****************************"
-    echo "Patching package"
-    echo "****************************"
-
-    patch -u -p0 < ../patch/nginx.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "****************************"
-echo "Configuring package"
-echo "****************************"
-
-# Nginx is another package that f**ks up flags and options. There's nothing
-# like trading something that works for something that does not work.
-# http://nginx.org/en/docs/configure.html
-
-nginx_cppflags="${INSTX_CPPFLAGS} -I${INSTX_PREFIX}/include"
-nginx_cflags="${INSTX_CFLAGS}"
-nginx_cxxflags="${INSTX_CXXFLAGS}"
-nginx_ldflags="${INSTX_LDFLAGS} -L${INSTX_LIBDIR}"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${nginx_cppflags}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${nginx_cflags}" \
-    CXXFLAGS="${nginx_cxxflags}" \
-    LDFLAGS="${nginx_ldflags}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --with-cc-opt="${nginx_cppflags} ${nginx_cflags}" \
-    --with-ld-opt="${nginx_ldflags}" \
-    --with-threads \
-    --with-file-aio \
-    --with-http_ssl_module \
-    --with-http_sub_module \
-    --with-http_auth_request_module
-
-    # --with-pcre="${INSTX_PREFIX}" \
-    # --with-zlib="${INSTX_PREFIX}" \
-    # --with-openssl="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure Nginx"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "****************************"
-echo "Building package"
-echo "****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Nginx"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Testing package"
-echo "****************************"
-
-MAKE_FLAGS=("test")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to test Nginx"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "****************************"
-    echo "Installing anyways"
-    echo "****************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Installing package"
-echo "****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NGINX_TAR" "$NGINX_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-nsd.sh b/build-nsd.sh
deleted file mode 100755
index 3999b2dca..000000000
--- a/build-nsd.sh
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds NSD from sources.
-
-NSD_VER=4.3.9
-NSD_TAR=nsd-${NSD_VER}.tar.gz
-NSD_DIR=nsd-${NSD_VER}
-PKG_NAME=nsd
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= NSD =================="
-echo "========================================"
-
-echo ""
-echo "***********************"
-echo "Downloading package"
-echo "***********************"
-
-if ! "${WGET}" -q -O "$NSD_TAR" --ca-certificate="${IDENTRUST_ROOT}" \
-     "https://www.nlnetlabs.nl/downloads/nsd/$NSD_TAR"
-then
-    echo "Failed to download NSD"
-    exit 1
-fi
-
-rm -rf "$NSD_DIR" &>/dev/null
-gzip -d < "$NSD_TAR" | tar xf -
-cd "$NSD_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/nsd.patch ]]; then
-    patch -u -p0 < ../patch/nsd.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***********************"
-echo "Configuring package"
-echo "***********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-ssl="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo "***********************"
-    echo "Failed to configure NSD"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix config.h. We define NDEBUG in CPPFLAGS
-sed 's/#define NDEBUG \/\*\*\///g' config.h > config.h.fixed
-mv config.h.fixed config.h
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "***********************"
-echo "Building package"
-echo "***********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***********************"
-    echo "Failed to build NSD"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***********************"
-echo "Testing package"
-echo "***********************"
-
-MAKE_FLAGS=("test" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***********************"
-    echo "Failed to test NSD"
-    echo "***********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***********************"
-echo "Installing package"
-echo "***********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NSD_TAR" "$NSD_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ntbTLS.sh b/build-ntbTLS.sh
deleted file mode 100755
index f77dc8807..000000000
--- a/build-ntbTLS.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds ntbTLS from sources.
-
-NTBTLS_VER=0.3.1
-NTBTLS_TAR="ntbtls-${NTBTLS_VER}.tar.bz2"
-NTBTLS_DIR="ntbtls-${NTBTLS_VER}"
-PKG_NAME=ntbtls
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gpgerror.sh
-then
-    echo "Failed to build libgpg-error"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libgcrypt.sh
-then
-    echo "Failed to build libgpg-gcrypt"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libksba.sh
-then
-    echo "Failed to build libksba"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ ntbTLS ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "ntbTLS ${NTBTLS_VER}..."
-
-if ! "${WGET}" -q -O "$NTBTLS_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://gnupg.org/ftp/gcrypt/ntbtls/$NTBTLS_TAR"
-then
-    echo "Failed to download ntbTLS"
-    exit 1
-fi
-
-rm -rf "$NTBTLS_DIR" &>/dev/null
-tar xjf "$NTBTLS_TAR"
-cd "$NTBTLS_DIR"
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/ntbtls.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/ntbtls.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS} $INSTX_STD" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --with-zlib="${INSTX_PREFIX}" \
-    --with-libgpg-error-prefix="${INSTX_PREFIX}" \
-    --with-libgcrypt-prefix="${INSTX_PREFIX}" \
-    --with-ksba-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure ntbTLS"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build ntbTLS"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test ntbTLS"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$NTBTLS_TAR" "$NTBTLS_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-openldap.sh b/build-openldap.sh
deleted file mode 100755
index 6b81424d5..000000000
--- a/build-openldap.sh
+++ /dev/null
@@ -1,245 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenLDAP from sources.
-
-LDAP_VER=2.6.2
-LDAP_TAR="openldap-${LDAP_VER}.tgz"
-LDAP_DIR="openldap-${LDAP_VER}"
-PKG_NAME=openldap
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bdb.sh
-then
-    echo "Failed to build Berkeley DB"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "$IS_ALPINE" -ne 0 ]] && [[ -z "$(command -v soelim 2>/dev/null)" ]]
-then
-    if ! ./build-mandoc.sh
-    then
-        echo "Failed to build Mandoc"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== OpenLDAP ==============="
-echo "========================================"
-
-echo ""
-echo "****************************"
-echo "Downloading package"
-echo "****************************"
-
-if ! "${WGET}" --ca-certificate="${LETS_ENCRYPT_ROOT}" -O "$LDAP_TAR" \
-     "https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/$LDAP_TAR"
-then
-    echo "Failed to download OpenLDAP"
-    exit 1
-fi
-
-rm -rf "$LDAP_DIR" &>/dev/null
-gzip -d < "$LDAP_TAR" | tar xf -
-cd "$LDAP_DIR" || exit 1
-
-if [[ -e ../patch/openldap.patch ]]; then
-    echo ""
-    echo "****************************"
-    echo "Patching package"
-    echo "****************************"
-
-    patch -u -p0 < ../patch/openldap.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "****************************"
-echo "Configuring package"
-echo "****************************"
-
-# Fix Berkeley DB version test
-cp -p configure configure.new
-sed 's|0x060014|0x060300|g' configure > configure.new
-mv configure.new configure; chmod a+x configure
-
-# OpenLDAP munges -Wl,-R,'$ORIGIN/../lib'. Somehow it manages
-# to escape the '$ORIGIN/../lib' in single quotes. Set $ORIGIN
-# to itself to workaround it.
-export ORIGIN="\$ORIGIN"
-
-# mdb is too dirty and cannot build on OS X. It is also full of
-# undefined behavior. Just disable mdb on all platforms.
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--with-tls=openssl")
-CONFIG_OPTS+=("--enable-mdb=no")
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure OpenLDAP"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "****************************"
-echo "Building package"
-echo "****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build OpenLDAP"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Testing package"
-echo "****************************"
-
-# Can't pass self tests on ARM
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to test OpenLDAP"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "****************************"
-    echo "Installing anyways..."
-    echo "****************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "****************************"
-echo "Installing package"
-echo "****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$LDAP_TAR" "$LDAP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-opensc.sh b/build-opensc.sh
deleted file mode 100755
index 81b15d3b0..000000000
--- a/build-opensc.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenSC from sources.
-
-OPENSC_VER=0.22.0
-OPENSC_TAR=opensc-"$OPENSC_VER".tar.gz
-OPENSC_DIR=opensc-"$OPENSC_VER"
-PKG_NAME=opensc
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-p11kit.sh
-then
-    echo "Failed to build P11-Kit"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcsclite.sh
-then
-    echo "Failed to build PC/SC-Lite"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ OpenSC ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$OPENSC_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/OpenSC/OpenSC/releases/download/$OPENSC_VER/$OPENSC_TAR"
-then
-    echo "Failed to download OpenSC"
-    exit 1
-fi
-
-rm -rf "$OPENSC_DIR" &>/dev/null
-gzip -d < "$OPENSC_TAR" | tar xf -
-cd "$OPENSC_DIR" || exit 1
-
-if [[ -e ../patch/opensc.patch ]]; then
-    patch -u -p0 < ../patch/opensc.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --with-pic \
-    --disable-assert \
-    --enable-zlib \
-    --enable-openssl
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure OpenSC"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build OpenSC"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test OpenSC"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OPENSC_TAR" "$OPENSC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-openssh.sh b/build-openssh.sh
deleted file mode 100755
index e7e6db30d..000000000
--- a/build-openssh.sh
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds SSH and its dependencies from sources.
-# Also see https://superuser.com/q/961349/173513.
-
-OPENSSH_VER=9.5p1
-OPENSSH_TAR="openssh-${OPENSSH_VER}.tar.gz"
-OPENSSH_DIR="openssh-${OPENSSH_VER}"
-PKG_NAME=openssh
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# LDNS and dependencies will probably fail
-# to build, like on OS X 10.5.
-
-if [[ "$IS_DARWIN" -eq 0 ]]; then
-    enable_ldns=1
-elif [[ "${OSX_10p8_OR_ABOVE}" -eq 1 ]]; then
-    enable_ldns=1
-else
-    enable_ldns=0
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "${enable_ldns}" -eq 1 ]]
-then
-    if ! ./build-ldns.sh
-    then
-        echo "Failed to build LDNS"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ OpenSSH ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$OPENSSH_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "http://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH_TAR"
-then
-    echo "Failed to download SSH"
-    echo "Maybe Wget is too old. Perhaps run setup-wget.sh?"
-    exit 1
-fi
-
-rm -rf "$OPENSSH_DIR" &>/dev/null
-gzip -d < "$OPENSSH_TAR" | tar xf -
-cd "$OPENSSH_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-cppflags=${INSTX_CPPFLAGS}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-asflags=${INSTX_ASFLAGS}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-cflags=${INSTX_CFLAGS}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-ldflags=${INSTX_CFLAGS} ${INSTX_LDFLAGS}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-libs=-lz ${INSTX_LDLIBS}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-zlib=${INSTX_PREFIX}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-ssl-dir=${INSTX_PREFIX}"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-pie"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--disable-strip"
-
-if [[ "${enable_ldns}" -eq 1 ]]
-then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="--with-ldns=${INSTX_PREFIX}"
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    openssh_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSH_DIR}"
-    openssh_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSH_DIR}"
-else
-    openssh_cflags="${INSTX_CFLAGS}"
-    openssh_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${openssh_cflags}" \
-    CXXFLAGS="${openssh_cxxflags}" \
-    LDFLAGS="${INSTX_CFLAGS} ${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure SSH"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build SSH"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-echo
-echo "Unable to test OpenSSH"
-echo 'https://groups.google.com/forum/#!topic/mailing.unix.openssh-dev/srdwaPQQ_Aw'
-echo
-
-# No way to test OpenSSH after build...
-# https://groups.google.com/forum/#!topic/mailing.unix.openssh-dev/srdwaPQQ_Aw
-#MAKE_FLAGS=("check" "-k" "V=1")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "Failed to test SSH"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OPENSSH_TAR" "$OPENSSH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-openssl-1.0.2.sh b/build-openssl-1.0.2.sh
deleted file mode 100755
index a6a10fddb..000000000
--- a/build-openssl-1.0.2.sh
+++ /dev/null
@@ -1,324 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenSSL 1.0.2 from sources.
-
-# This script is used to build OpenSSL 1.0.2 on old platforms
-# due to OpenSSL dependencies. Newer versions of OpenSSL
-# require Perl 5.10 or higher. If we don't have Perl 5.10
-# then we use OpenSSL 1.0.2.
-
-# OpenSSL 1.0.2 is end of life. It was last updated in
-# December 2019. But it is better than the OpenSSL gear on
-# an old platform, which can sometimes be OpenSSL 0.9.8.
-
-OPENSSL_VER=1.0.2u
-OPENSSL_TAR=openssl-${OPENSSL_VER}.tar.gz
-OPENSSL_DIR=openssl-${OPENSSL_VER}
-PKG_NAME=openssl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-# Needed for OS X 10.4 and 10.5. Use OSX_10p5_OR_BELOW?
-if ! ./build-makedepend.sh
-then
-    echo "Failed to build makedepend"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "OpenSSL ${OPENSSL_VER}..."
-
-if ! "${WGET}" -q -O "$OPENSSL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.openssl.org/source/$OPENSSL_TAR"
-then
-    echo "Failed to download OpenSSL"
-    exit 1
-fi
-
-rm -rf "$OPENSSL_DIR" &>/dev/null
-gzip -d < "$OPENSSL_TAR" | tar xf -
-cd "$OPENSSL_DIR" || exit 1
-
-if [[ -e ../patch/openssl-1.0.2.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/openssl-1.0.2.patch
-fi
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-ssl2"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-ssl3"
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-comp"
-
-# DH is 2x to 4x faster with ec_nistp_64_gcc_128, but it is
-# only available on x64 machines with uint128 available.
-INT128_OPT=$("$CC" -dM -E - </dev/null | grep -i -c "__SIZEOF_INT128__")
-
-if [[ "$IS_AMD64" -eq 1 && "$INT128_OPT" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="enable-ec_nistp_64_gcc_128"
-fi
-
-# Debug symbols after install
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-fi
-
-if [[ "$IS_FREEBSD" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-Wno-error"
-fi
-
-# OpenSSL fails to link its engines and self tests on OpenBSD
-if [[ "$IS_OPENBSD" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-engine"
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-tests"
-    SKIP_OPENSSL_TESTS=1
-fi
-
-# Fix Alpine
-if [[ "$IS_ALPINE" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-afalgeng"
-fi
-
-# Fix the use of install_name
-if [[ "$IS_DARWIN" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-Wl,-headerpad_max_install_names"
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    openssl_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-    openssl_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-else
-    openssl_cflags="${INSTX_CFLAGS}"
-    openssl_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-# The "${CC##*/ }" strips everything proceeding
-# the name of the compiler. '/bin/gcc' becomes 'gcc'.
-# Otherwise, OpenSSL cannot configure itself.
-
-    CC="${CC##*/}" \
-    CXX="${CXX##*/}" \
-    KERNEL_BITS="$INSTX_BITNESS" \
-    MAKEDEPEND="${INSTX_PREFIX}/bin/makedepend" \
-    CPPFLAGS="${INSTX_CPPFLAGS} -DPEDANTIC" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${openssl_cflags}" \
-    CXXFLAGS="${openssl_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-./config \
-    --prefix="${INSTX_PREFIX}" \
-    --openssldir="${INSTX_PREFIX}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -eq 1 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure OpenSSL"
-    echo "***************************"
-
-    exit 1
-fi
-
-MAKE_FLAGS=(depend)
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to depend OpenSSL"
-    echo "***************************"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-# The OpenSSL makefile is fucked up. We can't seem to build
-# only libcrypto, libssl and openssl app. The configuration
-# system does not honor our options. Instead, we have to
-# build everything, and work around the build failures of
-# unneeded shit on some platforms.
-
-# MAKE_FLAGS=("-j" "${INSTX_JOBS}" build_libs build_apps)
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" all)
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build OpenSSL"
-    echo "***************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-# Self tests are still unreliable, https://github.com/openssl/openssl/issues/4963
-if [[ "$SKIP_OPENSSL_TESTS" -eq 0 ]];
-then
-    MAKE_FLAGS=("-j" "${INSTX_JOBS}" test)
-    if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo ""
-        echo "***************************"
-        echo "Failed to test OpenSSL"
-        echo "***************************"
-
-        # exit 1
-
-        echo ""
-        echo "***************************"
-        echo "Installing anyways..."
-        echo "***************************"
-    fi
-else
-    echo ""
-    echo "***************************"
-    echo "OpenSSL is not tested"
-    echo "***************************"
-
-    echo ""
-    echo "***************************"
-    echo "Installing anyways..."
-    echo "***************************"
-fi
-
-if [[ "$IS_DARWIN" -eq 1 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Fixing install_name"
-    echo "***************************"
-
-    install_name_tool -id "${INSTX_LIBDIR}/libcrypto.1.0.dylib" \
-        ./libcrypto.1.0.dylib
-    install_name_tool -id "${INSTX_LIBDIR}/libssl.1.0.dylib" \
-        ./libssl.1.0.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.1.0.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.1.0.dylib" ./libcrypto.1.0.dylib
-    install_name_tool -change "${INSTX_PREFIX}//libssl.1.0.dylib" \
-        "${INSTX_LIBDIR}/libssl.1.0.dylib" ./libcrypto.1.0.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.1.0.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.1.0.dylib" ./libssl.1.0.dylib
-    install_name_tool -change "${INSTX_PREFIX}//libssl.1.0.dylib" \
-        "${INSTX_LIBDIR}/libssl.1.0.dylib" ./libssl.1.0.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.1.0.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.1.0.dylib" ./apps/openssl
-    install_name_tool -change "${INSTX_PREFIX}//libssl.1.0.dylib" \
-        "${INSTX_LIBDIR}/libssl.1.0.dylib" ./apps/openssl
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-# Install the software only
-MAKE_FLAGS=(install_sw)
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-        printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${OPENSSL_DIR}"
-    fi
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${OPENSSL_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OPENSSL_TAR" "$OPENSSL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-openssl-1.1.1.sh b/build-openssl-1.1.1.sh
deleted file mode 100755
index f218b00e5..000000000
--- a/build-openssl-1.1.1.sh
+++ /dev/null
@@ -1,338 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenSSL 1.1.1 from sources.
-
-# This script is used to build OpenSSL 1.1.1 on new platforms
-# due to OpenSSL dependencies. Newer versions of OpenSSL
-# require Perl 5.10 or higher. If we have Perl 5.10 then
-# we can use OpenSSL 1.1.1.
-
-OPENSSL_MAJ=1.1
-OPENSSL_VER=1.1.1w
-OPENSSL_TAR=openssl-${OPENSSL_VER}.tar.gz
-OPENSSL_DIR=openssl-${OPENSSL_VER}
-PKG_NAME=openssl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ OpenSSL ==============="
-echo "========================================"
-
-# May be skipped if Perl is too old
-SKIP_OPENSSL_TESTS=0
-
-# OpenSSL self tests
-if ! perl -MTest::More -e1 2>/dev/null
-then
-    echo ""
-    echo "OpenSSL requires Perl's Test::More. Skipping OpenSSL self tests."
-    echo "To fix this issue, please install Test-More."
-    SKIP_OPENSSL_TESTS=1
-fi
-
-# OpenSSL self tests
-if ! perl -MText::Template -e1 2>/dev/null
-then
-    echo ""
-    echo "OpenSSL requires Perl's Text::Template. Skipping OpenSSL self tests."
-    echo "To fix this issue, please install Text-Template."
-    SKIP_OPENSSL_TESTS=1
-fi
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "OpenSSL ${OPENSSL_VER}..."
-
-if ! "${WGET}" -q -O "$OPENSSL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.openssl.org/source/$OPENSSL_TAR"
-then
-    echo "Failed to download OpenSSL"
-    exit 1
-fi
-
-rm -rf "$OPENSSL_DIR" &>/dev/null
-gzip -d < "$OPENSSL_TAR" | tar xf -
-cd "$OPENSSL_DIR" || exit 1
-
-if [[ -e ../patch/openssl-1.1.1.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/openssl-1.1.1.patch
-fi
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-comp"
-
-# DH is 2x to 4x faster with ec_nistp_64_gcc_128, but it is
-# only available on x64 machines with uint128 available.
-INT128_OPT=$("$CC" -dM -E - </dev/null | grep -i -c "__SIZEOF_INT128__")
-
-if [[ "$IS_AMD64" -eq 1 && "$INT128_OPT" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="enable-ec_nistp_64_gcc_128"
-fi
-
-# Debug symbols after install
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-fi
-
-if [[ "$IS_FREEBSD" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-Wno-error"
-fi
-
-# OpenSSL fails to link its engines and self tests on OpenBSD
-if [[ "$IS_OPENBSD" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-engine"
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-tests"
-    SKIP_OPENSSL_TESTS=1
-fi
-
-# Fix Alpine
-if [[ "$IS_ALPINE" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-afalgeng"
-fi
-
-# Fix use of CCRandomGenerateBytes
-if [[ "$OSX_10p9_OR_BELOW" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-DOPENSSL_NO_CCRANDOMGENERATEBYTES"
-fi
-
-# Fix the use of install_name
-if [[ "$IS_DARWIN" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-Wl,-headerpad_max_install_names"
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    openssl_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-    openssl_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-else
-    openssl_cflags="${INSTX_CFLAGS}"
-    openssl_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-# The "${CC##*/ }" strips everything proceeding
-# the name of the compiler. '/bin/gcc' becomes 'gcc'.
-# Otherwise, OpenSSL cannot configure itself.
-
-    CC="${CC##*/}" \
-    CXX="${CXX##*/}" \
-    KERNEL_BITS="$INSTX_BITNESS" \
-    CPPFLAGS="${INSTX_CPPFLAGS} -DPEDANTIC" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${openssl_cflags}" \
-    CXXFLAGS="${openssl_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-./config \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --openssldir="${INSTX_PREFIX}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -eq 1 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure OpenSSL"
-    echo "***************************"
-
-    exit 1
-fi
-
-# Fix Alpine
-if [[ "$IS_ALPINE" -eq 1 ]]; then
-    # This undefine's the macro after it has been set.
-    echo '#undef OPENSSL_SECURE_MEMORY' >> e_os.h
-    echo '' >> e_os.h
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-# The OpenSSL makefile is fucked up. We can't seem to build
-# only libcrypto, libssl and openssl app. The configuration
-# system does not honor our options. Instead, we have to
-# build everything, and work around the build failures of
-# unneeded shit on some platforms.
-
-# MAKE_FLAGS=("-j" "${INSTX_JOBS}" build_libs build_apps)
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" all)
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build OpenSSL"
-    echo "***************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-# Self tests are still unreliable, https://github.com/openssl/openssl/issues/4963
-if [[ "$SKIP_OPENSSL_TESTS" -eq 0 ]];
-then
-    MAKE_FLAGS=("-j" "${INSTX_JOBS}" test)
-    if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo ""
-        echo "***************************"
-        echo "Failed to test OpenSSL"
-        echo "***************************"
-
-        # exit 1
-
-        echo ""
-        echo "***************************"
-        echo "Installing anyways..."
-        echo "***************************"
-    fi
-else
-    echo ""
-    echo "***************************"
-    echo "OpenSSL is not tested"
-    echo "***************************"
-
-    echo ""
-    echo "***************************"
-    echo "Installing anyways..."
-    echo "***************************"
-fi
-
-if [[ "$IS_DARWIN" -eq 1 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Fixing install_name"
-    echo "***************************"
-
-    install_name_tool -id "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" \
-        ./libcrypto.${OPENSSL_MAJ}.dylib
-    install_name_tool -id "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" \
-        ./libssl.${OPENSSL_MAJ}.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" ./libcrypto.${OPENSSL_MAJ}.dylib
-    install_name_tool -change "${INSTX_PREFIX}//libssl.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" ./libcrypto.${OPENSSL_MAJ}.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" ./libssl.${OPENSSL_MAJ}.dylib
-    install_name_tool -change "${INSTX_PREFIX}//libssl.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" ./libssl.${OPENSSL_MAJ}.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" ./apps/openssl
-    install_name_tool -change "${INSTX_PREFIX}//libssl.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" ./apps/openssl
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-# Install the software only
-MAKE_FLAGS=(install_sw)
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-        printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${OPENSSL_DIR}"
-    fi
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${OPENSSL_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OPENSSL_TAR" "$OPENSSL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-openssl-3.1.sh b/build-openssl-3.1.sh
deleted file mode 100755
index 25a541420..000000000
--- a/build-openssl-3.1.sh
+++ /dev/null
@@ -1,338 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenSSL 3.1 from sources.
-
-# This script is used to build OpenSSL 3.1 on new platforms
-# due to OpenSSL dependencies. Newer versions of OpenSSL
-# require Perl 5.10 or higher. If we have Perl 5.10 then
-# we use OpenSSL 3.1.
-
-OPENSSL_MAJ=3.1
-OPENSSL_VER=3.1.4
-OPENSSL_TAR=openssl-${OPENSSL_VER}.tar.gz
-OPENSSL_DIR=openssl-${OPENSSL_VER}
-PKG_NAME=openssl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ OpenSSL ==============="
-echo "========================================"
-
-# May be skipped if Perl is too old
-SKIP_OPENSSL_TESTS=0
-
-# OpenSSL self tests
-if ! perl -MTest::More -e1 2>/dev/null
-then
-    echo ""
-    echo "OpenSSL requires Perl's Test::More. Skipping OpenSSL self tests."
-    echo "To fix this issue, please install Test-More."
-    SKIP_OPENSSL_TESTS=1
-fi
-
-# OpenSSL self tests
-if ! perl -MText::Template -e1 2>/dev/null
-then
-    echo ""
-    echo "OpenSSL requires Perl's Text::Template. Skipping OpenSSL self tests."
-    echo "To fix this issue, please install Text-Template."
-    SKIP_OPENSSL_TESTS=1
-fi
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-echo ""
-echo "OpenSSL ${OPENSSL_VER}..."
-
-if ! "${WGET}" -q -O "$OPENSSL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.openssl.org/source/$OPENSSL_TAR"
-then
-    echo "Failed to download OpenSSL"
-    exit 1
-fi
-
-rm -rf "$OPENSSL_DIR" &>/dev/null
-gzip -d < "$OPENSSL_TAR" | tar xf -
-cd "$OPENSSL_DIR" || exit 1
-
-if [[ -e ../patch/openssl-3.1.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/openssl-3.1.patch
-fi
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-comp"
-
-# DH is 2x to 4x faster with ec_nistp_64_gcc_128, but it is
-# only available on x64 machines with uint128 available.
-INT128_OPT=$("$CC" -dM -E - </dev/null | grep -i -c "__SIZEOF_INT128__")
-
-if [[ "$IS_AMD64" -eq 1 && "$INT128_OPT" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="enable-ec_nistp_64_gcc_128"
-fi
-
-# Debug symbols after install
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-fi
-
-if [[ "$IS_FREEBSD" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-Wno-error"
-fi
-
-# OpenSSL fails to link its engines and self tests on OpenBSD
-if [[ "$IS_OPENBSD" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-engine"
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-tests"
-    SKIP_OPENSSL_TESTS=1
-fi
-
-# Fix Alpine
-if [[ "$IS_ALPINE" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="no-afalgeng"
-fi
-
-# Fix use of CCRandomGenerateBytes
-if [[ "$OSX_10p9_OR_BELOW" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-DOPENSSL_NO_CCRANDOMGENERATEBYTES"
-fi
-
-# Fix the use of install_name
-if [[ "$IS_DARWIN" -eq 1 ]]; then
-    CONFIG_OPTS[${#CONFIG_OPTS[@]}]="-Wl,-headerpad_max_install_names"
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    openssl_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-    openssl_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${OPENSSL_DIR}"
-else
-    openssl_cflags="${INSTX_CFLAGS}"
-    openssl_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-# The "${CC##*/ }" strips everything proceeding
-# the name of the compiler. '/bin/gcc' becomes 'gcc'.
-# Otherwise, OpenSSL cannot configure itself.
-
-    CC="${CC##*/}" \
-    CXX="${CXX##*/}" \
-    KERNEL_BITS="$INSTX_BITNESS" \
-    CPPFLAGS="${INSTX_CPPFLAGS} -DPEDANTIC" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${openssl_cflags}" \
-    CXXFLAGS="${openssl_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-./config \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --openssldir="${INSTX_PREFIX}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -eq 1 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure OpenSSL"
-    echo "***************************"
-
-    exit 1
-fi
-
-# Fix Alpine
-if [[ "$IS_ALPINE" -eq 1 ]]; then
-    # This undefine's the macro after it has been set.
-    echo '#undef OPENSSL_SECURE_MEMORY' >> e_os.h
-    echo '' >> e_os.h
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-# The OpenSSL makefile is fucked up. We can't seem to build
-# only libcrypto, libssl and openssl app. The configuration
-# system does not honor our options. Instead, we have to
-# build everything, and work around the build failures of
-# unneeded shit on some platforms.
-
-# MAKE_FLAGS=("-j" "${INSTX_JOBS}" build_libs build_apps)
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" all)
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build OpenSSL"
-    echo "***************************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-# Self tests are still unreliable, https://github.com/openssl/openssl/issues/4963
-if [[ "$SKIP_OPENSSL_TESTS" -eq 0 ]];
-then
-    MAKE_FLAGS=("-j" "${INSTX_JOBS}" test)
-    if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo ""
-        echo "***************************"
-        echo "Failed to test OpenSSL"
-        echo "***************************"
-
-        # exit 1
-
-        echo ""
-        echo "***************************"
-        echo "Installing anyways..."
-        echo "***************************"
-    fi
-else
-    echo ""
-    echo "***************************"
-    echo "OpenSSL is not tested"
-    echo "***************************"
-
-    echo ""
-    echo "***************************"
-    echo "Installing anyways..."
-    echo "***************************"
-fi
-
-if [[ "$IS_DARWIN" -eq 1 ]]
-then
-    echo ""
-    echo "***************************"
-    echo "Fixing install_name"
-    echo "***************************"
-
-    install_name_tool -id "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" \
-        ./libcrypto.${OPENSSL_MAJ}.dylib
-    install_name_tool -id "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" \
-        ./libssl.${OPENSSL_MAJ}.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" ./libcrypto.${OPENSSL_MAJ}.dylib
-    install_name_tool -change "${INSTX_PREFIX}//libssl.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" ./libcrypto.${OPENSSL_MAJ}.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" ./libssl.${OPENSSL_MAJ}.dylib
-    install_name_tool -change "${INSTX_PREFIX}//libssl.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" ./libssl.${OPENSSL_MAJ}.dylib
-
-    install_name_tool -change "${INSTX_PREFIX}//libcrypto.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libcrypto.${OPENSSL_MAJ}.dylib" ./apps/openssl
-    install_name_tool -change "${INSTX_PREFIX}//libssl.${OPENSSL_MAJ}.dylib" \
-        "${INSTX_LIBDIR}/libssl.${OPENSSL_MAJ}.dylib" ./apps/openssl
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-# Install the software only
-MAKE_FLAGS=(install_sw)
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-        printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${OPENSSL_DIR}"
-    fi
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${OPENSSL_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$OPENSSL_TAR" "$OPENSSL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-openssl.sh b/build-openssl.sh
deleted file mode 100755
index 21ddcc91c..000000000
--- a/build-openssl.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenSSL from sources.
-
-# OpenSSL 1.1.1 requires Perl 5.10. If Perl 5.10 is available,
-# then OpenSSL 1.1.1 is built. Otherwise OpenSSL 1.0.2 is built.
-
-# OpenSSL 1.0.2 is end of life. It was last updated in
-# December 2019. But it is better than the OpenSSL gear on
-# an old platform, which can sometimes be OpenSSL 0.9.8.
-
-PKG_NAME=openssl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if [[ -n "$(command -v perl 2>/dev/null)" ]]; then
-    PERL_MAJ=$(perl -V | head -n 1 | awk '{ print $6 }')
-    PERL_MIN=$(perl -V | head -n 1 | awk '{ print $8 }')
-else
-    PERL_MAJ=0
-    PERL_MIN=0
-fi
-
-# Trim stray decimal points resent in old Perl
-PERL_MAJ=$(echo "${PERL_MAJ}" | awk -F '.' '{print $1}')
-PERL_MIN=$(echo "${PERL_MIN}" | awk -F '.' '{print $1}')
-
-# OpenSSL 1.1.1 needs Perl 5.10 or above.
-if [[ "$PERL_MAJ" -lt 5 || ("$PERL_MAJ" -eq 5 && "$PERL_MIN" -lt 10) ]]
-then
-
-    printf "\nFound PERL_MAJ=%d, PERL_MIN=%d, using OpenSSL 1.0.2\n" "${PERL_MAJ}" "${PERL_MIN}"
-
-    if ! ./build-openssl-1.0.2.sh
-    then
-        echo "Failed to build OpenSSL 1.0.2"
-        exit 1
-    fi
-else
-
-    printf "\nFound PERL_MAJ=%d, PERL_MIN=%d, using OpenSSL 1.1.1\n" "${PERL_MAJ}" "${PERL_MIN}"
-
-    if ! ./build-openssl-1.1.1.sh
-    then
-        echo "Failed to build OpenSSL 1.1.1"
-        exit 1
-    fi
-fi
-
-exit 0
-
diff --git a/build-openvpn.sh b/build-openvpn.sh
deleted file mode 100755
index 7f18b0ce3..000000000
--- a/build-openvpn.sh
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds OpenVPN and its dependencies from sources.
-
-TUNTAP_VER=1.3.3
-TUNTAP_TAR=v${TUNTAP_VER}.tar.gz
-TUNTAP_DIR=tuntap-${TUNTAP_VER}
-
-OPENVPN_VER=2.5.5
-OPENVPN_TAR=openvpn-${OPENVPN_VER}.tar.gz
-OPENVPN_DIR=openvpn-${OPENVPN_VER}
-PKG_NAME=openvpn
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "$IS_SOLARIS" -ne 0 ]]; then
-
-echo ""
-echo "========================================"
-echo "============ TUN/TAP Driver ============"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading TUN/TAP"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$TUNTAP_TAR" --ca-certificate="${DIGICERT_ROOT}" \
-     "https://github.com/kaizawa/tuntap/archive/$TUNTAP_TAR"
-then
-    echo "Failed to download TUN/TAP driver"
-    exit 1
-fi
-
-rm -rf "$TUNTAP_DIR" &>/dev/null
-gzip -d < "$TUNTAP_TAR" | tar xf -
-cd "$TUNTAP_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure TUN/TAP driver"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build TUN/TAP driver"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-cd "${CURR_DIR}" || exit 1
-
-fi  # Solaris
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ OpenVPN ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$OPENVPN_TAR" --ca-certificate="$ADDTRUST_ROOT" \
-     "https://swupdate.openvpn.org/community/releases/$OPENVPN_TAR"
-then
-    echo "Failed to download OpenVPN"
-    exit 1
-fi
-
-rm -rf "$OPENVPN_DIR" &>/dev/null
-gzip -d < "$OPENVPN_TAR" | tar xf -
-cd "$OPENVPN_DIR"
-
-if [[ -e ../patch/openvpn.patch ]]; then
-    patch -u -p0 < ../patch/openvpn.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-crypto-library=openssl \
-    --disable-lzo \
-    --disable-lz4 \
-    --disable-plugin-auth-pam
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure OpenVPN"
-    exit 1
-fi
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build OpenVPN"
-    exit 1
-fi
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build OpenVPN"
-    exit 1
-fi
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$TUNTAP_TAR" "$TUNTAP_DIR" "$OPENVPN_TAR" "$OPENVPN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-p11kit.sh b/build-p11kit.sh
deleted file mode 100755
index 626345d60..000000000
--- a/build-p11kit.sh
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds P11-Kit from sources.
-
-P11KIT_VER=0.25.0
-P11KIT_XZ=p11-kit-"$P11KIT_VER".tar.xz
-P11KIT_TAR=p11-kit-"$P11KIT_VER".tar
-P11KIT_DIR=p11-kit-"$P11KIT_VER"
-PKG_NAME=p11-kit
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libtasn1.sh
-then
-    echo "Failed to build libtasn1"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libffi.sh
-then
-    echo "Failed to build libffi"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ P11-kit ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$P11KIT_XZ" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/p11-glue/p11-kit/releases/download/$P11KIT_VER/$P11KIT_XZ"
-then
-    echo "Failed to download p11-kit"
-    exit 1
-fi
-
-rm -rf "$P11KIT_TAR" "$P11KIT_DIR" &>/dev/null
-unxz "$P11KIT_XZ" && tar -xf "$P11KIT_TAR"
-cd "$P11KIT_DIR"
-
-if [[ -e ../patch/p11kit.patch ]]; then
-    patch -u -p0 < ../patch/p11kit.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--with-libiconv-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libintl-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--without-systemd")
-CONFIG_OPTS+=("--without-bash-completion")
-
-# Use the path if available
-if [[ -n "$INSTX_CACERT_PATH" ]]; then
-    CONFIG_OPTS+=("--with-trust-paths=$INSTX_CACERT_PATH")
-else
-    CONFIG_OPTS+=("--without-trust-paths")
-fi
-
-if [[ "$IS_SOLARIS" -ne 0 ]]; then
-    INSTX_CPPFLAGS+=("-D_XOPEN_SOURCE=500")
-    INSTX_LDFLAGS=("-lsocket -lnsl ${INSTX_LDFLAGS}")
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure p11-kit"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# On Solaris the script puts /usr/gnu/bin on-path, so we get a useful grep
-if [[ "$IS_SOLARIS" -ne 0 ]]; then
-    for file in $(grep -IR '#define _XOPEN_SOURCE' "$PWD" | cut -f 1 -d ':' | sort | uniq)
-    do
-        sed -e '/#define _XOPEN_SOURCE/d' "$file" > "$file.fixed"
-        mv "$file.fixed" "$file"
-    done
-fi
-
-# https://github.com/p11-glue/p11-kit/issues/289
-file=p11-kit/test-rpc.c
-sed 's/0xFFFFFFFFFFFFFFFF/0xFFFFFFFFFFFFFFFFull/g' "$file" > "$file.fixed"
-mv "$file.fixed" "$file"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build p11-kit"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-# https://bugs.freedesktop.org/show_bug.cgi?id=103402
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test p11-kit"
-    # exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$P11KIT_XZ" "$P11KIT_TAR" "$P11KIT_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-parigp-data.sh b/build-parigp-data.sh
deleted file mode 100755
index 855108d8e..000000000
--- a/build-parigp-data.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script installs PARI/GP data.
-
-PARI_DATA_DIR=pari-data
-PARI_PACKAGES=(elldata.tgz galpol.tgz seadata.tgz galdata.tgz)
-PKG_NAME=pari-data
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "PARI/GP data is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-# PARI/GP expects data at $datadir. See Install Guide
-# and https://pari.math.u-bordeaux.fr/packages.html:
-#
-#   $ gp
-#   ? default(datadir)
-#   %1 = "/usr/local/share/pari"
-#
-# Packages should be named $datadir/elldata, $datadir/galdata, etc. Note:
-# we have to strip a leading 'data/' after unpacking the tarball.
-
-INSTX_DATADIR="${INSTX_PREFIX}/share/pari"
-export INSTX_DATADIR
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============= PARI/GP data ============="
-echo "========================================"
-
-# Do all of this from a separate subdirectory
-mkdir -p "${PARI_DATA_DIR}"
-cd "${PARI_DATA_DIR}" || exit 1
-
-echo ""
-echo "**********************"
-echo "Downloading packages"
-echo "**********************"
-
-for package in "${PARI_PACKAGES[@]}"
-do
-    echo "Downloading $package"
-    if "${WGET}" -q -O "$package" --ca-certificate="${THE_CA_ZOO}" \
-       "https://pari.math.u-bordeaux.fr/pub/pari/packages/$package"
-    then
-        if ! gzip -d < "$package" | tar xf -
-        then
-            echo "Failed to unpack $package"
-        fi
-    else
-        echo "Failed to download $package"
-    fi
-done
-
-echo ""
-echo "**********************"
-echo "Installing packages"
-echo "**********************"
-
-if [[ -n "${SUDO_PASSWORD}" ]];
-then
-    for package in "${PARI_PACKAGES[@]}"
-    do
-        package="${package%.*}"
-        echo "Installing $package"
-        printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mv "$INSTX_DATADIR/$package" "$INSTX_DATADIR/$package.old" 2>/dev/null
-        printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mv "data/$package" "$INSTX_DATADIR"
-        printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S rm -rf "$INSTX_DATADIR/$package.old"
-    done
-
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    for package in "${PARI_PACKAGES[@]}"
-    do
-        package="${package%.*}"
-        echo "Installing $package"
-        mv "$INSTX_DATADIR/$package" "$INSTX_DATADIR/$package.old" 2>/dev/null
-        mv "data/$package" "$INSTX_DATADIR"
-        rm -rf "$INSTX_DATADIR/$package.old"
-    done
-
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PARI_DATA_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-parigp.sh b/build-parigp.sh
deleted file mode 100755
index 469966e0b..000000000
--- a/build-parigp.sh
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds PARI/GP from sources.
-
-PARI_VER=2.13.0
-PARI_TAR=pari-${PARI_VER}.tar.gz
-PARI_DIR=pari-${PARI_VER}
-PKG_NAME=pari
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gzip.sh
-then
-    echo "Failed to build Gzip"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gmp.sh
-then
-    echo "Failed to build GMP"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-parigp-data.sh
-then
-    echo "Failed to install PARI/GP data"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== PARI/GP ================"
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$PARI_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://pari.math.u-bordeaux.fr/pub/pari/unix/$PARI_TAR"
-then
-    echo "Failed to download PARI/GP"
-    exit 1
-fi
-
-rm -rf "$PARI_DIR" &>/dev/null
-gzip -d < "$PARI_TAR" | tar xf -
-cd "$PARI_DIR" || exit 1
-
-# cp -p config/Makefile.SH config/Makefile.SH.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/parigp.patch ]]; then
-     echo ""
-     echo "***************************"
-     echo "Patching package"
-     echo "***************************"
-
-    patch -u -p0 < ../patch/parigp.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-# XXX_LIBS added to the PARI/GP build gear by parigp.patch.
-# The PARI/GP build gear is blowing away our LIBS.
-
-# TODO: add --tune to config options
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-    XXX_LIBS="${INSTX_LDLIBS}" \
-./Configure \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --sysdatadir="${INSTX_LIBDIR}" \
-    --with-readline="${INSTX_PREFIX}" \
-    --with-readline-lib="${INSTX_LIBDIR}" \
-    --with-gmp="${INSTX_PREFIX}" \
-    --with-gmp-lib="${INSTX_LIBDIR}" \
-    --with-qt
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure PARI/GP"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("gp" "-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build PARI/GP"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-# According to PARI/GP User manual, 'make bench' is the self tests???
-# According to the mailing list, it is 'make dobench'
-MAKE_FLAGS=("test-all" "-k" "-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test PARI/GP"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-fi
-
-# No pkgconfig file. Make one.
-{
-    echo "prefix=${INSTX_PREFIX}"
-    echo "exec_prefix=\${prefix}"
-    echo "includedir=\${prefix}/include"
-    echo "libdir=$INSTX_LIBDIR"
-
-    echo ""
-    echo "Name: PARI/GP"
-    echo "Description: Computer algebra system"
-    echo "URL: https://pari.math.u-bordeaux.fr"
-    echo "Version: $PARI_VER"
-    echo "Cflags: -I\${includedir}"
-    echo "Libs: -L\${libdir} -lpari"
-
-} > ./libpari.pc
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Install the pc file
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "./libpari.pc" "${INSTX_PKGCONFIG}"
-else
-    cp "./libpari.pc" "${INSTX_PKGCONFIG}"
-fi
-
-# Fix permissions once
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PARI_TAR" "$PARI_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-patch-git.sh b/build-patch-git.sh
deleted file mode 100755
index 5f4520425..000000000
--- a/build-patch-git.sh
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds patch from sources.
-
-PATCH_DIR=patch-master
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= patch ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-rm -rf "${PATCH_DIR}"
-
-if ! git clone https://git.savannah.gnu.org/git/patch.git "${PATCH_DIR}"
-then
-    echo "Failed to clone patch"
-    exit 1
-fi
-
-cd "$PATCH_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/patch-master.patch ]]; then
-    patch -u -p0 < ../patch/patch-master.patch
-    echo ""
-fi
-
-if ! ./bootstrap; then
-    echo "Failed to bootstrap Patch"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure patch"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to build patch"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    # At least one known failure in deep-directories.
-    # https://lists.gnu.org/archive/html/bug-patch/2020-09/msg00000.html
-    echo "**********************"
-    echo "Failed to test patch"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PATCH_TAR" "$PATCH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-patch.sh b/build-patch.sh
deleted file mode 100755
index 0154ea737..000000000
--- a/build-patch.sh
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds patch from sources.
-
-PATCH_TAR=patch-2.7.6.tar.gz
-PATCH_DIR=patch-2.7.6
-PKG_NAME=patch
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= patch ================"
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-if ! "${WGET}" -q -O "$PATCH_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/patch/$PATCH_TAR"
-then
-    echo "Failed to download patch"
-    exit 1
-fi
-
-rm -rf "$PATCH_DIR" &>/dev/null
-gzip -d < "$PATCH_TAR" | tar xf -
-cd "$PATCH_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/patch.patch ]]; then
-    echo ""
-    echo "*************************"
-    echo "Patching package"
-    echo "*************************"
-
-    patch -u -p0 < ../patch/patch.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure patch"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build patch"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    # At least one known failure in deep-directories.
-    # https://lists.gnu.org/archive/html/bug-patch/2020-09/msg00000.html
-    echo ""
-    echo "*************************"
-    echo "Failed to test patch"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PATCH_TAR" "$PATCH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-patchelf.sh b/build-patchelf.sh
deleted file mode 100755
index 296c6f2a5..000000000
--- a/build-patchelf.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script downloads patchelf prebuilt binary for Linux
-# and installs it in PREFIX/bin. The prebuilt binary allows
-# us to cover more platforms, like Ubuntu 4 and Fedora 1.
-# The old platforms lack a C++11 compiler.
-
-PATCHELF_VER=0.14.3
-PATCHELF_TAR=${PATCHELF_VER}.tar.gz
-PATCHELF_DIR=patchelf-${PATCHELF_VER}
-PKG_NAME=patchelf
-
-case $(uname -m 2>/dev/null) in
-    i686) PATCHELF_ARCH=i686 ;;
-    x86_64|amd64) PATCHELF_ARCH=x86_64 ;;
-    aarch64|arm64) PATCHELF_ARCH=aarch64 ;;
-    armv7l) PATCHELF_ARCH=armv7l ;;
-    ppc64le) PATCHELF_ARCH=ppc64le ;;
-    s390x) PATCHELF_ARCH=s390x ;;
-    *) PATCHELF_ARCH=unknown ;;
-esac
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# Verify system uses ELF
-#magic=$(cut -b 2-4 /bin/ls | head -n 1)
-#if [[ "$magic" != "ELF" ]]; then
-#    exit 0
-#fi
-
-# Patchelf only builds on Linux and HURD. Solaris is trouble.
-if [[ "$IS_LINUX" -eq 0 && "$IS_HURD" -eq 0 ]]; then
-    exit 0
-fi
-
-# patchelf is a program and it is supposed to be rebuilt
-# on demand. However, we install a prebuilt binary. No
-# need to puke a message for each recipe.
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    #echo ""
-    #echo "${PKG_NAME} is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if [[ -e ./build-cacerts.sh ]]; then
-    BUILD_CACERTS=./build-cacerts.sh
-elif [[ -e ../build-cacerts.sh ]]; then
-    BUILD_CACERTS=../build-cacerts.sh
-elif [[ -e ../../build-cacerts.sh ]]; then
-    BUILD_CACERTS=../../build-cacerts.sh
-fi
-
-if ! ${BUILD_CACERTS}
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ -e ./setup-directories.sh ]]; then
-    SETUP_DIRS=./setup-directories.sh
-elif [[ -e ../setup-directories.sh ]]; then
-    SETUP_DIRS=../setup-directories.sh
-fi
-
-if ! ${SETUP_DIRS}
-then
-    echo "Failed to setup directories"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Patchelf ==============="
-echo "========================================"
-
-echo ""
-echo "****************************"
-echo "Downloading package"
-echo "****************************"
-
-echo ""
-echo "Patchelf ${PATCHELF_VER}..."
-
-rm -rf "$PATCHELF_DIR" && mkdir -p "$PATCHELF_DIR" && cd "$PATCHELF_DIR" || exit 1
-
-if ! "${WGET}" -q -O "${PATCHELF_TAR}" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/NixOS/patchelf/releases/download/${PATCHELF_VER}/patchelf-${PATCHELF_VER}-${PATCHELF_ARCH}.tar.gz"
-then
-    echo "Failed to download patchelf"
-    exit 1
-fi
-
-# The binary is prebuilt so we only need to unpack it
-gzip -d < "$PATCHELF_TAR" | tar xf -
-
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo mkdir -p "${INSTX_PREFIX}/bin"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo cp -p bin/patchelf "${INSTX_PREFIX}/bin"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    mkdir -p "${INSTX_PREFIX}/bin"
-    cp -p bin/patchelf "${INSTX_PREFIX}/bin"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("${PATCHELF_TAR}" "${PATCHELF_DIR}")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-pcre.sh b/build-pcre.sh
deleted file mode 100755
index 7eb64fd0c..000000000
--- a/build-pcre.sh
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds PCRE from sources.
-
-PCRE_VER=8.45
-PCRE_TAR="pcre-${PCRE_VER}.tar.gz"
-PCRE_DIR="pcre-${PCRE_VER}"
-PKG_NAME=pcre
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= PCRE ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "PCRE ${PCRE_VER}..."
-
-# https://downloads.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.gz
-
-if ! "${WGET}" -q -O "$PCRE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VER}/${PCRE_TAR}"
-then
-    echo "Failed to download PCRE"
-    exit 1
-fi
-
-rm -rf "$PCRE_DIR" &>/dev/null
-gzip -d < "$PCRE_TAR" | tar xf -
-cd "$PCRE_DIR"
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/pcre.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    # patch -u -p0 < ../patch/pcre.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-pcregrep-libz")
-CONFIG_OPTS+=("--enable-pcregrep-libbz2")
-
-# Disable JIT for Apple M1's. The Guile devs need to port it.
-# https://www.wwdcnotes.com/notes/wwdc20/10686/
-apple_silicon=$(sysctl machdep.cpu.brand_string 2>/dev/null | grep -i -c "Apple M1")
-if [[ "${apple_silicon}" -eq 1 ]]; then
-    CONFIG_OPTS+=("--disable-jit")
-else
-    CONFIG_OPTS+=("--enable-jit")
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    pcre_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${PCRE_DIR}"
-    pcre_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${PCRE_DIR}"
-else
-    pcre_cflags="${INSTX_CFLAGS}"
-    pcre_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${pcre_cflags}" \
-    CXXFLAGS="${pcre_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure PCRE"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build PCRE"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test PCRE"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${PCRE_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${PCRE_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PCRE_TAR" "$PCRE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-pcre2.sh b/build-pcre2.sh
deleted file mode 100755
index f21a9d07f..000000000
--- a/build-pcre2.sh
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds PCRE from sources.
-
-PCRE2_VER=10.42
-PCRE2_TAR="pcre2-${PCRE2_VER}.tar.gz"
-PCRE2_DIR="pcre2-${PCRE2_VER}"
-PKG_NAME=pcre2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= PCRE2 ================"
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-echo ""
-echo "PCRE2 ${PCRE2_VER}..."
-
-if ! "${WGET}" -q -O "$PCRE2_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PCRE2_VER/$PCRE2_TAR"
-then
-    echo "Failed to download PCRE2"
-    exit 1
-fi
-
-rm -rf "$PCRE2_DIR" &>/dev/null
-gzip -d < "$PCRE2_TAR" | tar xf -
-cd "$PCRE2_DIR"
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/pcre2.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/pcre2.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-pcre2-8")
-CONFIG_OPTS+=("--enable-pcre2-16")
-CONFIG_OPTS+=("--enable-pcre2-32")
-
-# Disable JIT for Apple M1's. The Guile devs need to port it.
-# https://www.wwdcnotes.com/notes/wwdc20/10686/
-apple_silicon=$(sysctl machdep.cpu.brand_string 2>/dev/null | grep -i -c "Apple M1")
-if [[ "${apple_silicon}" -eq 1 ]]; then
-    CONFIG_OPTS+=("--disable-jit")
-else
-    CONFIG_OPTS+=("--enable-jit")
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    pcre2_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${PCRE2_DIR}"
-    pcre2_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${PCRE2_DIR}"
-else
-    pcre2_cflags="${INSTX_CFLAGS}"
-    pcre2_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${pcre2_cflags}" \
-    CXXFLAGS="${pcre2_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure PCRE2"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build PCRE2"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-# PCRE2 fails one self test on older systems, like Fedora 1
-# and Ubuntu 4. Allow the failure but print the result.
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to test PCRE2"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "*************************"
-    echo "Installing anyways..."
-    echo "*************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${PCRE2_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${PCRE2_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PCRE2_TAR" "$PCRE2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-pcsclite.sh b/build-pcsclite.sh
deleted file mode 100755
index 14ff7b6bc..000000000
--- a/build-pcsclite.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds PC/SC-Lite from sources.
-
-PCSC_VER=1.9.5
-PCSC_TAR=pcsc-lite-"$PCSC_VER".tar.bz2
-PCSC_DIR=pcsc-lite-"$PCSC_VER"
-PKG_NAME=pcsc-lite
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== PC/SC-Lite =============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$PCSC_TAR" --ca-certificate="${THE_CA_ZOO}" \
-     "https://pcsclite.apdu.fr/files/$PCSC_TAR"
-then
-    echo "Failed to download PC/SC-Lite"
-    exit 1
-fi
-
-rm -rf "$PCSC_DIR" &>/dev/null
-bzip2 -dk < "$PCSC_TAR" | tar xf -
-cd "$PCSC_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --disable-libsystemd \
-    --disable-libudev
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure PC/SC-Lite"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build PC/SC-Lite"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to test PC/SC-Lite"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PCSC_TAR" "$PCSC_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-perl.sh b/build-perl.sh
deleted file mode 100755
index 38f447bab..000000000
--- a/build-perl.sh
+++ /dev/null
@@ -1,415 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Perl from sources.
-
-# A modern Perl with some TextUtils and FindBin is needed by OpenSSL 1.1.x,
-# but Perl is fragile. We can't install packages like HTTP unless it is in
-# a magic directory like `/usr/local`. There's something broke with the cpan
-# program that gets built. We need to keep an eye on what breaks due to Perl.
-
-# This downloads and installs Perl's package manager. I'm not sure if we
-# should do something with it. I'm not even sure if it uses our Perl or not.
-#
-#     curl -L http://cpanmin.us | perl - App::cpanminus
-
-# Perl releases are even numbers. Don't install an odd-release number.
-
-PERL_VER=5.32.1
-PERL_TAR=perl-${PERL_VER}.tar.gz
-PERL_DIR=perl-${PERL_VER}
-PKG_NAME=perl
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gdbm.sh
-then
-    echo "Failed to build GNU DB"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bdb.sh
-then
-    echo "Failed to build Berkeley DB"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ ! -f "$INSTX_PREFIX/bin/sed" ]]; then
-    if ! ./build-sed.sh
-    then
-        echo "Failed to build Sed"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Perl ================="
-echo "========================================"
-
-echo ""
-echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-echo "@@ Warning: Perl does not handle rpaths and runpaths properly. @@"
-echo "@@ The wrong libraries will likely be loaded during runtime.   @@"
-echo "@@ Also see https://github.com/Perl/perl5/issues/17534,        @@"
-echo "@@ https://github.com/Perl/perl5/issues/18467, and             @@"
-echo "@@ https://github.com/Perl/perl5/issues/18468.                 @@"
-echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-echo ""
-echo "Perl ${PERL_VER}..."
-
-if ! "${WGET}" -q -O "$PERL_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.cpan.org/src/5.0/$PERL_TAR"
-then
-    echo "Failed to download Perl"
-    exit 1
-fi
-
-rm -rf "$PERL_DIR" &>/dev/null
-gzip -d < "$PERL_TAR" | tar xf -
-cd "$PERL_DIR" || exit 1
-
-#cp op.c op.c.orig
-#cp pp.c pp.c.orig
-#cp sv.c sv.c.orig
-#cp numeric.c numeric.c.orig
-#cp regcomp.c regcomp.c.orig
-#cp vms/vms.c vms/vms.c.orig
-#cp ext/POSIX/POSIX.xs ext/POSIX/POSIX.xs.orig
-#cp cpan/Compress-Raw-Zlib/zlib-src/zutil.c cpan/Compress-Raw-Zlib/zlib-src/zutil.c.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/perl.patch ]]; then
-    chmod a+w op.c pp.c sv.c numeric.c regcomp.c vms/vms.c
-    chmod a+w ext/POSIX/POSIX.xs
-    chmod a+w cpan/Compress-Raw-Zlib/zlib-src/zutil.c
-
-    echo ""
-    patch -u -p0 < ../patch/perl.patch
-
-    chmod a-w op.c pp.c sv.c numeric.c regcomp.c vms/vms.c
-    chmod a-w ext/POSIX/POSIX.xs
-    chmod a-w cpan/Compress-Raw-Zlib/zlib-src/zutil.c
-fi
-
-#diff -u op.c.orig op.c > ../patch/perl.patch
-#diff -u pp.c.orig pp.c >> ../patch/perl.patch
-#diff -u sv.c.orig sv.c >> ../patch/perl.patch
-#diff -u numeric.c.orig numeric.c >> ../patch/perl.patch
-#diff -u regcomp.c.orig regcomp.c >> ../patch/perl.patch
-#diff -u vms/vms.c.orig vms/vms.c >> ../patch/perl.patch
-#diff -u ext/POSIX/POSIX.xs.orig ext/POSIX/POSIX.xs >> ../patch/perl.patch
-#diff -u cpan/Compress-Raw-Zlib/zlib-src/zutil.c.orig cpan/Compress-Raw-Zlib/zlib-src/zutil.c >> ../patch/perl.patch
-
-# Perl creates files in the user's home directory, but owned by root:root.
-# It looks like they are building shit during 'make install'. WTF???
-# Note to future maintainers: never build shit during 'make install'.
-mkdir -p "$HOME/.cpan"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-# The HTTP gear breaks on all distros, like Ubuntu 4 and Fedora 32
-# https://www.nntp.perl.org/group/perl.beginners/2020/01/msg127308.html
-# -Dextras="HTTP::Daemon HTTP::Request Test::More Text::Template"
-
-# CPAN uses Make rather than Gmake. It breaks on some of the BSDs.
-# Also see https://github.com/Perl/perl5/issues/17543.
-export MAKE="${MAKE}"
-
-# More broken Perl shit... Mishandling of $ORIGIN requires this shit...
-# https://metacpan.org/pod/distribution/perl/INSTALL#Dynamic-Loading
-OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
-OLD_DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH"
-OLD_SHLIB_PATH="$SHLIB_PATH"
-OLD_LIBPATH="$LIBPATH"
-
-# Strip duplicate, leading and trailing colons
-LD_LIBRARY_PATH=$(echo "$INSTX_LIBDIR:$LD_LIBRARY_PATH" | tr -s ':' | sed -e 's/^:\(.*\)/\1/' | sed -e 's/:$//g')
-DYLD_LIBRARY_PATH=$(echo "$INSTX_LIBDIR:$DYLD_LIBRARY_PATH" | tr -s ':' | sed -e 's/^:\(.*\)/\1/' | sed -e 's/:$//g')
-SHLIB_PATH=$(echo "$INSTX_LIBDIR:$SHLIB_PATH" | tr -s ':' | sed -e 's/^:\(.*\)/\1/' | sed -e 's/:$//g')
-LIBPATH=$(echo "$INSTX_LIBDIR:$LIBPATH" | tr -s ':' | sed -e 's/^:\(.*\)/\1/' | sed -e 's/:$//g')
-export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
-
-# And More broken Perl shit... Why can't the build system do this itself???
-export PERL5LIB="$PWD/lib"
-
-# And even more broken Perl shit. Perl munges -Wl,-R,'$ORIGIN/../lib'.
-# Somehow it manages to escape the '$ORIGIN/../lib' in single quotes.
-# Set it to something it does not mishandle, and then fix it later.
-# Also see https://github.com/Perl/perl5/issues/17534.
-export ORIGIN="ABCDE_ORIGIN_VWXYZ"
-
-# Don't use Perl versions of zLib or Bzip2. Perl versions are old and
-# have outstanding CVEs. Our versions are new and hardened. Also see
-# http://www.linuxfromscratch.org/lfs/view/development/chapter08/perl.html
-export BUILD_ZLIB=0 BUILD_BZIP2=0
-
-# And more broken Perl shit on OS X.
-# https://stackoverflow.com/q/32280732
-if [[ "${OSX_10p5_OR_10p6}" -eq 1 ]]; then
-    echo "Fixing Perl's MACOSX_DEPLOYMENT_TARGET"
-    filename=hints/darwin.sh
-    chmod +w "${filename}"
-    sed 's/MACOSX_DEPLOYMENT_TARGET=10.3/MACOSX_DEPLOYMENT_TARGET=10.5/g' "${filename}" > "${filename}.fixed"
-    mv "${filename}.fixed" "${filename}"
-    chmod -w "${filename}"
-fi
-
-if [[ "${INSTX_LIBM}" -eq 1 ]]; then
-    opt_libm="-lm"
-fi
-
-    CC="${CC}" \
-    CXX="${CXX}" \
-    PKGCONFIG="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${opt_libm} ${INSTX_LDLIBS}" \
-    LIBS="${opt_libm} ${INSTX_LDLIBS}" \
-./Configure -des \
-    -Dprefix="${INSTX_PREFIX}" \
-    -Dlibdir="${INSTX_LIBDIR}" \
-    -Dlocincpth="${INSTX_PREFIX}/include" \
-    -Dloclibpth="${INSTX_LIBDIR}" \
-    -Dpkgconfig="${INSTX_PKGCONFIG}" \
-    -Dcc="${CC}" \
-    -Dcxx="${CXX}" \
-    -Acppflags="${INSTX_CPPFLAGS}" \
-    -Aasflags="${INSTX_ASFLAGS}" \
-    -Accflags="${INSTX_CPPFLAGS} ${INSTX_CFLAGS}" \
-    -Acxxflags="${INSTX_CPPFLAGS} ${INSTX_CXXFLAGS}" \
-    -Aldflags="${INSTX_LDFLAGS}" \
-    -Aldlibs="${opt_libm} ${INSTX_LDLIBS}" \
-    -Alibs="${opt_libm} ${INSTX_LDLIBS}" \
-    -Duseshrplib \
-    -Dusethreads \
-    -Dextras="FindBin Text::* Util::* ExtUtils::* Term::* Test::* HTTP::*"
-    # -Dextras="FindBin Text::Template Test::More HTTP::Daemon HTTP::Request"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "************************"
-    echo "Failed to configure Perl"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-echo ""
-echo "******************************"
-echo "Fixing config.sh and Makefiles"
-echo "******************************"
-
-# Thanks to @tonycoz on the Perl bug tracker.
-# https://github.com/Perl/perl5/issues/18466
-
-origin_good=$(echo '$$ORIGIN/' | sed -e 's/[\/&]/\\&/g')
-origin_bad=$(echo 'ABCDE_ORIGIN_VWXYZ/' | sed -e 's/[\/&]/\\&/g')
-
-miniperl_good=$(echo '$(miniperl_objs) $(libs)')
-miniperl_bad=$(echo '$(miniperl_objs) $(libs)')
-
-IFS= find "./" \( -name 'config.sh' -o -name 'Makefile' \) -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    echo "$file" | tr -s '/' | cut -c 3-
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-
-    sed -e "s/$origin_bad/$origin_good/g" \
-        -e "s/$miniperl_bad/$miniperl_good/g" \
-        -e "s/ -no-cpp-precomp//g" \
-        "$file" > "$file.fixed" && \
-    mv "$file.fixed" "$file"
-
-    # Need a subshell. Regenerate the Makefile
-    (
-        cd "$(dirname "${file}")"
-        if [[ -f Makefile ]]; then
-            ${MAKE} Makefile 2>/dev/null
-        fi
-    )
-
-    chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-# Not needed due to @tonycoz's workarounds.
-# bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# porting/exec-bit.t failure after fix-makefiles.sh
-# chmod a+x ./Makefile.SH;
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-# Perl has a problem with parallel builds on some paltforms.
-if [[ "$IS_NETBSD" -eq 1 ]]; then
-    MAKE_FLAGS=("-j" "1")
-else
-    MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-fi
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "************************"
-    echo "Failed to build Perl"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check" "-j" "1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "************************"
-    echo "Failed to test Perl"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-# Restore for the braindead installer
-export LD_LIBRARY_PATH="$OLD_LD_LIBRARY_PATH"
-export DYLD_LIBRARY_PATH="$OLD_DYLD_LIBRARY_PATH"
-export SHLIB_PATH="$OLD_LD_SHLIB_PATH"
-export LIBPATH="$OLD_LIBPATH"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-# printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S chown -R "$SUDO_USER:$SUDO_USER" "$HOME/.cpan"
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PERL_TAR" "$PERL_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-pkgconfig.sh b/build-pkgconfig.sh
deleted file mode 100755
index 48f8bf855..000000000
--- a/build-pkgconfig.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds pkg-config from sources.
-
-# On OS X, we may need to install pkg-config before running setup-wget.sh.
-# OS X has cURL by default, so use it instead of Wget when Wget is not available.
-
-PKGCONFIG_VER=0.29.2
-PKGCONFIG_TAR=pkg-config-${PKGCONFIG_VER}.tar.gz
-PKGCONFIG_DIR=pkg-config-${PKGCONFIG_VER}
-PKG_NAME=pkg-config
-
-###############################################################################
-
-# pkg-config is special
-export INSTX_DISABLE_PKGCONFIG_CHECK=1
-export INSTX_DISABLE_WGET_CHECK=1
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-unset INSTX_DISABLE_PKGCONFIG_CHECK
-unset INSTX_DISABLE_WGET_CHECK
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== pkg-config =============="
-echo "========================================"
-
-echo ""
-echo "******************************"
-echo "Downloading package"
-echo "******************************"
-
-if [[ -n $(command -v "${WGET}" 2>/dev/null) ]]
-then
-    if ! "${WGET}" -q -O "$PKGCONFIG_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-         "https://pkg-config.freedesktop.org/releases/$PKGCONFIG_TAR"
-    then
-        echo "Failed to download pkg-config"
-        exit 1
-    fi
-elif [[ -n $(command -v curl 2>/dev/null) ]]
-then
-    if ! curl -s -o "$PKGCONFIG_TAR" --cacert "${LETS_ENCRYPT_ROOT}" \
-         "https://pkg-config.freedesktop.org/releases/$PKGCONFIG_TAR"
-    then
-        echo "Failed to download pkg-config"
-        exit 1
-    fi
-else
-    echo "Wget and cURL are not available. We give up. Please install"
-    echo "pkg-config from https://pkg-config.freedesktop.org/releases."
-    exit 1
-fi
-
-rm -rf "$PKGCONFIG_DIR" &>/dev/null
-gzip -d < "$PKGCONFIG_TAR" | tar xf -
-cd "$PKGCONFIG_DIR" || exit 1
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "******************************"
-echo "Configuring package"
-echo "******************************"
-
-CONFIG_OPTS=()
-if [[ "$IS_DARWIN" -ne 0 ]]; then
-    CONFIG_OPTS+=("--with-internal-glib")
-#elif [[ "$IS_SOLARIS" -ne 0 ]]; then
-#    CONFIG_OPTS+=("--with-internal-glib")
-elif [[ "$IS_DRAGONFLY" -ne 0 ]]; then
-    CONFIG_OPTS+=("--with-internal-glib")
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "******************************"
-    echo "Failed to configure pkg-config"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "******************************"
-echo "Building package"
-echo "******************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "MAKEINFO=true" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "******************************"
-    echo "Failed to build pkg-config"
-    echo "******************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "******************************"
-echo "Installing package"
-echo "******************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PKGCONFIG_TAR" "$PKGCONFIG_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-pspp.sh b/build-pspp.sh
deleted file mode 100755
index 7dd215d7f..000000000
--- a/build-pspp.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds PSPP from sources.
-
-PSPP_VER=1.4.1
-PSPP_TAR=pspp-${PSPP_VER}.tar.gz
-PSPP_DIR=pspp-${PSPP_VER}
-PKG_NAME=pspp
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libxml2.sh
-then
-    echo "Failed to build libxml2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libgsl.sh
-then
-    echo "Failed to build GSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= PSPP ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$PSPP_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/pspp/$PSPP_TAR"
-then
-    echo "Failed to download PSPP"
-    exit 1
-fi
-
-rm -rf "$PSPP_DIR" &>/dev/null
-gzip -d < "$PSPP_TAR" | tar xf -
-cd "$PSPP_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/pspp.patch ]]; then
-    patch -u -p0 < ../patch/pspp.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libreadline-prefix="${INSTX_PREFIX}" \
-    --with-libhistory-prefix="${INSTX_PREFIX}" \
-    --disable-assert \
-    --without-gui \
-    --without-cairo
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure PSPP"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build PSPP"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test PSPP"
-    echo "**********************"
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PSPP_TAR" "$PSPP_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-python2.sh b/build-python2.sh
deleted file mode 100755
index 181437db0..000000000
--- a/build-python2.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Python 2.x from sources.
-# Python 2.7.18 is the last official 2.x release from the project.
-
-PYTHON_VER=2.7.18
-PYTHON_TAR=Python-${PYTHON_VER}.tgz
-PYTHON_DIR=Python-${PYTHON_VER}
-PKG_NAME=python2
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
- if ! source ./setup-environ.sh
- then
- echo "Failed to set environment"
- exit 1
- fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
- if ! source ./setup-password.sh
- then
- echo "Failed to process password"
- exit 1
- fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
- echo "Failed to install CA Certs"
- exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexpat.sh
-then
- echo "Failed to install Expat"
- exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gdbm.sh
-then
- echo "Failed to install GDBM"
- exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Python 2.7 =============="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-if ! "${WGET}" -q -O "$PYTHON_TAR" --ca-certificate="${DIGICERT_ROOT}"
- "https://www.python.org/ftp/python/$PYTHON_VER/$PYTHON_TAR"
-then
-    echo "Failed to download Python 2.7"
-    exit 1
-fi
-
-rm -rf "$PYTHON_DIR" &>/dev/null
-gzip -d < "$PYTHON_TAR" | tar xf -
-cd "$PYTHON_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/python2.patch ]]; then
-    patch -u -p0 < ../patch/python2.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-    CPPFLAGS="${INSTX_CPPFLAGS}"
-    ASFLAGS="${INSTX_ASFLAGS}"
-    CFLAGS="${INSTX_CFLAGS}"
-    CXXFLAGS="${INSTX_CXXFLAGS}"
-    LDFLAGS="${INSTX_LDFLAGS}"
-    LIBS="${INSTX_LDLIBS}"
-./configure
-    --build="${AUTOCONF_BUILD}"
-    --prefix="${INSTX_PREFIX}"
-    --libdir="${INSTX_LIBDIR}"
-    --enable-shared
-    --with-ensurepip=yes
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Python 2.7"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build Python 2.7"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("test" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "*************************"
-    echo "Failed to test Python 2.7"
-    echo "*************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PYTHON_TAR" "$PYTHON_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-python3.sh b/build-python3.sh
deleted file mode 100755
index e59b3804e..000000000
--- a/build-python3.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Python 3.x from sources.
-
-PYTHON_VER=3.10.1
-PYTHON_TAR=Python-${PYTHON_VER}.tgz
-PYTHON_DIR=Python-${PYTHON_VER}
-PKG_NAME=python3
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-     fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexpat.sh
-then
-    echo "Failed to install Expat"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-gdbm.sh
-then
-    echo "Failed to install GDBM"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== Python 3.8 =============="
-echo "========================================"
-
-echo ""
-echo "*************************"
-echo "Downloading package"
-echo "*************************"
-
-if ! "${WGET}" -q -O "$PYTHON_TAR" --ca-certificate="${DIGICERT_ROOT}"
- "https://www.python.org/ftp/python/$PYTHON_VER/$PYTHON_TAR"
-then
-    echo "Failed to download Python 3.8"
-    exit 1
-fi
-
-rm -rf "$PYTHON_DIR" &>/dev/null
-gzip -d < "$PYTHON_TAR" | tar xf -
-cd "$PYTHON_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/python3.patch ]]; then
-    patch -u -p0 < ../patch/python3.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-    CPPFLAGS="${INSTX_CPPFLAGS}"
-    ASFLAGS="${INSTX_ASFLAGS}"
-    CFLAGS="${INSTX_CFLAGS}"
-    CXXFLAGS="${INSTX_CXXFLAGS}"
-    LDFLAGS="${INSTX_LDFLAGS}"
-    LIBS="${INSTX_LDLIBS}"
-./configure
-    --build="${AUTOCONF_BUILD}"
-    --prefix="${INSTX_PREFIX}"
-    --libdir="${INSTX_LIBDIR}"
-    --enable-shared
-    --with-ensurepip=yes
-
-if [[ "$?" -ne 0 ]]; then
-   echo "Failed to configure Python 3.8"
-   exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build Python 3.8"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-MAKE_FLAGS=("test" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "*************************"
-    echo "Failed to test Python 3.8"
-    echo "*************************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$PYTHON_TAR" "$PYTHON_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-qemacs.sh b/build-qemacs.sh
deleted file mode 100755
index a5f814813..000000000
--- a/build-qemacs.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds QEmacs from CVS sources.
-
-# http://savannah.nongnu.org/cvs/?group=qemacs
-# https://www.emacswiki.org/emacs/QEmacs
-# http://cvs.savannah.nongnu.org/viewvc/qemacs/qemacs/
-
-QEMACS_DIR=qemacs
-PKG_NAME=qemacs
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -z "$(command -v cvs)" ]]; then
-    echo "QEmacs requires CVS access to Savannah. Please install cvs."
-    exit 1
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-#if ! ./build-readline.sh
-#then
-#    echo "Failed to build Readline"
-#    exit 1
-#fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Qemacs ================"
-echo "========================================"
-
-export CVSEDITOR=emacs
-export CVSROOT="$PWD/qemacs"
-mkdir -p "$CVSROOT"
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-if ! cvs -z3 -d:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs co qemacs;
-then
-    echo "Failed to download QEmacs"
-    exit 1
-fi
-
-cd "$QEMACS_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/qemacs.patch ]]; then
-    patch -u -p0 < ../patch/qemacs.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --disable-x11 \
-    --disable-ffmpeg
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure QEmacs"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS}"
-then
-    echo "Failed to build QEmacs"
-    exit 1
-fi
-
-# Fix flags in .pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-#MAKE_FLAGS="check"
-#if ! "${MAKE}" "${MAKE_FLAGS}"
-#then
-#    echo ""
-#    echo "Failed to test QEmacs"
-#    echo ""
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$QEMACS_TAR" "$QEMACS_DIR")
-    for artifact in "${ARTIFACTS}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-readline.sh b/build-readline.sh
deleted file mode 100755
index df94d5e16..000000000
--- a/build-readline.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Readline from sources. Ncurses should
-# be built first.
-
-READLN_TAR=readline-8.2.tar.gz
-READLN_DIR=readline-8.2
-PKG_NAME=readline
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses.sh
-then
-    echo "Failed to build ncurses"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Readline ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$READLN_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/readline/$READLN_TAR"
-then
-    echo "Failed to download Readline"
-    exit 1
-fi
-
-rm -rf "$READLN_DIR" &>/dev/null
-gzip -d < "$READLN_TAR" | tar xf -
-cd "$READLN_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/readline.patch ]]; then
-    echo ""
-    echo "****************************"
-    echo "Patching package"
-    echo "****************************"
-
-    patch -u -p0 < ../patch/readline.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "$IS_DARWIN" -ne 0 ]]; then
-    readline_cppflags="${INSTX_CPPFLAGS} -DNEED_EXTERN_PC"
-else
-    readline_cppflags="${INSTX_CPPFLAGS}"
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    readline_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${READLN_DIR}"
-    readline_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${READLN_DIR}"
-else
-    readline_cflags="${INSTX_CFLAGS}"
-    readline_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${readline_cppflags}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${readline_cflags}" \
-    CXXFLAGS="${readline_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --enable-multibyte \
-    --disable-install-examples
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "****************************"
-    echo "Failed to configure Readline"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to build Readline"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "****************************"
-    echo "Failed to test Readline"
-    echo "****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${READLN_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${READLN_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true
-then
-    ARTIFACTS=("$READLN_TAR" "$READLN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-rootkey.sh b/build-rootkey.sh
deleted file mode 100755
index 6c2c7263a..000000000
--- a/build-rootkey.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script writes several files needed by DNSSEC
-# and libraries like Unbound and LDNS.
-
-PKG_NAME=rootkey
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    #echo ""
-    #echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============ ICANN Root CAs ============"
-echo "========================================"
-
-BOOTSTRAP_ICANN_FILE="bootstrap/icannbundle.pem"
-
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "$INSTX_ICANN_PATH"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "$BOOTSTRAP_ICANN_FILE" "$INSTX_ICANN_FILE"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S chmod u=rw,g=r,o=r "$INSTX_ICANN_FILE"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash"${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    mkdir -p "$INSTX_ICANN_PATH"
-    cp "$BOOTSTRAP_ICANN_FILE" "$INSTX_ICANN_FILE"
-    chmod u=rw,g=r,o=r "$INSTX_ICANN_FILE"
-    bash"${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============ DNS Root Keys ============="
-echo "========================================"
-
-BOOTSTRAP_ROOTKEY_FILE="bootstrap/dnsrootkey.pem"
-
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "$INSTX_ROOTKEY_PATH"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S rm -f "$INSTX_ROOTKEY_PATH/dnsroot.key"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "$BOOTSTRAP_ROOTKEY_FILE" "$INSTX_ROOTKEY_FILE"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S chmod u=rw,g=r,o=r "$INSTX_ROOTKEY_FILE"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash"${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    mkdir -p "$INSTX_ROOTKEY_PATH"
-    rm -f "$INSTX_ROOTKEY_PATH/dnsroot.key"
-    cp "$BOOTSTRAP_ROOTKEY_FILE" "$INSTX_ROOTKEY_FILE"
-    chmod u=rw,g=r,o=r "$INSTX_ROOTKEY_FILE"
-    bash"${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "You should create a cron job that runs unbound-anchor on a"
-echo "regular basis to update $INSTX_ROOTKEY_FILE"
-echo "*****************************************************************************"
-echo ""
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-exit 0
diff --git a/build-sed.sh b/build-sed.sh
deleted file mode 100755
index c895c0fca..000000000
--- a/build-sed.sh
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Sed from sources.
-
-SED_VER=4.8
-SED_TAR="sed-${SED_VER}.tar.gz"
-SED_DIR="sed-${SED_VER}"
-PKG_NAME=sed
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== Sed ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Sed ${SED_VER}..."
-
-if ! "${WGET}" -q -O "$SED_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/sed/$SED_TAR"
-then
-    echo "Failed to download Sed"
-    echo "Maybe Wget is too old. Perhaps run setup-wget.sh?"
-    exit 1
-fi
-
-rm -rf "$SED_DIR" &>/dev/null
-gzip -d < "$SED_TAR" | tar xf -
-cd "$SED_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/sed.patch ]]; then
-    patch -u -p0 < ../patch/sed.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --disable-assert
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Sed"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build Sed"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    # Sed cannot pass its self test on some platforms
-    # https://lists.gnu.org/archive/html/bug-sed/2020-01/msg00010.html
-    echo "**********************"
-    echo "Failed to test Sed"
-    echo "Installing anyway..."
-    echo "**********************"
-    # exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$SED_TAR" "$SED_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-sipwitch.sh b/build-sipwitch.sh
deleted file mode 100755
index 228f634ef..000000000
--- a/build-sipwitch.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds SIP Witch from sources.
-
-SIPW_TAR=sipwitch-1.9.15.tar.gz
-SIPW_DIR=sipwitch-1.9.15
-PKG_NAME=sipwitch
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexosip2-rc.sh
-then
-    echo "Failed to build libosip2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ucommon.sh
-then
-    echo "Failed to build ucommon"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "============== SIP Witch ==============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$SIPW_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/sipwitch/$SIPW_TAR"
-then
-    echo "Failed to download SIP Witch"
-    exit 1
-fi
-
-rm -rf "$SIPW_DIR" &>/dev/null
-gzip -d < "$SIPW_TAR" | tar xf -
-cd "$SIPW_DIR" || exit 1
-
-#cp common/voip.cpp common/voip.cpp.orig
-#cp utils/sipquery.cpp utils/sipquery.cpp.orig
-#cp server/stack.cpp server/stack.cpp.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/sipwitch-rc.patch ]]; then
-    patch -u -p0 < ../patch/sipwitch-rc.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --sysconfdir="${INSTX_PREFIX}/etc" \
-    --localstatedir="${INSTX_PREFIX}/var" \
-    --with-pkg-config \
-    --with-libeXosip2=libeXosip2 \
-    --enable-openssl
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure SIP Witch"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-# Fix makefiles again
-IFS= find "./" -iname 'Makefile' -print | while read -r file
-do
-    echo "$file" | sed 's/^\.\///g'
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed -e "s/ libosip2/ -leXosip2/g" \
-        -e "s/ libeXosip2/ -leXosip2/g" \
-        "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-k" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build SIP Witch"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to test SIP Witch"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$SIPW_TAR" "$SIPW_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-sqlite3.sh b/build-sqlite3.sh
deleted file mode 100755
index 08f0e02bf..000000000
--- a/build-sqlite3.sh
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Sqlite3 from sources.
-
-SQLITE_VER=3370200
-SQLITE_TAR=sqlite-autoconf-${SQLITE_VER}.tar.gz
-SQLITE_DIR=sqlite-autoconf-${SQLITE_VER}
-PKG_NAME=sqlite3
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-#Sqlite only needs Readline
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Sqlite3 ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Sqlite3 ${SQLITE_VER}..."
-
-if ! "${WGET}" -q -O "$SQLITE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://sqlite.org/2021/$SQLITE_TAR"
-then
-    echo "Failed to download Sqlite3"
-    exit 1
-fi
-
-rm -rf "$SQLITE_DIR" &>/dev/null
-gzip -d < "$SQLITE_TAR" | tar xf -
-cd "$SQLITE_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/sqlite3.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/sqlite3.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Compile: https://sqlite.org/compile.html
-# FTS3 and FTS4: https://sqlite.org/fts3.html
-# FTS5: https://sqlite.org/fts5.html
-# R*Tree: https://sqlite.org/rtree.html
-# JSON1: https://sqlite.org/json1.html
-
-    sqlite_cppflags="${INSTX_CPPFLAGS}"
-    sqlite_cppflags="${sqlite_cppflags} -DSQLITE_OMIT_DEPRECATED"
-    sqlite_cppflags="${sqlite_cppflags} -DSQLITE_TEMP_STORE=2"
-    sqlite_cppflags="${sqlite_cppflags} -DSQLITE_ENABLE_COLUMN_METADATA"
-    sqlite_cppflags="${sqlite_cppflags} -DSQLITE_SOUNDEX"
-    sqlite_cppflags="${sqlite_cppflags} -DSQLITE_HAVE_ZLIB"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${sqlite_cppflags}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static \
-    --enable-shared \
-    --enable-readline \
-    --enable-threadsafe \
-    --enable-dynamic-extensions \
-    --enable-fts4 \
-    --enable-fts5 \
-    --enable-json1 \
-    --enable-rtree
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure Sqlite3"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Sqlite3"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test Sqlite3"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$SQLITE_TAR" "$SQLITE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ssh.sh b/build-ssh.sh
new file mode 100644
index 000000000..190a4f070
--- /dev/null
+++ b/build-ssh.sh
@@ -0,0 +1,302 @@
+#!/usr/bin/env bash
+
+# See fixup for INSTALL_LIBDIR below
+INSTALL_PREFIX=/usr/local
+INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+
+# OpenSSH can only use OpenSSL 1.0.2 at the moment
+OPENSSL_TAR=openssl-1.0.2l.tar.gz
+OPENSSL_DIR=openssl-1.0.2l
+#OPENSSL_TAR=openssl-1.1.0e.tar.gz
+#OPENSSL_DIR=openssl-1.1.0e
+
+OPENSSH_TAR=openssh-7.5p1.tar.gz
+OPENSSH_DIR=openssh-7.5p1
+
+ZLIB_TAR=zlib-1.2.11.tar.gz
+ZLIB_DIR=zlib-1.2.11
+
+###############################################################################
+
+# Autotools on Solaris has an implied requirement for GNU gear. Things fall apart without it.
+# Also see https://blogs.oracle.com/partnertech/entry/preparing_for_the_upcoming_removal.
+if [[ -d "/usr/gnu/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/gnu/bin"*) ]]; then
+        echo
+        echo "Adding /usr/gnu/bin to PATH for Solaris"
+        PATH="/usr/gnu/bin:$PATH"
+    fi
+elif [[ -d "/usr/swf/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/sfw/bin"*) ]]; then
+        echo
+        echo "Adding /usr/sfw/bin to PATH for Solaris"
+        PATH="/usr/sfw/bin:$PATH"
+    fi
+elif [[ -d "/usr/ucb/bin" ]]; then
+    if [[ ! ("$PATH" == *"/usr/ucb/bin"*) ]]; then
+        echo
+        echo "Adding /usr/ucb/bin to PATH for Solaris"
+        PATH="/usr/ucb/bin:$PATH"
+    fi
+fi
+
+###############################################################################
+
+if [[ -z `which autoreconf` ]]; then
+    echo "Some packages require autoreconf. Please install autoconf or automake."
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+###############################################################################
+
+echo
+echo "If you enter a sudo password, then it will be used for installation."
+echo "If you don't enter a password, then ensure INSTALL_PREFIX is writable."
+echo "To avoid sudo and the password, just press ENTER and they won't be used."
+read -s -p "Please enter password for sudo: " SUDO_PASSWWORD
+echo
+
+###############################################################################
+
+THIS_SYSTEM=$(uname -s 2>&1)
+IS_DARWIN=$(echo -n "$THIS_SYSTEM" | grep -i -c darwin)
+IS_LINUX=$(echo -n "$THIS_SYSTEM" | grep -i -c linux)
+IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | grep -i -c cygwin)
+IS_MINGW=$(echo -n "$THIS_SYSTEM" | grep -i -c mingw)
+IS_OPENBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c openbsd)
+IS_DRAGONFLY=$(echo -n "$THIS_SYSTEM" | grep -i -c dragonfly)
+IS_FREEBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c freebsd)
+IS_NETBSD=$(echo -n "$THIS_SYSTEM" | grep -i -c netbsd)
+IS_SOLARIS=$(echo -n "$THIS_SYSTEM" | grep -i -c sunos)
+
+if [[ ("$IS_FREEBSD" -eq "1" || "$IS_OPENBSD" -eq "1" || "$IS_NETBSD" -eq "1" || "$IS_DRAGONFLY" -eq "1" || "$IS_SOLARIS" -eq "1") ]]; then
+    if [[ !(-z `which gmake 2>/dev/null | grep -v 'no gmake'`) ]]; then
+        MAKE=gmake
+    else
+        MAKE=make
+    fi
+else
+    MAKE=make
+fi
+
+# Try to determine 32 vs 64-bit, /usr/local/lib, /usr/local/lib32 and /usr/local/lib64
+# The Autoconf programs misdetect Solaris as x86 even though its x64. OpenBSD has
+# getconf, but it does not have LONG_BIT.
+IS_64BIT=$(getconf LONG_BIT 2>&1 | grep -i -c 64)
+if [[ "$IS_64BIT" -eq "0" ]]; then
+    IS_64BIT=$(file /bin/ls 2>&1 | grep -i -c '64-bit')
+fi
+
+if [[ "$IS_SOLARIS" -eq "1" ]]; then
+    SH_KBITS=64
+    SH_MARCH=-m64
+    INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+    INSTALL_LIBDIR_DIR="lib64"
+elif [[ "$IS_64BIT" -eq "1" ]]; then
+    if [[ (-d /usr/lib) && (-d /usr/lib32) ]]; then
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+        INSTALL_LIBDIR_DIR="lib"
+    elif [[ (-d /usr/lib) && (-d /usr/lib64) ]]; then
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib64"
+        INSTALL_LIBDIR_DIR="lib64"
+    else
+        SH_KBITS=64
+        SH_MARCH=-m64
+        INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+        INSTALL_LIBDIR_DIR="lib"
+    fi
+else
+    SH_KBITS=32
+    SH_MARCH=-m32
+    INSTALL_LIBDIR="$INSTALL_PREFIX/lib"
+    INSTALL_LIBDIR_DIR="lib"
+fi
+
+if [[ -z "$CC" ]]; then CC=`which cc`; fi
+
+MARCH_ERROR=`$CC $SH_MARCH -x c -c -o /dev/null - </dev/null 2>&1 | grep -i -c error`
+if [[ "$MARCH_ERROR" -ne "0" ]]; then
+	SH_MARCH=
+fi
+
+echo
+echo "********** libdir **********"
+echo
+echo "Using libdir $INSTALL_LIBDIR"
+
+###############################################################################
+
+echo
+echo "********** zLib **********"
+echo
+
+wget "http://www.zlib.net/$ZLIB_TAR" -O "$ZLIB_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$ZLIB_DIR" &>/dev/null
+tar -xzf "$ZLIB_TAR"
+cd "$ZLIB_DIR"
+
+SH_LDLIBS=("-ldl -lpthread")
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --enable-shared --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build zLib"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
+
+###############################################################################
+
+echo
+echo "********** OpenSSL **********"
+echo
+
+# wget on Ubuntu 16 cannot validate against Let's Encrypt certificate
+wget "https://www.openssl.org/source/$OPENSSL_TAR" --no-check-certificate -O "$OPENSSL_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download OpenSSL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$OPENSSL_DIR" &>/dev/null
+tar -xzf "$OPENSSL_TAR"
+cd "$OPENSSL_DIR"
+
+# OpenSSL and enable-ec_nistp_64_gcc_128 option
+IS_X86_64=$(uname -m 2>&1 | egrep -i -c "(amd64|x86_64)")
+if [[ "$SH_KBITS" -eq "32" ]]; then IS_X86_64=0; fi
+
+CONFIG=./config
+CONFIG_FLAGS=("no-ssl2" "no-ssl3" "no-comp" "shared" "-DNDEBUG" "-Wl,-rpath,$INSTALL_LIBDIR"
+        "--prefix=$INSTALL_PREFIX" "--openssldir=$INSTALL_PREFIX" "--libdir=$INSTALL_LIBDIR_DIR")
+if [[ "$IS_X86_64" -eq "1" ]]; then
+    CONFIG_FLAGS+=("enable-ec_nistp_64_gcc_128")
+fi
+
+KERNEL_BITS="$SH_KBITS" "$CONFIG" "${CONFIG_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure OpenSSL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4 depend)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+MAKE_FLAGS=(-j 4)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build OpenSSL"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install_sw)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
+
+###############################################################################
+
+echo
+echo "********** OpenSSH **********"
+echo
+
+# https://savannah.gnu.org/bugs/?func=detailitem&item_id=26786
+wget "http://ftp4.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH_TAR" --no-check-certificate -O "$OPENSSH_TAR"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to download SSH"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+rm -rf "$OPENSSH_DIR" &>/dev/null
+tar -xzf "$OPENSSH_TAR"
+cd "$OPENSSH_DIR"
+
+SH_LDFLAGS=("$SH_MARCH" "-Wl,-rpath,$INSTALL_LIBDIR" "-L$INSTALL_LIBDIR")
+SH_LDLIBS=("-lz" "-ldl" "-lpthread")
+
+CPPFLAGS="-I$INSTALL_PREFIX/include -DNDEBUG" CFLAGS="$SH_MARCH" CXXFLAGS="$SH_MARCH" \
+    LDFLAGS="${SH_LDFLAGS[@]}" LIBS="${SH_LDLIBS[@]}" \
+    ./configure --prefix="$INSTALL_PREFIX" --libdir="$INSTALL_LIBDIR" \
+    --with-openssl-dir="$INSTALL_PREFIX" --with-zlib="$INSTALL_PREFIX"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to configure SSH"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(-j 4 all)
+"$MAKE" "${MAKE_FLAGS[@]}"
+
+if [[ "$?" -ne "0" ]]; then
+    echo "Failed to build SSH"
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+MAKE_FLAGS=(install)
+if [[ ! (-z "$SUDO_PASSWWORD") ]]; then
+    echo "$SUDO_PASSWWORD" | sudo -S "$MAKE" "${MAKE_FLAGS[@]}"
+else
+    "$MAKE" "${MAKE_FLAGS[@]}"
+fi
+
+cd ..
+
+###############################################################################
+
+echo
+echo "********** Cleanup **********"
+echo
+
+# Set to false to retain artifacts
+if true; then
+
+    ARTIFACTS=("$OPENSSL_TAR" "$OPENSSL_DIR" "$OPENSSH_TAR" "$OPENSSH_DIR" "$ZLIB_TAR" "$ZLIB_DIR")
+
+    for artifact in "${ARTIFACTS[@]}"; do
+        rm -rf "$artifact"
+    done
+
+    # ./build-ssh.sh 2>&1 | tee build-ssh.log
+    if [[ -e build-ssh.log ]]; then
+        rm build-ssh.log
+    fi
+fi
+
+[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0
diff --git a/build-sslscan.sh b/build-sslscan.sh
deleted file mode 100755
index 3b91ab554..000000000
--- a/build-sslscan.sh
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds sslscan from sources.
-
-SSLSCAN_TAR=2.0.0.tar.gz
-SSLSCAN_DIR=sslscan-2.0.0
-PKG_NAME=sslscan
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ sslscan ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$SSLSCAN_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://github.com/rbsec/sslscan/archive/$SSLSCAN_TAR"
-then
-    echo "Failed to download sslscan"
-    exit 1
-fi
-
-rm -rf "$SSLSCAN_DIR" &>/dev/null
-gzip -d < "$SSLSCAN_TAR" | tar xf -
-cd "$SSLSCAN_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/sslscan.patch ]]; then
-    patch -u -p0 < ../patch/sslscan.patch
-    echo ""
-fi
-
-if ! "${WGET}" -q -O Makefile --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://raw.githubusercontent.com/noloader/sslscan/master/Makefile"
-then
-    echo "Failed to update sslscan Makefile"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("all" "-j" "${INSTX_JOBS}")
-if ! CPPFLAGS="${CPPFLAGS}" \
-     CFLAGS="${CFLAGS}" \
-     CXXFLAGS="${CXXFLAGS}" \
-     LDFLAGS="${LDFLAGS}" \
-     LIBS="${LIBS}" \
-     "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build sslscan"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test sslscan"
-    echo "**********************"
-    # exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install" "PREFIX=${INSTX_PREFIX}" "LIBDIR=${INSTX_LIBDIR}")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$SSLSCAN_TAR" "$SSLSCAN_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ssm.sh b/build-ssm.sh
deleted file mode 100755
index b19524500..000000000
--- a/build-ssm.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds SSM from sources.
-
-SSM_TAR=v1.4.tar.gz
-SSM_DIR=ssm-1.4
-PKG_NAME=ssm
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== SSM =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$SSM_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://github.com/system-storage-manager/ssm/archive/$SSM_TAR"
-then
-    echo "Failed to download SSM"
-    exit 1
-fi
-
-rm -rf "$SSM_DIR" &>/dev/null
-gzip -d < "$SSM_TAR" | tar xf -
-cd "$SSM_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/ssm.patch ]]; then
-    patch -u -p0 < ../patch/ssm.patch
-    echo ""
-fi
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-if ! python setup.py build
-then
-    echo "**********************"
-    echo "Failed to build SSM"
-    echo "**********************"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-if ! python test.py
-then
-    echo "**********************"
-    echo "Failed to test SSM"
-    echo "**********************"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S python setup.py install --prefix="${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    python setup.py install --prefix="${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$SSM_TAR" "$SSM_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-tar.sh b/build-tar.sh
deleted file mode 100755
index d3d4f382f..000000000
--- a/build-tar.sh
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Tar from sources.
-
-TAR_VER=1.34
-TAR_TAR=tar-${TAR_VER}.tar.gz
-TAR_DIR=tar-${TAR_VER}
-PKG_NAME=tar
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Tar =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Tar ${TAR_VER}..."
-
-if ! "${WGET}" -q -O "$TAR_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/tar/$TAR_TAR"
-then
-    echo "Failed to download Tar"
-    exit 1
-fi
-
-rm -rf "$TAR_DIR" &>/dev/null
-gzip -d < "$TAR_TAR" | tar xf -
-cd "$TAR_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    tar_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${TAR_DIR}"
-    tar_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${TAR_DIR}"
-else
-    tar_cflags="${INSTX_CFLAGS}"
-    tar_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${tar_cflags}" \
-    CXXFLAGS="${tar_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libpcre2-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Tar"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to build Tar"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "**********************"
-    echo "Failed to test Tar"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${TAR_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${TAR_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$TAR_TAR" "$TAR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-tinyxml2.sh b/build-tinyxml2.sh
deleted file mode 100755
index ca3481836..000000000
--- a/build-tinyxml2.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds TinyXML from sources.
-
-TINYXML2_VER=9.0.9
-TINYXML2_TAR=${TINYXML2_VER}.tar.gz
-TINYXML2_DIR=tinyxml2-${TINYXML2_VER}
-PKG_NAME=tinyxml
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== TinyXML2 ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$TINYXML2_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/leethomason/tinyxml2/archive/$TINYXML2_TAR"
-then
-    echo "Failed to download tinyxml2"
-    exit 1
-fi
-
-rm -rf "$TINYXML2_DIR" &>/dev/null
-gzip -d < "$TINYXML2_TAR" | tar xf -
-cd "$TINYXML2_DIR"
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/tinyxml2.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/tinyxml2.patch
-fi
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-# Since we call the makefile directly, we need to escape dollar signs.
-PKG_CONFIG_PATH="${INSTX_PKGCONFIG}"
-CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-CFLAGS=$(echo "${INSTX_CFLAGS}" | sed 's/\$/\$\$/g')
-CXXFLAGS=$(echo "${INSTX_CXXFLAGS}" | sed 's/\$/\$\$/g')
-LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-LIBS="${INSTX_LDLIBS}"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("CPPFLAGS=${CPPFLAGS}")
-MAKE_FLAGS+=("ASFLAGS=${ASFLAGS}")
-MAKE_FLAGS+=("CFLAGS=${CFLAGS}")
-MAKE_FLAGS+=("CXXFLAGS=${CXXFLAGS}")
-MAKE_FLAGS+=("LDFLAGS=${LDFLAGS}")
-MAKE_FLAGS+=("LIBS=${LIBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build tinyxml2"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("test")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-   echo "Failed to test tinyxml2"
-   exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-# TODO... fix this simple copy
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp tinyxml2.h "${INSTX_PREFIX}/include"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp libtinyxml2.a "${INSTX_LIBDIR}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    echo ""
-else
-    cp tinyxml2.h "${INSTX_PREFIX}/include"
-    cp libtinyxml2.a "${INSTX_LIBDIR}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    echo ""
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$TINYXML2_TAR" "$TINYXML2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-ucommon.sh b/build-ucommon.sh
deleted file mode 100755
index ccab5444c..000000000
--- a/build-ucommon.sh
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds ucommon from sources.
-
-# There's a hidden dependency on GetText and libintl. There
-# is no configure option for GetText or libintl, but there
-# are linker errors for some libintl functions.
-
-UCOMMON_TAR=ucommon-7.0.0.tar.gz
-UCOMMON_DIR=ucommon-7.0.0
-PKG_NAME=ucommon
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== uCommon ================"
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$UCOMMON_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/commoncpp/$UCOMMON_TAR"
-then
-    echo "Failed to download uCommon"
-    exit 1
-fi
-
-rm -rf "$UCOMMON_DIR" &>/dev/null
-gzip -d < "$UCOMMON_TAR" | tar xf -
-cd "$UCOMMON_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/ucommon.patch ]]; then
-    echo ""
-    echo "***************************"
-    echo "Patching package"
-    echo "***************************"
-
-    patch -u -p0 < ../patch/ucommon.patch
-fi
-
-echo ""
-echo "******************************"
-echo "Fixing C++ throw specification"
-echo "******************************"
-
-IFS= find "./" -type f -name '*.*' -print | while read -r file
-do
-
-    if ! grep -q 'throw(PersistException)' "${file}"; then
-        continue
-    fi
-
-    # Display filename, strip leading "./"
-    echo "$file" | tr -s '/' | cut -c 3-
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed -e 's/ throw(PersistException)//g' \
-        "$file" > "$file.fixed" && \
-    mv "$file.fixed" "$file"
-    chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --with-pkg-config \
-    --with-sslstack=openssl
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "***************************"
-    echo "Failed to configure uCommon"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to build uCommon"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "***************************"
-    echo "Failed to test uCommon"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$UCOMMON_TAR" "$UCOMMON_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-unbound.sh b/build-unbound.sh
deleted file mode 100755
index 235eb5199..000000000
--- a/build-unbound.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Unbound from sources.
-
-UNBOUND_VER=1.17.0
-UNBOUND_TAR="unbound-${UNBOUND_VER}.tar.gz"
-UNBOUND_DIR="unbound-${UNBOUND_VER}"
-PKG_NAME=unbound
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-libexpat.sh
-then
-    echo "Failed to build Expat"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-nettle.sh
-then
-    echo "Failed to build Nettle"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-hiredis.sh
-then
-    echo "Failed to build Hiredis"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-# Copy icannbundle.pem and rootkey.pem from bootstrap/
-if ! ./build-rootkey.sh
-then
-    echo "Failed to update Unbound Root Key"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Unbound ==============="
-echo "========================================"
-
-echo ""
-echo "***************************"
-echo "Downloading package"
-echo "***************************"
-
-if ! "${WGET}" -q -O "$UNBOUND_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://unbound.net/downloads/$UNBOUND_TAR"
-then
-    echo "Failed to download Unbound"
-    exit 1
-fi
-
-rm -rf "$UNBOUND_DIR" &>/dev/null
-gzip -d < "$UNBOUND_TAR" | tar xf -
-cd "$UNBOUND_DIR" || exit 1
-
-if [[ -e ../patch/unbound.patch ]]; then
-    patch -u -p0 < ../patch/unbound.patch
-    echo ""
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "***************************"
-echo "Configuring package"
-echo "***************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static-exe \
-    --enable-shared \
-    --with-rootkey-file="$INSTX_ROOTKEY_FILE" \
-    --with-rootcert-file="$INSTX_ICANN_FILE" \
-    --with-ssl="${INSTX_PREFIX}" \
-    --with-libexpat="${INSTX_PREFIX}" \
-    --with-libhiredis="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo "***************************"
-    echo "Failed to configure Unbound"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "***************************"
-echo "Building package"
-echo "***************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to build Unbound"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Testing package"
-echo "***************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "***************************"
-    echo "Failed to test Unbound"
-    echo "***************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "***************************"
-echo "Installing package"
-echo "***************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$UNBOUND_TAR" "$UNBOUND_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-###############################################################################
-
-exit 0
diff --git a/build-unistr-git.sh b/build-unistr-git.sh
deleted file mode 100755
index 16c3f8b40..000000000
--- a/build-unistr-git.sh
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Unistring from sources.
-
-UNISTR_DIR=libunistring-master
-PKG_NAME=unistring-git
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -z "$(command -v makeinfo 2>/dev/null)" ]]; then
-    echo "Please install makeinfo or texinfo package."
-    exit 1
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-# libunistring only needs iConvert
-
-if ! ./build-iconv-gettext.sh
-then
-    echo "Failed to build iConv and GetText"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Unistring =============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-rm -rf "$UNISTR_DIR" &>/dev/null
-
-if ! git clone https://git.savannah.gnu.org/git/libunistring.git "${UNISTR_DIR}";
-then
-    echo "Failed to clone patch"
-    exit 1
-fi
-
-cd "$UNISTR_DIR" || exit 1
-
-if [[ -e ../patch/unistring-git.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/unistring-git.patch
-fi
-
-echo ""
-echo "**********************"
-echo "Bootstrapping package"
-echo "**********************"
-
-if ! ./gitsub.sh pull;
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to bootstrap Unistring"
-    echo "*****************************"
-
-    exit 1
-fi
-
-if ! ./autogen.sh;
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to bootstrap Unistring"
-    echo "*****************************"
-
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/1340250
-if [[ -n "$opt_no_as_needed" ]]; then
-    UNISTR_LDFLAGS="$opt_no_as_needed"
-else
-    UNISTR_LDFLAGS=""
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS} ${UNISTR_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --enable-threads \
-    --with-libiconv-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Unistring"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*****************************"
-echo "Building package"
-echo "*****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build Unistring"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Testing package"
-echo "*****************************"
-
-# Unistring fails one self test on older systems, like Fedora 1
-# and Ubuntu 4. Allow the failure but print the result.
-# https://lists.gnu.org/archive/html/bug-libunistring/2021-01/msg00000.html
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Unistring"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "*****************************"
-    echo "Installing anyways..."
-    echo "*****************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Installing package"
-echo "*****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$UNISTR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-unistr.sh b/build-unistr.sh
deleted file mode 100755
index faeefcd30..000000000
--- a/build-unistr.sh
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Unistring from sources.
-
-UNISTR_VER=1.1
-UNISTR_TAR=libunistring-${UNISTR_VER}.tar.gz
-UNISTR_DIR=libunistring-${UNISTR_VER}
-PKG_NAME=libunistring
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-# libunistring only needs iConvert
-
-if ! ./build-iconv-gettext.sh
-then
-    echo "Failed to build iConv and GetText"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Unistring =============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$UNISTR_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/libunistring/$UNISTR_TAR"
-then
-    echo "Failed to download Unistring"
-    exit 1
-fi
-
-rm -rf "$UNISTR_DIR" &>/dev/null
-gzip -d < "$UNISTR_TAR" | tar xf -
-cd "$UNISTR_DIR"
-
-if [[ -e ../patch/unistring.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/unistring.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    unistr_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${UNISTR_DIR}"
-    unistr_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${UNISTR_DIR}"
-else
-    unistr_cflags="${INSTX_CFLAGS}"
-    unistr_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-# https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/1340250
-if [[ -n "$opt_no_as_needed" ]]; then
-    unistr_ldflags="${LDFLAGS} $opt_no_as_needed"
-else
-    unistr_ldflags="${LDFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${unistr_cflags}" \
-    CXXFLAGS="${unistr_cxxflags}" \
-    LDFLAGS="${unistr_ldflags}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-static --enable-shared \
-    --enable-threads \
-    --with-libiconv-prefix="${INSTX_PREFIX}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "*****************************"
-    echo "Failed to configure Unistring"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*****************************"
-echo "Building package"
-echo "*****************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to build Unistring"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Testing package"
-echo "*****************************"
-
-# Unistring fails one self test on older systems, like Fedora 1
-# and Ubuntu 4. Allow the failure but print the result.
-# https://lists.gnu.org/archive/html/bug-libunistring/2021-01/msg00000.html
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*****************************"
-    echo "Failed to test Unistring"
-    echo "*****************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    # exit 1
-
-    echo ""
-    echo "*****************************"
-    echo "Installing anyways..."
-    echo "*****************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*****************************"
-echo "Installing package"
-echo "*****************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${UNISTR_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${UNISTR_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$UNISTR_TAR" "$UNISTR_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-uthash.sh b/build-uthash.sh
deleted file mode 100755
index 15852f09b..000000000
--- a/build-uthash.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds UT Hash from sources.
-
-UTHASH_VER="2.1.0"
-UTHASH_TAR="v$UTHASH_VER.tar.gz"
-UTHASH_DIR="uthash-$UTHASH_VER"
-PKG_NAME=uthash
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ UT Hash ==============="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-if ! "${WGET}" -q -O "$UTHASH_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/troydhanson/uthash/archive/$UTHASH_TAR"
-then
-    echo "Failed to download UT Hash"
-    exit 1
-fi
-
-rm -rf "$UTHASH_DIR" &>/dev/null
-gzip -d < "$UTHASH_TAR" | tar xf -
-cd "$UTHASH_DIR"
-
-if [[ -e ../patch/uthash.patch ]]; then
-    patch -u -p0 < ../patch/uthash.patch
-    echo ""
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-# No Autotools or makefile in src/
-cd tests
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-MAKE_FLAGS+=("PKG_CONFIG_PATH=${INSTX_PKGCONFIG}")
-MAKE_FLAGS+=("CPPFLAGS=${INSTX_CPPFLAGS}")
-MAKE_FLAGS+=("ASFLAGS=${INSTX_ASFLAGS}")
-MAKE_FLAGS+=("CFLAGS=${INSTX_CFLAGS}")
-MAKE_FLAGS+=("CXXFLAGS=${INSTX_CXXFLAGS}")
-MAKE_FLAGS+=("LDFLAGS=${INSTX_LDFLAGS}")
-MAKE_FLAGS+=("LIBS=${INSTX_LDLIBS}")
-
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-   echo "Failed to test UT Hash"
-   exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-cd ../src/
-
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp *.h "${INSTX_PREFIX}/include/"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    cp *.h "${INSTX_PREFIX}/include/"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$UTHASH_TAR" "$UTHASH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-valgrind-git.sh b/build-valgrind-git.sh
deleted file mode 100755
index 2ce37fa65..000000000
--- a/build-valgrind-git.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Valgrind from sources.
-
-VALGRIND_DIR=valgrind-master
-PKG_NAME=valgrind
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "=============== Valgrind ==============="
-echo "========================================"
-
-rm -rf "$VALGRIND_DIR" 2>/dev/null
-
-echo ""
-echo "**********************"
-echo "Cloning package"
-echo "**********************"
-
-if ! git clone --depth=3 git://sourceware.org/git/valgrind.git "$VALGRIND_DIR";
-then
-    echo "Failed to checkout Valgrind"
-    exit 1
-fi
-
-cd "$VALGRIND_DIR"
-git checkout master &>/dev/null
-
-if ! ./autogen.sh
-then
-    echo "Failed to generate Valgrind build files"
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="-g2 -O3" \
-    ASFLAGS="" \
-    CFLAGS="-g2 -O3" \
-    CXXFLAGS="-g2 -O3" \
-    LDFLAGS="" \
-    LIBS="" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo "Failed to configure Valgrind"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo "Failed to build Valgrind"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-# Man, Valgirnd is awful when it comes to trying to build self tests.
-# MAKE_FLAGS=("check" "-k" "V=1")
-# if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-# then
-#    echo "Failed to test Valgrind"
-#    exit 1
-# fi
-
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$VALGRIND_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-wget.sh b/build-wget.sh
deleted file mode 100755
index 478af0903..000000000
--- a/build-wget.sh
+++ /dev/null
@@ -1,416 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Wget and its dependencies from sources.
-
-WGET_VER=1.21.3
-WGET_TAR=wget-${WGET_VER}.tar.gz
-WGET_DIR=wget-${WGET_VER}
-PKG_NAME=wget
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# c-ares needs a C++11 compiler. c-ares fails its self tests on Solaris.
-if [[ "$INSTX_CXX11" -eq 0 || "$IS_SOLARIS" -ne 0 ]]
-then
-    ENABLE_CARES=0
-else
-    ENABLE_CARES=1
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-unistr.sh
-then
-    echo "Failed to build Unistring"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-idn2.sh
-then
-    echo "Failed to build IDN2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-if [[ "$ENABLE_CARES" -eq 1 ]]
-then
-    if ! ./build-cares.sh
-    then
-        echo "Failed to build c-ares"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# PSL may be skipped if Python is too old. libpsl requires Python 2.7
-# Also see https://stackoverflow.com/a/40950971/608639
-if [[ -n "$(command -v python 2>/dev/null)" ]]
-then
-    ver=$(python -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]\).*/\1\2/')
-    if [ "$ver" -ge 27 ]
-    then
-        if ! ./build-libpsl.sh
-        then
-            echo "Failed to build Public Suffix List library"
-            exit 1
-        fi
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Wget ================="
-echo "========================================"
-
-# Optional. For Solaris see https://community.oracle.com/thread/1915569.
-SKIP_WGET_TESTS=0
-if [[ -z "$(command -v perl 2>/dev/null)" ]]; then
-    SKIP_WGET_TESTS=1
-else
-    if ! perl -MHTTP::Daemon -e1 2>/dev/null
-    then
-         echo ""
-         echo "Wget requires Perl's HTTP::Daemon. Skipping Wget self tests."
-         echo "To fix this issue, please install HTTP-Daemon."
-         SKIP_WGET_TESTS=1
-    fi
-
-    if ! perl -MHTTP::Request -e1 2>/dev/null
-    then
-         echo ""
-         echo "Wget requires Perl's HTTP::Request. Skipping Wget self tests."
-         echo "To fix this issue, please install HTTP-Request or HTTP-Message."
-         SKIP_WGET_TESTS=1
-    fi
-fi
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$WGET_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/pub/gnu/wget/$WGET_TAR"
-then
-    echo "Failed to download Wget"
-    exit 1
-fi
-
-rm -rf "$WGET_DIR" &>/dev/null
-gzip -d < "$WGET_TAR" | tar xf -
-cd "$WGET_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/wget.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/wget.patch
-fi
-
-# https://lists.gnu.org/archive/html/bug-gnulib/2019-07/msg00058.html
-if false; then
-IFS= find "$PWD" -name '*.h' -print | while read -r file
-do
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod u+w "$file" && cp -p "$file" "$file.fixed"
-
-    sed -e 's/__GNUC_PREREQ (3, 3)/__GNUC_PREREQ (4, 0)/g' "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-
-    chmod a+r "$file" && chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-fi
-
-# https://lists.gnu.org/archive/html/bug-wget/2019-05/msg00064.html
-IFS= find "$PWD" -name '*.px' -print | while read -r file
-do
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod u+w "$file" && cp -p "$file" "$file.fixed"
-
-    sed -e 's/env -S perl -I ./env perl/g' "$file" > "$file.fixed"
-
-    chmod a+x "$file" && chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-# https://lists.gnu.org/archive/html/bug-wget/2021-03/msg00003.html
-file=lib/malloc/dynarray-skeleton.c
-sed -e 's/__nonnull ((1))//g' \
-    -e 's/__nonnull ((1, 2))//g' \
-    "${file}" > "${file}.fixed"
-mv "${file}.fixed" "${file}"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--with-ssl=openssl")
-CONFIG_OPTS+=("--with-openssl=yes")
-
-if [[ "$ENABLE_CARES" -eq 1 ]]; then
-    CONFIG_OPTS+=("--with-cares")
-fi
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    wget_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${WGET_DIR}"
-    wget_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${WGET_DIR}"
-else
-    wget_cflags="${INSTX_CFLAGS}"
-    wget_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${wget_cflags}" \
-    CXXFLAGS="${wget_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --sysconfdir="${INSTX_PREFIX}/etc" \
-    --with-libintl-prefix="${INSTX_PREFIX}" \
-    --with-libiconv-prefix="${INSTX_PREFIX}" \
-    --with-libunistring-prefix="${INSTX_PREFIX}" \
-    --with-libssl-prefix="${INSTX_PREFIX}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Wget"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Wget"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-if [[ "$SKIP_WGET_TESTS" -eq 0 ]]
-then
-    # Perl IPv6 may be broken and cause Wget self tests to fail.
-    # Ignore failures about Socket::inet_itoa and incorrect sizes.
-    # https://rt.cpan.org/Public/Bug/Display.html?id=91699
-    # Perl does not include PWD so it compiles and executes
-    # tests like Test-https-pfs.px, but fails to find
-    # WgetFeature.pm which is located in the same directory.
-    # I fail to see the difference in risk. How is
-    # Test-https-pfs.px safe, but WgetFeature.pm dangerous?
-    MAKE_FLAGS=("check" "-k" "V=1")
-    if ! PERL_USE_UNSAFE_INC=1 "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo ""
-        echo "************************"
-        echo "Failed to test Wget"
-        echo "************************"
-
-        bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-        # exit 1
-
-        echo ""
-        echo "************************"
-        echo "Installing anyway..."
-        echo "************************"
-    fi
-else
-    echo ""
-    echo "************************"
-    echo "Wget not tested."
-    echo "************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${WGET_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${WGET_DIR}"
-fi
-
-# Wget does not have any CA's configured at the moment. HTTPS downloads
-# will fail with the message "... use --no-check-certificate ...". Fix it
-# through the system's wgetrc configuration file.
-cp "./doc/sample.wgetrc" "./wgetrc"
-{
-    echo ""
-    echo "############################################"
-    echo ""
-    echo "# Build Script default settings"
-    echo ""
-    echo "iri = on"
-    echo "secure_protocol = PFS"
-    echo "ca_directory = $INSTX_CACERT_PATH"
-    echo "ca_certificate = $INSTX_CACERT_FILE"
-    echo ""
-} >> "./wgetrc"
-
-# Install the rc file
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "${INSTX_PREFIX}/etc"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "./wgetrc" "${INSTX_PREFIX}/etc/"
-else
-    mkdir -p "${INSTX_PREFIX}/etc"
-    cp "./wgetrc" "${INSTX_PREFIX}/etc/"
-fi
-
-# Fix permissions once
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to true to retain artifacts
-if true;
-then
-    ARTIFACTS=("$WGET_TAR" "$WGET_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-wget2.sh b/build-wget2.sh
deleted file mode 100755
index 235a14345..000000000
--- a/build-wget2.sh
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Wget2 and its dependencies from sources.
-
-# Per TR, the tarballs are pre-release. We should clone Master.
-
-WGET2_VER=2.0.1
-WGET2_TAR=wget-${WGET_VER}.tar.gz
-WGET2_DIR=wget-${WGET_VER}
-PKG_NAME=wget
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-bzip.sh
-then
-    echo "Failed to build Bzip"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-idn2.sh
-then
-    echo "Failed to build IDN2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-pcre2.sh
-then
-    echo "Failed to build PCRE2"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-openssl.sh
-then
-    echo "Failed to build OpenSSL"
-    exit 1
-fi
-
-###############################################################################
-
-# libhsts has a few problems at the moment. Check the script for comments.
-
-#if ! ./build-libhsts.sh
-#then
-#    echo "Failed to build libhsts"
-#    exit 1
-#fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/flex" ]]
-then
-    if ! ./build-flex.sh
-    then
-        echo "Failed to build Flex"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/grep" ]]
-then
-    if ! ./build-grep.sh
-    then
-        echo "Failed to build Grep"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/xz" ]]
-then
-    if ! ./build-xz.sh
-    then
-        echo "Failed to build XZ"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if [[ ! -f "${INSTX_PREFIX}/bin/lzip" ]]
-then
-    if ! ./build-lzip.sh
-    then
-        echo "Failed to build Lzip"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# PSL may be skipped if Python is too old. libpsl requires Python 2.7
-# Also see https://stackoverflow.com/a/40950971/608639
-SKIP_WGET_PSL=1
-if [[ -n "$(command -v python 2>/dev/null)" ]]
-then
-    ver=$(python -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]\).*/\1\2/')
-    if [ "$ver" -ge 27 ]
-    then
-        if ! ./build-libpsl.sh
-        then
-            echo "Failed to build Public Suffix List library"
-            exit 1
-        fi
-    fi
-
-    SKIP_WGET_PSL=0
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Wget2 ================"
-echo "========================================"
-
-# Optional. For Solaris see https://community.oracle.com/thread/1915569.
-SKIP_WGET_TESTS=0
-if [[ -z "$(command -v perl 2>/dev/null)" ]]; then
-    SKIP_WGET_TESTS=1
-else
-    if ! perl -MHTTP::Daemon -e1 2>/dev/null
-    then
-         echo ""
-         echo "Wget2 requires Perl's HTTP::Daemon. Skipping Wget self tests."
-         echo "To fix this issue, please install HTTP-Daemon."
-         SKIP_WGET_TESTS=1
-    fi
-
-    if ! perl -MHTTP::Request -e1 2>/dev/null
-    then
-         echo ""
-         echo "Wget2 requires Perl's HTTP::Request. Skipping Wget self tests."
-         echo "To fix this issue, please install HTTP-Request or HTTP-Message."
-         SKIP_WGET_TESTS=1
-    fi
-fi
-
-#if ! "${WGET}" -q -O "$WGET_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-#     "https://ftp.gnu.org/pub/gnu/wget/$WGET_TAR"
-#then
-#    echo "Failed to download Wget2"
-#    exit 1
-#fi
-#
-#rm -rf "$WGET2_DIR" &>/dev/null
-#gzip -d < "$WGET_TAR" | tar xf -
-#cd "$WGET2_DIR" || exit 1
-
-rm -rf "$WGET2_DIR" &>/dev/null
-
-echo ""
-echo "*************************"
-echo "Cloning package"
-echo "*************************"
-
-if ! git clone https://gitlab.com/gnuwget/wget2.git;
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to clone Wget2"
-    echo "**************************"
-
-    exit 1
-fi
-
-cd "$WGET2_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/wget2.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching Wget2"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/wget2.patch
-fi
-
-# Hack for distro tools
-export MAKEINFO=true
-
-echo ""
-echo "*************************"
-echo "Bootstrapping package"
-echo "*************************"
-
-if ! ./bootstrap;
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to bootstrap Wget2"
-    echo "**************************"
-
-    exit 1
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "*************************"
-echo "Configuring package"
-echo "*************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    wget2_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${WGET2_DIR}"
-    wget2_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${WGET2_DIR}"
-else
-    wget2_cflags="${INSTX_CFLAGS}"
-    wget2_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--enable-static")
-CONFIG_OPTS+=("--enable-shared")
-CONFIG_OPTS+=("--with-pic")
-CONFIG_OPTS+=("--enable-threads")
-CONFIG_OPTS+=("--disable-assert")
-CONFIG_OPTS+=("--disable-doc")
-CONFIG_OPTS+=("--with-openssl=yes")
-CONFIG_OPTS+=("--with-ssl=openssl")
-CONFIG_OPTS+=("--with-libiconv-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libintl-prefix=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libidn2=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-libpcre2=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-bzip2=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-zlib=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--with-lzip=${INSTX_PREFIX}")
-CONFIG_OPTS+=("--without-idn")
-CONFIG_OPTS+=("--without-pcre")
-CONFIG_OPTS+=("--without-gpgme")
-CONFIG_OPTS+=("--without-libhsts")
-CONFIG_OPTS+=("--without-libmicrohttpd")
-
-if [[ "$SKIP_WGET_PSL" -eq 1 ]]; then
-    CONFIG_OPTS+=("--without-libpsl")
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${wget2_cflags}" \
-    CXXFLAGS="${wget2_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --sysconfdir="${INSTX_PREFIX}/etc" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne 0 ]]
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to configure Wget2"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "*************************"
-echo "Building package"
-echo "*************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "*************************"
-    echo "Failed to build Wget2"
-    echo "*************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Testing package"
-echo "*************************"
-
-if [[ "$SKIP_WGET_TESTS" -eq 0 ]]
-then
-    MAKE_FLAGS=("check" "-k" "V=1")
-    if ! PERL_USE_UNSAFE_INC=1 "${MAKE}" "${MAKE_FLAGS[@]}"
-    then
-        echo ""
-        echo "*************************"
-        echo "Failed to test Wget2"
-        echo "*************************"
-
-        bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-        exit 1
-    fi
-else
-    echo ""
-    echo "*************************"
-    echo "Wget2 not tested."
-    echo "*************************"
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "*************************"
-echo "Installing package"
-echo "*************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${WGET2_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${WGET2_DIR}"
-fi
-
-# Wget does not have any CA's configured at the moment. HTTPS downloads
-# will fail with the message "... use --no-check-certificate ...". Fix it
-# through the system's wget2rc configuration file.
-cp "./doc/sample.wget2rc" "./wget2rc"
-{
-    echo ""
-    echo "############################################"
-    echo ""
-    echo "# Build Script default settings"
-    echo ""
-    echo "iri = on"
-    echo "secure_protocol = PFS"
-    echo "ca_directory = $INSTX_CACERT_PATH"
-    echo "ca_certificate = $INSTX_CACERT_FILE"
-    echo ""
-} >> ./wget2rc
-
-# Install the rc file
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S cp "./wget2rc" "${INSTX_PREFIX}/etc/"
-else
-    cp "./wget2rc" "${INSTX_PREFIX}/etc/"
-fi
-
-# Fix permissions once
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-# Collect test logs for error reporting
-bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to true to retain artifacts
-if true;
-then
-    ARTIFACTS=("$WGET_TAR" "$WGET2_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-xerces.sh b/build-xerces.sh
deleted file mode 100755
index 1c854f72d..000000000
--- a/build-xerces.sh
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Xerces from sources.
-
-XERCES_VER=3.2.3
-XERCES_TAR=xerces-c-${XERCES_VER}.tar.gz
-XERCES_DIR=xerces-c-${XERCES_VER}
-PKG_NAME=xerces
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-base.sh
-then
-    echo "Failed to build GNU base packages"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-curl.sh
-then
-    echo "Failed to build cURL"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Xerces ================"
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-if ! "${WGET}" -q -O "$XERCES_TAR" \
-     "http://apache.mirrors.tds.net/xerces/c/3/sources/$XERCES_TAR"
-then
-    echo "Failed to download xerces"
-    exit 1
-fi
-
-rm -rf "$XERCES_DIR" &>/dev/null
-gzip -d < "$XERCES_TAR" | tar xf -
-cd "$XERCES_DIR"
-
-if [[ -e ../patch/xerces.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/xerces.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared --enable-static \
-    --with-pic \
-    --enable-netaccessor-curl \
-    --enable-transcoder-iconv
-    # --enable-msgloader-iconv
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure Xerces"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build Xerces"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test Xerces"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$XERCES_TAR" "$XERCES_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-xproto.sh b/build-xproto.sh
deleted file mode 100755
index 6de51aa73..000000000
--- a/build-xproto.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Xproto from sources.
-
-XPROTO_VER=7.0.31
-XPROTO_TAR=xproto-${XPROTO_VER}.tar.gz
-XPROTO_DIR=xproto-${XPROTO_VER}
-PKG_NAME=xproto
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ Xproto ================"
-echo "========================================"
-
-echo ""
-echo "**************************"
-echo "Downloading package"
-echo "**************************"
-
-echo ""
-echo "xproto ${XPROTO_VER}..."
-
-# https://www.x.org/releases/individual/proto/xproto-7.0.6.tar.gz
-
-if ! "${WGET}" -q -O "$XPROTO_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://www.x.org/releases/individual/proto/$XPROTO_TAR"
-then
-    echo "Failed to download xproto"
-    exit 1
-fi
-
-rm -rf "$XPROTO_DIR" &>/dev/null
-gzip -d < "$XPROTO_TAR" | tar xf -
-cd "$XPROTO_DIR" || exit 1
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/xproto.patch ]]; then
-    echo ""
-    echo "**************************"
-    echo "Patching package"
-    echo "**************************"
-
-    patch -u -p0 < ../patch/xproto.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**************************"
-echo "Configuring package"
-echo "**************************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}"
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**************************"
-    echo "Failed to configure xproto"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**************************"
-echo "Building package"
-echo "**************************"
-
-MAKE_FLAGS=("MAKEINFO=true" "-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to build xproto"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Testing package"
-echo "**************************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**************************"
-    echo "Failed to test xproto"
-    echo "**************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**************************"
-echo "Installing package"
-echo "**************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$XPROTO_TAR" "$XPROTO_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-xz-5.0.sh b/build-xz-5.0.sh
deleted file mode 100755
index 40d0b2c12..000000000
--- a/build-xz-5.0.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds xz from sources.
-
-XZ_VER=5.0.0
-XZ_TAR=xz-${XZ_VER}.tar.gz
-XZ_DIR=xz-${XZ_VER}
-PKG_NAME=xz
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================ XZ 5.0 ================"
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Xz ${XZ_VER}..."
-
-if ! "${WGET}" -q -O "$XZ_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://tukaani.org/xz/$XZ_TAR"
-then
-    echo "Failed to download xz"
-    exit 1
-fi
-
-rm -rf "$XZ_DIR" &>/dev/null
-gzip -d < "$XZ_TAR" | tar xf -
-cd "$XZ_DIR"
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --disable-doc
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure Xz"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Xz"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-#echo ""
-#echo "**********************"
-#echo "Testing package"
-#echo "**********************"
-
-#MAKE_FLAGS=("check")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo ""
-#    echo "**********************"
-#    echo "Failed to test Xz"
-#    echo "**********************"
-#
-#    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-#    exit 1
-#fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$XZ_TAR" "$XZ_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-xz.sh b/build-xz.sh
deleted file mode 100755
index 5a691afdb..000000000
--- a/build-xz.sh
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds xz from sources.
-
-XZ_VER=5.2.5
-XZ_TAR=xz-${XZ_VER}.tar.gz
-XZ_DIR=xz-${XZ_VER}
-PKG_NAME=xz
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================== XZ =================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Xz ${XZ_VER}..."
-
-if ! "${WGET}" -q -O "$XZ_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://tukaani.org/xz/$XZ_TAR"
-then
-    echo "Failed to download xz"
-    exit 1
-fi
-
-rm -rf "$XZ_DIR" &>/dev/null
-gzip -d < "$XZ_TAR" | tar xf -
-cd "$XZ_DIR" || exit 1
-
-if [[ -e ../patch/xz.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/xz.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-shared \
-    --disable-doc
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "**********************"
-    echo "Failed to configure Xz"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Xz"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test Xz"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$XZ_TAR" "$XZ_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-zile.sh b/build-zile.sh
deleted file mode 100755
index ce267f058..000000000
--- a/build-zile.sh
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Zile from sources.
-
-ZILE_VER=2.4.14
-ZILE_TAR=zile-${ZILE_VER}.tar.gz
-ZILE_DIR=zile-${ZILE_VER}
-PKG_NAME=zile
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-ncurses-readline.sh
-then
-    echo "Failed to build Ncurses and Readline"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "=================================================="
-echo "====================== Zile ======================"
-echo "=================================================="
-
-echo ""
-echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-echo "@@ Warning: Zile is in maintenance mode and   @@"
-echo "@@ not recommended for use by its maintainer. @@"
-echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -q -O "$ZILE_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/zile/$ZILE_TAR"
-then
-    echo "Failed to download Zile"
-    exit 1
-fi
-
-rm -rf "$ZILE_DIR" &>/dev/null
-gzip -d < "$ZILE_TAR" | tar xf -
-cd "$ZILE_DIR"
-
-if [[ -e ../patch/zile.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/zile.patch
-fi
-
-if ! "${WGET}" -q -O m4/pkg.m4 --ca-certificate="${GITHUB_CA_ZOO}" \
-     https://raw.githubusercontent.com/pkgconf/pkgconf/master/pkg.m4
-then
-    echo ""
-    echo "************************"
-    echo "Failed to update pkg.m4"
-    echo "************************"
-else
-    chmod u=rw,go=r m4/pkg.m4
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("--without-ncurses")
-CONFIG_OPTS+=("--without-ncursesw")
-CONFIG_OPTS+=("--disable-threads")
-CONFIG_OPTS+=("--disable-valgrind-tests")
-CONFIG_OPTS+=("HELP2MAN=true")
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${INSTX_CFLAGS}" \
-    CXXFLAGS="${INSTX_CXXFLAGS}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    "${CONFIG_OPTS[@]}"
-
-if [[ "$?" -ne "0" ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Zile"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Zile"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-#MAKE_FLAGS=("check")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo ""
-#    echo "************************"
-#    echo "Failed to test Zile"
-#    echo "************************"
-#    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-#    exit 1
-#fi
-
-# Zile is impossible to test. It breaks the current terminal.
-echo ""
-echo "************************"
-echo "Zile not tested"
-echo "************************"
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ZILE_TAR" "$ZILE_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-zlib.sh b/build-zlib.sh
deleted file mode 100755
index 578033133..000000000
--- a/build-zlib.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds zLib from sources.
-
-ZLIB_VER=1.3
-ZLIB_TAR=zlib-${ZLIB_VER}.tar.gz
-ZLIB_DIR=zlib-${ZLIB_VER}
-PKG_NAME=zlib
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-if [[ -e "${INSTX_PKG_CACHE}/${PKG_NAME}" ]]; then
-    echo ""
-    echo "$PKG_NAME is already installed."
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= zLib ================="
-echo "========================================"
-
-echo ""
-echo "************************"
-echo "Downloading package"
-echo "************************"
-
-if ! "${WGET}" -O "$ZLIB_TAR" \
-     "http://www.zlib.net/$ZLIB_TAR"
-then
-    echo "Failed to download zLib"
-    echo "Maybe Wget is too old. Perhaps run setup-wget.sh?"
-    exit 1
-fi
-
-rm -rf "$ZLIB_DIR" &>/dev/null
-gzip -d < "$ZLIB_TAR" | tar xf -
-cd "$ZLIB_DIR" || exit 1
-
-# cp Makefile.in Makefile.in.orig
-# cp configure configure.orig
-
-if [[ -e ../patch/zlib.patch ]]; then
-    echo ""
-    echo "************************"
-    echo "Patching package"
-    echo "************************"
-
-    patch -u -p0 < ../patch/zlib.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "************************"
-echo "Configuring package"
-echo "************************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    zlib_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ZLIB_DIR}"
-    zlib_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ZLIB_DIR}"
-else
-    zlib_cflags="${INSTX_CFLAGS}"
-    zlib_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CC="${CC}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${zlib_cflags}" \
-    CXXFLAGS="${zlib_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --static --shared
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure zLib"
-    echo "************************"
-
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "************************"
-echo "Building package"
-echo "************************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "all")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build zLib"
-    echo "************************"
-
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Testing package"
-echo "************************"
-
-MAKE_FLAGS=("check")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to test zLib"
-    echo "************************"
-
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "************************"
-echo "Installing package"
-echo "************************"
-
-MAKE_FLAGS=("install")
-MAKE_FLAGS+=("prefix=${INSTX_PREFIX}")
-MAKE_FLAGS+=("libdir=${INSTX_LIBDIR}")
-
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ZLIB_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ZLIB_DIR}"
-fi
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ZLIB_TAR" "$ZLIB_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/build-zstd.sh b/build-zstd.sh
deleted file mode 100755
index 463de4800..000000000
--- a/build-zstd.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Zstd from sources.
-
-# v1.5.1 suffers from loss of NX-stacks due to huf_decompress_amd64.S
-# $ find . -name '*.S'
-# lib/decompress/huf_decompress_amd64.S
-# $ grep -IR huf_decompress_amd64.S
-# build/meson/lib/meson.build:  join_paths(zstd_rootdir, 'lib/decompress/huf_decompress_amd64.S'),
-
-ZSTD_VER=1.5.1
-ZSTD_GH_VER=v1.5.1
-ZSTD_TAR="zstd-${ZSTD_VER}.tar.gz"
-ZSTD_DIR="zstd-${ZSTD_VER}"
-PKG_NAME=zstd
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-if ! ./build-zlib.sh
-then
-    echo "Failed to build zLib"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Zstd ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Zstd ${ZSTD_VER}..."
-
-if ! "${WGET}" -q -O "$ZSTD_TAR" --ca-certificate="${GITHUB_CA_ZOO}" \
-     "https://github.com/facebook/zstd/releases/download/$ZSTD_GH_VER/$ZSTD_TAR"
-then
-    echo "Failed to download Zstd"
-    exit 1
-fi
-
-rm -rf "$ZSTD_DIR" &>/dev/null
-gzip -d < "$ZSTD_TAR" | tar xf -
-cd "$ZSTD_DIR" || exit 1
-
-# cp -p programs/Makefile programs/Makefile.orig
-# cp -p tests/Makefile tests/Makefile.orig
-# cp -p tests/fuzz/Makefile tests/fuzz/Makefile.orig
-# cp -p lib/Makefile lib/Makefile.orig
-# cp -p lib/libzstd.mk lib/libzstd.mk.orig
-# cp -p contrib/linux-kernel/test/Makefile contrib/linux-kernel/test/Makefile.orig
-
-# Patches are created with 'diff -u' from the pkg root directory.
-if [[ -e ../patch/zstd.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/zstd.patch
-fi
-
-# echo "" > ../patch/zstd.patch
-# diff -u programs/Makefile.orig programs/Makefile >> ../patch/zstd.patch
-# diff -u tests/Makefile.orig tests/Makefile >> ../patch/zstd.patch
-# diff -u tests/fuzz/Makefile.orig tests/fuzz/Makefile >> ../patch/zstd.patch
-# diff -u lib/Makefile.orig lib/Makefile >> ../patch/zstd.patch
-# diff -u lib/libzstd.mk.orig lib/libzstd.mk >> ../patch/zstd.patch
-# diff -u contrib/linux-kernel/test/Makefile.orig contrib/linux-kernel/test/Makefile >> ../patch/zstd.patch
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    zstd_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ZSTD_DIR}"
-    zstd_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${ZSTD_DIR}"
-else
-    zstd_cflags="${INSTX_CFLAGS}"
-    zstd_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-# Since we call the makefile directly, we need to escape dollar signs.
-export CPPFLAGS=$(echo "${INSTX_CPPFLAGS}" | sed 's/\$/\$\$/g')
-export ASFLAGS=$(echo "${INSTX_ASFLAGS}" | sed 's/\$/\$\$/g')
-export CFLAGS=$(echo "${zstd_cflags}" | sed 's/\$/\$\$/g')
-export CXXFLAGS=$(echo "${zstd_cxxflags}" | sed 's/\$/\$\$/g')
-export LDFLAGS=$(echo "${INSTX_LDFLAGS}" | sed 's/\$/\$\$/g')
-export LIBS="${INSTX_LDLIBS}"
-
-export PREFIX="${INSTX_PREFIX}"
-export LIBDIR="${INSTX_LIBDIR}"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to build Zstd"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-# Fix runpaths
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-MAKE_FLAGS=("check" "-k" "V=1")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "**********************"
-    echo "Failed to test Zstd"
-    echo "**********************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix runpaths again
-bash "${INSTX_TOPDIR}/fix-runpath.sh"
-
-echo ""
-echo "**********************"
-echo "Installing package"
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ZSTD_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${ZSTD_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$ZSTD_TAR" "$ZSTD_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/collect-logs.sh b/collect-logs.sh
deleted file mode 100755
index 85557fe5c..000000000
--- a/collect-logs.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script collects configuration and log files.
-
-if [[ -z "$(command -v zip)" ]]
-then
-    echo "zip program is missing"
-    exit 1
-fi
-
-# If available, add a prefix to the log names. The names will
-# be bison-config.log.zip, bison-test-suite.log.zip, etc.
-if [[ -n "$1" ]]; then
-    pkg_prefix="$1-"
-elif [[ -n "${PKG_NAME}" ]]; then
-    pkg_prefix="$PKG_NAME-"
-else
-    pkg_prefix=
-fi
-
-config_log_zip="${pkg_prefix}config.log.zip"
-test_suite_log_zip="${pkg_prefix}test-suite.log.zip"
-
-echo ""
-echo "**********************"
-echo "Saving log files"
-echo "**********************"
-
-rm -f "config.log.zip" "../config.log.zip" "../../config.log.zip"
-rm -f "test-suite.log.zip" "../test-suite.log.zip" "../../test-suite.log.zip"
-rm -f "${config_log_zip}" "../${config_log_zip}" "../../${config_log_zip}"
-rm -f "${test_suite_log_zip}" "../${test_suite_log_zip}" "../../${test_suite_log_zip}"
-
-# Collect all config.log files
-IFS= find . -name 'config.log' -print | while read -r file
-do
-    zip -9 "${config_log_zip}" "$file"
-done
-
-# Collect all test-suite.log files
-IFS= find . -name 'test*.log' -print | while read -r file
-do
-    zip -9 "${test_suite_log_zip}" "$file"
-done
-
-# And Emacs test logs
-IFS= find . -name '*-tests.log' -print | while read -r file
-do
-    zip -9 "${test_suite_log_zip}" "$file"
-done
-
-# And GnuPG test logs
-if [[ -e libgcrypt.log ]]; then
-    zip -9 "${test_suite_log_zip}" libgcrypt.log
-fi
-if [[ -e gnupg.log ]]; then
-    zip -9 "${test_suite_log_zip}" gnupg.log
-fi
-
-# Copy the zips to the build script directory
-if [[ -e "${config_log_zip}" ]]; then
-    cp "${config_log_zip}" ../
-fi
-
-if [[ -e "${test_suite_log_zip}" ]]; then
-    cp "${test_suite_log_zip}" ../
-fi
-
-exit 0
diff --git a/copy-sources.sh b/copy-sources.sh
deleted file mode 100755
index d53fb83b9..000000000
--- a/copy-sources.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script copies source files for debugging after installation.
-
-# Only copy sources on Linux machines
-if [[ $(uname -s | grep -i -c 'linux') -eq 0 ]]; then
-    exit 0
-fi
-
-# Exit if INSTX_DEBUG_MAP is not set
-INSTX_DEBUG_MAP=${INSTX_DEBUG_MAP:-0}
-if [[ "${INSTX_DEBUG_MAP}" -eq 0 ]]; then
-    exit 0
-fi
-
-echo ""
-echo "**********************"
-echo "Copying source files"
-echo "**********************"
-
-src_dir="$1"
-dest_dir="$2"
-
-if [[ -z "${src_dir}" ]]; then
-    echo "Please specify a source directory"
-    exit 1
-fi
-
-if [[ ! -d "${src_dir}" ]]; then
-    echo "Source directory is not valid"
-    exit 1
-fi
-
-if [[ -z "${dest_dir}" ]]; then
-    echo "Please specify a destination directory"
-    exit 1
-fi
-
-cd "${src_dir}" || exit 1
-rm -rf "${dest_dir}"
-mkdir -p "${dest_dir}"
-
-IFS= find "./" \( -name '*.h' -o -name '*.hpp' -o -name '*.hxx' -o \
-                  -name '*.c' -o -name '*.cc' -o \
-                  -name '*.cpp' -o -name '*.cxx' -o -name '*.CC' -o \
-                  -name '*.s' -o -name '*.S' \) -print | while read -r file
-do
-    # This trims the leading "./" in "./foo.c".
-    file=$(echo -n "${file}" | tr -s '/' | cut -c 3-);
-    cp --parents --preserve=timestamps "${file}" "${dest_dir}"
-done
-
-exit 0
diff --git a/fix-configure.sh b/fix-configure.sh
deleted file mode 100755
index d7e23a51c..000000000
--- a/fix-configure.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-
-# This script fixes *.pc files. It removes extra fodder from Libs
-# and Libs.private. It is needed because some configure scripts
-# cannot handle the extra options in pkg config files. For example,
-# Zile fails to find Ncurses because Ncurses uses the following in
-# its *.pc file:
-#     Libs: -L<path> -Wl,-rpath,<path> -lncurses
-# Zile can find the libraries when using:
-#     Libs: -L<path> -lncurses
-
-echo ""
-echo "************************"
-echo "Fixing configure scripts"
-echo "************************"
-
-if [[ -n "$1" ]]; then
-    PROG_PATH="$1"
-else
-    PROG_PATH="${INSTX_TOPDIR}/programs"
-fi
-
-CXX="${CXX:-CC}"
-if ! "${CXX}" "$PROG_PATH/fix-configure.cpp" -o fix-configure.exe 2>/dev/null;
-then
-    if ! g++ "$PROG_PATH/fix-configure.cpp" -o fix-configure.exe 2>/dev/null;
-    then
-        if ! clang++ "$PROG_PATH/fix-configure.cpp" -o fix-configure.exe 2>/dev/null;
-        then
-            echo "Failed to build fix-configure"
-            exit 1
-        fi
-    fi
-fi
-
-IFS= find "./" -name 'configure.ac' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"; chmod a+x "$file"
-    ./fix-configure.exe "$file" > "$file.fixed"
-    mv "$file.fixed" "$file";
-    chmod a+x "$file"; chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-IFS= find "./" -name 'configure' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"; chmod a+x "$file"
-    ./fix-configure.exe "$file" > "$file.fixed"
-    mv "$file.fixed" "$file";
-    chmod a+x "$file"; chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-echo "patching config.sub..."
-IFS= find "./" -name 'config.sub' -print | while read -r file
-do
-    chmod a+w "$file"; chmod a+x "$file"
-    cp -p "$PROG_PATH/config.sub" "$file"
-    chmod a+x "$file"; chmod go-w "$file"
-done
-
-echo "patching config.guess..."
-IFS= find "./" -name 'config.guess' -print | while read -r file
-do
-    chmod a+w "$file"; chmod a+x "$file"
-    cp -p "$PROG_PATH/config.guess" "$file"
-    chmod a+x "$file"; chmod go-w "$file"
-done
-
-exit 0
diff --git a/fix-library-path.sh b/fix-library-path.sh
deleted file mode 100755
index 54fd15eaa..000000000
--- a/fix-library-path.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script converts LD_LIBRARY_PATH to DYLD_LIBRARY_PATH
-# for OS X. Autotools authors don't need to worry about it.
-
-echo ""
-echo "**********************"
-echo "Fixing LD_LIBRARY_PATH"
-echo "**********************"
-
-if [[ "$IS_DARWIN" -ne 0 ]]
-then
-    grep -rl LD_LIBRARY_PATH . | cut -f 1 -d ':' | sort | uniq | while IFS='' read -r file
-    do
-        # Display filename, strip leading "./"
-        echo "patching ${file}..."
-
-        touch -a -m -r "$file" "$file.timestamp"
-        chmod a+w "$file"
-        # This is the one we want
-        sed 's/LD_LIBRARY_PATH/DYLD_LIBRARY_PATH/g' "$file" > "$file.fixed"
-        mv "$file.fixed" "$file"
-        # In case we create a DYDYLD_LIBRARY_PATH
-        sed 's/DYDY/DY/g' "$file" > "$file.fixed"
-        mv "$file.fixed" "$file"
-
-        chmod go-w "$file"
-        touch -a -m -r "$file.timestamp" "$file"
-        rm "$file.timestamp"
-
-    done
-else
-    echo "Nothing to do."
-fi
-
-exit 0
diff --git a/fix-makefiles.sh b/fix-makefiles.sh
deleted file mode 100755
index 12cafee35..000000000
--- a/fix-makefiles.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script fixes $ORIGIN-based runpaths in Makefiles. Projects that
-# generate makefiles on the fly after configure may break due to their
-# cleverness. Also see https://github.com/Perl/perl5/issues/17978 and
-# https://gitlab.alpinelinux.org/alpine/aports/-/issues/11655.
-#
-# Perl's build system is completely broken beyond repair. The broken
-# runpath handling cannot be fixed with makefile patching. Also see
-# https://github.com/Perl/perl5/issues/17978.
-#
-# We also remove -Wextra, if present. Old GCC does not know the option.
-# -Wextra is a developer option, and we don't need it in production.
-
-echo ""
-echo "**********************"
-echo "Fixing Makefiles"
-echo "**********************"
-
-# We want the leading single quote, and the trailing slash.
-origin1=$(echo "'"'$ORIGIN/' | sed -e 's/[\/&]/\\&/g')
-origin2=$(echo "'"'$$ORIGIN/' | sed -e 's/[\/&]/\\&/g')
-
-# And with braces
-origin1b=$(echo "'"'${ORIGIN}/' | sed -e 's/[\/&]/\\&/g')
-origin2b=$(echo "'"'$${ORIGIN}/' | sed -e 's/[\/&]/\\&/g')
-
-# And Perl
-origin1p=$(echo "-Wl,-R,RIGIN/" | sed -e 's/[\/&]/\\&/g')
-origin2p=$(echo "-Wl,-R,""'"'$${ORIGIN}/' | sed -e 's/[\/&]/\\&/g')
-
-IFS= find "./" -iname 'Makefile' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    echo "$file" | tr -s '/' | cut -c 3-
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed -e "s/$origin1/$origin2/g" \
-        -e "s/$origin1b/$origin2b/g" \
-        -e "s/GZIP_ENV = --best/GZIP_ENV = -9/g" \
-        -e "s/-Wextra/ /g" \
-        "$file" > "$file.fixed" && \
-    mv "$file.fixed" "$file"
-    chmod a-x "$file"; chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-IFS= find "./" -iname 'GNUmakefile' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    echo "$file" | tr -s '/' | cut -c 3-
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed -e "s/$origin1/$origin2/g" \
-        -e "s/$origin1b/$origin2b/g" \
-        -e "s/GZIP_ENV = --best/GZIP_ENV = -9/g" \
-        -e "s/-Wextra/ /g" \
-        "$file" > "$file.fixed" && \
-    mv "$file.fixed" "$file"
-    chmod a-x "$file"; chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-# And Perl...
-IFS= find "./" -iname 'makefile*' -print | while read -r file
-do
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+w "$file"
-    sed -e "s/$origin1/$origin2/g" \
-        -e "s/$origin1p/$origin2p/g" \
-        -e "s/GZIP_ENV = --best/GZIP_ENV = -9/g" \
-        -e "s/-Wextra/ /g" \
-        "$file" > "$file.fixed" && \
-    mv "$file.fixed" "$file"
-    chmod a-x "$file"; chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-exit 0
diff --git a/fix-permissions.sh b/fix-permissions.sh
deleted file mode 100755
index d22a04002..000000000
--- a/fix-permissions.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script fixes owner and permissions on files and directories.
-# Some packages use SUDO_USER and SUDO_GROUP during install for
-# system directories. I _think_ using SUDO_USER:SUDO_GROUP is
-# correct Unix behavior, but we want to use more traditional file
-# permissions in system directories.
-#
-# There are two use case. First use case, $root_dir is in $HOME.
-# In this case we use the user's info as owner:group. The second
-# use case is, an arbitrary filesystem location. In this case we
-# use the filesystem's info as owner:group. The filesystem
-# typically uses root:root, admin:staff, etc.
-
-echo ""
-echo "**********************"
-echo "Fixing ownership"
-echo "**********************"
-
-root_dir="$1"
-if [[ -z "${root_dir}" ]]; then
-    echo "Please specify a directory as first arg"
-    exit 1
-fi
-
-# Fold slashes
-root_dir=$(echo "${root_dir}" | tr -s '\\' | tr -s '/' )
-
-# Validate
-if [[ ! -d "${root_dir}" ]]; then
-    echo "Directory does not exist"
-    exit 1
-elif [[ "${root_dir}" == "\\" || "${root_dir}" == "/" ]]; then
-    echo "Will not modify" "'""${1}""'"
-    exit 1
-fi
-
-# Remove trailing slash
-root_dir=$(echo "${root_dir}" | sed 's/\/$//g')
-
-# Don't operate on root directories, like /bin or /usr
-# The tr removes all characters except the forward slash.
-count=$(echo "${root_dir}" | tr -cd '/' | wc -c)
-if [[ "${count}" -le 1 ]]; then
-    echo "Will not modify" "'""${1}""'"
-    exit 1
-fi
-
-# See if this is case 1, $root_dir is in $HOME.
-# Also include an install into /tmp in this case.
-if [[ "${root_dir}" == "$HOME"* || "${root_dir}" == "/tmp"* ]]; then
-    private_subdir=1
-else
-    private_subdir=0
-fi
-
-# Find the most reasonable owner:group of the directory
-if [[ "${private_subdir}" -eq 1 ]];
-then
-    # Find the owner:group of $HOME
-    dir_usr=$(ls -ld "$HOME" 2>/dev/null | head -n 1 | awk 'NR==1 {print $3}')
-    dir_grp=$(ls -ld "$HOME" 2>/dev/null | head -n 1 | awk 'NR==1 {print $4}')
-elif [[ -d /usr ]]
-then
-    # Non-home directory. Assume a system directory
-    dir_usr=$(ls -ld "/usr" 2>/dev/null | head -n 1 | awk 'NR==1 {print $3}')
-    dir_grp=$(ls -ld "/usr" 2>/dev/null | head -n 1 | awk 'NR==1 {print $4}')
-    dir_bin=$(ls -ld "/usr/bin" 2>/dev/null | head -n 1 | awk 'NR==1 {print $4}')
-else
-    # Find the parent directory
-    parent_dir="$(dirname "${root_dir}")"
-    if [[ -z "${parent_dir}" ]]; then
-        echo "Failed to find parent directory"
-        exit 1
-    fi
-
-    # Find the owner:group of $root_dir/..
-    dir_usr=$(ls -ld "${parent_dir}" 2>/dev/null | head -n 1 | awk 'NR==1 {print $3}')
-    dir_grp=$(ls -ld "${parent_dir}" 2>/dev/null | head -n 1 | awk 'NR==1 {print $4}')
-    dir_bin=$(ls -ld "${parent_dir}/bin" 2>/dev/null | head -n 1 | awk 'NR==1 {print $4}')
-fi
-
-# Sanity check on user and group
-if [[ -z "${dir_usr}" || -z "${dir_grp}" ]]; then
-    echo "Failed to determine owner and group"
-    exit 1
-fi
-
-# User and group are mostly standard. Solaris can be different.
-echo "user: ${dir_usr}"
-echo "group: ${dir_grp}"
-
-if [[ -n "${dir_bin}" && "${dir_grp}" != "${dir_bin}" ]]; then
-    echo "bin: ${dir_bin}"
-fi
-
-# Set the owner:group on the root directory and below
-if ! chown -hR "${dir_usr}:${dir_grp}" "${root_dir}"; then
-    echo "Failed to change owner and group on root directory"
-    exit 1
-fi
-
-#  Solaris uses group 'bin' on bin/, lib/ and friends
-if [[ -n "${dir_bin}" && "${dir_grp}" != "${dir_bin}" ]];
-then
-    for exec_dir in "${root_dir}/bin" "${root_dir}/sbin" \
-                    "${root_dir}/lib" "${root_dir}/libexec" \
-                    "${root_dir}/lib32" "${root_dir}/lib64" \
-                    "${root_dir}/32" "${root_dir}/64";
-    do
-        if [[ -d "${exec_dir}" ]]; then
-            chown -hR "${dir_usr}:${dir_bin}" "${exec_dir}"
-        fi
-    done
-fi
-
-# Make directories viewable
-find "${root_dir}" -type d -exec chmod a+x {} \;
-
-# Fix permissions on shared objects
-IS_DARWIN="$(uname -s | grep -i -c darwin)"
-IFS= find "${root_dir}" -type d -name 'lib*' -print | while read -r sharedobj_dir
-do
-    if [[ "${IS_DARWIN}" -ne 0 ]]; then
-        find "${sharedobj_dir}" -type f -name '*\.dylib*' -exec chmod a+x {} \;
-    else
-        find "${sharedobj_dir}" -type f -name '*\.so*' -exec chmod a+x {} \;
-    fi
-done
-
-# Fix permissions on archives and libtool archives
-IFS= find "${root_dir}" -type d -name 'lib*' -print | while read -r sharedobj_dir
-do
-    find "${sharedobj_dir}" -name '*\.a$' -exec chmod a-x {} \;
-    find "${sharedobj_dir}" -name '*\.la$' -exec chmod a-x {} \;
-done
-
-echo "**********************"
-
-exit 0
diff --git a/fix-pkgconfig.sh b/fix-pkgconfig.sh
deleted file mode 100755
index 440d36183..000000000
--- a/fix-pkgconfig.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-# This script fixes *.pc files. It removes extra fodder from Libs
-# and Libs.private. It is needed because some configure scripts
-# cannot handle the extra options in pkg config files. For example,
-# Zile fails to find Ncurses because Ncurses uses the following in
-# its *.pc file:
-#     Libs: -L<path> -Wl,-rpath,<path> -lncurses
-# Zile can find the libraries when using:
-#     Libs: -L<path> -lncurses
-
-echo ""
-echo "**********************"
-echo "Fixing *.pc files"
-echo "**********************"
-
-if [[ -n "$1" ]]; then
-    PROG_PATH="$1"
-else
-    PROG_PATH="${INSTX_TOPDIR}/programs"
-fi
-
-CXX="${CXX:-CC}"
-if ! "${CXX}" "$PROG_PATH/fix-pkgconfig.cpp" -o fix-pkgconfig.exe 2>/dev/null;
-then
-    if ! g++ "$PROG_PATH/fix-pkgconfig.cpp" -o fix-pkgconfig.exe 2>/dev/null;
-    then
-        if ! clang++ "$PROG_PATH/fix-pkgconfig.cpp" -o fix-pkgconfig.exe 2>/dev/null;
-        then
-            echo "Failed to build fix-pkgconfig"
-            exit 1
-        fi
-    fi
-fi
-
-IFS= find "./" -iname '*.pc' -print | while read -r file
-do
-    # Display filename, strip leading "./"
-    this_file=$(echo "$file" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    touch -a -m -r "$file" "$file.timestamp"
-    chmod a+rw "$file"
-    ./fix-pkgconfig.exe "$file" > "$file.fixed"
-    mv "$file.fixed" "$file"
-    chmod go-w "$file"
-    touch -a -m -r "$file.timestamp" "$file"
-    rm "$file.timestamp"
-done
-
-exit 0
diff --git a/fix-runpath.sh b/fix-runpath.sh
deleted file mode 100755
index 632b95c8f..000000000
--- a/fix-runpath.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script attempts to fix runpaths. Perl, OpenLDAP, Nettle and
-# several others need a full fix because they don't escape the dollar
-# sign or they expand the rpath token. Also see
-# https://github.com/Perl/perl5/issues/17534.
-# Many GNU libraries need the runpaths fixed because the order gets
-# randomized during configuration.
-#
-# This script should be run after 'make' and before 'make check'.
-# Finally, the latest patchelf is needed due to mishandling something
-# in patchelf.
-#
-# Also see https://bugzilla.redhat.com/show_bug.cgi?id=1497012 and
-# https://bugs.launchpad.net/ubuntu/+source/patchelf/+bug/1888175
-# Related issues are https://github.com/NixOS/patchelf/issues/44
-# and https://sourceware.org/bugzilla/show_bug.cgi?id=25087.
-
-echo ""
-echo "**********************"
-echo "Fixing runpaths"
-echo "**********************"
-
-###############################################################################
-
-# Verify the system uses ELF format. /usr/bin/env is Posix, and it is always
-# available at /usr/bin. Programs like ls may be in a different location.
-magic=$(cut -b 2-4 /usr/bin/env | tr -d '\0' | head -n 1)
-if [[ "$magic" != "ELF" ]]; then
-    echo "ELF is not used, nothing to do"
-    exit 0
-fi
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# Patchelf only builds on Linux and HURD. Solaris is trouble.
-if [[ "$IS_LINUX" -ne 0 || "$IS_HURD" -ne 0 ]]
-then
-    if [[ -e ./build-patchelf.sh ]]; then
-        BUILD_PATCHELF=./build-patchelf.sh
-    else
-        BUILD_PATCHELF=${INSTX_TOPDIR}/build-patchelf.sh
-    fi
-
-    if ! ${BUILD_PATCHELF}
-    then
-        echo "Failed to build patchelf"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-# We need to remove the single quotes.
-FIXED_RUNPATH="$INSTX_OPATH:$INSTX_RPATH"
-FIXED_RUNPATH="""$(echo "${FIXED_RUNPATH}" | sed "s/'//g")"""
-# echo "Using RUNPATH \"${FIXED_RUNPATH}\""
-
-# Find a non-anemic grep
-GREP=$(command -v grep 2>/dev/null)
-if [[ -d /usr/gnu/bin ]]; then
-    GREP=/usr/gnu/bin/grep
-fi
-
-# Find programs and libraries using the shell wildcard. Some programs
-# and libraries are _not_ executable and get missed in the do loop
-# when using options like -executable.
-IFS= find "./" -type f -name '*' -print | while read -r file
-do
-    # Smoke test. Object files have ELF signature.
-    if [[ $(echo "${file}" | ${GREP} -E '\.o$|\.lo$') ]]; then continue; fi
-
-    # Smoke test. No symbolic links.
-    if [[ -L "${file}" ]]; then continue; fi
-
-    # Check for ELF signature
-    magic=$(cut -b 2-4 "${file}" 2>/dev/null | tr -d '\0' | head -n 1)
-    if [[ "$magic" != "ELF" ]]; then continue; fi
-
-    # Display filename, strip leading "./"
-    this_file=$(echo "${file}" | tr -s '/' | cut -c 3-)
-    echo "patching ${this_file}..."
-
-    touch -a -m -r "${file}" "${file}.timestamp"
-    chmod a+rw "${file}"
-
-    # https://blogs.oracle.com/solaris/avoiding-ldlibrarypath%3a-the-options-v2
-    if [[ "$IS_SOLARIS" -ne 0 && -e /usr/bin/elfedit ]]
-    then
-        /usr/bin/elfedit -e "dyn:rpath ${FIXED_RUNPATH}" "${file}"
-        /usr/bin/elfedit -e "dyn:runpath ${FIXED_RUNPATH}" "${file}"
-
-    # https://stackoverflow.com/questions/13769141/can-i-change-rpath-in-an-already-compiled-binary
-    elif [[ -n $(command -v patchelf 2>/dev/null) ]]
-    then
-        #echo "  Before: $(readelf -d "${file}" | ${GREP} PATH)"
-        patchelf --set-rpath "${FIXED_RUNPATH}" "${file}"
-        #echo "  After: $(readelf -d "${file}" | ${GREP} PATH)"
-
-    elif [[ -n $(command -v chrpath 2>/dev/null) ]]
-    then
-        chrpath -r "${FIXED_RUNPATH}" "${file}" 2>/dev/null
-
-    elif [[ "$IS_LINUX" -eq 1 ]]
-    then
-        echo "Unable to find elf editor"
-
-    else
-        :
-    fi
-
-    chmod a+rx "${file}"; chmod go-w "${file}"
-    touch -a -m -r "${file}.timestamp" "${file}"
-    rm "${file}.timestamp"
-done
-
-exit 0
diff --git a/patch/acl.patch b/patch/acl.patch
deleted file mode 100644
index a91c257f1..000000000
--- a/patch/acl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- test/runwrapper
-+++ test/runwrapper
-@@ -1,7 +1,8 @@
- #!/bin/bash
- 
- if [ -e "$PWD/.libs/libtestlookup.so" ]; then
--	export LD_PRELOAD="$PWD/.libs/libtestlookup.so"
-+    export LD_LIBRARY_PATH="$PWD/.libs:$LD_LIBRARY_PATH"
-+    export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH"
- fi
- 
- "${srcdir:-${PWD}}"/test/run "$@"
diff --git a/patch/apg.patch b/patch/apg.patch
deleted file mode 100644
index 8d557b12c..000000000
--- a/patch/apg.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- apg.c
-+++ apg.c
-@@ -571,7 +571,7 @@
-  char * seq;
-  UINT32 prom[2] = { 0L, 0L };
-  UINT32 sdres = 0L;
-- printf ("\nPlease enter some random data (only first %d are significant)\n", sizeof(prom));
-+ printf ("\nPlease enter some random data (only first %d are significant)\n", (int)sizeof(prom));
-  seq = (char *)getpass("(eg. your old password):>");
-  if (strlen(seq) < sizeof(prom))
-   (void)memcpy((void *)&prom[0], (void *)seq, (int)strlen(seq));
---- Makefile
-+++ Makefile
-@@ -1,19 +1,9 @@
- ##################################################################
--# You can modify CC variable if you have compiler other than GCC
--# But the code was designed and tested with GCC
--CC = gcc
--
--##################################################################
--# Compilation flags
--# You should comment the line below for AIX+native cc
--FLAGS = -Wall
--
--##################################################################
- # Libraries
- #
- # You should comment the line below ('LIBS= -lcrypt')for QNX RTP
- # 6.1.0, OpenBSD 2.8 and above, WIN32 (+MinGW)
--LIBS = -lcrypt
-+#LIBS = -lcrypt
- LIBM = -lm
- # Use lines below for cygwin
- # LIBS = 
-@@ -39,7 +29,7 @@
- ##################################################################
- # Directories
- # Install dirs
--INSTALL_PREFIX = /usr/local
-+APG_PREFIX = /usr/local
- APG_BIN_DIR = /bin
- APG_MAN_DIR = /man/man1
- APGD_BIN_DIR = /sbin
-@@ -74,9 +64,6 @@
- #CS_LIBS = -lsocket
- 
- # ====== YOU DO NOT NEED TO MODIFY ANYTHING BELOW THIS LINE ======
--# Find group ID for user root
--FIND_GROUP = `grep '^root:' /etc/passwd | awk -F: '{ print $$4 }'`
--
- PROGNAME = apg
- CS_PROGNAME = apgd
- BFM_PROGNAME = apgbfm
-@@ -96,52 +83,54 @@
- cygwin: standalone
- 
- apg:
--	${CC} ${FLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
-+	${CC} ${CPPFLAGS} ${CFLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LDFLAGS} ${LIBS} ${LIBM}
- 
- apgd:
--	${CC} ${FLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
-+	${CC} ${CPPFLAGS} ${CFLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${LDFLAGS} ${CS_LIBS} ${LIBM}
- 
- apgbfm:
--	${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
-+	${CC} ${CPPFLAGS} ${CFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LDFLAGS} ${LIBM}
- 
- strip:
- 	strip ${PROGNAME}
- 	strip ${CS_PROGNAME}
- 	strip ${BFM_PROGNAME}
- 
-+.PHONY: install
- install:
- 	if test -x ./apg; then \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
--./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
-+./install-sh -c -m 0755 ./apg ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./install-sh -c -m 0444 ./doc/man/apg.1 ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
- fi
- 	if test -x ./apgd; then \
--./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
--./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
--./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
--./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APGD_BIN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APGD_MAN_DIR}; \
-+./install-sh -c -m 0755 ./apgd ${DESTDIR}${APG_PREFIX}${APGD_BIN_DIR}; \
-+./install-sh -c -m 0444 ./doc/man/apgd.8 ${DESTDIR}${APG_PREFIX}${APGD_MAN_DIR}; \
- fi
- 	if test -x ./apgbfm; then \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
--./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
-+./install-sh -c -m 0755 ./apgbfm ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
- fi
- 
- install-cygwin:
- 	if test -x ./apg.exe; then \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
--./install-sh -c -m 0755 ./apg.exe ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
-+./install-sh -c -m 0755 ./apg.exe ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./install-sh -c -m 0444 ./doc/man/apg.1 ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
- fi
- 	if test -x ./apgbfm.exe; then \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
--./install-sh -c -m 0755 ./apgbfm.exe ${INSTALL_PREFIX}${APG_BIN_DIR}; \
--./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./mkinstalldirs ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
-+./install-sh -c -m 0755 ./apgbfm.exe ${DESTDIR}${APG_PREFIX}${APG_BIN_DIR}; \
-+./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${DESTDIR}${APG_PREFIX}${APG_MAN_DIR}; \
- fi
- 
-+.PHONY: clean
- clean:
- 	rm -f ${CS_PROGNAME} ${PROGNAME} ${BFM_PROGNAME} ${OBJECTS} *core*
diff --git a/patch/attr.patch b/patch/attr.patch
deleted file mode 100644
index 316ca8501..000000000
--- a/patch/attr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/run
-+++ test/run
-@@ -106,7 +106,7 @@
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
diff --git a/patch/b2sum-autotools.zip b/patch/b2sum-autotools.zip
deleted file mode 100644
index 44fc5feac..000000000
Binary files a/patch/b2sum-autotools.zip and /dev/null differ
diff --git a/patch/b2sum.patch b/patch/b2sum.patch
deleted file mode 100644
index 15346b09a..000000000
--- a/patch/b2sum.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with BLAKE2-20190724
---- sse/blake2b-load-sse2.h
-+++ sse/blake2b-load-sse2.h
-@@ -15,6 +15,8 @@
- #ifndef BLAKE2B_LOAD_SSE2_H
- #define BLAKE2B_LOAD_SSE2_H
- 
-+#include <emmintrin.h>
-+
- #define LOAD_MSG_0_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4)
- #define LOAD_MSG_0_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5)
- #define LOAD_MSG_0_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12)
---- sse/blake2s-load-sse2.h
-+++ sse/blake2s-load-sse2.h
-@@ -15,6 +15,8 @@
- #ifndef BLAKE2S_LOAD_SSE2_H
- #define BLAKE2S_LOAD_SSE2_H
- 
-+#include <emmintrin.h>
-+
- #define LOAD_MSG_0_1(buf) buf = _mm_set_epi32(m6,m4,m2,m0)
- #define LOAD_MSG_0_2(buf) buf = _mm_set_epi32(m7,m5,m3,m1)
- #define LOAD_MSG_0_3(buf) buf = _mm_set_epi32(m12,m10,m8,m14)
diff --git a/patch/bash.patch b/patch/bash.patch
deleted file mode 100644
index eefddd88e..000000000
--- a/patch/bash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Bash.
---- support/Makefile.in
-+++ support/Makefile.in
-@@ -48,6 +48,8 @@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- CPPFLAGS = @CPPFLAGS@
- CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_FOR_BUILD = ${LDFLAGS}
- LOCAL_CFLAGS = @LOCAL_CFLAGS@
- DEFS = @DEFS@
- LOCAL_DEFS = @LOCAL_DEFS@
-@@ -77,7 +79,7 @@
- all: man2html$(EXEEXT)
- 
- man2html$(EXEEXT): $(OBJ1)
--	$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) $(OBJ1) -o $@ ${LIBS_FOR_BUILD}
-+	$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) $(OBJ1) -o $@ $(LDFLAGS_FOR_BUILD) $(LIBS_FOR_BUILD)
- 
- clean:
- 	$(RM) man2html$(EXEEXT) $(OBJ1)
---- lib/malloc/malloc.c
-+++ lib/malloc/malloc.c
-@@ -847,7 +847,10 @@
- 
-   /* Silently reject too-large requests. XXX - can increase this if HAVE_MMAP */
-   if (nunits >= NBUCKETS)
-+    {
-+    write (1, "nunits >= NBUCKETS, return NULL\n", 32);
-     return ((PTR_T) NULL);
-+    }
- 
-   /* In case this is reentrant use of malloc from signal handler,
-      pick a block size that no other malloc level is currently
diff --git a/patch/bc.patch b/patch/bc.patch
deleted file mode 100644
index 325af515e..000000000
--- a/patch/bc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with BC calculator.
---- Makefile.in
-+++ Makefile.in
-@@ -288,7 +288,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib bc dc doc
-+SUBDIRS = lib bc dc
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing \
- 			bc/libmath.h
diff --git a/patch/bzip-makefiles.zip b/patch/bzip-makefiles.zip
deleted file mode 100644
index b4c4fc648..000000000
Binary files a/patch/bzip-makefiles.zip and /dev/null differ
diff --git a/patch/bzip.patch b/patch/bzip.patch
deleted file mode 100644
index d282bf8c9..000000000
--- a/patch/bzip.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Bzip2.
---- bzip2recover.c
-+++ bzip2recover.c
-@@ -36,8 +36,13 @@
-    the 512MB limitation.
- */
- #ifdef __GNUC__
-+# if defined(_LP64) || defined(__LP64__)
-+   typedef  unsigned long long int  MaybeUInt64;
-+#  define MaybeUInt64_FMT "%llu"
-+# else
-    typedef  unsigned long long int  MaybeUInt64;
- #  define MaybeUInt64_FMT "%Lu"
-+# endif
- #else
- #ifdef _MSC_VER
-    typedef  unsigned __int64  MaybeUInt64;
---- bzip2.c
-+++ bzip2.c
-@@ -44,6 +44,15 @@
- 
- /*---------------------------------------------*/
- /*--
-+  Portable way to silence some warnings
-+--*/
-+#ifndef BZIP_UNUSED
-+#define BZIP_UNUSED(x) ((void)(x))
-+#endif
-+
-+
-+/*---------------------------------------------*/
-+/*--
-   Some stuff for all platforms.
- --*/
- 
-@@ -815,10 +824,10 @@
- static 
- void mySIGSEGVorSIGBUScatcher ( IntNative n )
- {
-+   const char *msg;
-+   ssize_t rc;
-    if (opMode == OM_Z)
--      fprintf ( 
--      stderr,
--      "\n%s: Caught a SIGSEGV or SIGBUS whilst compressing.\n"
-+      msg = ": Caught a SIGSEGV or SIGBUS whilst compressing.\n"
-       "\n"
-       "   Possible causes are (most likely first):\n"
-       "   (1) This computer has unreliable memory or cache hardware\n"
-@@ -834,12 +843,9 @@
-       "   bug report should have.  If the manual is available on your\n"
-       "   system, please try and read it before mailing me.  If you don't\n"
-       "   have the manual or can't be bothered to read it, mail me anyway.\n"
--      "\n",
--      progName );
--      else
--      fprintf ( 
--      stderr,
--      "\n%s: Caught a SIGSEGV or SIGBUS whilst decompressing.\n"
-+      "\n";
-+   else
-+      msg = ": Caught a SIGSEGV or SIGBUS whilst decompressing.\n"
-       "\n"
-       "   Possible causes are (most likely first):\n"
-       "   (1) The compressed data is corrupted, and bzip2's usual checks\n"
-@@ -857,13 +863,27 @@
-       "   bug report should have.  If the manual is available on your\n"
-       "   system, please try and read it before mailing me.  If you don't\n"
-       "   have the manual or can't be bothered to read it, mail me anyway.\n"
--      "\n",
--      progName );
-+      "\n";
- 
--   showFileNames();
--   if (opMode == OM_Z)
--      cleanUpAndFail( 3 ); else
--      { cadvise(); cleanUpAndFail( 2 ); }
-+   rc = write ( STDERR_FILENO, "\n", 1 );
-+   rc = write ( STDERR_FILENO, progName, strlen ( progName ) );
-+   rc = write ( STDERR_FILENO, msg, strlen ( msg ) );
-+
-+   msg = "\tInput file = ";
-+   rc = write ( STDERR_FILENO, msg, strlen (msg) );
-+   rc = write ( STDERR_FILENO, inName, strlen (inName) );
-+   rc = write ( STDERR_FILENO, "\n", 1 );
-+   msg = "\tOutput file = ";
-+   rc = write ( STDERR_FILENO, msg, strlen (msg) );
-+   rc = write ( STDERR_FILENO, outName, strlen (outName) );
-+   rc = write ( STDERR_FILENO, "\n", 1 );
-+   BZIP_UNUSED( rc );
-+
-+   /* Don't call cleanupAndFail. If we ended up here something went
-+      terribly wrong. Trying to clean up might fail spectacularly. */
-+
-+   if (opMode == OM_Z) setExit(3); else setExit(2);
-+   _exit(exitValue);
- }
- 
- 
-@@ -1070,7 +1090,9 @@
-    retVal = fchmod ( fd, fileMetaInfo.st_mode );
-    ERROR_IF_NOT_ZERO ( retVal );
- 
--   (void) fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
-+   retVal = fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
-+   BZIP_UNUSED( retVal );
-+
-    /* chown() will in many cases return with EPERM, which can
-       be safely ignored.
-    */
diff --git a/patch/cpuid.patch b/patch/cpuid.patch
deleted file mode 100644
index 87e0e298b..000000000
--- a/patch/cpuid.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with CPUID program.
---- Makefile
-+++ Makefile
-@@ -1,10 +1,5 @@
--CFLAGS+=-g
--CPPFLAGS?=
--LDFLAGS?=
--ifneq (,$(findstring arch=i386,$(CFLAGS)))
--CISA=-m32
--endif
--CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
-+
-+ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) -Wall -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
- 
- PACKAGE=cpuid
- VERSION=20180519
-@@ -12,172 +7,26 @@
- 
- PROG=$(PACKAGE)
- 
--SRC_TAR=$(PACKAGE)-$(VERSION).src.tar.gz
--i386_TAR=$(PACKAGE)-$(VERSION).i386.tar.gz
--x86_64_TAR=$(PACKAGE)-$(VERSION).x86_64.tar.gz
--TARS=$(SRC_TAR) $(i386_TAR) $(x86_64_TAR)
--SRC_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
--i386_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).i386.rpm
--x86_64_RPM=$(PACKAGE)-$(VERSION)-$(RELEASE).x86_64.rpm
--RPMS=$(SRC_RPM) $(i386_RPM) $(x86_64_RPM)
--i386_DEBUG_RPM=$(PACKAGE)-debuginfo-$(VERSION)-$(RELEASE).i386.rpm
--x86_64_DEBUG_RPM=$(PACKAGE)-debuginfo-$(VERSION)-$(RELEASE).x86_64.rpm
--DEBUG_RPMS=$(i386_DEBUG_RPM) $(x86_64_DEBUG_RPM)
--
- SRCS=cpuid.c
- 
--OTHER_SRCS=Makefile $(PROG).man cpuinfo2cpuid \
--           $(PACKAGE).proto.spec $(PACKAGE).spec \
--           ChangeLog FUTURE LICENSE
--OTHER_BINS=$(PROG).man cpuinfo2cpuid.man
-+OTHER_SRCS=Makefile cpuinfo2cpuid
- 
- REL_DIR=../$(shell date +%Y-%m-%d)
- WEB_DIR=/toad2/apps.mine/www/www/$(PROG)
- 
--BUILDROOT=
-+PREFIX ?= /usr/local
-+LIBDIR ?= $(PREFIX)/lib
-+BINDIR ?= $(PREFIX)/bin
- 
--default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-+default: $(PROG) cpuinfo2cpuid
- 
- $(PROG): cpuid.c Makefile
--	$(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
--
--$(PROG).man.gz: $(PROG).man
--	gzip < $< > $@
--
--cpuinfo2cpuid.man: cpuinfo2cpuid Makefile
--	pod2man -r "$(VERSION)" -c "" $< > $@
-+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ cpuid.c $(LIBS)
- 
--cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
--	gzip < $< > $@
--
--install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
--	install -D -s -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
--	install -D    -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
--	install -D    -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
--	install -D    -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+install: $(PROG) cpuinfo2cpuid
-+	install -d -m 755                    $(DESTDIR)$(BINDIR)
-+	install -s -m 755 $(PROG)            $(DESTDIR)$(BINDIR)/$(PROG)
-+	install    -m 755 cpuinfo2cpuid      $(DESTDIR)$(BINDIR)/cpuinfo2cpuid
- 
- clean:
--	rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
--	rm -f $(PROG).man.gz
--	rm -f cpuinfo2cpuid.man cpuinfo2cpuid.man.gz
--	rm -f $(PACKAGE).spec
--	rm -f $(TARS)
--	rm -f $(RPMS)
--	rm -f $(DEBUG_RPMS)
--	rm -f $(PACKAGE)-*.src.tar.gz $(PACKAGE)-*.i386.tar.gz $(PACKAGE)-*.x86_64.tar.gz
--	rm -f $(PACKAGE)-*.src.rpm $(PACKAGE)-*.i386.rpm $(PACKAGE)-*.x86_64.rpm
--	rm -f $(PACKAGE)-debuginfo-*.i386.rpm $(PACKAGE)-debuginfo-*.x86_64.rpm
--
--# Todd's Development rules
--
--$(PROG).i386: cpuid.c Makefile
--	$(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c
--
--$(PROG).x86_64: cpuid.c Makefile
--	$(CC) -m64 $(CFL) $(LDFLAGS) -o $@ cpuid.c
--
--todd: $(PROG).i386 $(PROG).x86_64
--	rm -f ~/.bin/execs/i586/$(PROG)
--	rm -f ~/.bin/execs/x86_64/$(PROG)
--	cp -p $(PROG).i386   ~/.bin/execs/i586/$(PROG)
--	cp -p $(PROG).x86_64 ~/.bin/execs/x86_64/$(PROG)
--	chmod 777 ~/.bin/execs/i586/$(PROG)
--	chmod 777 ~/.bin/execs/x86_64/$(PROG)
--	(cd ~/.bin/execs; prop i586/$(PROG) x86_64/$(PROG))
--
--# Release rules
--
--$(PACKAGE).spec: $(PACKAGE).proto.spec
--	@(echo "%define version $(VERSION)"; \
--	  echo "%define release $(RELEASE)"; \
--	  cat $<) > $@
--
--$(SRC_TAR): $(SRCS) $(OTHER_SRCS)
--	@echo "Tarring source"
--	@rm -rf $(PACKAGE)-$(VERSION)
--	@mkdir $(PACKAGE)-$(VERSION)
--	@ls -1d $(SRCS) $(OTHER_SRCS) | cpio -pdmuv $(PACKAGE)-$(VERSION)
--	@tar cvf - $(PACKAGE)-$(VERSION) | gzip -c >| $(SRC_TAR)
--	@rm -rf $(PACKAGE)-$(VERSION)
--
--$(i386_TAR): $(PROG).i386 $(OTHER_BINS)
--	@echo "Tarring i386 binary"
--	@rm -rf $(PACKAGE)-$(VERSION)
--	@mkdir $(PACKAGE)-$(VERSION)
--	@ls -1d $(PROG).i386 $(OTHER_BINS) | cpio -pdmuv $(PACKAGE)-$(VERSION)
--	@mv $(PACKAGE)-$(VERSION)/$(PROG).i386 $(PACKAGE)-$(VERSION)/$(PROG)
--	@(cd $(PACKAGE)-$(VERSION); strip $(PROG))
--	@tar cvf - $(PACKAGE)-$(VERSION) | gzip -c >| $(i386_TAR)
--	@rm -rf $(PACKAGE)-$(VERSION)
--
--$(x86_64_TAR): $(PROG).x86_64 $(OTHER_BINS)
--	@echo "Tarring x86_64 binary"
--	@rm -rf $(PACKAGE)-$(VERSION)
--	@mkdir $(PACKAGE)-$(VERSION)
--	@ls -1d $(PROG).x86_64 $(OTHER_BINS) | cpio -pdmuv $(PACKAGE)-$(VERSION)
--	@mv $(PACKAGE)-$(VERSION)/$(PROG).x86_64 $(PACKAGE)-$(VERSION)/$(PROG)
--	@(cd $(PACKAGE)-$(VERSION); strip $(PROG))
--	@tar cvf - $(PACKAGE)-$(VERSION) | gzip -c >| $(x86_64_TAR)
--	@rm -rf $(PACKAGE)-$(VERSION)
--
--src_tar: $(SRC_TAR)
--
--tar tars: $(TARS)
--
--$(i386_RPM) $(i386_DEBUG_RPM) $(SRC_RPM): $(SRC_TAR) $(PACKAGE).spec
--	@echo "Building i386 RPMs"
--	@rm -rf build
--	@mkdir build
--	@rpmbuild -ba --target i386 \
--	          --buildroot "${PWD}/build" \
--	          --define "_builddir ${PWD}/build" \
--	          --define "_rpmdir ${PWD}" \
--	          --define "_srcrpmdir ${PWD}" \
--	          --define "_sourcedir ${PWD}" \
--	          --define "_specdir ${PWD}" \
--	          --define "__check_files ''" \
--	          --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
--	          $(PACKAGE).spec
--	@rm -rf build
--
--$(x86_64_RPM) $(x86_64_DEBUG_RPM): $(SRC_TAR) $(PACKAGE).spec
--	@echo "Building x86_64 RPMs"
--	@rm -rf build
--	@mkdir build
--	@rpmbuild -ba --target x86_64 \
--	          --buildroot "${PWD}/build" \
--	          --define "_builddir ${PWD}/build" \
--	          --define "_rpmdir ${PWD}" \
--	          --define "_srcrpmdir ${PWD}" \
--	          --define "_sourcedir ${PWD}" \
--	          --define "_specdir ${PWD}" \
--	          --define "__check_files ''" \
--	          --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
--	          $(PACKAGE).spec
--	@rm -rf build
--
--rpm rpms: $(RPMS)
--
--# Todd's release rules
--
--release: $(PROG) $(PROG).i386 $(PROG).x86_64 $(TARS) $(RPMS)
--	if [ -d $(REL_DIR) ]; then                         \
--	   echo "Makefile: $(REL_DIR) already exists" >&2; \
--	   exit 1;                                         \
--	fi
--	mkdir $(REL_DIR)
--	cp -p $(PROG) $(PROG).i386 $(PROG).x86_64 $(SRCS) $(OTHER_SRCS) $(REL_DIR)
--	mv $(TARS) $(RPMS) $(REL_DIR)
--	if [ -e $(i386_DEBUG_RPM) ]; then   \
--	   mv $(i386_DEBUG_RPM) $(REL_DIR); \
--	fi
--	if [ -e $(x86_64_DEBUG_RPM) ]; then  \
--	   mv $(x86_64_DEBUG_RPM) $(REL_DIR); \
--	fi
--	chmod -w $(REL_DIR)/*
--	cp -f -p $(REL_DIR)/*.tar.gz $(REL_DIR)/*.rpm $(WEB_DIR)
--	rm -f $(PACKAGE).spec
--
--rerelease:
--	rm -rf $(REL_DIR)
--	$(MAKE) -$(MAKEFLAGS) release
-+	rm -f $(PROG)
---- cpuid.c
-+++ cpuid.c
-@@ -19,19 +19,23 @@
- */
- 
- #ifdef __linux__
--#define USE_CPUID_MODULE
--#define USE_KERNEL_SCHED_SETAFFINITY
-+#define USE_CPUID_MODULE 1
-+#define USE_KERNEL_SCHED_SETAFFINITY 1
- #endif
- 
- #if __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40300
--#define USE_CPUID_COUNT
-+#define USE_CPUID_COUNT 1
-+#endif
-+
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#define BSD_FAMILY 1
- #endif
- 
- #define _GNU_SOURCE
-+
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -40,6 +44,18 @@
- #include <regex.h>
- #include <getopt.h>
- 
-+#if defined(__APPLE__)
-+#include <mach/thread_policy.h>
-+#include <pthread.h>
-+#elif defined(__sun)
-+#include <sys/processor.h>
-+#include <sys/procset.h>
-+#include <strings.h>
-+#include <pthread.h>
-+#elif defined(__linux__)
-+#include <sys/sysmacros.h>
-+#endif
-+
- #ifdef USE_CPUID_MODULE
- #include <linux/major.h>
- #endif
-@@ -48,12 +64,30 @@
- #include <cpuid.h>
- #endif
- 
--#ifdef USE_KERNEL_SCHED_SETAFFINITY
-+#if defined(USE_KERNEL_SCHED_SETAFFINITY)
- #include <sys/syscall.h>
--#else
-+#elif defined(__linux__) || defined(BSD_FAMILY)
- #include <sched.h>
- #endif
- 
-+#if defined(__APPLE__) || defined(BSD_FAMILY)
-+#define OFF64_T off_t
-+#define LSEEK64 lseek
-+#else
-+#define OFF64_T off64_t
-+#define LSEEK64 lseek64
-+#endif
-+
-+/* Commented out in current headers */
-+#ifdef __APPLE__
-+extern kern_return_t 
-+thread_policy_set(
-+    thread_t                thread,
-+    thread_policy_flavor_t  flavor,
-+    thread_policy_t         policy_info,
-+    mach_msg_type_number_t  count);
-+#endif
-+
- typedef int   boolean;
- #define TRUE  1
- #define FALSE 0
-@@ -66,8 +100,9 @@
- #define STR(x)   #x
- #define XSTR(x)  STR(x)
- 
--
-+#ifndef MAX
- #define MAX(l,r)            ((l) > (r) ? (l) : (r))
-+#endif
- 
- #define LENGTH(array, type) (sizeof(array) / sizeof(type))
- #define STRLEN(s)           (LENGTH(s,char) - 1)
-@@ -273,10 +308,10 @@
-    unsigned int   val_80000001_edx;
-    unsigned int   val_80000008_ecx;
-    unsigned int   transmeta_proc_rev;
--   char           brand[48];
--   char           transmeta_info[48];
--   char           override_brand[48];
--   char           soc_brand[48];
-+   char           brand[98];
-+   char           transmeta_info[98];
-+   char           override_brand[98];
-+   char           soc_brand[98];
-    hypervisor_t   hypervisor;
- 
-    struct mp {
-@@ -358,7 +393,7 @@
-                     0, 0, 0, 0, 0, 0, \
-                     "", "", "", "", \
-                     HYPERVISOR_UNKNOWN, \
--                    { NULL, -1, -1 }, \
-+                    { NULL, ((unsigned int)-1), ((unsigned int)-1) }, \
-                     { FALSE, \
-                       { FALSE, FALSE, FALSE, FALSE, FALSE, \
-                         FALSE, FALSE, FALSE, FALSE }, \
-@@ -6850,6 +6885,26 @@
- 
-          int  status;
-          status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
-+#elif defined(__APPLE__)
-+         /*
-+          ** https://developer.apple.com/library/archive/releasenotes/Performance/RN-AffinityAPI/
-+          ** https://stackoverflow.com/a/39839919/608639
-+          */
-+         pthread_t thread = pthread_self();
-+         mach_port_t mthread = pthread_mach_thread_np(thread);
-+         thread_affinity_policy_data_t policy = { cpu };
-+         int status = thread_policy_set(mthread, THREAD_AFFINITY_POLICY, (thread_policy_t)&policy, 1);
-+         if (status != KERN_SUCCESS) {
-+             errno = EINVAL;
-+             status = -1;
-+         }
-+#elif defined(__sun)
-+         /*
-+          ** https://www.oracle.com/technetwork/server-storage/solaris/solaris-linux-app-139382.html
-+          ** https://docs.oracle.com/cd/E19455-01/806-0626/6j9vgh685/index.html
-+          */
-+         pthread_t thread = pthread_self();
-+         int status = processor_bind(P_LWPID, thread, cpu, NULL);
- #else
-          cpu_set_t  cpuset;
-          CPU_ZERO(&cpuset);
-@@ -6978,11 +7033,11 @@
-             "c" (ecx));
- #endif
-    } else {
--      off64_t  result;
--      off64_t  offset = ((off64_t)ecx << 32) + reg;
-+      OFF64_T  result;
-+      OFF64_T  offset = ((OFF64_T)ecx << 32) + reg;
-       int      status;
- 
--      result = lseek64(cpuid_fd, offset, SEEK_SET);
-+      result = LSEEK64(cpuid_fd, offset, SEEK_SET);
-       if (result == -1) {
-          if (quiet) {
-             return FALSE;
-@@ -7391,7 +7446,7 @@
-         boolean   debug)
- {
-    boolean       seen_cpu    = FALSE;
--   unsigned int  cpu         = -1;
-+   unsigned int  cpu         = (unsigned int)-1;
-    /*
-    ** The try* variables are a kludge to deal with those leaves that depended on
-    ** the try (a.k.a. ecx) values that existed with cpuid's old-style method of
-@@ -7399,11 +7454,11 @@
-    ** It is not necessary to add more kludges for more modern ecx-dependent
-    ** leaves.
-    */
--   unsigned int  try2        = -1;
--   unsigned int  try4        = -1;
--   unsigned int  try7        = -1;
--   unsigned int  tryb        = -1;
--   unsigned int  try8000001d = -1;
-+   unsigned int  try2        = (unsigned int)-1;
-+   unsigned int  try4        = (unsigned int)-1;
-+   unsigned int  try7        = (unsigned int)-1;
-+   unsigned int  tryb        = (unsigned int)-1;
-+   unsigned int  try8000001d = (unsigned int)-1;
-    code_stash_t  stash       = NIL_STASH;
- 
-    FILE*  file;
diff --git a/patch/cryptlib.patch b/patch/cryptlib.patch
deleted file mode 100644
index 767077ede..000000000
--- a/patch/cryptlib.patch
+++ /dev/null
@@ -1,1462 +0,0 @@
---- crypt/osconfig.h
-+++ crypt/osconfig.h
-@@ -374,6 +374,13 @@
- 	  #define BN_LLONG
- 	  #define DES_RISC1
- 	#endif /* 64- vs. 32-bit ARM */
-+  #elif defined( __aarch64__ ) || defined( __arm64 )
-+          /* Apple M1 */
-+          #define SYSTEM_NAME   "OS X Arm64"
-+          #define L_ENDIAN
-+          #undef SIXTY_FOUR_BIT
-+          #define SIXTY_FOUR_BIT_LONG
-+          #define RC4_CHAR
-   #elif defined( __ppc__ )
- 	#define SYSTEM_NAME		"OS X PowerPC"
- 	#define B_ENDIAN
---- random/unix.c
-+++ random/unix.c
-@@ -503,7 +503,9 @@
- 									   amount of output so typically gets
- 									   truncated at SYSCTL_BUFFER_SIZE */
- #endif /* KERN_PROC2 */
-+#ifdef GPROF_COUNT
- 	{ 3, { CTL_KERN, KERN_PROF, GPROF_COUNT }, 10 },
-+#endif
- 									/* If kernel is compiled for profiling, 
- 									   an array of statistical program 
- 									   counter counts.  This typically isn't
---- test/certs.c
-+++ test/certs.c
-@@ -53,6 +53,12 @@
-   #endif /* CERTTIME_DATETEST <= MIN_TIME_VALUE */
- #endif /* Safety check of time test value against MIN_TIME_VALUE */
- 
-+/* Per PG in private email */
-+#ifdef MIN_TIME_VALUE
-+# undef CERTTIME_DATETEST
-+# define CERTTIME_DATETEST       MIN_TIME_VALUE + 1
-+#endif
-+
- /****************************************************************************
- *																			*
- *								Utility Functions							*
---- makefile
-+++ makefile
-@@ -90,7 +90,12 @@
- # Further cc flags are gathered dynamically at runtime via the ccopts.sh
- # script.
- 
--CFLAGS			= -c -D__UNIX__ -DNDEBUG -I.
-+# Cryptlib stomps on our CFLAGS!!!!
-+CRYPTLIB_CPPFLAGS		= -D__UNIX__ -DNDEBUG -I.
-+CRYPTLIB_CFLAGS			= -c
-+CPPFLAGS			:= $(CRYPTLIB_CPPFLAGS) $(CPPFLAGS)
-+CFLAGS				:= $(CRYPTLIB_CFLAGS) $(CFLAGS)
-+
- CFLAGS_DEBUG	= -c -D__UNIX__ -I. -g -O1
- CFLAGS_DEBUGGCC	= -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O1
- CFLAGS_ANALYSE	= -c -D__UNIX__ -I.
-@@ -367,22 +372,22 @@
- 
- default:
- 	@$(MAKE) common-tasks
--	@./tools/buildall.sh $(MAKE) $(CC) $(OSNAME) $(CFLAGS)
-+	@./tools/buildall.sh $(MAKE) $(CC) $(OSNAME) $(CPPFLAGS) $(CFLAGS)
- 
- shared:
- 	@$(MAKE) common-tasks
--	@./tools/buildall.sh shared $(MAKE) $(CC) $(OSNAME) $(CFLAGS)
-+	@./tools/buildall.sh shared $(MAKE) $(CC) $(OSNAME) $(CPPFLAGS) $(CFLAGS)
- 
- debug:
- 	@$(MAKE) common-tasks
--	@./tools/buildall.sh $(MAKE) $(CC) $(OSNAME) $(CFLAGS_DEBUG)
-+	@./tools/buildall.sh $(MAKE) $(CC) $(OSNAME) $(CPPFLAGS) $(CFLAGS_DEBUG)
- 
- # Special-case targets.  The "analyse" target isn't used directly but is 
- # invoked as part of the clang static analyser build process.
- 
- analyse:
- 	@$(MAKE) common-tasks
--	@./tools/buildall.sh analyse $(MAKE) $(CC) $(OSNAME) $(CFLAGS_ANALYSE)
-+	@./tools/buildall.sh analyse $(MAKE) $(CC) $(OSNAME) $(CPPFLAGS) $(CFLAGS_ANALYSE)
- 
- testlib-special:
- 	@echo $(TESTOBJS) > $(LINKFILE)
-@@ -395,7 +400,7 @@
- 	@$(MAKE) common-tasks
- 	@export AFL_HARDEN=1 ; export AFL_USE_ASAN=1 ; \
- 		./tools/buildall.sh special $(MAKE) ~/afl-2*/afl-clang-fast \
--		$(OSNAME) $(CFLAGS_FUZZ)
-+		$(OSNAME) $(CPPFLAGS) $(CFLAGS_FUZZ)
- 	@rm -f $(LINKFILE)
- 	make testlib-special LD=~/afl-2*/afl-clang-fast LDFLAGS="-fsanitize=address" \
- 		LDEXTRA="~/afl-2*/afl-llvm-rt.o" OSNAME=$(OSNAME)
-@@ -540,985 +545,985 @@
- # Main directory
- 
- $(OBJPATH)cryptapi.o:	$(CRYPT_DEP) cryptapi.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptapi.o cryptapi.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptapi.o cryptapi.c
- 
- $(OBJPATH)cryptcrt.o:	$(CRYPT_DEP) $(CERT_DEP) cryptcrt.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptcrt.o cryptcrt.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptcrt.o cryptcrt.c
- 
- $(OBJPATH)cryptctx.o:	$(CRYPT_DEP) context/context.h cryptctx.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptctx.o cryptctx.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptctx.o cryptctx.c
- 
- $(OBJPATH)cryptdev.o:	$(CRYPT_DEP) device/device.h cryptdev.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptdev.o cryptdev.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptdev.o cryptdev.c
- 
- $(OBJPATH)cryptenv.o:	$(CRYPT_DEP) envelope/envelope.h $(ASN1_DEP) \
- 						cryptenv.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptenv.o cryptenv.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptenv.o cryptenv.c
- 
- $(OBJPATH)cryptkey.o:	$(CRYPT_DEP) keyset/keyset.h cryptkey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptkey.o cryptkey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptkey.o cryptkey.c
- 
- $(OBJPATH)cryptlib.o:	$(CRYPT_DEP) cryptlib.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptlib.o cryptlib.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptlib.o cryptlib.c
- 
- $(OBJPATH)cryptses.o:	$(CRYPT_DEP) session/session.h cryptses.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptses.o cryptses.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptses.o cryptses.c
- 
- $(OBJPATH)cryptusr.o:	$(CRYPT_DEP) misc/user.h cryptusr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cryptusr.o cryptusr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cryptusr.o cryptusr.c
- 
- # Additional modules whose use needs to be explicitly enabled by the user.
- 
- $(OBJPATH)java_jni.o:	$(CRYPT_DEP) bindings/java_jni.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)java_jni.o bindings/java_jni.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)java_jni.o bindings/java_jni.c
- 
- # bn subdirectory
- 
- $(OBJPATH)bn_asm.o:		crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/bn_asm.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)bn_asm.o bn/bn_asm.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)bn_asm.o bn/bn_asm.c
- 
- $(OBJPATH)bn_exp.o:		crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/bn_exp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)bn_exp.o bn/bn_exp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)bn_exp.o bn/bn_exp.c
- 
- $(OBJPATH)bn_exp2.o:	crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/bn_exp2.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)bn_exp2.o bn/bn_exp2.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)bn_exp2.o bn/bn_exp2.c
- 
- $(OBJPATH)bn_gcd.o:		crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/bn_gcd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)bn_gcd.o bn/bn_gcd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)bn_gcd.o bn/bn_gcd.c
- 
- $(OBJPATH)bn_mul.o:		crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/bn_mul.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)bn_mul.o bn/bn_mul.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)bn_mul.o bn/bn_mul.c
- 
- $(OBJPATH)bn_recp.o:	crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/bn_recp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)bn_recp.o bn/bn_recp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)bn_recp.o bn/bn_recp.c
- 
- $(OBJPATH)ec_lib.o:		crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/ec.h bn/ec_lib.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ec_lib.o bn/ec_lib.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ec_lib.o bn/ec_lib.c
- 
- $(OBJPATH)ecp_mont.o:	crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/ec.h bn/ecp_mont.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ecp_mont.o bn/ecp_mont.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ecp_mont.o bn/ecp_mont.c
- 
- $(OBJPATH)ecp_smpl.o:	crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/ec.h bn/ecp_smpl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ecp_smpl.o bn/ecp_smpl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ecp_smpl.o bn/ecp_smpl.c
- 
- $(OBJPATH)ec_mult.o:	crypt/osconfig.h bn/bn.h bn/bn_lcl.h bn/ec.h bn/ec_mult.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ec_mult.o bn/ec_mult.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ec_mult.o bn/ec_mult.c
- 
- # cert subdirectory
- 
- $(OBJPATH)certrev.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certrev.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)certrev.o cert/certrev.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)certrev.o cert/certrev.c
- 
- $(OBJPATH)certschk.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certschk.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)certschk.o cert/certschk.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)certschk.o cert/certschk.c
- 
- $(OBJPATH)certsign.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certsign.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)certsign.o cert/certsign.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)certsign.o cert/certsign.c
- 
- $(OBJPATH)certval.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certval.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)certval.o cert/certval.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)certval.o cert/certval.c
- 
- $(OBJPATH)chain.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/chain.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)chain.o cert/chain.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)chain.o cert/chain.c
- 
- $(OBJPATH)chk_cert.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/chk_cert.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)chk_cert.o cert/chk_cert.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)chk_cert.o cert/chk_cert.c
- 
- $(OBJPATH)chk_chn.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/chk_chn.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)chk_chn.o cert/chk_chn.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)chk_chn.o cert/chk_chn.c
- 
- $(OBJPATH)chk_san.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/chk_san.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)chk_san.o cert/chk_san.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)chk_san.o cert/chk_san.c
- 
- $(OBJPATH)chk_use.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/chk_use.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)chk_use.o cert/chk_use.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)chk_use.o cert/chk_use.c
- 
- $(OBJPATH)comp_cert.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_cert.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_cert.o cert/comp_cert.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_cert.o cert/comp_cert.c
- 
- $(OBJPATH)comp_curs.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_curs.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_curs.o cert/comp_curs.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_curs.o cert/comp_curs.c
- 
- $(OBJPATH)comp_del.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_del.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_del.o cert/comp_del.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_del.o cert/comp_del.c
- 
- $(OBJPATH)comp_get.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_get.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_get.o cert/comp_get.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_get.o cert/comp_get.c
- 
- $(OBJPATH)comp_gets.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_gets.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_gets.o cert/comp_gets.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_gets.o cert/comp_gets.c
- 
- $(OBJPATH)comp_pkiu.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_pkiu.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_pkiu.o cert/comp_pkiu.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_pkiu.o cert/comp_pkiu.c
- 
- $(OBJPATH)comp_set.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/comp_set.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)comp_set.o cert/comp_set.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)comp_set.o cert/comp_set.c
- 
- $(OBJPATH)dn.o:			$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/dn.h cert/dn.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dn.o cert/dn.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dn.o cert/dn.c
- 
- $(OBJPATH)dn_rw.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/dn.h cert/dn_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dn_rw.o cert/dn_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dn_rw.o cert/dn_rw.c
- 
- $(OBJPATH)dn_rws.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/dn.h cert/dn_rws.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dn_rws.o cert/dn_rws.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dn_rws.o cert/dn_rws.c
- 
- $(OBJPATH)dn_string.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/dn.h cert/dn_string.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dn_string.o cert/dn_string.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dn_string.o cert/dn_string.c
- 
- $(OBJPATH)ext.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext.o cert/ext.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext.o cert/ext.c
- 
- $(OBJPATH)ext_add.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext_add.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext_add.o cert/ext_add.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext_add.o cert/ext_add.c
- 
- $(OBJPATH)ext_chk.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext_chk.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext_chk.o cert/ext_chk.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext_chk.o cert/ext_chk.c
- 
- $(OBJPATH)ext_copy.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext_copy.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext_copy.o cert/ext_copy.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext_copy.o cert/ext_copy.c
- 
- $(OBJPATH)ext_def.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext_def.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext_def.o cert/ext_def.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext_def.o cert/ext_def.c
- 
- $(OBJPATH)ext_rd.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext_rd.o cert/ext_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext_rd.o cert/ext_rd.c
- 
- $(OBJPATH)ext_wr.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/certattr.h cert/ext_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ext_wr.o cert/ext_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ext_wr.o cert/ext_wr.c
- 
- $(OBJPATH)imp_chk.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/imp_chk.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)imp_chk.o cert/imp_chk.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)imp_chk.o cert/imp_chk.c
- 
- $(OBJPATH)imp_exp.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/imp_exp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)imp_exp.o cert/imp_exp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)imp_exp.o cert/imp_exp.c
- 
- $(OBJPATH)read.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/read.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)read.o cert/read.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)read.o cert/read.c
- 
- $(OBJPATH)trustmgr.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/trustmgr.h cert/trustmgr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)trustmgr.o cert/trustmgr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)trustmgr.o cert/trustmgr.c
- 
- $(OBJPATH)write.o:		$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/write.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)write.o cert/write.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)write.o cert/write.c
- 
- $(OBJPATH)write_pre.o:	$(CRYPT_DEP) $(ASN1_DEP) $(CERT_DEP) cert/write_pre.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)write_pre.o cert/write_pre.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)write_pre.o cert/write_pre.c
- 
- # context subdirectory
- 
- $(OBJPATH)ctx_3des.o:	$(CRYPT_DEP) context/context.h crypt/des.h context/ctx_3des.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_3des.o context/ctx_3des.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_3des.o context/ctx_3des.c
- 
- $(OBJPATH)ctx_aes.o:	$(CRYPT_DEP) context/context.h crypt/aes.h crypt/aes_ni.h \
- 						crypt/aes_via_ace.h crypt/aesopt.h context/ctx_aes.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_aes.o context/ctx_aes.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_aes.o context/ctx_aes.c
- 
- $(OBJPATH)ctx_attr.o:	$(CRYPT_DEP) context/context.h context/ctx_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_attr.o context/ctx_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_attr.o context/ctx_attr.c
- 
- $(OBJPATH)ctx_bn.o:		$(CRYPT_DEP) context/context.h context/ctx_bn.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bn.o context/ctx_bn.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bn.o context/ctx_bn.c
- 
- $(OBJPATH)ctx_bnmath.o:	$(CRYPT_DEP) context/context.h context/ctx_bnmath.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bnmath.o context/ctx_bnmath.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bnmath.o context/ctx_bnmath.c
- 
- $(OBJPATH)ctx_bnpkc.o:	$(CRYPT_DEP) context/context.h context/ctx_bnpkc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bnpkc.o context/ctx_bnpkc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bnpkc.o context/ctx_bnpkc.c
- 
- $(OBJPATH)ctx_bnprime.o:	$(CRYPT_DEP) context/context.h context/ctx_bnprime.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bnprime.o context/ctx_bnprime.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bnprime.o context/ctx_bnprime.c
- 
- $(OBJPATH)ctx_bnrw.o:	$(CRYPT_DEP) context/context.h context/ctx_bnrw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bnrw.o context/ctx_bnrw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bnrw.o context/ctx_bnrw.c
- 
- $(OBJPATH)ctx_bnsieve.o:	$(CRYPT_DEP) context/context.h context/ctx_bnsieve.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bnsieve.o context/ctx_bnsieve.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bnsieve.o context/ctx_bnsieve.c
- 
- $(OBJPATH)ctx_bntest.o:	$(CRYPT_DEP) context/context.h context/ctx_bntest.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_bntest.o context/ctx_bntest.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_bntest.o context/ctx_bntest.c
- 
- $(OBJPATH)ctx_cast.o:	$(CRYPT_DEP) context/context.h crypt/cast.h context/ctx_cast.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_cast.o context/ctx_cast.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_cast.o context/ctx_cast.c
- 
- $(OBJPATH)ctx_des.o:	$(CRYPT_DEP) context/context.h crypt/testdes.h crypt/des.h \
- 						context/ctx_des.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_des.o context/ctx_des.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_des.o context/ctx_des.c
- 
- $(OBJPATH)ctx_dh.o:		$(CRYPT_DEP) context/context.h bn/bn.h context/ctx_dh.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_dh.o context/ctx_dh.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_dh.o context/ctx_dh.c
- 
- $(OBJPATH)ctx_dsa.o:	$(CRYPT_DEP) context/context.h bn/bn.h context/ctx_dsa.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_dsa.o context/ctx_dsa.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_dsa.o context/ctx_dsa.c
- 
- $(OBJPATH)ctx_ecdh.o:	$(CRYPT_DEP) context/context.h bn/bn.h context/ctx_ecdh.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_ecdh.o context/ctx_ecdh.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_ecdh.o context/ctx_ecdh.c
- 
- $(OBJPATH)ctx_ecdsa.o:	$(CRYPT_DEP) context/context.h bn/bn.h context/ctx_ecdsa.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_ecdsa.o context/ctx_ecdsa.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_ecdsa.o context/ctx_ecdsa.c
- 
- $(OBJPATH)ctx_elg.o:	$(CRYPT_DEP) context/context.h bn/bn.h context/ctx_elg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_elg.o context/ctx_elg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_elg.o context/ctx_elg.c
- 
- $(OBJPATH)ctx_encr.o:	$(CRYPT_DEP) context/context.h context/ctx_encr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_encr.o context/ctx_encr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_encr.o context/ctx_encr.c
- 
- $(OBJPATH)ctx_generic.o: $(CRYPT_DEP) context/context.h context/ctx_generic.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_generic.o context/ctx_generic.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_generic.o context/ctx_generic.c
- 
- $(OBJPATH)ctx_hsha.o:	$(CRYPT_DEP) context/context.h crypt/sha.h context/ctx_hsha.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_hsha.o context/ctx_hsha.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_hsha.o context/ctx_hsha.c
- 
- $(OBJPATH)ctx_hsha2.o:	$(CRYPT_DEP) context/context.h crypt/sha2.h context/ctx_hsha2.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_hsha2.o context/ctx_hsha2.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_hsha2.o context/ctx_hsha2.c
- 
- $(OBJPATH)ctx_idea.o:	$(CRYPT_DEP) context/context.h crypt/idea.h context/ctx_idea.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_idea.o context/ctx_idea.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_idea.o context/ctx_idea.c
- 
- $(OBJPATH)ctx_md5.o:	$(CRYPT_DEP) context/context.h crypt/md5.h context/ctx_md5.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_md5.o context/ctx_md5.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_md5.o context/ctx_md5.c
- 
- $(OBJPATH)ctx_misc.o:	$(CRYPT_DEP) context/context.h context/ctx_misc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_misc.o context/ctx_misc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_misc.o context/ctx_misc.c
- 
- $(OBJPATH)ctx_rc2.o:	$(CRYPT_DEP) context/context.h crypt/rc2.h context/ctx_rc2.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_rc2.o context/ctx_rc2.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_rc2.o context/ctx_rc2.c
- 
- $(OBJPATH)ctx_rc4.o:	$(CRYPT_DEP) context/context.h crypt/rc4.h context/ctx_rc4.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_rc4.o context/ctx_rc4.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_rc4.o context/ctx_rc4.c
- 
- $(OBJPATH)ctx_rsa.o:	$(CRYPT_DEP) context/context.h bn/bn.h context/ctx_rsa.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_rsa.o context/ctx_rsa.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_rsa.o context/ctx_rsa.c
- 
- $(OBJPATH)ctx_sha.o:	$(CRYPT_DEP) context/context.h crypt/sha.h context/ctx_sha.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_sha.o context/ctx_sha.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_sha.o context/ctx_sha.c
- 
- $(OBJPATH)ctx_sha2.o:	$(CRYPT_DEP) context/context.h crypt/sha2.h context/ctx_sha2.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ctx_sha2.o context/ctx_sha2.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ctx_sha2.o context/ctx_sha2.c
- 
- $(OBJPATH)kg_dlp.o:		$(CRYPT_DEP) context/context.h context/kg_dlp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)kg_dlp.o context/kg_dlp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)kg_dlp.o context/kg_dlp.c
- 
- $(OBJPATH)kg_ecc.o:		$(CRYPT_DEP) context/context.h context/kg_ecc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)kg_ecc.o context/kg_ecc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)kg_ecc.o context/kg_ecc.c
- 
- $(OBJPATH)kg_prime.o:	$(CRYPT_DEP) context/context.h context/kg_prime.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)kg_prime.o context/kg_prime.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)kg_prime.o context/kg_prime.c
- 
- $(OBJPATH)kg_rsa.o:		$(CRYPT_DEP) context/context.h context/kg_rsa.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)kg_rsa.o context/kg_rsa.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)kg_rsa.o context/kg_rsa.c
- 
- $(OBJPATH)keyload.o:	$(CRYPT_DEP) context/context.h context/keyload.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)keyload.o context/keyload.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)keyload.o context/keyload.c
- 
- $(OBJPATH)key_id.o:		$(CRYPT_DEP) $(ASN1_DEP) context/key_id.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)key_id.o context/key_id.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)key_id.o context/key_id.c
- 
- $(OBJPATH)key_rdpri.o:	$(CRYPT_DEP) $(ASN1_DEP) context/key_rdpri.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)key_rdpri.o context/key_rdpri.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)key_rdpri.o context/key_rdpri.c
- 
- $(OBJPATH)key_rdpub.o:	$(CRYPT_DEP) $(ASN1_DEP) context/key_rdpub.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)key_rdpub.o context/key_rdpub.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)key_rdpub.o context/key_rdpub.c
- 
- $(OBJPATH)key_wr.o:		$(CRYPT_DEP) $(ASN1_DEP) context/key_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)key_wr.o context/key_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)key_wr.o context/key_wr.c
- 
- # crypt subdirectory - crypt algos
- 
- $(OBJPATH)aes_modes.o:	$(CRYPT_DEP) crypt/aes.h crypt/aes_ni.h crypt/aes_via_ace.h \
- 						crypt/aesopt.h crypt/aes_modes.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)aes_modes.o crypt/aes_modes.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)aes_modes.o crypt/aes_modes.c
- 
- $(OBJPATH)aes_ni.o:		$(CRYPT_DEP) crypt/aes.h crypt/aes_ni.h crypt/aes_via_ace.h \
- 						crypt/aes_ni.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)aes_ni.o crypt/aes_ni.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)aes_ni.o crypt/aes_ni.c
- 
- $(OBJPATH)aescrypt.o:	$(CRYPT_DEP) crypt/aes.h crypt/aes_ni.h crypt/aes_via_ace.h \
- 						crypt/aescrypt.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)aescrypt.o crypt/aescrypt.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)aescrypt.o crypt/aescrypt.c
- 
- $(OBJPATH)aeskey.o:		$(CRYPT_DEP) crypt/aes.h crypt/aes_ni.h crypt/aes_via_ace.h \
- 						crypt/aeskey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)aeskey.o crypt/aeskey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)aeskey.o crypt/aeskey.c
- 
- $(OBJPATH)aestab.o:		$(CRYPT_DEP) crypt/aes.h crypt/aes_ni.h crypt/aes_via_ace.h \
- 						crypt/aestab.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)aestab.o crypt/aestab.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)aestab.o crypt/aestab.c
- 
- $(OBJPATH)castecb.o:	crypt/osconfig.h crypt/cast.h crypt/castlcl.h crypt/castecb.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)castecb.o crypt/castecb.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)castecb.o crypt/castecb.c
- 
- $(OBJPATH)castenc.o:	crypt/osconfig.h crypt/cast.h crypt/castlcl.h crypt/castenc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)castenc.o crypt/castenc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)castenc.o crypt/castenc.c
- 
- $(OBJPATH)castskey.o:	crypt/osconfig.h crypt/cast.h crypt/castlcl.h crypt/castsbox.h \
- 						crypt/castskey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)castskey.o crypt/castskey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)castskey.o crypt/castskey.c
- 
- $(OBJPATH)descbc.o:		crypt/osconfig.h crypt/des.h crypt/deslocl.h crypt/descbc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)descbc.o crypt/descbc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)descbc.o crypt/descbc.c
- 
- $(OBJPATH)desecb.o:		crypt/osconfig.h crypt/des.h crypt/deslocl.h crypt/desecb.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)desecb.o crypt/desecb.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)desecb.o crypt/desecb.c
- 
- $(OBJPATH)desecb3.o:	crypt/osconfig.h crypt/des.h crypt/deslocl.h crypt/desecb3.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)desecb3.o crypt/desecb3.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)desecb3.o crypt/desecb3.c
- 
- $(OBJPATH)desenc.o:		crypt/osconfig.h crypt/des.h crypt/deslocl.h crypt/desenc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)desenc.o crypt/desenc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)desenc.o crypt/desenc.c
- 
- $(OBJPATH)desskey.o:	crypt/osconfig.h crypt/des.h crypt/deslocl.h crypt/desskey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)desskey.o crypt/desskey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)desskey.o crypt/desskey.c
- 
- $(OBJPATH)gcm.o:		$(CRYPT_DEP) crypt/gf128mul.h crypt/gcm.h crypt/mode_hdr.h \
- 						crypt/gcm.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)gcm.o crypt/gcm.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)gcm.o crypt/gcm.c
- 
- $(OBJPATH)gf128mul.o:	$(CRYPT_DEP) crypt/gf128mul.h crypt/mode_hdr.h \
- 						crypt/gf_mul_lo.h crypt/gf128mul.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)gf128mul.o crypt/gf128mul.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)gf128mul.o crypt/gf128mul.c
- 
- $(OBJPATH)icbc.o:		$(CRYPT_DEP) crypt/idea.h crypt/idealocl.h crypt/icbc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)icbc.o crypt/icbc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)icbc.o crypt/icbc.c
- 
- $(OBJPATH)iecb.o:		$(CRYPT_DEP) crypt/idea.h crypt/idealocl.h crypt/iecb.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)iecb.o crypt/iecb.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)iecb.o crypt/iecb.c
- 
- $(OBJPATH)iskey.o:		$(CRYPT_DEP) crypt/idea.h crypt/idealocl.h crypt/iskey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)iskey.o crypt/iskey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)iskey.o crypt/iskey.c
- 
- $(OBJPATH)rc2cbc.o:		crypt/osconfig.h crypt/rc2.h crypt/rc2locl.h crypt/rc2cbc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rc2cbc.o crypt/rc2cbc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rc2cbc.o crypt/rc2cbc.c
- 
- $(OBJPATH)rc2ecb.o:		crypt/osconfig.h crypt/rc2.h crypt/rc2locl.h crypt/rc2ecb.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rc2ecb.o crypt/rc2ecb.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rc2ecb.o crypt/rc2ecb.c
- 
- $(OBJPATH)rc2skey.o:	crypt/osconfig.h crypt/rc2.h crypt/rc2locl.h crypt/rc2skey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rc2skey.o crypt/rc2skey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rc2skey.o crypt/rc2skey.c
- 
- $(OBJPATH)rc4enc.o:		crypt/osconfig.h crypt/rc4.h crypt/rc4locl.h crypt/rc4enc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rc4enc.o crypt/rc4enc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rc4enc.o crypt/rc4enc.c
- 
- $(OBJPATH)rc4skey.o:	crypt/osconfig.h crypt/rc4.h crypt/rc4locl.h crypt/rc4skey.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rc4skey.o crypt/rc4skey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rc4skey.o crypt/rc4skey.c
- 
- # crypt subdirectory - hash algos
- 
- $(OBJPATH)md5dgst.o:	crypt/osconfig.h crypt/md5.h crypt/md5locl.h \
- 						crypt/md32com.h crypt/md5dgst.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)md5dgst.o crypt/md5dgst.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)md5dgst.o crypt/md5dgst.c
- 
- $(OBJPATH)sha1dgst.o:	crypt/osconfig.h crypt/sha.h crypt/sha1locl.h \
- 						crypt/md32com.h crypt/sha1dgst.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sha1dgst.o crypt/sha1dgst.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sha1dgst.o crypt/sha1dgst.c
- 
- $(OBJPATH)sha2.o:		crypt/osconfig.h crypt/sha.h crypt/sha1locl.h crypt/sha2.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sha2.o crypt/sha2.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sha2.o crypt/sha2.c
- 
- # device subdirectory
- 
- $(OBJPATH)dev_attr.o:	$(CRYPT_DEP) device/device.h device/dev_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dev_attr.o device/dev_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dev_attr.o device/dev_attr.c
- 
- $(OBJPATH)hardware.o:	$(CRYPT_DEP) device/device.h device/hardware.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)hardware.o device/hardware.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)hardware.o device/hardware.c
- 
- $(OBJPATH)hw_dummy.o:	$(CRYPT_DEP) device/device.h device/hw_dummy.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)hw_dummy.o device/hw_dummy.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)hw_dummy.o device/hw_dummy.c
- 
- $(OBJPATH)pkcs11.o:		$(CRYPT_DEP) device/device.h device/pkcs11_api.h device/pkcs11.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs11.o device/pkcs11.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs11.o device/pkcs11.c
- 
- $(OBJPATH)pkcs11_init.o: $(CRYPT_DEP) device/device.h device/pkcs11_api.h \
- 						device/pkcs11_init.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs11_init.o device/pkcs11_init.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs11_init.o device/pkcs11_init.c
- 
- $(OBJPATH)pkcs11_pkc.o:	$(CRYPT_DEP) device/device.h device/pkcs11_api.h \
- 						device/pkcs11_pkc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs11_pkc.o device/pkcs11_pkc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs11_pkc.o device/pkcs11_pkc.c
- 
- $(OBJPATH)pkcs11_rd.o:	$(CRYPT_DEP) device/device.h device/pkcs11_api.h \
- 						device/pkcs11_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs11_rd.o device/pkcs11_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs11_rd.o device/pkcs11_rd.c
- 
- $(OBJPATH)pkcs11_wr.o:	$(CRYPT_DEP) device/device.h device/pkcs11_api.h \
- 						device/pkcs11_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs11_wr.o device/pkcs11_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs11_wr.o device/pkcs11_wr.c
- 
- $(OBJPATH)system.o:		$(CRYPT_DEP) device/device.h device/capabil.h device/system.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)system.o device/system.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)system.o device/system.c
- 
- # enc_dec subdirectory
- 
- $(OBJPATH)asn1_algid.o:	$(CRYPT_DEP) $(ASN1_DEP) enc_dec/asn1_algid.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)asn1_algid.o enc_dec/asn1_algid.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)asn1_algid.o enc_dec/asn1_algid.c
- 
- $(OBJPATH)asn1_chk.o:	$(CRYPT_DEP) $(ASN1_DEP) enc_dec/asn1_chk.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)asn1_chk.o enc_dec/asn1_chk.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)asn1_chk.o enc_dec/asn1_chk.c
- 
- $(OBJPATH)asn1_ext.o:	$(CRYPT_DEP) $(ASN1_DEP) enc_dec/asn1_oids.h enc_dec/asn1_ext.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)asn1_ext.o enc_dec/asn1_ext.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)asn1_ext.o enc_dec/asn1_ext.c
- 
- $(OBJPATH)asn1_rd.o:	$(CRYPT_DEP) $(ASN1_DEP) enc_dec/asn1_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)asn1_rd.o enc_dec/asn1_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)asn1_rd.o enc_dec/asn1_rd.c
- 
- $(OBJPATH)asn1_wr.o:	$(CRYPT_DEP) $(ASN1_DEP) enc_dec/asn1_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)asn1_wr.o enc_dec/asn1_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)asn1_wr.o enc_dec/asn1_wr.c
- 
- $(OBJPATH)base64.o:		$(CRYPT_DEP) enc_dec/base64.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)base64.o enc_dec/base64.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)base64.o enc_dec/base64.c
- 
- $(OBJPATH)base64_id.o:	$(CRYPT_DEP) enc_dec/base64_id.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)base64_id.o enc_dec/base64_id.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)base64_id.o enc_dec/base64_id.c
- 
- $(OBJPATH)misc_rw.o:	$(CRYPT_DEP) $(IO_DEP) enc_dec/misc_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)misc_rw.o enc_dec/misc_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)misc_rw.o enc_dec/misc_rw.c
- 
- $(OBJPATH)pgp_rw.o:		$(CRYPT_DEP) $(IO_DEP) enc_dec/pgp_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp_rw.o enc_dec/pgp_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp_rw.o enc_dec/pgp_rw.c
- 
- # envelope subdirectory
- 
- $(OBJPATH)cms_denv.o:	$(CRYPT_DEP) envelope/envelope.h $(ASN1_DEP) \
- 						envelope/cms_denv.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cms_denv.o envelope/cms_denv.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cms_denv.o envelope/cms_denv.c
- 
- $(OBJPATH)cms_env.o:	$(CRYPT_DEP) envelope/envelope.h $(ASN1_DEP) \
- 						envelope/cms_env.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cms_env.o envelope/cms_env.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cms_env.o envelope/cms_env.c
- 
- $(OBJPATH)cms_envpre.o:	$(CRYPT_DEP) envelope/envelope.h $(ASN1_DEP) \
- 						envelope/cms_envpre.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cms_envpre.o envelope/cms_envpre.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cms_envpre.o envelope/cms_envpre.c
- 
- $(OBJPATH)decode.o:		$(CRYPT_DEP) envelope/envelope.h $(ASN1_DEP) \
- 						envelope/decode.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)decode.o envelope/decode.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)decode.o envelope/decode.c
- 
- $(OBJPATH)encode.o:		$(CRYPT_DEP) envelope/envelope.h $(ASN1_DEP) \
- 						envelope/encode.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)encode.o envelope/encode.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)encode.o envelope/encode.c
- 
- $(OBJPATH)env_attr.o:	$(CRYPT_DEP) envelope/envelope.h envelope/env_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)env_attr.o envelope/env_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)env_attr.o envelope/env_attr.c
- 
- $(OBJPATH)pgp_denv.o:	$(CRYPT_DEP) $(IO_DEP) misc/pgp.h envelope/pgp_denv.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp_denv.o envelope/pgp_denv.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp_denv.o envelope/pgp_denv.c
- 
- $(OBJPATH)pgp_env.o:	$(CRYPT_DEP) $(IO_DEP) misc/pgp.h envelope/pgp_env.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp_env.o envelope/pgp_env.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp_env.o envelope/pgp_env.c
- 
- $(OBJPATH)res_actn.o:	$(CRYPT_DEP) envelope/envelope.h envelope/res_actn.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)res_actn.o envelope/res_actn.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)res_actn.o envelope/res_actn.c
- 
- $(OBJPATH)res_denv.o:	$(CRYPT_DEP) envelope/envelope.h envelope/res_denv.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)res_denv.o envelope/res_denv.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)res_denv.o envelope/res_denv.c
- 
- $(OBJPATH)res_env.o:	$(CRYPT_DEP) envelope/envelope.h envelope/res_env.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)res_env.o envelope/res_env.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)res_env.o envelope/res_env.c
- 
- # io subdirectory
- 
- $(OBJPATH)dns.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/dns.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dns.o io/dns.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dns.o io/dns.c
- 
- $(OBJPATH)dns_srv.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/dns_srv.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dns_srv.o io/dns_srv.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dns_srv.o io/dns_srv.c
- 
- $(OBJPATH)file.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/file.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)file.o io/file.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)file.o io/file.c
- 
- $(OBJPATH)http.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/http.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)http.o io/http.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)http.o io/http.c
- 
- $(OBJPATH)http_rd.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/http_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)http_rd.o io/http_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)http_rd.o io/http_rd.c
- 
- $(OBJPATH)http_parse.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/http_parse.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)http_parse.o io/http_parse.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)http_parse.o io/http_parse.c
- 
- $(OBJPATH)http_wr.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/http_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)http_wr.o io/http_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)http_wr.o io/http_wr.c
- 
- $(OBJPATH)memory.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/memory.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)memory.o io/memory.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)memory.o io/memory.c
- 
- $(OBJPATH)net.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/net.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)net.o io/net.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)net.o io/net.c
- 
- $(OBJPATH)net_proxy.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/net_proxy.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)net_proxy.o io/net_proxy.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)net_proxy.o io/net_proxy.c
- 
- $(OBJPATH)net_trans.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/net_trans.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)net_trans.o io/net_trans.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)net_trans.o io/net_trans.c
- 
- $(OBJPATH)net_url.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/net_url.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)net_url.o io/net_url.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)net_url.o io/net_url.c
- 
- $(OBJPATH)stream.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/stream.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)stream.o io/stream.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)stream.o io/stream.c
- 
- $(OBJPATH)tcp.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/tcp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)tcp.o io/tcp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)tcp.o io/tcp.c
- 
- $(OBJPATH)tcp_conn.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/tcp_conn.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)tcp_conn.o io/tcp_conn.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)tcp_conn.o io/tcp_conn.c
- 
- $(OBJPATH)tcp_err.o:	$(CRYPT_DEP) $(IO_DEP_INT) io/tcp_err.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)tcp_err.o io/tcp_err.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)tcp_err.o io/tcp_err.c
- 
- $(OBJPATH)tcp_rw.o:		$(CRYPT_DEP) $(IO_DEP_INT) io/tcp_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)tcp_rw.o io/tcp_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)tcp_rw.o io/tcp_rw.c
- 
- # kernel subdirectory
- 
- $(OBJPATH)attr_acl.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/attr_acl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)attr_acl.o kernel/attr_acl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)attr_acl.o kernel/attr_acl.c
- 
- $(OBJPATH)certm_acl.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/certm_acl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)certm_acl.o kernel/certm_acl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)certm_acl.o kernel/certm_acl.c
- 
- $(OBJPATH)init.o:		$(CRYPT_DEP) $(KERNEL_DEP) kernel/init.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)init.o kernel/init.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)init.o kernel/init.c
- 
- $(OBJPATH)int_msg.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/int_msg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_msg.o kernel/int_msg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_msg.o kernel/int_msg.c
- 
- $(OBJPATH)key_acl.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/key_acl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)key_acl.o kernel/key_acl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)key_acl.o kernel/key_acl.c
- 
- $(OBJPATH)mech_acl.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/mech_acl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_acl.o kernel/mech_acl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_acl.o kernel/mech_acl.c
- 
- $(OBJPATH)msg_acl.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/msg_acl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)msg_acl.o kernel/msg_acl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)msg_acl.o kernel/msg_acl.c
- 
- $(OBJPATH)obj_acc.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/obj_acc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)obj_acc.o kernel/obj_acc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)obj_acc.o kernel/obj_acc.c
- 
- $(OBJPATH)objects.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/objects.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)objects.o kernel/objects.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)objects.o kernel/objects.c
- 
- $(OBJPATH)sec_mem.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/sec_mem.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sec_mem.o kernel/sec_mem.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sec_mem.o kernel/sec_mem.c
- 
- $(OBJPATH)selftest.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/selftest.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)selftest.o kernel/selftest.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)selftest.o kernel/selftest.c
- 
- $(OBJPATH)semaphore.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/semaphore.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)semaphore.o kernel/semaphore.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)semaphore.o kernel/semaphore.c
- 
- $(OBJPATH)sendmsg.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/sendmsg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sendmsg.o kernel/sendmsg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sendmsg.o kernel/sendmsg.c
- 
- $(OBJPATH)storage.o:	$(CRYPT_DEP) $(KERNEL_DEP) kernel/storage.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)storage.o kernel/storage.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)storage.o kernel/storage.c
- 
- # keyset subdirectory
- 
- $(OBJPATH)dbms.o:		$(CRYPT_DEP) keyset/keyset.h keyset/dbms.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dbms.o keyset/dbms.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dbms.o keyset/dbms.c
- 
- $(OBJPATH)ca_add.o:		$(CRYPT_DEP) keyset/keyset.h keyset/ca_add.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ca_add.o keyset/ca_add.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ca_add.o keyset/ca_add.c
- 
- $(OBJPATH)ca_clean.o:	$(CRYPT_DEP) keyset/keyset.h keyset/ca_clean.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ca_clean.o keyset/ca_clean.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ca_clean.o keyset/ca_clean.c
- 
- $(OBJPATH)ca_issue.o:	$(CRYPT_DEP) keyset/keyset.h keyset/ca_issue.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ca_issue.o keyset/ca_issue.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ca_issue.o keyset/ca_issue.c
- 
- $(OBJPATH)ca_misc.o:	$(CRYPT_DEP) keyset/keyset.h keyset/ca_misc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ca_misc.o keyset/ca_misc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ca_misc.o keyset/ca_misc.c
- 
- $(OBJPATH)ca_rev.o:		$(CRYPT_DEP) keyset/keyset.h keyset/ca_rev.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ca_rev.o keyset/ca_rev.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ca_rev.o keyset/ca_rev.c
- 
- $(OBJPATH)dbx_misc.o:	$(CRYPT_DEP) keyset/keyset.h keyset/dbx_misc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dbx_misc.o keyset/dbx_misc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dbx_misc.o keyset/dbx_misc.c
- 
- $(OBJPATH)dbx_rd.o:		$(CRYPT_DEP) keyset/keyset.h keyset/dbx_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dbx_rd.o keyset/dbx_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dbx_rd.o keyset/dbx_rd.c
- 
- $(OBJPATH)dbx_wr.o:		$(CRYPT_DEP) keyset/keyset.h keyset/dbx_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)dbx_wr.o keyset/dbx_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)dbx_wr.o keyset/dbx_wr.c
- 
- $(OBJPATH)http_keys.o:	$(CRYPT_DEP) keyset/keyset.h keyset/http_keys.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)http_keys.o keyset/http_keys.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)http_keys.o keyset/http_keys.c
- 
- $(OBJPATH)key_attr.o:	$(CRYPT_DEP) keyset/keyset.h keyset/key_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)key_attr.o keyset/key_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)key_attr.o keyset/key_attr.c
- 
- $(OBJPATH)ldap.o:		$(CRYPT_DEP) keyset/keyset.h keyset/ldap.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ldap.o keyset/ldap.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ldap.o keyset/ldap.c
- 
- $(OBJPATH)odbc.o:		$(CRYPT_DEP) keyset/keyset.h keyset/odbc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)odbc.o keyset/odbc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)odbc.o keyset/odbc.c
- 
- $(OBJPATH)pgp.o:		$(CRYPT_DEP) misc/pgp.h keyset/pgp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp.o keyset/pgp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp.o keyset/pgp.c
- 
- $(OBJPATH)pgp_rd.o:		$(CRYPT_DEP) misc/pgp.h keyset/pgp_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp_rd.o keyset/pgp_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp_rd.o keyset/pgp_rd.c
- 
- $(OBJPATH)pgp_wr.o:		$(CRYPT_DEP) misc/pgp.h keyset/pgp_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp_wr.o keyset/pgp_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp_wr.o keyset/pgp_wr.c
- 
- $(OBJPATH)pkcs12.o:		$(CRYPT_DEP) keyset/keyset.h keyset/pkcs12.h keyset/pkcs12.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs12.o keyset/pkcs12.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs12.o keyset/pkcs12.c
- 
- $(OBJPATH)pkcs12_rd.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs12.h keyset/pkcs12_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs12_rd.o keyset/pkcs12_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs12_rd.o keyset/pkcs12_rd.c
- 
- $(OBJPATH)pkcs12_rdo.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs12.h keyset/pkcs12_rdo.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs12_rdo.o keyset/pkcs12_rdo.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs12_rdo.o keyset/pkcs12_rdo.c
- 
- $(OBJPATH)pkcs12_wr.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs12.h keyset/pkcs12_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs12_wr.o keyset/pkcs12_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs12_wr.o keyset/pkcs12_wr.c
- 
- $(OBJPATH)pkcs15.o:		$(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15.o keyset/pkcs15.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15.o keyset/pkcs15.c
- 
- $(OBJPATH)pkcs15_add.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_add.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_add.o keyset/pkcs15_add.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_add.o keyset/pkcs15_add.c
- 
- $(OBJPATH)pkcs15_adpb.o: $(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_adpb.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_adpb.o keyset/pkcs15_adpb.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_adpb.o keyset/pkcs15_adpb.c
- 
- $(OBJPATH)pkcs15_adpr.o: $(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_adpr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_adpr.o keyset/pkcs15_adpr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_adpr.o keyset/pkcs15_adpr.c
- 
- $(OBJPATH)pkcs15_atrd.o: $(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_atrd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_atrd.o keyset/pkcs15_atrd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_atrd.o keyset/pkcs15_atrd.c
- 
- $(OBJPATH)pkcs15_atwr.o: $(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_atwr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_atwr.o keyset/pkcs15_atwr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_atwr.o keyset/pkcs15_atwr.c
- 
- $(OBJPATH)pkcs15_get.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_get.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_get.o keyset/pkcs15_get.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_get.o keyset/pkcs15_get.c
- 
- $(OBJPATH)pkcs15_getp.o: $(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_getp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_getp.o keyset/pkcs15_getp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_getp.o keyset/pkcs15_getp.c
- 
- $(OBJPATH)pkcs15_rd.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_rd.o keyset/pkcs15_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_rd.o keyset/pkcs15_rd.c
- 
- $(OBJPATH)pkcs15_set.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_set.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_set.o keyset/pkcs15_set.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_set.o keyset/pkcs15_set.c
- 
- $(OBJPATH)pkcs15_wr.o:	$(CRYPT_DEP) keyset/keyset.h keyset/pkcs15.h keyset/pkcs15_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pkcs15_wr.o keyset/pkcs15_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pkcs15_wr.o keyset/pkcs15_wr.c
- 
- # mechanism subdirectory
- 
- $(OBJPATH)keyex.o:		$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/keyex.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)keyex.o mechs/keyex.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)keyex.o mechs/keyex.c
- 
- $(OBJPATH)keyex_int.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/keyex_int.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)keyex_int.o mechs/keyex_int.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)keyex_int.o mechs/keyex_int.c
- 
- $(OBJPATH)keyex_rw.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/keyex_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)keyex_rw.o mechs/keyex_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)keyex_rw.o mechs/keyex_rw.c
- 
- $(OBJPATH)mech_cwrap.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/mech_cwrap.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_cwrap.o mechs/mech_cwrap.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_cwrap.o mechs/mech_cwrap.c
- 
- $(OBJPATH)mech_drv.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/mech_drv.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_drv.o mechs/mech_drv.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_drv.o mechs/mech_drv.c
- 
- $(OBJPATH)mech_int.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/mech_int.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_int.o mechs/mech_int.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_int.o mechs/mech_int.c
- 
- $(OBJPATH)mech_pkwrap.o: $(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/mech_pkwrap.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_pkwrap.o mechs/mech_pkwrap.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_pkwrap.o mechs/mech_pkwrap.c
- 
- $(OBJPATH)mech_privk.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/mech_privk.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_privk.o mechs/mech_privk.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_privk.o mechs/mech_privk.c
- 
- $(OBJPATH)mech_sig.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/mech_sig.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)mech_sig.o mechs/mech_sig.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)mech_sig.o mechs/mech_sig.c
- 
- $(OBJPATH)obj_qry.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/obj_qry.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)obj_qry.o mechs/obj_qry.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)obj_qry.o mechs/obj_qry.c
- 
- $(OBJPATH)sign.o:		$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/sign.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sign.o mechs/sign.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sign.o mechs/sign.c
- 
- $(OBJPATH)sign_cms.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/sign_cms.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sign_cms.o mechs/sign_cms.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sign_cms.o mechs/sign_cms.c
- 
- $(OBJPATH)sign_int.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/sign_int.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sign_int.o mechs/sign_int.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sign_int.o mechs/sign_int.c
- 
- $(OBJPATH)sign_pgp.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/sign_pgp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sign_pgp.o mechs/sign_pgp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sign_pgp.o mechs/sign_pgp.c
- 
- $(OBJPATH)sign_rw.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/sign_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sign_rw.o mechs/sign_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sign_rw.o mechs/sign_rw.c
- 
- $(OBJPATH)sign_x509.o:	$(CRYPT_DEP) $(ASN1_DEP) mechs/mech.h mechs/sign_x509.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sign_x509.o mechs/sign_x509.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sign_x509.o mechs/sign_x509.c
- 
- # misc subdirectory
- 
- $(OBJPATH)int_api.o:	$(CRYPT_DEP) misc/int_api.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_api.o misc/int_api.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_api.o misc/int_api.c
- 
- $(OBJPATH)int_attr.o:	$(CRYPT_DEP) misc/int_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_attr.o misc/int_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_attr.o misc/int_attr.c
- 
- $(OBJPATH)int_debug.o:	$(CRYPT_DEP) misc/int_debug.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_debug.o misc/int_debug.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_debug.o misc/int_debug.c
- 
- $(OBJPATH)int_env.o:	$(CRYPT_DEP) misc/int_env.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_env.o misc/int_env.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_env.o misc/int_env.c
- 
- $(OBJPATH)int_err.o:	$(CRYPT_DEP) misc/int_err.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_err.o misc/int_err.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_err.o misc/int_err.c
- 
- $(OBJPATH)int_mem.o:	$(CRYPT_DEP) misc/int_mem.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_mem.o misc/int_mem.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_mem.o misc/int_mem.c
- 
- $(OBJPATH)int_string.o:	$(CRYPT_DEP) misc/int_string.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_string.o misc/int_string.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_string.o misc/int_string.c
- 
- $(OBJPATH)int_time.o:	$(CRYPT_DEP) misc/int_time.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)int_time.o misc/int_time.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)int_time.o misc/int_time.c
- 
- $(OBJPATH)os_spec.o: 	$(CRYPT_DEP) misc/os_spec.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)os_spec.o misc/os_spec.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)os_spec.o misc/os_spec.c
- 
- $(OBJPATH)pgp_misc.o:	$(CRYPT_DEP) $(IO_DEP) misc/pgp.h misc/pgp_misc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pgp_misc.o misc/pgp_misc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pgp_misc.o misc/pgp_misc.c
- 
- $(OBJPATH)random.o:		$(CRYPT_DEP) random/random.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)random.o random/random.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)random.o random/random.c
- 
- $(OBJPATH)rand_x917.o:	$(CRYPT_DEP) random/rand_x917.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rand_x917.o random/rand_x917.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rand_x917.o random/rand_x917.c
- 
- $(OBJPATH)unix.o:		$(CRYPT_DEP) random/unix.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)unix.o random/unix.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)unix.o random/unix.c
- 
- $(OBJPATH)user.o:		$(CRYPT_DEP) misc/user.h misc/user.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)user.o misc/user.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)user.o misc/user.c
- 
- $(OBJPATH)user_attr.o:	$(CRYPT_DEP) misc/user.h misc/user_int.h misc/user_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)user_attr.o misc/user_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)user_attr.o misc/user_attr.c
- 
- $(OBJPATH)user_cfg.o:	$(CRYPT_DEP) misc/user.h misc/user_int.h misc/user_cfg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)user_cfg.o misc/user_cfg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)user_cfg.o misc/user_cfg.c
- 
- $(OBJPATH)user_rw.o:	$(CRYPT_DEP) misc/user.h misc/user_int.h misc/user_rw.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)user_rw.o misc/user_rw.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)user_rw.o misc/user_rw.c
- 
- # session subdirectory
- 
- $(OBJPATH)certstore.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/certstore.h \
- 						session/certstore.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)certstore.o session/certstore.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)certstore.o session/certstore.c
- 
- $(OBJPATH)cmp.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp.o session/cmp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp.o session/cmp.c
- 
- $(OBJPATH)cmp_cli.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_cli.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_cli.o session/cmp_cli.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_cli.o session/cmp_cli.c
- 
- $(OBJPATH)cmp_crypt.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_crypt.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_crypt.o session/cmp_crypt.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_crypt.o session/cmp_crypt.c
- 
- $(OBJPATH)cmp_err.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_err.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_err.o session/cmp_err.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_err.o session/cmp_err.c
- 
- $(OBJPATH)cmp_rd.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_rd.o session/cmp_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_rd.o session/cmp_rd.c
- 
- $(OBJPATH)cmp_rdmsg.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_rdmsg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_rdmsg.o session/cmp_rdmsg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_rdmsg.o session/cmp_rdmsg.c
- 
- $(OBJPATH)cmp_svr.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_svr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_svr.o session/cmp_svr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_svr.o session/cmp_svr.c
- 
- $(OBJPATH)cmp_wr.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_wr.o session/cmp_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_wr.o session/cmp_wr.c
- 
- $(OBJPATH)cmp_wrmsg.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/cmp_wrmsg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)cmp_wrmsg.o session/cmp_wrmsg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)cmp_wrmsg.o session/cmp_wrmsg.c
- 
- $(OBJPATH)ocsp.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/ocsp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ocsp.o session/ocsp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ocsp.o session/ocsp.c
- 
- $(OBJPATH)pnppki.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/cmp.h \
- 						session/pnppki.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)pnppki.o session/pnppki.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)pnppki.o session/pnppki.c
- 
- $(OBJPATH)rtcs.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/rtcs.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)rtcs.o session/rtcs.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)rtcs.o session/rtcs.c
- 
- $(OBJPATH)scep.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/scep.h \
- 						session/scep.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)scep.o session/scep.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)scep.o session/scep.c
- 
- $(OBJPATH)scep_cli.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/scep.h \
- 						session/scep_cli.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)scep_cli.o session/scep_cli.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)scep_cli.o session/scep_cli.c
- 
- $(OBJPATH)scep_svr.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/certstore.h \
- 						session/scep.h session/scep_svr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)scep_svr.o session/scep_svr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)scep_svr.o session/scep_svr.c
- 
- $(OBJPATH)scorebrd.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/scorebrd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)scorebrd.o session/scorebrd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)scorebrd.o session/scorebrd.c
- 
- $(OBJPATH)sess_attr.o:	$(CRYPT_DEP) session/session.h session/sess_attr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sess_attr.o session/sess_attr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sess_attr.o session/sess_attr.c
- 
- $(OBJPATH)sess_iattr.o:	$(CRYPT_DEP) session/session.h session/sess_iattr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sess_iattr.o session/sess_iattr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sess_iattr.o session/sess_iattr.c
- 
- $(OBJPATH)sess_rd.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/sess_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sess_rd.o session/sess_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sess_rd.o session/sess_rd.c
- 
- $(OBJPATH)sess_wr.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/sess_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sess_wr.o session/sess_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sess_wr.o session/sess_wr.c
- 
- $(OBJPATH)sess_ws.o:	$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/sess_ws.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)sess_ws.o session/sess_ws.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)sess_ws.o session/sess_ws.c
- 
- $(OBJPATH)session.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/session.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)session.o session/session.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)session.o session/session.c
- 
- $(OBJPATH)ssh.o:		$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh.o session/ssh.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh.o session/ssh.c
- 
- $(OBJPATH)ssh2.o:		$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2.o session/ssh2.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2.o session/ssh2.c
- 
- $(OBJPATH)ssh2_authc.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_authc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_authc.o session/ssh2_authc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_authc.o session/ssh2_authc.c
- 
- $(OBJPATH)ssh2_auths.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_auths.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_auths.o session/ssh2_auths.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_auths.o session/ssh2_auths.c
- 
- $(OBJPATH)ssh2_chn.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_chn.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_chn.o session/ssh2_chn.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_chn.o session/ssh2_chn.c
- 
- $(OBJPATH)ssh2_cli.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_cli.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_cli.o session/ssh2_cli.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_cli.o session/ssh2_cli.c
- 
- $(OBJPATH)ssh2_crypt.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_crypt.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_crypt.o session/ssh2_crypt.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_crypt.o session/ssh2_crypt.c
- 
- $(OBJPATH)ssh2_msg.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_msg.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_msg.o session/ssh2_msg.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_msg.o session/ssh2_msg.c
- 
- $(OBJPATH)ssh2_msgc.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_msgc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_msgc.o session/ssh2_msgc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_msgc.o session/ssh2_msgc.c
- 
- $(OBJPATH)ssh2_msgs.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_msgs.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_msgs.o session/ssh2_msgs.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_msgs.o session/ssh2_msgs.c
- 
- $(OBJPATH)ssh2_rd.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_rd.o session/ssh2_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_rd.o session/ssh2_rd.c
- 
- $(OBJPATH)ssh2_svr.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_svr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_svr.o session/ssh2_svr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_svr.o session/ssh2_svr.c
- 
- $(OBJPATH)ssh2_wr.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssh.h \
- 						session/ssh2_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssh2_wr.o session/ssh2_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssh2_wr.o session/ssh2_wr.c
- 
- $(OBJPATH)ssl.o:		$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl.o session/ssl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl.o session/ssl.c
- 
- $(OBJPATH)ssl_cli.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_cli.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_cli.o session/ssl_cli.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_cli.o session/ssl_cli.c
- 
- $(OBJPATH)ssl_crypt.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_crypt.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_crypt.o session/ssl_crypt.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_crypt.o session/ssl_crypt.c
- 
- $(OBJPATH)ssl_ext.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_ext.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_ext.o session/ssl_ext.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_ext.o session/ssl_ext.c
- 
- $(OBJPATH)ssl_hs.o:		$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_hs.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_hs.o session/ssl_hs.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_hs.o session/ssl_hs.c
- 
- $(OBJPATH)ssl_hsc.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_hsc.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_hsc.o session/ssl_hsc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_hsc.o session/ssl_hsc.c
- 
- $(OBJPATH)ssl_kmgmt.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_kmgmt.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_kmgmt.o session/ssl_kmgmt.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_kmgmt.o session/ssl_kmgmt.c
- 
- $(OBJPATH)ssl_rd.o:		$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_rd.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_rd.o session/ssl_rd.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_rd.o session/ssl_rd.c
- 
- $(OBJPATH)ssl_suites.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_suites.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_suites.o session/ssl_suites.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_suites.o session/ssl_suites.c
- 
- $(OBJPATH)ssl_svr.o:	$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_svr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_svr.o session/ssl_svr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_svr.o session/ssl_svr.c
- 
- $(OBJPATH)ssl_wr.o:		$(CRYPT_DEP) $(IO_DEP) session/session.h session/ssl.h \
- 						session/ssl_wr.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)ssl_wr.o session/ssl_wr.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)ssl_wr.o session/ssl_wr.c
- 
- $(OBJPATH)tsp.o:		$(CRYPT_DEP) $(ASN1_DEP) session/session.h session/tsp.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)tsp.o session/tsp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)tsp.o session/tsp.c
- 
- # zlib subdirectory
- 
- $(OBJPATH)adler32.o:	$(ZLIB_DEP) zlib/adler32.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)adler32.o zlib/adler32.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)adler32.o zlib/adler32.c
- 
- $(OBJPATH)deflate.o:	$(ZLIB_DEP) zlib/deflate.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)deflate.o zlib/deflate.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)deflate.o zlib/deflate.c
- 
- $(OBJPATH)inffast.o:	$(ZLIB_DEP) zlib/inffast.h zlib/inffixed.h \
- 						zlib/inftrees.h zlib/inffast.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)inffast.o zlib/inffast.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)inffast.o zlib/inffast.c
- 
- $(OBJPATH)inflate.o:	$(ZLIB_DEP) zlib/inflate.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)inflate.o zlib/inflate.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)inflate.o zlib/inflate.c
- 
- $(OBJPATH)inftrees.o:	$(ZLIB_DEP) zlib/inftrees.h zlib/inftrees.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)inftrees.o zlib/inftrees.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)inftrees.o zlib/inftrees.c
- 
- $(OBJPATH)trees.o:		$(ZLIB_DEP) zlib/trees.h zlib/trees.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)trees.o zlib/trees.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)trees.o zlib/trees.c
- 
- $(OBJPATH)zutil.o:		$(ZLIB_DEP) zlib/zutil.c
--						$(CC) $(CFLAGS) -o $(OBJPATH)zutil.o zlib/zutil.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) -o $(OBJPATH)zutil.o zlib/zutil.c
- 
- #****************************************************************************
- #*																			*
-@@ -1529,64 +1534,64 @@
- # The test code
- 
- utils.o:				cryptlib.h crypt.h test/test.h test/utils.c
--						$(CC) $(CFLAGS) test/utils.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/utils.c
- 
- certimp.o:				cryptlib.h crypt.h test/test.h test/certimp.c
--						$(CC) $(CFLAGS) test/certimp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/certimp.c
- 
- certproc.o:				cryptlib.h crypt.h test/test.h test/certproc.c
--						$(CC) $(CFLAGS) test/certproc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/certproc.c
- 
- certs.o:				cryptlib.h crypt.h test/test.h test/certs.c
--						$(CC) $(CFLAGS) test/certs.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/certs.c
- 
- devices.o:				cryptlib.h crypt.h test/test.h test/devices.c
--						$(CC) $(CFLAGS) test/devices.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/devices.c
- 
- envelope.o:				cryptlib.h crypt.h test/test.h test/envelope.c
--						$(CC) $(CFLAGS) test/envelope.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/envelope.c
- 
- highlvl.o:				cryptlib.h crypt.h test/test.h test/highlvl.c
--						$(CC) $(CFLAGS) test/highlvl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/highlvl.c
- 
- keydbx.o:				cryptlib.h crypt.h test/test.h test/keydbx.c
--						$(CC) $(CFLAGS) test/keydbx.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/keydbx.c
- 
- keyfile.o:				cryptlib.h crypt.h test/test.h test/keyfile.c
--						$(CC) $(CFLAGS) test/keyfile.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/keyfile.c
- 
- loadkey.o:				cryptlib.h crypt.h test/test.h test/loadkey.c
--						$(CC) $(CFLAGS) test/loadkey.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/loadkey.c
- 
- lowlvl.o:				cryptlib.h crypt.h test/test.h test/lowlvl.c
--						$(CC) $(CFLAGS) test/lowlvl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/lowlvl.c
- 
- s_cmp.o:				cryptlib.h crypt.h test/test.h test/s_cmp.c
--						$(CC) $(CFLAGS) test/s_cmp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/s_cmp.c
- 
- s_scep.o:				cryptlib.h crypt.h test/test.h test/s_scep.c
--						$(CC) $(CFLAGS) test/s_scep.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/s_scep.c
- 
- sreqresp.o:				cryptlib.h crypt.h test/test.h test/sreqresp.c
--						$(CC) $(CFLAGS) test/sreqresp.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/sreqresp.c
- 
- ssh.o:					cryptlib.h crypt.h test/test.h test/ssh.c
--						$(CC) $(CFLAGS) test/ssh.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/ssh.c
- 
- ssl.o:					cryptlib.h crypt.h test/test.h test/ssl.c
--						$(CC) $(CFLAGS) test/ssl.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/ssl.c
- 
- stress.o:				cryptlib.h crypt.h test/test.h test/stress.c
--						$(CC) $(CFLAGS) test/stress.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/stress.c
- 
- suiteb.o:				cryptlib.h crypt.h test/test.h test/suiteb.c
--						$(CC) $(CFLAGS) test/suiteb.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/suiteb.c
- 
- testfunc.o:				cryptlib.h crypt.h test/test.h test/testfunc.c
--						$(CC) $(CFLAGS) test/testfunc.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/testfunc.c
- 
- testlib.o:				cryptlib.h crypt.h test/test.h test/testlib.c
--						$(CC) $(CFLAGS) test/testlib.c
-+						$(CC) $(CPPFLAGS) $(CFLAGS) test/testlib.c
- 
- #****************************************************************************
- #*																			*
diff --git a/patch/curl.patch b/patch/curl.patch
deleted file mode 100644
index a1dd10acc..000000000
--- a/patch/curl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with cURL.
---- libcurl.pc.in
-+++ libcurl.pc.in
-@@ -25,6 +25,7 @@
- #
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-+bindir=@bindir@
- libdir=@libdir@
- includedir=@includedir@
- supported_protocols="@SUPPORT_PROTOCOLS@"
diff --git a/patch/datefudge-solaris.patch b/patch/datefudge-solaris.patch
deleted file mode 100644
index 7502b9580..000000000
--- a/patch/datefudge-solaris.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with DateFudge.
---- datefudge.c
-+++ datefudge.c
-@@ -14,7 +14,6 @@
- #include <stdlib.h>
- #include <dlfcn.h>
- #include <assert.h>
--#include <features.h>
- #include <stdbool.h>
- #include <unistd.h>
- #include <time.h>
-@@ -78,7 +77,7 @@
-     return 0;
- }
- 
--int gettimeofday(struct timeval *x, struct timezone *y) {
-+int gettimeofday(struct timeval *_RESTRICT_KYWD x, void *_RESTRICT_KYWD y) {
-     return __gettimeofday(x,y);
- }
- 
---- Makefile
-+++ Makefile
-@@ -1,46 +1,39 @@
- VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
- 
- CC      ?= gcc
--CFLAGS  += -Wall -Wextra -D_REENTRANT -fpic
-+CFLAGS  += -Wall
- 
- ifeq (,$(INSTALL_PROGRAM))
-     INSTALL_PROGRAM := "install"
- endif
- 
--prefix	= /usr
--libdir 	= $(prefix)/lib
-+prefix	?= /usr
-+libdir 	?= $(prefix)/lib
- ifneq (,$(libarch))
- # The `*-*' pattern matches to both hurd-i386 and e.g. i386-linux-gnu
- marchpt = /*-*
- endif
--bindir	= $(prefix)/bin
--mandir	= $(prefix)/share/man
-+bindir	?= $(prefix)/bin
-+mandir	?= $(prefix)/share/man
- 
--all compile: datefudge datefudge.so datefudge.1
-+all compile: datefudge datefudge.so
- 
--install: datefudge datefudge.so datefudge.1
-+install: datefudge datefudge.so
- 	install -d $(DESTDIR)$(libdir)/$(libarch)/datefudge
- 	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
- 	install -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)$(bindir)
-- 	install -d $(DESTDIR)$(mandir)/man1
--	install -o root -g root -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
- 
- datefudge: datefudge.sh
--datefudge.1: datefudge.man
- 
--datefudge datefudge.1:
--	sed -e 's,@VERSION@,$(VERSION),g; s,@MULTIARCH_PATTERN@,$(marchpt),g; s,@LIBDIR@,$(libdir),g;' \
--	< $< > $@
--
- datefudge.so: datefudge.o
--	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< -ldl -lc
- 
- datefudge.o: datefudge.c
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
- 
- clean:
--	rm -f datefudge.o datefudge.so datefudge datefudge.1
-+	rm -f datefudge.o datefudge.so datefudge
- 
- # The first run may possibly fail when it's around midnight, that's why it's run twice.
- test: compile
diff --git a/patch/db.patch b/patch/db.patch
deleted file mode 100644
index 7995f2313..000000000
--- a/patch/db.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with libdb.
---- src/log/log_put.c
-+++ src/log/log_put.c
-@@ -1915,7 +1915,8 @@
- 			} else {
- 				LOGCOPY_32(env, bp, &dbt->size);
- 				bp += sizeof(dbt->size);
--				memcpy(bp, dbt->data, dbt->size);
-+				if (bp && dbt->data)
-+				    memcpy(bp, dbt->data, dbt->size);
- 			}
- 			/* Process fields that need to be byte swapped. */
- 			if (dbp != NULL && F_ISSET(dbp, DB_AM_SWAP)) {
diff --git a/patch/ecgen.patch b/patch/ecgen.patch
deleted file mode 100644
index adff97376..000000000
--- a/patch/ecgen.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with ecgen.
---- test/src/Makefile
-+++ test/src/Makefile
-@@ -7,14 +7,13 @@
- 
- 
- CC ?= gcc
--CFLAGS = -Wall
- TEST ?= 0
- ifeq ($(TEST), 1)
--    CFLAGS += --coverage -g -O0
-+    ECGEN_CFLAGS = --coverage -g -O0
- endif
--LDFLAGS = -L../../lib/parson -L../../lib/sha1 -L../../lib/pari -L../lib/criterion/build
--INCLUDES = -I. -I../../src -I../../lib -I../lib/criterion/include
--LIBS = -lrt -lpari -lpthread -lparson -lsha1 -lcriterion
-+ECGEN_LDFLAGS = -L../../lib/parson -L../../lib/sha1 -L../../lib/pari -L../lib/criterion/build
-+ECGEN_INCLUDES = -I. -I../../src -I../../lib -I../lib/criterion/include
-+ECGEN_LIBS = -lrt -lpari -lpthread -lparson -lsha1 -lcriterion
- 
- TEST_SRC = $(wildcard *.c) $(wildcard */*.c)
- TEST_HDR = $(wildcard */*.h)
-@@ -27,16 +26,16 @@
- all: unittest
- 
- unittest: test_ecgen
--	LD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1 --filter \!\(brainpool_rfc/test_brainpool_rfc_params\)
-+	LD_LIBRARY_PATH=../lib/criterion/build DYLD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1 --filter \!\(brainpool_rfc/test_brainpool_rfc_params\)
- 
- fulltest: test_ecgen
--	LD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1
-+	LD_LIBRARY_PATH=../lib/criterion/build DYLD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1
- 
- test_ecgen: $(TEST_OBJ) $(ECGEN_OBJ)
--	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -o) $@ $^ $(ECGEN_LDFLAGS) $(LDFLAGS) $(ECGEN_LIBS) $(LIBS)
- 
- %.o: %.c
--	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -c -o) $@ $<
- 
- clean-all: clean
- 	rm -f ./test_ecgen
-@@ -53,4 +52,4 @@
- 	clang-format -i $(TEST_SRC)
- 	clang-format -i $(TEST_HDR)
- 
--.PHONY: all clean-all clean clean-cov format
-\ No newline at end of file
-+.PHONY: all clean-all clean clean-cov format
---- test/Makefile
-+++ test/Makefile
-@@ -27,4 +27,4 @@
- 	+$(MAKE) -C src clean-cov
- 
- format:
--	+$(MAKE) -C src format
-\ No newline at end of file
-+	+$(MAKE) -C src format
---- src/Makefile
-+++ src/Makefile
-@@ -14,32 +14,32 @@
- STATIC ?= 0
- 
- ifeq ($(DEBUG), 1)
--    CFLAGS += -DDEBUG -g -Og -Werror -pedantic
-+    ECGEN_CFLAGS = -DDEBUG -g -Og -Werror -pedantic
- else ifeq ($(TEST), 1)
--	CFLAGS += -DNDEBUG --coverage -g -O0
-+	ECGEN_CFLAGS = -DNDEBUG --coverage -g -O0
- else ifeq ($(FAST), 1)
-     ifeq ($(CC), gcc)
--        CFLAGS += -DNDEBUG -O3 -march=native -pipe
-+        ECGEN_CFLAGS = -DNDEBUG -O3 -march=native -pipe
-     else
--        CFLAGS += -DNDEBUG -O3
-+        ECGEN_CFLAGS = -DNDEBUG -O3
-     endif
- else
--    CFLAGS += -DNDEBUG -O2
-+    ECGEN_CFLAGS = -DNDEBUG -O2
- endif
- 
--LDFLAGS = -L../lib/parson -L../lib/sha1 -L../lib/pari
-+ECGEN_LDFLAGS = -L../lib/parson -L../lib/sha1 -L../lib/pari
- ifeq ($(STATIC), 1)
--	LIBS = -lrt -Wl,-Bstatic -lpari -Wl,-Bdynamic -lpthread -lparson -lsha1 -lm -lgmp -ldl
-+	ECGEN_LIBS = -lrt -Wl,-Bstatic -lpari -Wl,-Bdynamic -lpthread -lparson -lsha1 -lm -lgmp -ldl
- else
--	LIBS = -lrt -lpari -lpthread -lparson -lsha1
-+	ECGEN_LIBS = -lrt -lpari -lpthread -lparson -lsha1
- endif
- 
--INCLUDES = -I. -I../lib
-+ECGEN_INCLUDES = -I. -I../lib
- 
- 
--GIT_COMMIT = $(shell git rev-parse --short HEAD)
-+GIT_COMMIT = $(shell git rev-parse --short HEAD 2>/dev/null)
- ifneq ($(GIT_COMMIT),)
--	CFLAGS += -DGIT_COMMIT=\"$(GIT_COMMIT)\"
-+	ECGEN_CFLAGS += -DGIT_COMMIT=\"$(GIT_COMMIT)\"
- endif
- 
- ####
-@@ -55,11 +55,11 @@
- all: ecgen
- 
- ecgen: ecgen.o $(ECGEN_OBJ)
--	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -o) $@ $^ $(ECGEN_LDFLAGS) $(LDFLAGS) $(ECGEN_LIBS) $(LIBS)
- 	mv ecgen ..
- 
- %.o: %.c
--	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -c -o) $@ $<
- 
- ####
- 
---- lib/parson/Makefile
-+++ lib/parson/Makefile
-@@ -1,6 +1,4 @@
- CC ?= gcc
--CCFLAGS ?= -Wall
--LDFLAGS =
- 
- SOURCES = $(wildcard *.c)
- OBJECTS = $(SOURCES:.c=.o)
-@@ -11,13 +9,13 @@
- all: $(TARGET)
- 
- $(TARGET): $(OBJECTS)
--	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -o) $@ $^ $(LDFLAGS) $(LIBS)
- 
- $(A): $(OBJECTS)
- 	ar rcs $(A) $(OBJECTS)
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -c) $<
- 
- clean:
- 	rm -f *.o *.a $(TARGET)
---- lib/Makefile
-+++ lib/Makefile
-@@ -1,21 +1,20 @@
- CC ?= gcc
- 
--CFLAGS = -Wall
- DEBUG ?= 0
- TEST ?= 0
- FAST ?= 0
- ifeq ($(DEBUG), 1)
--    CFLAGS += -DDEBUG -g -Og -Werror -pedantic
-+    ECGEN_CFLAGS = -DDEBUG -g -Og -Werror -pedantic
- else ifeq ($(TEST), 1)
--	CFLAGS += -DNDEBUG --coverage -g -O0
-+	ECGEN_CFLAGS = -DNDEBUG --coverage -g -O0
- else ifeq ($(FAST), 1)
-     ifeq ($(CC), gcc)
--        CFLAGS += -DNDEBUG -O3 -march=native -pipe
-+        ECGEN_CFLAGS = -DNDEBUG -O3 -march=native -pipe
-     else
--        CFLAGS += -DNDEBUG -O3
-+        ECGEN_CFLAGS = -DNDEBUG -O3
-     endif
- else
--    CFLAGS += -DNDEBUG -O2
-+    ECGEN_CFLAGS = -DNDEBUG -O2
- endif
- export
- 
-@@ -25,4 +24,4 @@
- 
- clean:
- 	$(MAKE) -C parson clean
--	$(MAKE) -C sha1 clean
-\ No newline at end of file
-+	$(MAKE) -C sha1 clean
---- lib/sha1/Makefile
-+++ lib/sha1/Makefile
-@@ -1,6 +1,4 @@
- CC ?= gcc
--CFLAGS ?= -Wall
--LDFLAGS =
- 
- SOURCES = $(wildcard *.c)
- OBJECTS = $(SOURCES:.c=.o)
-@@ -11,13 +9,13 @@
- all: $(TARGET)
- 
- $(TARGET): $(OBJECTS)
--	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -o) $@ $^ $(LDFLAGS) $(LIBS)
- 
- $(A): $(OBJECTS)
- 	ar rcs $(A) $(OBJECTS)
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -c) $<
- 
- clean:
- 	rm -f *.o *.a $(TARGET)
---- src/invalid/invalid.c
-+++ src/invalid/invalid.c
-@@ -239,7 +239,9 @@
- 	pthread_t pthreads[cfg->threads];
- 	thread_t threads[cfg->threads];
- 	struct pari_thread pari_threads[cfg->threads];
--	pari_thread_sync();
-+#if PARI_VERSION_CODE < PARI_VERSION(2,12,1)
-+	pari_thread_sync();
-+#endif
- 
- 	size_t generated = 0;
- 	state_e states[nprimes];
---- src/gen/field.c
-+++ src/gen/field.c
-@@ -7,6 +7,12 @@
- #include "io/output.h"
- #include "math/poly.h"
- 
-+#if PARI_VERSION_CODE >= PARI_VERSION(2,12,1)
-+#  define ecgen_isirreducible(x) polisirreducible(x)
-+#else
-+#  define ecgen_isirreducible(x) isirreducible(x)
-+#endif
-+
- static GEN field_primer(unsigned long bits) { return random_prime(bits); }
- 
- static GEN field_binaryr(unsigned long bits) {
-@@ -84,7 +90,7 @@
- 			gel(v, 1) = gen_1;
- 
- 			GEN poly = gmul(gtopolyrev(v, -1), gmodulss(1, 2));
--			if (!isirreducible(poly)) {
-+			if (!ecgen_isirreducible(poly)) {
- 				fprintf(err, "Polynomial is reducible.\n");
- 				avma = ltop;
- 				return 0;
diff --git a/patch/emacs.patch b/patch/emacs.patch
deleted file mode 100644
index 24f3f3153..000000000
--- a/patch/emacs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# From the Emacs project at
-# https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=6a4ed891d84b
---- src/editfns.c
-+++ src/editfns.c
-@@ -2053,6 +2053,8 @@
-      code.  */
-   ptrdiff_t del_bytes = (size_t) size_a / CHAR_BIT + 1;
-   ptrdiff_t ins_bytes = (size_t) size_b / CHAR_BIT + 1;
-+  unsigned char *deletions = SAFE_ALLOCA (del_bytes);
-+  unsigned char *insertions = SAFE_ALLOCA (ins_bytes);
-   struct context ctx = {
-     .buffer_a = a,
-     .buffer_b = b,
-@@ -2060,8 +2062,8 @@
-     .beg_b = min_b,
-     .a_unibyte = BUF_ZV (a) == BUF_ZV_BYTE (a),
-     .b_unibyte = BUF_ZV (b) == BUF_ZV_BYTE (b),
--    .deletions = SAFE_ALLOCA (del_bytes),
--    .insertions = SAFE_ALLOCA (ins_bytes),
-+    .deletions = deletions,
-+    .insertions = insertions,
-     .fdiag = buffer + size_b + 1,
-     .bdiag = buffer + diags + size_b + 1,
-     .heuristic = true,
---- test/lisp/autorevert-tests.el
-+++ test/lisp/autorevert-tests.el
-@@ -131,7 +131,9 @@
-                        (format-message
-                         "Reverting buffer `%s'\\." (buffer-name buffer))
-                        auto-revert--messages)))
--      (if (with-current-buffer buffer auto-revert-use-notify)
-+      (if (and (or file-notify--library
-+                   (file-remote-p temporary-file-directory)
-+               (with-current-buffer buffer auto-revert-use-notify))
-           (read-event nil nil 0.1)
-         (sleep-for 0.1)))))
- 
diff --git a/patch/expat.patch b/patch/expat.patch
deleted file mode 100644
index c68017f1e..000000000
--- a/patch/expat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton
-# This patch fixes some issue with libexpat.
-# https://github.com/libexpat/libexpat/issues/569
---- tests/runtests.c
-+++ tests/runtests.c
-@@ -54,7 +54,6 @@
- #include <ctype.h>
- #include <limits.h>
- #include <stdint.h> /* intptr_t uint64_t */
--#include <math.h>   /* NAN, INFINITY, isnan */
- 
- #if ! defined(__cplusplus)
- #  include <stdbool.h>
-@@ -6712,7 +6711,8 @@
-   XML_Char **elemstr = (XML_Char **)userData;
-   if (xcstrcmp(elemstr[0], name) != 0) {
-     char buffer[1024];
--    sprintf(buffer, "unexpected end string: '%" XML_FMT_STR "'", name);
-+    snprintf(buffer, sizeof(buffer), "unexpected end string: '%" XML_FMT_STR "'", name);
-+    buffer[sizeof(buffer)-1] = '\0';  /* ensure NULL termination */
-     fail(buffer);
-   }
-   triplet_end_flag = XML_TRUE;
-@@ -11762,6 +11762,19 @@
- }
- END_TEST
- 
-+static float portableNAN(void);
-+static float portableINFINITY(void);
-+
-+static float
-+portableNAN() {
-+  return strtof("nan", NULL);
-+}
-+
-+static float
-+portableINFINITY() {
-+  return strtof("infinity", NULL);
-+}
-+
- START_TEST(test_billion_laughs_attack_protection_api) {
-   XML_Parser parserWithoutParent = XML_ParserCreate(NULL);
-   XML_Parser parserWithParent
-@@ -11780,7 +11793,7 @@
-       == XML_TRUE)
-     fail("Call with non-root parser is NOT supposed to succeed");
-   if (XML_SetBillionLaughsAttackProtectionMaximumAmplification(
--          parserWithoutParent, NAN)
-+          parserWithoutParent, portableNAN())
-       == XML_TRUE)
-     fail("Call with NaN limit is NOT supposed to succeed");
-   if (XML_SetBillionLaughsAttackProtectionMaximumAmplification(
-@@ -11802,7 +11815,7 @@
-       == XML_FALSE)
-     fail("Call with positive limit >=1.0 is supposed to succeed");
-   if (XML_SetBillionLaughsAttackProtectionMaximumAmplification(
--          parserWithoutParent, INFINITY)
-+          parserWithoutParent, portableINFINITY())
-       == XML_FALSE)
-     fail("Call with positive limit >=1.0 is supposed to succeed");
- 
diff --git a/patch/flex.patch b/patch/flex.patch
deleted file mode 100644
index 2e8cdabd0..000000000
--- a/patch/flex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Flex.
---- src/misc.c
-+++ src/misc.c
-@@ -338,6 +338,10 @@
- 
- void line_directive_out (FILE *output_file, int do_infile)
- {
-+	/* Based on GCC object size checker */
-+	#undef MAXLINE
-+	# define MAXLINE (2048+64)
-+
- 	char    directive[MAXLINE], filename[MAXLINE];
- 	char   *s1, *s2, *s3;
- 	static const char line_fmt[] = "#line %d \"%s\"\n";
---- src/filter.c
-+++ src/filter.c
-@@ -336,6 +336,10 @@
-  */
- int filter_fix_linedirs (struct filter *chain)
- {
-+	/* Based on GCC object size checker */
-+	#undef MAXLINE
-+	# define MAXLINE (2048+64)
-+
- 	char   *buf;
- 	const size_t readsz = 512;
- 	int     lineno = 1;
diff --git a/patch/gdbm.patch b/patch/gdbm.patch
deleted file mode 100644
index 775e4b3ba..000000000
--- a/patch/gdbm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GDBM.
---- src/hash.c
-+++ src/hash.c
-@@ -31,14 +31,14 @@
- _gdbm_hash (datum key)
- {
-   unsigned int value;	/* Used to compute the hash value.  */
--  int   index;		/* Used to cycle through random values. */
-+  size_t  index;	/* Used to cycle through random values. */
- 
-   /* Set the initial value from key. */
--  value = 0x238F13AF * key.dsize;
-+  value = 0x238F13AFu * key.dsize;
-   for (index = 0; index < key.dsize; index++)
-     value = (value + (key.dptr[index] << (index*5 % 24))) & 0x7FFFFFFF;
- 
--  value = (1103515243 * value + 12345) & 0x7FFFFFFF;  
-+  value = (1103515243u * value + 12345) & 0x7FFFFFFF;  
- 
-   /* Return the value. */
-   return((int) value);
diff --git a/patch/gettext.patch b/patch/gettext.patch
deleted file mode 100644
index 5e9556339..000000000
--- a/patch/gettext.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton
-# This patch squashes warnings in GetText 0.21.
---- gettext-runtime/gnulib-lib/xalloc-oversized.h
-+++ gettext-runtime/gnulib-lib/xalloc-oversized.h
-@@ -27,6 +27,7 @@
-    By gnulib convention, SIZE_MAX represents overflow in size
-    calculations, so the conservative size_t-based dividend to use here
-    is SIZE_MAX - 1.  */
-+#undef __xalloc_oversized
- #define __xalloc_oversized(n, s) \
-   ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
- 
-@@ -42,9 +43,11 @@
-    function, so that it works correctly even when SIZE_MAX < N.  */
- 
- #if 7 <= __GNUC__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
- #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    (__builtin_constant_p (n) && __builtin_constant_p (s) \
-     ? __xalloc_oversized (n, s) \
-@@ -54,6 +57,7 @@
- /* Other compilers use integer division; this may be slower but is
-    more portable.  */
- #else
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) __xalloc_oversized (n, s)
- #endif
- 
---- libtextstyle/lib/xalloc-oversized.h
-+++ libtextstyle/lib/xalloc-oversized.h
-@@ -27,6 +27,7 @@
-    By gnulib convention, SIZE_MAX represents overflow in size
-    calculations, so the conservative size_t-based dividend to use here
-    is SIZE_MAX - 1.  */
-+#undef __xalloc_oversized
- #define __xalloc_oversized(n, s) \
-   ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
- 
-@@ -42,9 +43,11 @@
-    function, so that it works correctly even when SIZE_MAX < N.  */
- 
- #if 7 <= __GNUC__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
- #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    (__builtin_constant_p (n) && __builtin_constant_p (s) \
-     ? __xalloc_oversized (n, s) \
-@@ -54,6 +57,7 @@
- /* Other compilers use integer division; this may be slower but is
-    more portable.  */
- #else
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) __xalloc_oversized (n, s)
- #endif
- 
---- gettext-tools/libgettextpo/xalloc-oversized.h
-+++ gettext-tools/libgettextpo/xalloc-oversized.h
-@@ -27,6 +27,7 @@
-    By gnulib convention, SIZE_MAX represents overflow in size
-    calculations, so the conservative size_t-based dividend to use here
-    is SIZE_MAX - 1.  */
-+#undef __xalloc_oversized
- #define __xalloc_oversized(n, s) \
-   ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
- 
-@@ -42,9 +43,11 @@
-    function, so that it works correctly even when SIZE_MAX < N.  */
- 
- #if 7 <= __GNUC__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
- #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    (__builtin_constant_p (n) && __builtin_constant_p (s) \
-     ? __xalloc_oversized (n, s) \
-@@ -54,6 +57,7 @@
- /* Other compilers use integer division; this may be slower but is
-    more portable.  */
- #else
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) __xalloc_oversized (n, s)
- #endif
- 
---- gettext-tools/gnulib-lib/xalloc-oversized.h
-+++ gettext-tools/gnulib-lib/xalloc-oversized.h
-@@ -27,6 +27,7 @@
-    By gnulib convention, SIZE_MAX represents overflow in size
-    calculations, so the conservative size_t-based dividend to use here
-    is SIZE_MAX - 1.  */
-+#undef __xalloc_oversized
- #define __xalloc_oversized(n, s) \
-   ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
- 
-@@ -42,9 +43,11 @@
-    function, so that it works correctly even when SIZE_MAX < N.  */
- 
- #if 7 <= __GNUC__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
- #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    (__builtin_constant_p (n) && __builtin_constant_p (s) \
-     ? __xalloc_oversized (n, s) \
-@@ -54,6 +57,7 @@
- /* Other compilers use integer division; this may be slower but is
-    more portable.  */
- #else
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) __xalloc_oversized (n, s)
- #endif
- 
---- gettext-runtime/gnulib-lib/xalloc.h
-+++ gettext-runtime/gnulib-lib/xalloc.h
-@@ -88,6 +88,7 @@
- 
- /* Allocate an object of type T dynamically, with error checking.  */
- /* extern T *XMALLOC (typename T); */
-+#undef XMALLOC
- #define XMALLOC(T) \
-   ((T *) xmalloc (sizeof (T)))
- 
-@@ -97,6 +98,7 @@
- /* xnmalloc performs a division and multiplication by sizeof (T).  Arrange to
-    perform the division at compile-time and the multiplication with a factor
-    known at compile-time.  */
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 \
-            ? xmalloc (N) \
-@@ -109,6 +111,7 @@
-   return xmalloc (n * s);
- }
- #else
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 ? xmalloc (N) : xnmalloc (N, sizeof (T))))
- #endif
-@@ -116,17 +119,20 @@
- /* Allocate an object of type T dynamically, with error checking,
-    and zero it.  */
- /* extern T *XZALLOC (typename T); */
-+#undef XZALLOC
- #define XZALLOC(T) \
-   ((T *) xzalloc (sizeof (T)))
- 
- /* Allocate memory for NMEMB elements of type T, with error checking,
-    and zero it.  */
- /* extern T *XCALLOC (size_t nmemb, typename T); */
-+#undef XCALLOC
- #define XCALLOC(N,T) \
-   ((T *) xcalloc (N, sizeof (T)))
- 
- /* Return a pointer to a new buffer of N bytes.  This is like xmalloc,
-    except it returns char *.  */
-+#undef xcharalloc
- #define xcharalloc(N) \
-   XNMALLOC (N, char)
- 
---- libtextstyle/lib/xalloc.h
-+++ libtextstyle/lib/xalloc.h
-@@ -88,6 +88,7 @@
- 
- /* Allocate an object of type T dynamically, with error checking.  */
- /* extern T *XMALLOC (typename T); */
-+#undef XMALLOC
- #define XMALLOC(T) \
-   ((T *) xmalloc (sizeof (T)))
- 
-@@ -97,6 +98,7 @@
- /* xnmalloc performs a division and multiplication by sizeof (T).  Arrange to
-    perform the division at compile-time and the multiplication with a factor
-    known at compile-time.  */
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 \
-            ? xmalloc (N) \
-@@ -109,6 +111,7 @@
-   return xmalloc (n * s);
- }
- #else
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 ? xmalloc (N) : xnmalloc (N, sizeof (T))))
- #endif
-@@ -116,17 +119,20 @@
- /* Allocate an object of type T dynamically, with error checking,
-    and zero it.  */
- /* extern T *XZALLOC (typename T); */
-+#undef XZALLOC
- #define XZALLOC(T) \
-   ((T *) xzalloc (sizeof (T)))
- 
- /* Allocate memory for NMEMB elements of type T, with error checking,
-    and zero it.  */
- /* extern T *XCALLOC (size_t nmemb, typename T); */
-+#undef XCALLOC
- #define XCALLOC(N,T) \
-   ((T *) xcalloc (N, sizeof (T)))
- 
- /* Return a pointer to a new buffer of N bytes.  This is like xmalloc,
-    except it returns char *.  */
-+#undef xcharalloc
- #define xcharalloc(N) \
-   XNMALLOC (N, char)
- 
---- gnulib-local/lib/xalloc.h
-+++ gnulib-local/lib/xalloc.h
-@@ -88,6 +88,7 @@
- 
- /* Allocate an object of type T dynamically, with error checking.  */
- /* extern T *XMALLOC (typename T); */
-+#undef XMALLOC
- #define XMALLOC(T) \
-   ((T *) xmalloc (sizeof (T)))
- 
-@@ -97,6 +98,7 @@
- /* xnmalloc performs a division and multiplication by sizeof (T).  Arrange to
-    perform the division at compile-time and the multiplication with a factor
-    known at compile-time.  */
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 \
-            ? xmalloc (N) \
-@@ -109,6 +111,7 @@
-   return xmalloc (n * s);
- }
- #else
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 ? xmalloc (N) : xnmalloc (N, sizeof (T))))
- #endif
-@@ -116,17 +119,20 @@
- /* Allocate an object of type T dynamically, with error checking,
-    and zero it.  */
- /* extern T *XZALLOC (typename T); */
-+#undef XZALLOC
- #define XZALLOC(T) \
-   ((T *) xzalloc (sizeof (T)))
- 
- /* Allocate memory for NMEMB elements of type T, with error checking,
-    and zero it.  */
- /* extern T *XCALLOC (size_t nmemb, typename T); */
-+#undef XCALLOC
- #define XCALLOC(N,T) \
-   ((T *) xcalloc (N, sizeof (T)))
- 
- /* Return a pointer to a new buffer of N bytes.  This is like xmalloc,
-    except it returns char *.  */
-+#undef xcharalloc
- #define xcharalloc(N) \
-   XNMALLOC (N, char)
- 
---- gettext-tools/libgettextpo/xalloc.h
-+++ gettext-tools/libgettextpo/xalloc.h
-@@ -88,6 +88,7 @@
- 
- /* Allocate an object of type T dynamically, with error checking.  */
- /* extern T *XMALLOC (typename T); */
-+#undef XMALLOC
- #define XMALLOC(T) \
-   ((T *) xmalloc (sizeof (T)))
- 
-@@ -97,6 +98,7 @@
- /* xnmalloc performs a division and multiplication by sizeof (T).  Arrange to
-    perform the division at compile-time and the multiplication with a factor
-    known at compile-time.  */
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 \
-            ? xmalloc (N) \
-@@ -109,6 +111,7 @@
-   return xmalloc (n * s);
- }
- #else
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 ? xmalloc (N) : xnmalloc (N, sizeof (T))))
- #endif
-@@ -116,17 +119,20 @@
- /* Allocate an object of type T dynamically, with error checking,
-    and zero it.  */
- /* extern T *XZALLOC (typename T); */
-+#undef XZALLOC
- #define XZALLOC(T) \
-   ((T *) xzalloc (sizeof (T)))
- 
- /* Allocate memory for NMEMB elements of type T, with error checking,
-    and zero it.  */
- /* extern T *XCALLOC (size_t nmemb, typename T); */
-+#undef XCALLOC
- #define XCALLOC(N,T) \
-   ((T *) xcalloc (N, sizeof (T)))
- 
- /* Return a pointer to a new buffer of N bytes.  This is like xmalloc,
-    except it returns char *.  */
-+#undef xcharalloc
- #define xcharalloc(N) \
-   XNMALLOC (N, char)
- 
---- gettext-tools/gnulib-lib/xalloc.h
-+++ gettext-tools/gnulib-lib/xalloc.h
-@@ -88,6 +88,7 @@
- 
- /* Allocate an object of type T dynamically, with error checking.  */
- /* extern T *XMALLOC (typename T); */
-+#undef XMALLOC
- #define XMALLOC(T) \
-   ((T *) xmalloc (sizeof (T)))
- 
-@@ -97,6 +98,7 @@
- /* xnmalloc performs a division and multiplication by sizeof (T).  Arrange to
-    perform the division at compile-time and the multiplication with a factor
-    known at compile-time.  */
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 \
-            ? xmalloc (N) \
-@@ -109,6 +111,7 @@
-   return xmalloc (n * s);
- }
- #else
-+# undef XNMALLOC
- # define XNMALLOC(N,T) \
-    ((T *) (sizeof (T) == 1 ? xmalloc (N) : xnmalloc (N, sizeof (T))))
- #endif
-@@ -116,17 +119,20 @@
- /* Allocate an object of type T dynamically, with error checking,
-    and zero it.  */
- /* extern T *XZALLOC (typename T); */
-+#undef XZALLOC
- #define XZALLOC(T) \
-   ((T *) xzalloc (sizeof (T)))
- 
- /* Allocate memory for NMEMB elements of type T, with error checking,
-    and zero it.  */
- /* extern T *XCALLOC (size_t nmemb, typename T); */
-+#undef XCALLOC
- #define XCALLOC(N,T) \
-   ((T *) xcalloc (N, sizeof (T)))
- 
- /* Return a pointer to a new buffer of N bytes.  This is like xmalloc,
-    except it returns char *.  */
-+#undef xcharalloc
- #define xcharalloc(N) \
-   XNMALLOC (N, char)
- 
-# https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=5e50baa16ef9
-# https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=b2d4b6c87827
---- gettext-tools/gnulib-lib/fopen.c
-+++ gettext-tools/gnulib-lib/fopen.c
-@@ -19,12 +19,12 @@
- /* If the user's config.h happens to include <stdio.h>, let it include only
-    the system's <stdio.h> here, so that orig_fopen doesn't recurse to
-    rpl_fopen.  */
--#define __need_FILE
-+#define _GL_ALREADY_INCLUDING_STDIO_H
- #include <config.h>
- 
- /* Get the original definition of fopen.  It might be defined as a macro.  */
- #include <stdio.h>
--#undef __need_FILE
-+#undef _GL_ALREADY_INCLUDING_STDIO_H
- 
- static FILE *
- orig_fopen (const char *filename, const char *mode)
-@@ -176,7 +176,8 @@
-             return NULL;
-           }
- 
--        fd = open (filename, open_direction | open_flags);
-+        fd = open (filename, open_direction | open_flags,
-+                   S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-         if (fd < 0)
-           return NULL;
- 
-@@ -209,7 +210,8 @@
-       int fd;
-       FILE *fp;
- 
--      fd = open (filename, open_direction | open_flags);
-+      fd = open (filename, open_direction | open_flags,
-+                 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-       if (fd < 0)
-         return NULL;
- 
---- gettext-tools/libgettextpo/fopen.c
-+++ gettext-tools/libgettextpo/fopen.c
-@@ -19,12 +19,12 @@
- /* If the user's config.h happens to include <stdio.h>, let it include only
-    the system's <stdio.h> here, so that orig_fopen doesn't recurse to
-    rpl_fopen.  */
--#define __need_FILE
-+#define _GL_ALREADY_INCLUDING_STDIO_H
- #include <config.h>
- 
- /* Get the original definition of fopen.  It might be defined as a macro.  */
- #include <stdio.h>
--#undef __need_FILE
-+#undef _GL_ALREADY_INCLUDING_STDIO_H
- 
- static FILE *
- orig_fopen (const char *filename, const char *mode)
-@@ -176,7 +176,8 @@
-             return NULL;
-           }
- 
--        fd = open (filename, open_direction | open_flags);
-+        fd = open (filename, open_direction | open_flags,
-+                   S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-         if (fd < 0)
-           return NULL;
- 
-@@ -209,7 +210,8 @@
-       int fd;
-       FILE *fp;
- 
--      fd = open (filename, open_direction | open_flags);
-+      fd = open (filename, open_direction | open_flags,
-+                 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-       if (fd < 0)
-         return NULL;
- 
diff --git a/patch/git.patch b/patch/git.patch
deleted file mode 100644
index 2ef692e6e..000000000
--- a/patch/git.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Git.
---- configure.ac
-+++ configure.ac
-@@ -677,39 +677,57 @@
- GIT_CONF_SUBST([NO_DEFLATE_BOUND])
- 
- #
-+# The next few tests will define NEEDS_RESOLV, NEEDS_SOCKET or
-+# NEEDS_NSL if linking with libresolv, libsocket and libnsl
-+# provides some of the functions we would normally get from libc.
-+NEEDS_RESOLV=
-+NEEDS_SOCKET=
-+NEEDS_NSL=
-+
-+#
- # Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
- # Patrick Mauritz).
--AC_CHECK_LIB([c], [socket],
--[NEEDS_SOCKET=],
--[NEEDS_SOCKET=YesPlease])
--GIT_CONF_SUBST([NEEDS_SOCKET])
--test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket"
-+AC_CHECK_FUNC([socket],
-+    [],
-+    [AC_SEARCH_LIBS([socket], [c],
-+       [NEEDS_SOCKET=],
-+       [NEEDS_SOCKET=YesPlease])
-+])
- 
- #
--# The next few tests will define NEEDS_RESOLV if linking with
--# libresolv provides some of the functions we would normally get
--# from libc.
--NEEDS_RESOLV=
--#
--# Define NO_INET_NTOP if linking with -lresolv is not enough.
--# Solaris 2.7 in particular hos inet_ntop in -lresolv.
-+# Define NO_INET_NTOP if linking with -lresolv, -lsocket and -lnsl
-+# is not enough. Solaris 11 provides inet_ntop in -lsocket -lnsl.
-+# Solaris 2.7 provides inet_ntop in -lresolv.
- NO_INET_NTOP=
- AC_CHECK_FUNC([inet_ntop],
-     [],
--    [AC_CHECK_LIB([resolv], [inet_ntop],
--	[NEEDS_RESOLV=YesPlease],
--	[NO_INET_NTOP=YesPlease])
-+    [AC_SEARCH_LIBS([inet_ntop], [socket nsl],
-+       [NEEDS_SOCKET=YesPlease; NEEDS_NSL=YesPlease],
-+       [AC_CHECK_FUNC([inet_ntop],
-+          [],
-+          [AC_SEARCH_LIBS([inet_ntop], [resolv],
-+          [NEEDS_RESOLV=YesPlease],
-+          [NO_INET_PTON=YesPlease])
-+       ])
-+    ])
- ])
- GIT_CONF_SUBST([NO_INET_NTOP])
- #
--# Define NO_INET_PTON if linking with -lresolv is not enough.
--# Solaris 2.7 in particular hos inet_pton in -lresolv.
-+# Define NO_INET_PTON if linking with -lresolv, -lsocket and -lnsl
-+# is not enough. Solaris 11 provides inet_pton in -lsocket -lnsl.
-+# Solaris 2.7 provides inet_pton in -lresolv.
- NO_INET_PTON=
- AC_CHECK_FUNC([inet_pton],
-     [],
--    [AC_CHECK_LIB([resolv], [inet_pton],
--	[NEEDS_RESOLV=YesPlease],
--	[NO_INET_PTON=YesPlease])
-+    [AC_SEARCH_LIBS([inet_pton], [socket nsl],
-+       [NEEDS_SOCKET=YesPlease; NEEDS_NSL=YesPlease],
-+       [AC_CHECK_FUNC([inet_pton],
-+          [],
-+          [AC_SEARCH_LIBS([inet_pton], [resolv],
-+          [NEEDS_RESOLV=YesPlease],
-+          [NO_INET_PTON=YesPlease])
-+       ])
-+    ])
- ])
- GIT_CONF_SUBST([NO_INET_PTON])
- #
-@@ -718,19 +736,25 @@
- NO_HSTRERROR=
- AC_CHECK_FUNC([hstrerror],
-     [],
--    [AC_CHECK_LIB([resolv], [hstrerror],
--	[NEEDS_RESOLV=YesPlease],
--	[NO_HSTRERROR=YesPlease])
-+    [AC_SEARCH_LIBS([hstrerror], [resolv],
-+       [NEEDS_RESOLV=YesPlease],
-+       [NO_HSTRERROR=YesPlease])
- ])
- GIT_CONF_SUBST([NO_HSTRERROR])
- 
- dnl This must go after all the possible places for its initialization,
- dnl in the AC_CHECK_FUNC invocations above.
- GIT_CONF_SUBST([NEEDS_RESOLV])
-+GIT_CONF_SUBST([NEEDS_SOCKET])
-+GIT_CONF_SUBST([NEEDS_NSL])
-+
- #
--# If any of the above tests determined that -lresolv is needed at
--# build-time, also set it here for remaining configure-time checks.
-+# If any of the above tests determined that -lresolv, -lsocket or -lnsl
-+# are needed at build-time, also set it here for remaining configure-time
-+# checks. The Sun man pages list library order as -lresolv -lsocket -lnsl.
- test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
-+test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket"
-+test -n "$NEEDS_NSL" && LIBS="$LIBS -lnsl"
- 
- AC_CHECK_LIB([c], [basename],
- [NEEDS_LIBGEN=],
---- Makefile
-+++ Makefile
-@@ -1504,15 +1504,15 @@
- 	EXTLIBS += -lintl
- endif
- endif
-+ifdef NEEDS_RESOLV
-+	EXTLIBS += -lresolv
-+endif
- ifdef NEEDS_SOCKET
- 	EXTLIBS += -lsocket
- endif
- ifdef NEEDS_NSL
- 	EXTLIBS += -lnsl
- endif
--ifdef NEEDS_RESOLV
--	EXTLIBS += -lresolv
--endif
- ifdef NO_D_TYPE_IN_DIRENT
- 	BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
- endif
diff --git a/patch/gmp-darwin.patch b/patch/gmp-darwin.patch
deleted file mode 100644
index cebe07089..000000000
--- a/patch/gmp-darwin.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GMP.
---- gmp-h.in
-+++ gmp-h.in
-@@ -363,9 +363,9 @@
- #ifdef __GNUC__
- #if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \
-   || (defined __GNUC_GNU_INLINE__ && defined __cplusplus)
--#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-+#define __GMP_EXTERN_INLINE inline
- #else
--#define __GMP_EXTERN_INLINE      extern __inline__
-+#define __GMP_EXTERN_INLINE inline
- #endif
- #define __GMP_INLINE_PROTOTYPES  1
- #endif
-@@ -622,7 +622,7 @@
- 
- #define mpz_abs __gmpz_abs
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_abs)
--__GMP_DECLSPEC void mpz_abs (mpz_ptr, mpz_srcptr);
-+static void mpz_abs (mpz_ptr, mpz_srcptr);
- #endif
- 
- #define mpz_add __gmpz_add
-@@ -798,17 +798,17 @@
- 
- #define mpz_fits_uint_p __gmpz_fits_uint_p
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_uint_p)
--__GMP_DECLSPEC int mpz_fits_uint_p (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static int mpz_fits_uint_p (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_fits_ulong_p __gmpz_fits_ulong_p
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ulong_p)
--__GMP_DECLSPEC int mpz_fits_ulong_p (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static int mpz_fits_ulong_p (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_fits_ushort_p __gmpz_fits_ushort_p
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ushort_p)
--__GMP_DECLSPEC int mpz_fits_ushort_p (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static int mpz_fits_ushort_p (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_gcd __gmpz_gcd
-@@ -834,12 +834,12 @@
- 
- #define mpz_get_ui __gmpz_get_ui
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_get_ui)
--__GMP_DECLSPEC unsigned long int mpz_get_ui (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static unsigned long int mpz_get_ui (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_getlimbn __gmpz_getlimbn
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_getlimbn)
--__GMP_DECLSPEC mp_limb_t mpz_getlimbn (mpz_srcptr, mp_size_t) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static mp_limb_t mpz_getlimbn (mpz_srcptr, mp_size_t) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_hamdist __gmpz_hamdist
-@@ -941,7 +941,7 @@
- 
- #define mpz_neg __gmpz_neg
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_neg)
--__GMP_DECLSPEC void mpz_neg (mpz_ptr, mpz_srcptr);
-+static void mpz_neg (mpz_ptr, mpz_srcptr);
- #endif
- 
- #define mpz_nextprime __gmpz_nextprime
-@@ -962,12 +962,12 @@
- 
- #define mpz_perfect_square_p __gmpz_perfect_square_p
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_perfect_square_p)
--__GMP_DECLSPEC int mpz_perfect_square_p (mpz_srcptr) __GMP_ATTRIBUTE_PURE;
-+static int mpz_perfect_square_p (mpz_srcptr) __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_popcount __gmpz_popcount
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_popcount)
--__GMP_DECLSPEC mp_bitcnt_t mpz_popcount (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static mp_bitcnt_t mpz_popcount (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_pow_ui __gmpz_pow_ui
-@@ -1023,7 +1023,7 @@
- 
- #define mpz_set_q __gmpz_set_q
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_set_q)
--__GMP_DECLSPEC void mpz_set_q (mpz_ptr, mpq_srcptr);
-+static void mpz_set_q (mpz_ptr, mpq_srcptr);
- #endif
- 
- #define mpz_set_si __gmpz_set_si
-@@ -1040,7 +1040,7 @@
- 
- #define mpz_size __gmpz_size
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_size)
--__GMP_DECLSPEC size_t mpz_size (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static size_t mpz_size (mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpz_sizeinbase __gmpz_sizeinbase
-@@ -1134,7 +1134,7 @@
- 
- #define mpq_abs __gmpq_abs
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_abs)
--__GMP_DECLSPEC void mpq_abs (mpq_ptr, mpq_srcptr);
-+static void mpq_abs (mpq_ptr, mpq_srcptr);
- #endif
- 
- #define mpq_add __gmpq_add
-@@ -1204,7 +1204,7 @@
- 
- #define mpq_neg __gmpq_neg
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_neg)
--__GMP_DECLSPEC void mpq_neg (mpq_ptr, mpq_srcptr);
-+static void mpq_neg (mpq_ptr, mpq_srcptr);
- #endif
- 
- #define mpq_out_str __gmpq_out_str
-@@ -1462,12 +1462,12 @@
- 
- #define mpn_add __MPN(add)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add)
--__GMP_DECLSPEC mp_limb_t mpn_add (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
-+static mp_limb_t mpn_add (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
- #endif
- 
- #define mpn_add_1 __MPN(add_1)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add_1)
--__GMP_DECLSPEC mp_limb_t mpn_add_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t) __GMP_NOTHROW;
-+static mp_limb_t mpn_add_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t) __GMP_NOTHROW;
- #endif
- 
- #define mpn_add_n __MPN(add_n)
-@@ -1478,12 +1478,12 @@
- 
- #define mpn_cmp __MPN(cmp)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_cmp)
--__GMP_DECLSPEC int mpn_cmp (mp_srcptr, mp_srcptr, mp_size_t) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static int mpn_cmp (mp_srcptr, mp_srcptr, mp_size_t) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpn_zero_p __MPN(zero_p)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_zero_p)
--__GMP_DECLSPEC int mpn_zero_p (mp_srcptr, mp_size_t) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-+static int mpn_zero_p (mp_srcptr, mp_size_t) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
- #endif
- 
- #define mpn_divexact_1 __MPN(divexact_1)
-@@ -1554,7 +1554,7 @@
- 
- #define mpn_neg __MPN(neg)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_neg)
--__GMP_DECLSPEC mp_limb_t mpn_neg (mp_ptr, mp_srcptr, mp_size_t);
-+static mp_limb_t mpn_neg (mp_ptr, mp_srcptr, mp_size_t);
- #endif
- 
- #define mpn_com __MPN(com)
-@@ -1602,12 +1602,12 @@
- 
- #define mpn_sub __MPN(sub)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_sub)
--__GMP_DECLSPEC mp_limb_t mpn_sub (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
-+static mp_limb_t mpn_sub (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
- #endif
- 
- #define mpn_sub_1 __MPN(sub_1)
- #if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_sub_1)
--__GMP_DECLSPEC mp_limb_t mpn_sub_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t) __GMP_NOTHROW;
-+static mp_limb_t mpn_sub_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t) __GMP_NOTHROW;
- #endif
- 
- #define mpn_sub_n __MPN(sub_n)
diff --git a/patch/gnupg.patch b/patch/gnupg.patch
deleted file mode 100644
index 73e8f6e35..000000000
--- a/patch/gnupg.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GnuPG.
-# Also see https://dev.gnupg.org/T5369, https://dev.gnupg.org/T5370
---- g10/keylist.c
-+++ g10/keylist.c
-@@ -1681,8 +1681,8 @@
-           char *issuer_fpr = NULL;
-           char *reason_text = NULL;
-           char *reason_comment = NULL;
--          size_t reason_commentlen;
--          int reason_code;
-+          size_t reason_commentlen = 0;
-+          int reason_code = 0;
- 
- 	  if (sig->sig_class == 0x20 || sig->sig_class == 0x28
- 	      || sig->sig_class == 0x30)
-# Squash some printf format specifier warnings.
---- g10/decrypt-data.c
-+++ g10/decrypt-data.c
-@@ -658,8 +658,8 @@
-   /* Decrypt the buffer.  This first requires a loop to handle the
-    * case when a chunk ends within the buffer.  */
-   if (DBG_FILTER)
--    log_debug ("decrypt: chunklen=%ju total=%ju size=%zu len=%zu%s\n",
--               dfx->chunklen, dfx->total, size, len,
-+    log_debug ("decrypt: chunklen=%u total=%zu size=%zu len=%zu%s\n",
-+               (unsigned int)dfx->chunklen, dfx->total, size, len,
-                dfx->eof_seen? " eof":"");
- 
-   while (len && dfx->chunklen + len >= dfx->chunksize)
-@@ -695,8 +695,8 @@
-       len -= n;
- 
-       if (DBG_FILTER)
--        log_debug ("ndecrypted: %zu (nchunk=%ju) bytes left: %zu at off=%zu\n",
--                   totallen, dfx->chunklen, len, off);
-+        log_debug ("ndecrypted: %zu (nchunk=%u) bytes left: %zu at off=%zu\n",
-+                   totallen, (unsigned int)dfx->chunklen, len, off);
- 
-       /* Check the tag.  */
-       if (len < 16)
-@@ -777,7 +777,8 @@
-       dfx->chunklen += len;
-       dfx->total += len;
-       if (DBG_FILTER)
--        log_debug ("ndecrypted: %zu (nchunk=%ju)\n", totallen, dfx->chunklen);
-+        log_debug ("ndecrypted: %zu (nchunk=%u)\n", totallen,
-+                   (unsigned int)dfx->chunklen);
-     }
- 
-   if (dfx->eof_seen)
-# Fix a missing return code on-path
---- tests/gpgscm/scheme.c
-+++ tests/gpgscm/scheme.c
-@@ -172,6 +172,7 @@
-      case T_FRAME: return "frame";
-      }
-      assert (! "not reached");
-+     return "unknown";
- }
- 
- /* ADJ is enough slack to align cells in a TYPE_BITS-bit boundary */
-# Fix undefined behavior sanitizer finding
---- sm/certdump.c
-+++ sm/certdump.c
-@@ -774,9 +774,13 @@
-       gpg_err_set_errno (c->error);
-       return -1;
-     }
--  memcpy (p + c->len, buffer, size);
--  c->len += size;
--  p[c->len] = 0; /* Terminate string. */
-+
-+  if (p && buffer)
-+    {
-+      memcpy (p + c->len, buffer, size);
-+      c->len += size;
-+    }
-+  p[c->len] = 0; /* Terminate string. */
- 
-   return (gpgrt_ssize_t)size;
- }
diff --git a/patch/gnutls.patch b/patch/gnutls.patch
deleted file mode 100644
index 53790ae24..000000000
--- a/patch/gnutls.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GnuTLS.
---- lib/accelerated/x86/x86-common.c
-+++ lib/accelerated/x86/x86-common.c
-@@ -150,8 +150,10 @@
- 
- #if defined(_MSC_VER) && !defined(__clang__)
- 	xcr0 = _xgetbv(0);
--#else
-+#elif (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
- 	__asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx");
-+#else
-+	__asm__ (".byte 0x0f, 0x01, 0xd0" : "=a" (xcr0) : "c" (0) : "%edx" );
- #endif
- 	/* Check if xmm and ymm state are enabled in XCR0. */
- 	return (xcr0 & 6) == 6;
---- lib/random.c
-+++ lib/random.c
-@@ -35,6 +35,13 @@
- extern gnutls_crypto_rnd_st _gnutls_fuzz_rnd_ops;
- #endif
- 
-+#if defined(__APPLE__)
-+# if defined(_ARCH_PPC)
-+#  undef _Thread_local
-+#  define _Thread_local
-+# endif
-+#endif
-+
- /* Per thread context of random generator, and a flag to indicate initialization */
- static _Thread_local void *gnutls_rnd_ctx;
- static _Thread_local unsigned rnd_initialized = 0;
diff --git a/patch/gpgerror.patch b/patch/gpgerror.patch
deleted file mode 100644
index 03d87afc9..000000000
--- a/patch/gpgerror.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GnuPG.
---- src/argparse.c
-+++ src/argparse.c
-@@ -1941,7 +1941,7 @@
-   int argc;
-   char **argv;
-   char *s, *s2;
--  int i;
-+  int i = 0;
- 
-   if (no_init)
-     ;
---- tests/Makefile.in
-+++ tests/Makefile.in
-@@ -647,6 +647,10 @@
- check-TESTS: $(TESTS)
- 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
-+	gpgerror_libdir=`dirname $$PWD`/src/.libs; \
-+	LD_LIBRARY_PATH=`echo "$$gpgerror_libdir:$$LD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	DYLD_LIBRARY_PATH=`echo "$$gpgerror_libdir:$$DYLD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	export LD_LIBRARY_PATH; export DYLD_LIBRARY_PATH; \
- 	list=' $(TESTS) '; \
- 	$(am__tty_colors); \
- 	if test -n "$$list"; then \
---- tests/t-logging.c
-+++ tests/t-logging.c
-@@ -76,15 +76,21 @@
- 
-       nread = gpgrt_fread (buffer + buflen, 1, NCHUNK, stream);
-       if (nread < NCHUNK && gpgrt_ferror (stream))
--        die ("fread failed at line %d: %s\n", __LINE__,
-+        {
-+          free (buffer); buffer = NULL;
-+          die ("fread failed at line %d: %s\n", __LINE__,
-              gpg_strerror (gpg_err_code_from_syserror ()));
-+        }
-       buflen += nread;
-     }
-   while (nread == NCHUNK);
-   buffer[nread] = 0;
- 
-   if (strlen (buffer) != buflen)
--    fail ("stream_to_string detected an embedded nul");
-+    {
-+      free (buffer); buffer = NULL;
-+      fail ("stream_to_string detected an embedded nul");
-+    }
- 
-   gpgrt_ftruncate (stream, 0);
-   return buffer;
-@@ -95,12 +101,15 @@
- static void
- check_log_info (void)
- {
--  char *logbuf;
-+  char *logbuf = NULL;
- 
-   log_info ("first log\n");
-   logbuf = log_to_string ();
-   if (strcmp (logbuf, "t-logging: first log\n"))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   /* The second line should not have a LF.  */
-@@ -109,7 +118,10 @@
-   logbuf = log_to_string ();
-   if (strcmp (logbuf, ("t-logging: second log line\n"
-                        "t-logging: third log line")))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   /* Now a multi line log.  */
-@@ -118,14 +130,20 @@
-   if (strcmp (logbuf, ("t-logging: This is log line 1\n"
-                        "and 2\n"
-                        "and 3\n")))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   /* With arguments.  */
-   log_info ("file '%s' line %d: %s\n", "/foo/bar.txt", 20, "not found");
-   logbuf = log_to_string ();
-   if (strcmp (logbuf, "t-logging: file '/foo/bar.txt' line 20: not found\n"))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   /* With arguments and a control char in the string arg.  */
-@@ -133,7 +151,10 @@
-   logbuf = log_to_string ();
-   if (strcmp (logbuf,
-               "t-logging: file '/foo/bar.txt\\b' line 20: not found\n"))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   /* With arguments and the prefix in a string arg.  */
-@@ -141,7 +162,10 @@
-   logbuf = log_to_string ();
-   if (strcmp (logbuf,
-               "t-logging: file '/foo/bar.txt\\nt-logging': not \\x01 found\n"))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   /* With arguments and byte with bit 7 set in a string arg.  */
-@@ -149,9 +173,11 @@
-   logbuf = log_to_string ();
-   if (strcmp (logbuf,
-               "t-logging: file '/foo/bar.txt\\n': not \x81 found\n"))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   /* show ("===>%s<===\n", logbuf); */
--
-   free (logbuf);
- }
- 
-@@ -160,7 +186,7 @@
- check_with_pid (void)
- {
-   char testbuf[100];
--  char *logbuf;
-+  char *logbuf = NULL;
- 
-   snprintf (testbuf, sizeof testbuf, "t-logging[%u]: ",
-             (unsigned int)getpid ());
-@@ -169,7 +195,10 @@
-   logbuf = log_to_string ();
-   if (strncmp (logbuf, testbuf, strlen (testbuf))
-       || strcmp (logbuf+strlen (testbuf), "first log\n"))
--    fail ("log_with_pid test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_with_pid test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- 
-   log_info ("This is log line 1\nand 2\nand 3\n");
-@@ -178,7 +207,10 @@
-       || strcmp (logbuf+strlen (testbuf), ("This is log line 1\n"
-                                            "and 2\n"
-                                            "and 3\n")))
--    fail ("log_with_pid test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_with_pid test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
- }
- 
-@@ -186,18 +218,29 @@
- static void
- check_log_error (void)
- {
--  char *logbuf;
-+  char *logbuf = NULL;
- 
-   if (log_get_errorcount (0))
--    fail ("log_get_errorcount() != 0 at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_get_errorcount() != 0 at line %d\n", __LINE__);
-+    }
- 
-   log_error ("Hola, something went wrong\n");
-   if (log_get_errorcount (0) != 1)
--    fail ("log_get_errorcount() != 1 at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_get_errorcount() != 1 at line %d\n", __LINE__);
-+    }
-+
-   logbuf = log_to_string ();
-   if (strcmp (logbuf, "t-logging: Hola, something went wrong\n"))
--    fail ("log_info test failed at line %d\n", __LINE__);
-+    {
-+      free (logbuf); logbuf = NULL;
-+      fail ("log_info test failed at line %d\n", __LINE__);
-+    }
-   free (logbuf);
-+
-   if (log_get_errorcount (0) != 1)
-     fail ("log_get_errorcount() != 1 at line %d\n", __LINE__);
-   if (log_get_errorcount (1) != 1)  /* note: clear returns old value.  */
-@@ -227,7 +270,7 @@
-         case 'v': verbose++; break;
-         case 'd': debug++; break;
-         default : pargs.err = ARGPARSE_PRINT_ERROR; break;
--	}
-+        }
-     }
-   gpgrt_argparse (NULL, &pargs, NULL);
- 
diff --git a/patch/guile3.patch b/patch/guile3.patch
deleted file mode 100644
index 006b49248..000000000
--- a/patch/guile3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch starts fixing some issues with Guile 3 and JIT.
-# JIT does not work yet. Configure with --disable-jit.
---- libguile/jit.c
-+++ libguile/jit.c
-@@ -42,6 +42,10 @@
- 
- #include "jit.h"
- 
-+#if defined(__APPLE__)
-+# include <TargetConditionals.h>
-+# include <pthread.h>
-+#endif
- 
- 
- 
-@@ -292,6 +300,37 @@
- #define LENGTH_DOP3(a,b,c) 3
- #define LENGTH_DOP4(a,b,c,d) 4
- 
-+#define GUILE_UNUSED(x) ((void)(x))
-+
-+inline int
-+apple_mmap_write (void *base, size_t len)
-+{
-+  GUILE_UNUSED(base); GUILE_UNUSED(len);
-+#if defined(TARGET_OSX)
-+  if (__builtin_available(macOS 11, *) &&
-+    pthread_jit_write_protect_supported_np())
-+      return pthread_jit_write_protect_np(false);
-+  else
-+#endif
-+    return 0;
-+}
-+
-+inline int
-+apple_mmap_execute (void *base, size_t len)
-+{
-+  GUILE_UNUSED(base); GUILE_UNUSED(len);
-+#if defined(TARGET_OSX)
-+  if (__builtin_available(macOS 11, *) &&
-+    pthread_jit_write_protect_supported_np()) {
-+      int ret = pthread_jit_write_protect_np(true);
-+      sys_icache_invalidate(base, len);
-+      return ret;
-+	}
-+  else
-+#endif
-+    return 0;
-+}
-+
- static const uint8_t op_lengths[256] = {
- #define OP_LENGTH(code, cname, name, arity) LENGTH_##arity,
- FOR_EACH_VM_OPERATION(OP_LENGTH)
-@@ -1338,9 +1375,17 @@
-   ret->used = 0;
-   ret->size = size;
-   ret->prev = prev;
-+
-+#if defined(TARGET_OSX) && defined(MAP_JIT)
-+  /* MAP_JIT will succeed, even with W+X */
-+  ret->base = mmap (NULL, ret->size,
-+                    PROT_EXEC | PROT_READ | PROT_WRITE,
-+                    MAP_JIT | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+#else
-   ret->base = mmap (NULL, ret->size,
-                     PROT_EXEC | PROT_READ | PROT_WRITE,
-                     MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+#endif
- 
-   if (ret->base == MAP_FAILED)
-     {
-@@ -1372,8 +1417,12 @@
- 
-       uint8_t *ret = jit_address (j->jit);
- 
-+      apple_mmap_write(arena->base, arena->size);
-+
-       emit (j);
- 
-+      apple_mmap_execute(arena->base, arena->size);
-+
-       size_t size;
-       if (!jit_has_overflow (j->jit) && jit_end (j->jit, &size))
-         {
diff --git a/patch/hiredis.patch b/patch/hiredis.patch
deleted file mode 100644
index 13dd78d80..000000000
--- a/patch/hiredis.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Hiredis.
---- Makefile
-+++ Makefile
-@@ -21,13 +21,13 @@
- HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
- 
- # Installation related variables and target
--PREFIX?=/usr/local
--INCLUDE_PATH?=include/hiredis
--LIBRARY_PATH?=lib
--PKGCONF_PATH?=pkgconfig
--INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
--INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
--INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
-+PREFIX ?= /usr/local
-+INCLUDE_PATH ?= $(PREFIX)/include
-+LIBRARY_PATH ?= $(PREFIX)/lib
-+PKGCONF_PATH ?= $(LIBRARY_PATH)/pkgconfig
-+INSTALL_INCLUDE_PATH = $(DESTDIR)$(INCLUDE_PATH)/hiredis
-+INSTALL_LIBRARY_PATH = $(DESTDIR)$(LIBRARY_PATH)
-+INSTALL_PKGCONF_PATH = $(DESTDIR)$(PKGCONF_PATH)
- 
- # redis-server configuration used for testing
- REDIS_PORT=56379
-@@ -41,11 +41,8 @@
- endef
- export REDIS_TEST_CONFIG
- 
--# Fallback to gcc when $CC is not in $PATH.
--CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
--CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
- OPTIMIZATION?=-O3
--WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
-+WARNINGS=-Wall
- DEBUG_FLAGS?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
- REAL_LDFLAGS=$(LDFLAGS)
-@@ -98,8 +95,8 @@
- ifeq ($(uname_S),Darwin)
-   DYLIBSUFFIX=dylib
-   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
--  DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
--  SSL_DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) -o $(SSL_DYLIBNAME) $(LDFLAGS) $(SSL_LDFLAGS)
-+  DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-+  SSL_DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) -o $(SSL_DYLIBNAME) $(LDFLAGS) $(SSL_LDFLAGS)
-   DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
- endif
- 
-@@ -234,8 +231,8 @@
- 	@echo "Generating $@ for pkgconfig..."
- 	@echo prefix=$(PREFIX) > $@
- 	@echo exec_prefix=\$${prefix} >> $@
--	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
--	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-+	@echo libdir=$(LIBRARY_PATH) >> $@
-+	@echo includedir=$(INCLUDE_PATH) >> $@
- 	@echo >> $@
- 	@echo Name: hiredis >> $@
- 	@echo Description: Minimalistic C client library for Redis. >> $@
-@@ -247,8 +244,8 @@
- 	@echo "Generating $@ for pkgconfig..."
- 	@echo prefix=$(PREFIX) > $@
- 	@echo exec_prefix=\$${prefix} >> $@
--	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
--	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-+	@echo libdir=$(LIBRARY_PATH) >> $@
-+	@echo includedir=$(INCLUDE_PATH) >> $@
- 	@echo >> $@
- 	@echo Name: hiredis_ssl >> $@
- 	@echo Description: SSL Support for hiredis. >> $@
-@@ -297,7 +294,7 @@
- 	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
- 
- coverage: gcov
--	make check
-+	$(MAKE) check
- 	mkdir -p tmp/lcov
- 	lcov -d . -c -o tmp/lcov/hiredis.info
- 	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
diff --git a/patch/iconv.patch b/patch/iconv.patch
deleted file mode 100644
index 2d03929dd..000000000
--- a/patch/iconv.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with libiconv.
---- src/iconv.c
-+++ src/iconv.c
-@@ -465,7 +465,7 @@
- 
- /* Auxiliary variables for subst_uc_to_mb_fallback. */
- /* Converter from locale encoding to target encoding. */
--static iconv_t subst_uc_to_mb_cd;
-+static iconv_t subst_uc_to_mb_cd = (iconv_t)(-1);
- /* Buffer of size ilseq_unicode_subst_size*4. */
- static char* subst_uc_to_mb_temp_buffer;
- 
-@@ -504,7 +504,7 @@
- 
- /* Auxiliary variables for subst_mb_to_wc_fallback. */
- /* Converter from locale encoding to wchar_t. */
--static iconv_t subst_mb_to_wc_cd;
-+static iconv_t subst_mb_to_wc_cd = (iconv_t)(-1);
- /* Buffer of size ilseq_byte_subst_size. */
- static wchar_t* subst_mb_to_wc_temp_buffer;
- 
-@@ -546,7 +546,7 @@
- 
- /* Auxiliary variables for subst_wc_to_mb_fallback. */
- /* Converter from locale encoding to target encoding. */
--static iconv_t subst_wc_to_mb_cd;
-+static iconv_t subst_wc_to_mb_cd = (iconv_t)(-1);
- /* Buffer of size ilseq_wchar_subst_size*4.
-    Hardcode factor 4, because MB_LEN_MAX is not reliable on some platforms. */
- static char* subst_wc_to_mb_temp_buffer;
-@@ -591,7 +591,7 @@
- 
- /* Auxiliary variables for subst_mb_to_mb_fallback. */
- /* Converter from locale encoding to target encoding. */
--static iconv_t subst_mb_to_mb_cd;
-+static iconv_t subst_mb_to_mb_cd = (iconv_t)(-1);
- /* Buffer of size ilseq_byte_subst_size*4. */
- static char* subst_mb_to_mb_temp_buffer;
- 
-@@ -836,12 +836,15 @@
- 
- /* ========================================================================= */
- 
-+/* Be sure the handle is closed on exit when destructors are available */
-+static iconv_t std_cd = (iconv_t)(-1);
-+static iconv_t tmp_cd = (iconv_t)(-1);
-+
- int main (int argc, char* argv[])
- {
-   const char* fromcode = NULL;
-   const char* tocode = NULL;
-   int do_list = 0;
--  iconv_t cd;
-   struct iconv_fallbacks fallbacks;
-   struct iconv_hooks hooks;
-   int i;
-@@ -1015,15 +1018,15 @@
-       fromcode = "char";
-     if (tocode == NULL)
-       tocode = "char";
--    cd = iconv_open(tocode,fromcode);
--    if (cd == (iconv_t)(-1)) {
--      if (iconv_open("UCS-4",fromcode) == (iconv_t)(-1))
-+    std_cd = iconv_open(tocode,fromcode);
-+    if (std_cd == (iconv_t)(-1)) {
-+      if ((tmp_cd = iconv_open("UCS-4",fromcode)) == (iconv_t)(-1))
-         error(0,0,
-               /* TRANSLATORS: An error message.
-                  The placeholder expands to the encoding name, specified through --from-code.  */
-               _("conversion from %s unsupported"),
-               fromcode);
--      else if (iconv_open(tocode,"UCS-4") == (iconv_t)(-1))
-+      else if ((tmp_cd = iconv_open(tocode,"UCS-4")) == (iconv_t)(-1))
-         error(0,0,
-               /* TRANSLATORS: An error message.
-                  The placeholder expands to the encoding name, specified through --to-code.  */
-@@ -1085,15 +1088,15 @@
-       fallbacks.wc_to_mb_fallback =
-         (ilseq_wchar_subst != NULL ? subst_wc_to_mb_fallback : NULL);
-       fallbacks.data = NULL;
--      iconvctl(cd, ICONV_SET_FALLBACKS, &fallbacks);
-+      iconvctl(std_cd, ICONV_SET_FALLBACKS, &fallbacks);
-     }
-     /* Set up hooks for updating the line and column position. */
-     hooks.uc_hook = update_line_column;
-     hooks.wc_hook = NULL;
-     hooks.data = NULL;
--    iconvctl(cd, ICONV_SET_HOOKS, &hooks);
-+    iconvctl(std_cd, ICONV_SET_HOOKS, &hooks);
-     if (i == argc)
--      status = convert(cd,fileno(stdin),
-+      status = convert(std_cd,fileno(stdin),
-                        /* TRANSLATORS: A filename substitute denoting standard input.  */
-                        _("(stdin)"));
-     else {
-@@ -1111,12 +1114,13 @@
-                 infilename);
-           status = 1;
-         } else {
--          status |= convert(cd,fileno(infile),infilename);
-+          status |= convert(std_cd,fileno(infile),infilename);
-           fclose(infile);
-         }
-       }
-     }
--    iconv_close(cd);
-+    iconv_close(std_cd);
-+    std_cd = (iconv_t)(-1);
-   }
-   if (ferror(stdout) || fclose(stdout)) {
-     error(0,0,
-@@ -1126,3 +1130,26 @@
-   }
-   exit(status);
- }
-+
-+/* Leak check tooling like Valgrind and Asan */
-+#if defined(__GNUC__) || defined(__clang__)
-+__attribute__((destructor))
-+static void
-+do_cleanup (void)
-+{
-+  if (std_cd != (iconv_t)(-1))
-+    iconv_close(std_cd);
-+  if (tmp_cd != (iconv_t)(-1))
-+    iconv_close(tmp_cd);
-+  if (subst_mb_to_uc_cd != (iconv_t)(-1))
-+    iconv_close(subst_mb_to_uc_cd);
-+  if (subst_uc_to_mb_cd != (iconv_t)(-1))
-+    iconv_close(subst_uc_to_mb_cd);
-+  if (subst_mb_to_wc_cd != (iconv_t)(-1))
-+    iconv_close(subst_mb_to_wc_cd);
-+  if (subst_wc_to_mb_cd != (iconv_t)(-1))
-+    iconv_close(subst_wc_to_mb_cd);
-+  if (subst_mb_to_mb_cd != (iconv_t)(-1))
-+    iconv_close(subst_mb_to_mb_cd);
-+}
-+#endif
---- tests/test-shiftseq.c
-+++ tests/test-shiftseq.c
-@@ -58,8 +58,13 @@
-     */
-     if (!(r == (size_t)(-1) && errno == EILSEQ
-           && inptr - input == 1 && outptr - buf == 0))
-+    {
-+      iconv_close(cd);
-       abort();
-+    }
-   }
-+  if (cd != (iconv_t)(-1))
-+    iconv_close(cd);
- }
- 
- void main2 (void)
-@@ -92,7 +97,10 @@
-     */
-     if (!(r == (size_t)(-1) && errno == EINVAL
-           && inptr - input == 1 && outptr - buf == 0))
-+    {
-+      iconv_close(cd);
-       abort();
-+    }
- 
-     inleft = input + 20 - inptr;
-     r = iconv (cd, (ICONV_CONST char **) &inptr, &inleft, &outptr, &outleft);
-@@ -106,8 +114,13 @@
-     */
-     if (!(r == (size_t)(-1) && errno == EILSEQ
-           && inptr - input == 1 && outptr - buf == 0))
-+    {
-+      iconv_close(cd);
-       abort();
-+    }
-   }
-+  if (cd != (iconv_t)(-1))
-+    iconv_close(cd);
- }
- 
- int main ()
---- tests/test-to-wchar.c
-+++ tests/test-to-wchar.c
-@@ -44,8 +44,14 @@
-                       &outptr, &outbytesleft);
- 
-     if (!(r == (size_t)(-1) && errno == EINVAL))
-+    {
-+      iconv_close(cd);
-       abort ();
-+    }
-   }
- 
-+  if (cd != (iconv_t)(-1))
-+    iconv_close(cd);
-+
-   return 0;
- }
- 
---- srclib/xalloc-oversized.h
-+++ srclib/xalloc-oversized.h
-@@ -27,6 +27,7 @@
-    By gnulib convention, SIZE_MAX represents overflow in size
-    calculations, so the conservative size_t-based dividend to use here
-    is SIZE_MAX - 1.  */
-+#undef xalloc_oversized
- #define __xalloc_oversized(n, s) \
-   ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
- 
-@@ -42,9 +43,11 @@
-    function, so that it works correctly even when SIZE_MAX < N.  */
- 
- #if 7 <= __GNUC__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
- #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) \
-    (__builtin_constant_p (n) && __builtin_constant_p (s) \
-     ? __xalloc_oversized (n, s) \
-@@ -54,6 +57,7 @@
- /* Other compilers use integer division; this may be slower but is
-    more portable.  */
- #else
-+# undef xalloc_oversized
- # define xalloc_oversized(n, s) __xalloc_oversized (n, s)
- #endif
- 
diff --git a/patch/icu.patch b/patch/icu.patch
deleted file mode 100644
index 7a3462a25..000000000
--- a/patch/icu.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with ICU.
---- source/tools/gensprep/store.c
-+++ source/tools/gensprep/store.c
-@@ -412,7 +412,7 @@
-         int16_t delta = (int16_t)((int32_t)codepoint - (int16_t) mapping[0]);
-         if(delta >= SPREP_DELTA_RANGE_NEGATIVE_LIMIT && delta <= SPREP_DELTA_RANGE_POSITIVE_LIMIT){
- 
--            trieWord = delta << 2;
-+            trieWord = (int16_t)((uint16_t)delta << 2);
- 
- 
-             /* make sure that the second bit is OFF */
---- source/test/intltest/alphaindextst.cpp
-+++ source/test/intltest/alphaindextst.cpp
-@@ -697,7 +697,7 @@
-     static const UChar32 kanji[] = { 0x4E9C, 0x95C7, 0x4E00, 0x58F1 };
-     int32_t overflowIndex = immIndex->getBucketCount() - 1;
-     for(int32_t i = 0; i < UPRV_LENGTHOF(kanji); ++i) {
--        char msg[40];
-+        char msg[56+1];
-         sprintf(msg, "kanji[%d]=U+%04lX in overflow bucket", (int)i, (long)kanji[i]);
-         assertEquals(msg, overflowIndex, immIndex->getBucketIndex(UnicodeString(kanji[i]), status));
-         TEST_CHECK_STATUS;
---- source/i18n/numparse_symbols.h
-+++ source/i18n/numparse_symbols.h
-@@ -79,7 +79,7 @@
- // Exported as U_I18N_API for tests
- class U_I18N_API MinusSignMatcher : public SymbolMatcher {
-   public:
--    MinusSignMatcher() = default;  // WARNING: Leaves the object in an unusable state
-+    MinusSignMatcher() : fAllowTrailing(false) { }
- 
-     MinusSignMatcher(const DecimalFormatSymbols& dfs, bool allowTrailing);
- 
-@@ -151,7 +151,7 @@
- // Exported as U_I18N_API for tests
- class U_I18N_API PlusSignMatcher : public SymbolMatcher {
-   public:
--    PlusSignMatcher() = default;  // WARNING: Leaves the object in an unusable state
-+    PlusSignMatcher() : fAllowTrailing(false) { }
- 
-     PlusSignMatcher(const DecimalFormatSymbols& dfs, bool allowTrailing);
- 
---- source/i18n/numparse_currency.h
-+++ source/i18n/numparse_currency.h
-@@ -32,7 +32,7 @@
- // Exported as U_I18N_API for tests
- class U_I18N_API CombinedCurrencyMatcher : public NumberParseMatcher, public UMemory {
-   public:
--    CombinedCurrencyMatcher() = default;  // WARNING: Leaves the object in an unusable state
-+    CombinedCurrencyMatcher() : fUseFullCurrencyData(false) { }
- 
-     CombinedCurrencyMatcher(const CurrencySymbols& currencySymbols, const DecimalFormatSymbols& dfs,
-                             parse_flags_t parseFlags, UErrorCode& status);
---- source/i18n/calendar.cpp
-+++ source/i18n/calendar.cpp
-@@ -2350,7 +2350,7 @@
-                 break;
-             } else {
-                 min = max;
--                max <<= 1;
-+                max = (int32_t)((uint32_t)max << 1);
-                 if (max == 0) {
-                     // Field difference too large to fit into int32_t
- #if defined (U_DEBUG_CAL)
---- source/i18n/udat.cpp
-+++ source/i18n/udat.cpp
-@@ -20,6 +20,7 @@
- #include "unicode/fieldpos.h"
- #include "unicode/parsepos.h"
- #include "unicode/calendar.h"
-+#include "unicode/gregocal.h"
- #include "unicode/numfmt.h"
- #include "unicode/dtfmtsym.h"
- #include "unicode/ustring.h"
-@@ -193,7 +194,12 @@
- U_CAPI void U_EXPORT2
- udat_close(UDateFormat* format)
- {
--    delete (DateFormat*)format;
-+    // UDateFormat is a void* typedef, so format is void**.
-+    DateFormat* pFormat = static_cast<DateFormat*>(*format);
-+    if(dynamic_cast<GregorianCalendar*>(pFormat))
-+        delete dynamic_cast<GregorianCalendar*>(pFormat);
-+    else
-+        delete pFormat;
- }
- 
- U_CAPI UDateFormat* U_EXPORT2
---- source/common/ucnvscsu.cpp
-+++ source/common/ucnvscsu.cpp
-@@ -1923,7 +1923,7 @@
-         cnv->charErrorBufferLength=(int8_t)length;
- 
-         /* now output what fits into the regular target */
--        c>>=8*length; /* length was reduced by targetCapacity */
-+        c = (int32_t)((uint64_t)c>>8*length); /* length was reduced by targetCapacity */
-         switch(targetCapacity) {
-             /* each branch falls through to the next one */
-         case 3:
---- source/common/ucnvbocu.cpp
-+++ source/common/ucnvbocu.cpp
-@@ -916,7 +916,7 @@
-     }
- 
-     /* return the state for decoding the trail byte(s) */
--    return (diff<<2)|count;
-+    return (int32_t)(((uint32_t)diff<<2)|count);
- }
- 
- /**
-@@ -1356,7 +1356,7 @@
-     } else {
-         /* set the converter state back into UConverter */
-         cnv->toUnicodeStatus=(uint32_t)prev;
--        cnv->mode=(diff<<2)|count;
-+        cnv->mode=(int32_t)(((uint32_t)diff<<2)|count);
-     }
-     cnv->toULength=byteIndex;
- 
---- source/common/ucurr.cpp
-+++ source/common/ucurr.cpp
-@@ -2087,7 +2087,7 @@
-                     if (U_SUCCESS(localStatus)) {
-                         int32_t fromLength = 0;
-                         const int32_t *fromArray = ures_getIntVector(fromRes, &fromLength, &localStatus);
--                        int64_t currDate64 = (int64_t)fromArray[0] << 32;
-+                        int64_t currDate64 = (int64_t)((uint64_t)fromArray[0] << 32);
-                         currDate64 |= ((int64_t)fromArray[1] & (int64_t)INT64_C(0x00000000FFFFFFFF));
-                         fromDate = (UDate)currDate64;
-                     }
-@@ -2101,7 +2101,7 @@
-                     if (U_SUCCESS(localStatus)) {
-                         int32_t toLength = 0;
-                         const int32_t *toArray = ures_getIntVector(toRes, &toLength, &localStatus);
--                        int64_t currDate64 = (int64_t)toArray[0] << 32;
-+                        int64_t currDate64 = (int64_t)((uint64_t)toArray[0] << 32);
-                         currDate64 |= ((int64_t)toArray[1] & (int64_t)INT64_C(0x00000000FFFFFFFF));
-                         toDate = (UDate)currDate64;
-                     }
-@@ -2296,7 +2296,7 @@
-                 UResourceBundle *fromRes = ures_getByKey(currencyRes, "from", NULL, &localStatus);
-                 const int32_t *fromArray = ures_getIntVector(fromRes, &fromLength, &localStatus);
- 
--                int64_t currDate64 = (int64_t)fromArray[0] << 32;
-+                int64_t currDate64 = (int64_t)((uint64_t)fromArray[0] << 32);
-                 currDate64 |= ((int64_t)fromArray[1] & (int64_t)INT64_C(0x00000000FFFFFFFF));
-                 UDate fromDate = (UDate)currDate64;
- 
-@@ -2306,7 +2306,7 @@
-                     UResourceBundle *toRes = ures_getByKey(currencyRes, "to", NULL, &localStatus);
-                     const int32_t *toArray = ures_getIntVector(toRes, &toLength, &localStatus);
- 
--                    currDate64 = (int64_t)toArray[0] << 32;
-+                    currDate64 = (int64_t)((uint64_t)toArray[0] << 32);
-                     currDate64 |= ((int64_t)toArray[1] & (int64_t)INT64_C(0x00000000FFFFFFFF));
-                     UDate toDate = (UDate)currDate64;
- 
-@@ -2420,7 +2420,7 @@
-                     UResourceBundle *fromRes = ures_getByKey(currencyRes, "from", NULL, &localStatus);
-                     const int32_t *fromArray = ures_getIntVector(fromRes, &fromLength, &localStatus);
- 
--                    int64_t currDate64 = (int64_t)fromArray[0] << 32;
-+                    int64_t currDate64 = (int64_t)((uint64_t)fromArray[0] << 32);
-                     currDate64 |= ((int64_t)fromArray[1] & (int64_t)INT64_C(0x00000000FFFFFFFF));
-                     UDate fromDate = (UDate)currDate64;
- 
-@@ -2430,7 +2430,7 @@
-                         UResourceBundle *toRes = ures_getByKey(currencyRes, "to", NULL, &localStatus);
-                         const int32_t *toArray = ures_getIntVector(toRes, &toLength, &localStatus);
- 
--                        currDate64 = (int64_t)toArray[0] << 32;
-+                        currDate64 = (int64_t)((uint64_t)toArray[0] << 32);
-                         currDate64 |= ((int64_t)toArray[1] & (int64_t)INT64_C(0x00000000FFFFFFFF));
-                         UDate toDate = (UDate)currDate64;
- 
---- source/common/uloc_tag.cpp
-+++ source/common/uloc_tag.cpp
-@@ -2042,7 +2042,9 @@
-         *status = U_MEMORY_ALLOCATION_ERROR;
-         return NULL;
-     }
--    uprv_memcpy(tagBuf, tag, tagLen);
-+    // src and dest cannot be NULL
-+    if (tagBuf && tag)
-+      uprv_memcpy(tagBuf, tag, tagLen);
-     *(tagBuf + tagLen) = 0;
- 
-     /* create a ULanguageTag */
diff --git a/patch/libassuan.patch b/patch/libassuan.patch
deleted file mode 100644
index 0e6470f0f..000000000
--- a/patch/libassuan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tests/Makefile.in
-+++ tests/Makefile.in
-@@ -576,6 +576,10 @@
- check-TESTS: $(TESTS)
- 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
-+	libassuan_libdir=`dirname $$PWD`/src/.libs; \
-+	LD_LIBRARY_PATH=`echo "$$libassuan_libdir:$$LD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	DYLD_LIBRARY_PATH=`echo "$$libassuan_libdir:$$DYLD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	export LD_LIBRARY_PATH; export DYLD_LIBRARY_PATH; \
- 	list=' $(TESTS) '; \
- 	$(am__tty_colors); \
- 	if test -n "$$list"; then \
diff --git a/patch/libffi.patch b/patch/libffi.patch
deleted file mode 100644
index ac2029bb9..000000000
--- a/patch/libffi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with libffi.
---- src/x86/ffi64.c
-+++ src/x86/ffi64.c
-@@ -537,6 +537,8 @@
- 		      void *codeloc)
- {
-   volatile unsigned short *tramp;
-+  unsigned short *tramp_nv;
-+  unsigned long t1, t2;
- 
-   /* Sanity check on the cif ABI.  */
-   {
-@@ -546,13 +548,24 @@
-   }
- 
-   tramp = (volatile unsigned short *) &closure->tramp[0];
-+  tramp_nv = (unsigned short *) &closure->tramp[0];
- 
-+#if 0
-   tramp[0] = 0xbb49;		/* mov <code>, %r11	*/
-   *((unsigned long long * volatile) &tramp[1])
-     = (unsigned long) ffi_closure_unix64;
-   tramp[5] = 0xba49;		/* mov <data>, %r10	*/
-   *((unsigned long long * volatile) &tramp[6])
-     = (unsigned long) codeloc;
-+#endif
-+
-+  tramp[0] = 0xbb49;
-+  t1 = (unsigned long) ffi_closure_unix64;
-+  memcpy(&tramp_nv[1], &t1, sizeof(t1));
-+
-+  tramp[5] = 0xba49;
-+  t2 = (unsigned long) codeloc;
-+  memcpy(&tramp_nv[6], &t2, sizeof(t2));
- 
-   /* Set the carry bit iff the function uses any sse registers.
-      This is clc or stc, together with the first byte of the jmp.  */
-@@ -564,6 +577,10 @@
-   closure->fun = fun;
-   closure->user_data = user_data;
- 
-+#ifdef __GNUC__
-+  asm volatile ("" : : : "memory");
-+#endif
-+
-   return FFI_OK;
- }
- 
diff --git a/patch/libgcrypt-darwin.patch b/patch/libgcrypt-darwin.patch
deleted file mode 100644
index 5e371ef87..000000000
--- a/patch/libgcrypt-darwin.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GnuPG on Apple M1.
-#
-# This patch is a hack. The module should have exported symbols with
-# double underscore names, like __gcry_mpih_add_n. However, the symbols
-# were not wrapped in C_SYMBOL_NAME macro so they only got the single
-# underscore name. Later, GnuPG could not locate the symbols because GnuPG
-# was trying to link to the double underscore names. To fix it and retain
-# compatibility, both the single and double underscore names are exported.
-#
-# According to nm, both symbols are exported (as expected):
-#     % nm /usr/local/lib/libgcrypt.20.dylib | grep gcry_mpih_add_n
-#     000000000007bd9c T __gcry_mpih_add_n
-#     00000000000761e8 T __gcry_mpih_add_n_cond
-#     000000000007bd9c T _gcry_mpih_add_n
-#
-# The patch also copies the ELF macro from the original code. The ELF
-# macro is not needed on Darwin since Darwin does not use ELF. It
-# can be deleted and everything will work just fine.
-#
-# Also see https://dev.gnupg.org/T5157 and https://dev.gnupg.org/T5370
---- mpi/aarch64/mpih-add1.S
-+++ mpi/aarch64/mpih-add1.S
-@@ -36,7 +36,13 @@
- 
- .globl _gcry_mpih_add_n
- ELF(.type  _gcry_mpih_add_n,%function)
-+.globl __gcry_mpih_add_n
-+ELF(.type  __gcry_mpih_add_n,%function)
-+
-+.align 2
-+
- _gcry_mpih_add_n:
-+__gcry_mpih_add_n:
- 	CFI_STARTPROC()
- 	and	w5, w3, #3;
- 	adds	xzr, xzr, xzr; /* clear carry flag */
---- mpi/aarch64/mpih-sub1.S
-+++ mpi/aarch64/mpih-sub1.S
-@@ -36,7 +36,13 @@
- 
- .globl _gcry_mpih_sub_n
- ELF(.type  _gcry_mpih_sub_n,%function)
-+.globl __gcry_mpih_sub_n
-+ELF(.type  __gcry_mpih_sub_n,%function)
-+
-+.align 2
-+
- _gcry_mpih_sub_n:
-+__gcry_mpih_sub_n:
- 	CFI_STARTPROC()
- 	and	w5, w3, #3;
- 	subs	xzr, xzr, xzr; /* prepare carry flag for sub */
---- mpi/aarch64/mpih-mul1.S
-+++ mpi/aarch64/mpih-mul1.S
-@@ -36,7 +36,13 @@
- 
- .globl _gcry_mpih_mul_1
- ELF(.type  _gcry_mpih_mul_1,%function)
-+.globl __gcry_mpih_mul_1
-+ELF(.type  __gcry_mpih_mul_1,%function)
-+
-+.align 2
-+
- _gcry_mpih_mul_1:
-+__gcry_mpih_mul_1:
- 	CFI_STARTPROC()
- 	and	w5, w2, #3;
- 	mov	x4, xzr;
---- mpi/aarch64/mpih-mul2.S
-+++ mpi/aarch64/mpih-mul2.S
-@@ -36,7 +36,13 @@
- 
- .globl _gcry_mpih_addmul_1
- ELF(.type  _gcry_mpih_addmul_1,%function)
-+.globl __gcry_mpih_addmul_1
-+ELF(.type  __gcry_mpih_addmul_1,%function)
-+
-+.align 2
-+
- _gcry_mpih_addmul_1:
-+__gcry_mpih_addmul_1:
- 	CFI_STARTPROC()
- 	and	w5, w2, #3;
- 	mov	x6, xzr;
---- mpi/aarch64/mpih-mul3.S
-+++ mpi/aarch64/mpih-mul3.S
-@@ -36,7 +36,13 @@
- 
- .globl _gcry_mpih_submul_1
- ELF(.type  _gcry_mpih_submul_1,%function)
-+.globl __gcry_mpih_submul_1
-+ELF(.type  __gcry_mpih_submul_1,%function)
-+
-+.align 2
-+
- _gcry_mpih_submul_1:
-+__gcry_mpih_submul_1:
- 	CFI_STARTPROC()
- 	and	w5, w2, #3;
- 	mov	x7, xzr;
diff --git a/patch/libgcrypt.patch b/patch/libgcrypt.patch
deleted file mode 100644
index a37ed7f7a..000000000
--- a/patch/libgcrypt.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GnuPG.
-#
-# The mpi/mpiutil.c changes avoid memory leaks on exit so tools like
-# Asan don't produce findings. The change also avoids the memory manager
-# on startup and turns _gcry_mpi_init() into a nop. Also see
-# https://dev.gnupg.org/T4499.
-#
-# The random change was shamelessly ripped from MacPorts at
-# https://github.com/macports/macports-ports/tree/master/devel/libgcrypt
-#
-# The Makefile.in changes allow the self tests to run on Apple SIP
-# machines. Also see https://dev.gnupg.org/T5159.
---- mpi/mpiutil.c
-+++ mpi/mpiutil.c
-@@ -43,10 +43,21 @@
- #endif
- 
- 
--/* Constants allocated right away at startup.  */
--static gcry_mpi_t constants[MPI_NUMBER_OF_CONSTANTS];
--
-+/* Fixed constants allocated statically.  */
-+static mpi_limb_t constant_limbs[MPI_NUMBER_OF_CONSTANTS] =
-+{
-+  0, 1, 2, 3, 4, 8
-+};
- 
-+static struct gcry_mpi constants[MPI_NUMBER_OF_CONSTANTS] =
-+{
-+  /* [MPI_C_ZERO]  = */ { 1, 0, 0, (16 | 32), &constant_limbs[0] },
-+  /* [MPI_C_ONE]   = */ { 1, 1, 0, (16 | 32), &constant_limbs[1] },
-+  /* [MPI_C_TWO]   = */ { 1, 1, 0, (16 | 32), &constant_limbs[2] },
-+  /* [MPI_C_THREE] = */ { 1, 1, 0, (16 | 32), &constant_limbs[3] },
-+  /* [MPI_C_FOUR]  = */ { 1, 1, 0, (16 | 32), &constant_limbs[4] },
-+  /* [MPI_C_EIGHT] = */ { 1, 1, 0, (16 | 32), &constant_limbs[5] },
-+};
- 
- const char *
- _gcry_mpi_get_hw_config (void)
-@@ -60,25 +72,6 @@
- gcry_err_code_t
- _gcry_mpi_init (void)
- {
--  int idx;
--  unsigned long value;
--
--  for (idx=0; idx < MPI_NUMBER_OF_CONSTANTS; idx++)
--    {
--      switch (idx)
--        {
--        case MPI_C_ZERO:  value = 0; break;
--        case MPI_C_ONE:   value = 1; break;
--        case MPI_C_TWO:   value = 2; break;
--        case MPI_C_THREE: value = 3; break;
--        case MPI_C_FOUR:  value = 4; break;
--        case MPI_C_EIGHT: value = 8; break;
--        default: log_bug ("invalid mpi_const selector %d\n", idx);
--        }
--      constants[idx] = mpi_alloc_set_ui (value);
--      constants[idx]->flags = (16|32);
--    }
--
-   return 0;
- }
- 
-@@ -774,7 +767,5 @@
- {
-   if ((int)no < 0 || no > MPI_NUMBER_OF_CONSTANTS)
-     log_bug("invalid mpi_const selector %d\n", no);
--  if (!constants[no])
--    log_bug("MPI subsystem not initialized\n");
--  return constants[no];
-+  return &constants[no];
- }
---- random/rndlinux.c
-+++ random/rndlinux.c
-@@ -48,6 +48,10 @@
- #endif
- #endif
- 
-+#ifdef __APPLE__
-+# include <sys/random.h>
-+#endif
-+
- #include "types.h"
- #include "g10lib.h"
- #include "rand-internal.h"
---- tests/Makefile.in
-+++ tests/Makefile.in
-@@ -942,6 +942,10 @@
- check-TESTS: $(TESTS)
- 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
-+	gcrypt_libdir=`dirname $$PWD`/src/.libs; \
-+	LD_LIBRARY_PATH=`echo "$$gcrypt_libdir:$$LD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	DYLD_LIBRARY_PATH=`echo "$$gcrypt_libdir:$$DYLD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	export LD_LIBRARY_PATH; export DYLD_LIBRARY_PATH; \
- 	list=' $(TESTS) '; \
- 	$(am__tty_colors); \
- 	if test -n "$$list"; then \
diff --git a/patch/libgsl.patch b/patch/libgsl.patch
deleted file mode 100644
index e50c6a5d6..000000000
--- a/patch/libgsl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- spmatrix/test_complex_source.c.orig	2020-08-28 23:30:41.817232247 -0400
-+++ spmatrix/test_complex_source.c	2020-08-28 23:32:22.794874295 -0400
-@@ -490,9 +490,13 @@
-                       GSL_REAL(aij)*GSL_REAL(xj) - GSL_IMAG(aij)*GSL_IMAG(xj),
-                       GSL_IMAG(aij)*GSL_REAL(xj) + GSL_REAL(aij)*GSL_IMAG(xj));
- 
--      if (GSL_REAL(bij) != GSL_REAL(cij) ||
--          GSL_IMAG(bij) != GSL_IMAG(cij))
--        status = 1;
-+      gsl_test_rel(GSL_REAL(bij), GSL_REAL(cij), 10.0 * GSL_DBL_EPSILON,
-+                   NAME (gsl_spmatrix) "_scale_columns[%zu,%zu](%s) real",
-+                   M, N, FUNCTION (gsl_spmatrix, type) (B));
-+
-+      gsl_test_rel(GSL_IMAG(bij), GSL_IMAG(cij), 10.0 * GSL_DBL_EPSILON,
-+                   NAME (gsl_spmatrix) "_scale_columns[%zu,%zu](%s) imag",
-+                   M, N, FUNCTION (gsl_spmatrix, type) (B));
-     }
- 
-   gsl_test (status, NAME (gsl_spmatrix) "_scale_columns[%zu,%zu](%s)",
-@@ -522,9 +526,13 @@
-                       GSL_REAL(aij)*GSL_REAL(xi) - GSL_IMAG(aij)*GSL_IMAG(xi),
-                       GSL_IMAG(aij)*GSL_REAL(xi) + GSL_REAL(aij)*GSL_IMAG(xi));
- 
--      if (GSL_REAL(bij) != GSL_REAL(cij) ||
--          GSL_IMAG(bij) != GSL_IMAG(cij))
--        status = 1;
-+      gsl_test_rel(GSL_REAL(bij), GSL_REAL(cij), 10.0 * GSL_DBL_EPSILON,
-+                   NAME (gsl_spmatrix) "_scale_rows[%zu,%zu](%s) real",
-+                   M, N, FUNCTION (gsl_spmatrix, type) (B));
-+
-+      gsl_test_rel(GSL_IMAG(bij), GSL_IMAG(cij), 10.0 * GSL_DBL_EPSILON,
-+                   NAME (gsl_spmatrix) "_scale_rows[%zu,%zu](%s) imag",
-+                   M, N, FUNCTION (gsl_spmatrix, type) (B));
-     }
- 
-   gsl_test (status, NAME (gsl_spmatrix) "_scale_rows[%zu,%zu](%s)",
diff --git a/patch/libksba.patch b/patch/libksba.patch
deleted file mode 100644
index 39812d748..000000000
--- a/patch/libksba.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GnuPG.
---- src/gen-help.h
-+++ src/gen-help.h
-@@ -38,13 +38,15 @@
- #define xtrymalloc(a) malloc ((a))
-
- char *gen_help_stpcpy (char *a, const char *b);
--#define stpcpy(a, b)  gen_help_stpcpy ((a), (b))
--
--
-
-+#ifdef stpcpy
-+# undef stpcpy
-+#endif
-+#define stpcpy(a, b)  gen_help_stpcpy ((a), (b))
-
- #define DIM(v) (sizeof(v)/sizeof((v)[0]))
- #define DIMof(type,member)   DIM(((type *)0)->member)
-+
- #ifndef STR
- # define STR(v) #v
- #endif
---- src/cms.c
-+++ src/cms.c
-@@ -1393,6 +1393,9 @@
-   const unsigned char *der;
-   size_t derlen;
-
-+  /* Unitialized finding */
-+  n = n2 = NULL;
-+
-   if (!cms)
-     return NULL;
-   if (!cms->recp_info)
-@@ -1482,7 +1485,7 @@
-       /* gpgrt_log_debug ("%s: encryptedKey:\n", __func__); */
-       /* dbg_print_sexp (string); */
-     }
--  else if (!strcmp (n->name, "kekri"))
-+  else if (n && !strcmp (n->name, "kekri"))
-     return NULL; /*GPG_ERR_UNSUPPORTED_CMS_OBJ*/
-   else
-     return NULL; /*GPG_ERR_INV_CMS_OBJ*/
---- tests/Makefile.in
-+++ tests/Makefile.in
-@@ -631,6 +631,10 @@
- check-TESTS: $(TESTS)
- 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
-+	libksba_libdir=`dirname $$PWD`/src/.libs; \
-+	LD_LIBRARY_PATH=`echo "$$libksba_libdir:$$LD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	DYLD_LIBRARY_PATH=`echo "$$libksba_libdir:$$DYLD_LIBRARY_PATH" | $(SED) 's/:*$$//g'`; \
-+	export LD_LIBRARY_PATH; export DYLD_LIBRARY_PATH; \
- 	list=' $(TESTS) '; \
- 	$(am__tty_colors); \
- 	if test -n "$$list"; then \
diff --git a/patch/libxml2.patch.old b/patch/libxml2.patch.old
deleted file mode 100644
index b4584dabf..000000000
--- a/patch/libxml2.patch.old
+++ /dev/null
@@ -1,174 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton
-# This patch fixes CVE-2022-23308. Also see
-# https://github.com/GNOME/libxml2/commit/652dd12a8589
---- valid.c
-+++ valid.c
-@@ -479,6 +479,35 @@
-     return (ret);
- }
- 
-+/**
-+ * xmlValidNormalizeString:
-+ * @str: a string
-+ *
-+ * Normalize a string in-place.
-+ */
-+static void
-+xmlValidNormalizeString(xmlChar *str) {
-+    xmlChar *dst;
-+    const xmlChar *src;
-+
-+    if (str == NULL)
-+        return;
-+    src = str;
-+    dst = str;
-+
-+    while (*src == 0x20) src++;
-+    while (*src != 0) {
-+	if (*src == 0x20) {
-+	    while (*src == 0x20) src++;
-+	    if (*src != 0)
-+		*dst++ = 0x20;
-+	} else {
-+	    *dst++ = *src++;
-+	}
-+    }
-+    *dst = 0;
-+}
-+
- #ifdef DEBUG_VALID_ALGO
- static void
- xmlValidPrintNode(xmlNodePtr cur) {
-@@ -2607,6 +2636,24 @@
- 	    (xmlDictOwns(dict, (const xmlChar *)(str)) == 0)))	\
- 	    xmlFree((char *)(str));
- 
-+static int
-+xmlIsStreaming(xmlValidCtxtPtr ctxt) {
-+    xmlParserCtxtPtr pctxt;
-+
-+    if (ctxt == NULL)
-+        return(0);
-+    /*
-+     * These magic values are also abused to detect whether we're validating
-+     * while parsing a document. In this case, userData points to the parser
-+     * context.
-+     */
-+    if ((ctxt->finishDtd != XML_CTXT_FINISH_DTD_0) &&
-+        (ctxt->finishDtd != XML_CTXT_FINISH_DTD_1))
-+        return(0);
-+    pctxt = ctxt->userData;
-+    return(pctxt->parseMode == XML_PARSE_READER);
-+}
-+
- /**
-  * xmlFreeID:
-  * @not:  A id
-@@ -2650,7 +2697,7 @@
-     if (doc == NULL) {
- 	return(NULL);
-     }
--    if (value == NULL) {
-+    if ((value == NULL) || (value[0] == 0)) {
- 	return(NULL);
-     }
-     if (attr == NULL) {
-@@ -2681,7 +2728,7 @@
-      */
-     ret->value = xmlStrdup(value);
-     ret->doc = doc;
--    if ((ctxt != NULL) && (ctxt->vstateNr != 0)) {
-+    if (xmlIsStreaming(ctxt)) {
- 	/*
- 	 * Operating in streaming mode, attr is gonna disappear
- 	 */
-@@ -2820,6 +2867,7 @@
-     ID = xmlNodeListGetString(doc, attr->children, 1);
-     if (ID == NULL)
-         return(-1);
-+    xmlValidNormalizeString(ID);
- 
-     id = xmlHashLookup(table, ID);
-     if (id == NULL || id->attr != attr) {
-@@ -3009,7 +3057,7 @@
-      * fill the structure.
-      */
-     ret->value = xmlStrdup(value);
--    if ((ctxt != NULL) && (ctxt->vstateNr != 0)) {
-+    if (xmlIsStreaming(ctxt)) {
- 	/*
- 	 * Operating in streaming mode, attr is gonna disappear
- 	 */
-@@ -4028,8 +4076,7 @@
- xmlChar *
- xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
- 	     xmlNodePtr elem, const xmlChar *name, const xmlChar *value) {
--    xmlChar *ret, *dst;
--    const xmlChar *src;
-+    xmlChar *ret;
-     xmlAttributePtr attrDecl = NULL;
-     int extsubset = 0;
- 
-@@ -4070,19 +4117,7 @@
-     ret = xmlStrdup(value);
-     if (ret == NULL)
- 	return(NULL);
--    src = value;
--    dst = ret;
--    while (*src == 0x20) src++;
--    while (*src != 0) {
--	if (*src == 0x20) {
--	    while (*src == 0x20) src++;
--	    if (*src != 0)
--		*dst++ = 0x20;
--	} else {
--	    *dst++ = *src++;
--	}
--    }
--    *dst = 0;
-+    xmlValidNormalizeString(ret);
-     if ((doc->standalone) && (extsubset == 1) && (!xmlStrEqual(value, ret))) {
- 	xmlErrValidNode(ctxt, elem, XML_DTD_NOT_STANDALONE,
- "standalone: %s on %s value had to be normalized based on external subset declaration\n",
-@@ -4114,8 +4149,7 @@
- xmlChar *
- xmlValidNormalizeAttributeValue(xmlDocPtr doc, xmlNodePtr elem,
- 			        const xmlChar *name, const xmlChar *value) {
--    xmlChar *ret, *dst;
--    const xmlChar *src;
-+    xmlChar *ret;
-     xmlAttributePtr attrDecl = NULL;
- 
-     if (doc == NULL) return(NULL);
-@@ -4145,19 +4179,7 @@
-     ret = xmlStrdup(value);
-     if (ret == NULL)
- 	return(NULL);
--    src = value;
--    dst = ret;
--    while (*src == 0x20) src++;
--    while (*src != 0) {
--	if (*src == 0x20) {
--	    while (*src == 0x20) src++;
--	    if (*src != 0)
--		*dst++ = 0x20;
--	} else {
--	    *dst++ = *src++;
--	}
--    }
--    *dst = 0;
-+    xmlValidNormalizeString(ret);
-     return(ret);
- }
- 
---- result/XInclude/ns1.xml.rdr
-+++ result/XInclude/ns1.xml.rdr
-@@ -1,7 +1,7 @@
- 0 1 doc 0 0
- 1 14 #text 0 1 
-     
--1 1 ns:elem 1 0
-+1 1 xi:include 1 0
- 1 14 #text 0 1 
-     
- 1 1 elem 0 0
diff --git a/patch/lzip.patch b/patch/lzip.patch
deleted file mode 100644
index c38ed52f3..000000000
--- a/patch/lzip.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Lzip.
---- configure
-+++ configure
-@@ -23,13 +23,11 @@
- build=no
- check=no
- installdir=
--CXX=g++
--CPPFLAGS=
--CXXFLAGS='-Wall -W -O2'
--LDFLAGS=
- 
--# checking whether we are using GNU C++.
--/bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; }
-+if [ -z "${CXX}" ]; then CXX=g++; fi
-+if [ -z "${CPPFLAGS}" ]; then CPPFLAGS=''; fi
-+if [ -z "${CXXFLAGS}" ]; then CXXFLAGS='-Wall -W -O2'; fi
-+if [ -z "${LDFLAGS}" ]; then LDFLAGS=''; fi
- 
- # Loop over all args
- args=
---- Makefile.in
-+++ Makefile.in
-@@ -1,10 +1,9 @@
--
-+SHELL = /bin/sh
- DISTNAME = $(pkgname)-$(pkgversion)
- INSTALL = install
- INSTALL_PROGRAM = $(INSTALL) -m 755
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_DIR = $(INSTALL) -d -m 755
--SHELL = /bin/sh
- CAN_RUN_INSTALLINFO = $(SHELL) -c "install-info --version" > /dev/null 2>&1
- 
- objs = arg_parser.o lzip_index.o list.o encoder_base.o encoder.o \
-@@ -20,7 +19,7 @@
- all : $(progname)
- 
- $(progname) : $(objs)
--	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(objs)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(objs) $(LIBS) $(LDLIBS)
- 
- main.o : main.cc
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
diff --git a/patch/make.patch b/patch/make.patch
deleted file mode 100644
index 1dd92d1da..000000000
--- a/patch/make.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GNU Make.
---- configure.ac
-+++ configure.ac
-@@ -399,10 +399,9 @@
- #include <glob.h>
- #include <fnmatch.h>
- 
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
-    gnu glob
- # endif
- #endif],
---- dir.c
-+++ dir.c
-@@ -407,6 +407,7 @@
-     const char *name;           /* Name of the file.  */
-     size_t length;
-     short impossible;           /* This file is impossible.  */
-+    unsigned char type;
-   };
- 
- static unsigned long
-@@ -731,6 +732,9 @@
- #else
-           df->name = strcache_add_len (d->d_name, len);
- #endif
-+#ifdef _DIRENT_HAVE_D_TYPE
-+          df->type = d->d_type;
-+#endif
-           df->length = len;
-           df->impossible = 0;
-           hash_insert_at (&dir->dirfiles, df, dirfile_slot);
-@@ -1242,7 +1246,7 @@
-           d->d_namlen = len - 1;
- #endif
- #ifdef _DIRENT_HAVE_D_TYPE
--          d->d_type = DT_UNKNOWN;
-+          d->d_type = df->type;
- #endif
-           memcpy (d->d_name, df->name, len);
-           return d;
-@@ -1299,15 +1303,40 @@
- }
- #endif
- 
-+/* Similarly for lstat.  */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+#  ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+#  endif
-+# else
-+    /* We are done with the fake lstat.  Go back to the real lstat */
-+#   ifdef lstat
-+#     undef lstat
-+#   endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat().  */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+  int e;
-+  EINTRLOOP (e, lstat (path, buf));
-+  return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
-   gl->gl_opendir = open_dirstream;
-   gl->gl_readdir = read_dirstream;
-   gl->gl_closedir = free;
-+  gl->gl_lstat = local_lstat;
-   gl->gl_stat = local_stat;
--  /* We don't bother setting gl_lstat, since glob never calls it.
--     The slot is only there for compatibility with 4.4 BSD.  */
- }
- 
- void
---- tests/run_make_tests.pl
-+++ tests/run_make_tests.pl
-@@ -58,6 +58,9 @@ if ($^O eq 'VMS')
-   *CORE::GLOBAL::rmdir = \&vms_rmdir;
- }
- 
-+use FindBin;
-+use lib "$FindBin::Bin";
-+
- require "test_driver.pl";
- require "config-flags.pm";
- 
---- configure	2016-06-10
-+++ configure	2019-05-04
-@@ -11481,10 +11481,9 @@
- #include <glob.h>
- #include <fnmatch.h>
- 
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
-    gnu glob
- # endif
- #endif
diff --git a/patch/mandoc.patch b/patch/mandoc.patch
deleted file mode 100644
index d37515358..000000000
--- a/patch/mandoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Mandoc. Also see
-# https://git.alpinelinux.org/aports/tree/main/mandoc/mandoc_configure.patch
---- configure
-+++ configure
-@@ -41,7 +41,7 @@
- OSNAME=
- UTF8_LOCALE=
- 
--CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
-+CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i PATH="${PATH}" make -sf -`
- CFLAGS=
- LDADD=
- LDFLAGS=
diff --git a/patch/moe.patch b/patch/moe.patch
deleted file mode 100644
index 4ce19c250..000000000
--- a/patch/moe.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Moe.
---- configure
-+++ configure
-@@ -21,13 +21,11 @@
- infodir='$(datarootdir)/info'
- mandir='$(datarootdir)/man'
- sysconfdir='$(prefix)/etc'
--CXX=g++
--CPPFLAGS=
--CXXFLAGS='-Wall -W -O2'
--LDFLAGS=
- 
--# checking whether we are using GNU C++.
--/bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; }
-+if [ -z "${CXX}" ]; then CXX=g++; fi
-+if [ -z "${CPPFLAGS}" ]; then CPPFLAGS=''; fi
-+if [ -z "${CXXFLAGS}" ]; then CXXFLAGS='-Wall -W -O2'; fi
-+if [ -z "${LDFLAGS}" ]; then LDFLAGS=''; fi
- 
- # Loop over all args
- args=
---- Makefile.in
-+++ Makefile.in
-@@ -1,4 +1,4 @@
--
-+SHELL = /bin/sh
- DISTNAME = $(pkgname)-$(pkgversion)
- INSTALL = install
- INSTALL_PROGRAM = $(INSTALL) -m 755
diff --git a/patch/ncurses61.patch b/patch/ncurses61.patch
deleted file mode 100644
index 680715f8e..000000000
--- a/patch/ncurses61.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Ncurses 6.2.
---- progs/tic.c
-+++ progs/tic.c
-@@ -120,9 +120,11 @@
-     free_namelist(namelst);
-     _nc_leaks_dump_entry();
- #endif
--    if (tmp_fp != 0)
--	fclose(tmp_fp);
--    if (to_remove != 0) {
-+    if (tmp_fp != NULL) {
-+    fclose(tmp_fp);
-+    tmp_fp = NULL;
-+    }
-+    if (to_remove != NULL) {
- #if HAVE_REMOVE
- 	rc = remove(to_remove);
- #else
-@@ -131,6 +133,12 @@
- 	if (rc != 0)
- 	    perror(to_remove);
-     }
-+#ifdef NO_LEAKS
-+    if (log_fp != NULL) {
-+    fclose(log_fp);
-+    log_fp = NULL;
-+    }
-+#endif
- }
- 
- static void
-@@ -403,7 +411,7 @@
- }
- 
- static FILE *
--copy_input(FILE *source, const char *filename, char *alt_file)
-+copy_input(FILE **source, const char *filename, char *alt_file)
- {
-     char my_altfile[PATH_MAX];
-     FILE *result = 0;
-@@ -413,17 +421,17 @@
-     if (alt_file == 0)
- 	alt_file = my_altfile;
- 
--    if (source == 0) {
-+    if (*source == 0) {
- 	failed("copy_input (source)");
-     } else if ((target = open_tempfile(alt_file)) == 0) {
- 	failed("copy_input (target)");
-     } else {
--	clearerr(source);
-+	clearerr(*source);
- 	for (;;) {
--	    ch = fgetc(source);
--	    if (feof(source)) {
-+	    ch = fgetc(*source);
-+	    if (feof(*source)) {
- 		break;
--	    } else if (ferror(source)) {
-+	    } else if (ferror(*source)) {
- 		failed(filename);
- 	    } else if (ch == 0) {
- 		/* don't loop in case someone wants to convert /dev/zero */
-@@ -432,7 +440,7 @@
- 	    }
- 	    fputc(ch, target);
- 	}
--	fclose(source);
-+	fclose(*source); *source = NULL;
- 	/*
- 	 * rewind() does not force the target file's data to disk (not does
- 	 * fflush()...).  So open a second stream on the data and then close
-@@ -440,7 +448,7 @@
- 	 * second stream.
- 	 */
- 	result = fopen(alt_file, "r+");
--	fclose(target);
-+	fclose(target); target = NULL;
- 	to_remove = strdup(alt_file);
-     }
-     return result;
-@@ -454,7 +462,8 @@
-     int mode;
- 
-     if (!strcmp(filename, "-")) {
--	fp = copy_input(stdin, STDIN_NAME, alt_file);
-+	FILE* tp = stdin;
-+	fp = copy_input(&tp, STDIN_NAME, alt_file);
-     } else if (stat(filename, &sb) < 0) {
- 	fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno));
- 	ExitProgram(EXIT_FAILURE);
-@@ -471,7 +480,7 @@
- 	}
- 	if (mode != S_IFREG) {
- 	    if (alt_file != 0) {
--		FILE *fp2 = copy_input(fp, filename, alt_file);
-+		FILE *fp2 = copy_input(&fp, filename, alt_file);
- 		fp = fp2;
- 	    } else {
- 		fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
diff --git a/patch/nettle.patch b/patch/nettle.patch
deleted file mode 100644
index 6f74917ce..000000000
--- a/patch/nettle.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Nettle.
---- run-tests
-+++ run-tests
-@@ -44,6 +44,13 @@
-   export WINEPATH
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- # When used in make rules, we sometimes get the filenames VPATH
- # expanded, but usually not.
- find_program () {
-
---- testsuite/nettle-pbkdf2-test
-+++ testsuite/nettle-pbkdf2-test
-@@ -4,6 +4,13 @@
-   srcdir=`pwd`
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- test_pbkdf2 () {
-     password="$1"
-     salt="$2"
---- testsuite/sexp-conv-test
-+++ testsuite/sexp-conv-test
-@@ -4,6 +4,13 @@
-   srcdir=`pwd`
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- print_raw () {
-     printf "%s" "$1" > "$2"
- }
---- testsuite/pkcs1-conv-test
-+++ testsuite/pkcs1-conv-test
-@@ -4,6 +4,13 @@
-   srcdir=`pwd`
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- [ -x ../tools/pkcs1-conv$EXEEXT ] || exit 77
- 
- # Private RSA key, generated by openssl
---- examples/setup-env
-+++ examples/setup-env
-@@ -2,6 +2,13 @@
- 
- set -e
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- if [ -x rsa-keygen$EXEEXT ] ; then
-   $EMULATOR ./rsa-keygen -r rsa-decrypt$EXEEXT -o testkey || exit 1
- fi
---- examples/rsa-encrypt-test
-+++ examples/rsa-encrypt-test
-@@ -4,6 +4,13 @@
-   srcdir=`pwd`
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- data="$srcdir/nettle-benchmark.c"
- 
- if [ -x rsa-encrypt$EXEEXT ] ; then
---- examples/rsa-verify-test
-+++ examples/rsa-verify-test
-@@ -4,6 +4,13 @@
-   srcdir=`pwd`
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- data="$srcdir/nettle-benchmark.c"
- 
- if [ -x rsa-verify$EXEEXT ] ; then
---- examples/rsa-sign-test
-+++ examples/rsa-sign-test
-@@ -4,6 +4,13 @@
-   srcdir=`pwd`
- fi
- 
-+nettle_libdir=`dirname $PWD`/.lib
-+LD_LIBRARY_PATH=$nettle_libdir
-+DYLD_LIBRARY_PATH=$nettle_libdir
-+
-+export LD_LIBRARY_PATH
-+export DYLD_LIBRARY_PATH
-+
- data="$srcdir/nettle-benchmark.c"
- 
- if [ -x rsa-sign$EXEEXT ] ; then
---- examples/nettle-openssl.c
-+++ examples/nettle-openssl.c
-@@ -374,6 +374,11 @@
-   EVP_DigestUpdate(ctx->evp, src, length);
- }
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+# define EVP_MD_CTX_new   EVP_MD_CTX_create
-+# define EVP_MD_CTX_free  EVP_MD_CTX_destroy
-+#endif
-+
- #define OPENSSL_HASH(NAME, name)					\
- static void								\
- openssl_##name##_init(void *p)						\
diff --git a/patch/ntbtls.patch b/patch/ntbtls.patch
deleted file mode 100644
index 6ee90fa7e..000000000
--- a/patch/ntbtls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with ntbTLS
-# Also see https://dev.gnupg.org/T5368
---- src/protocol.c
-+++ src/protocol.c
-@@ -687,7 +687,7 @@
-     }
-   else if (kex == KEY_EXCHANGE_ECDHE_PSK)
-     {
--      size_t zlen;
-+      size_t zlen = 0;
-
-       /* err = ecdh_calc_secret (&tls->handshake->ecdh_ctx, &zlen, */
-       /*                         p + 2, end - (p + 2)); */
diff --git a/patch/openldap.patch b/patch/openldap.patch
deleted file mode 100644
index e34fbac6c..000000000
--- a/patch/openldap.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with OpenLDAP.
---- libraries/libldap/cyrus.c
-+++ libraries/libldap/cyrus.c
-@@ -41,6 +41,10 @@
- #define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
- #endif
- 
-+#if !defined(HOST_NAME_MAX) && defined(__linux__)
-+#define HOST_NAME_MAX 64
-+#endif
-+
- #ifdef HAVE_SASL_SASL_H
- #include <sasl/sasl.h>
- #else
---- libraries/liblmdb/mdb.c
-+++ libraries/liblmdb/mdb.c
-@@ -187,10 +187,6 @@
- #define BIG_ENDIAN	__BIG_ENDIAN
- #endif
- 
--#if defined(__i386) || defined(__x86_64) || defined(_M_IX86)
--#define MISALIGNED_OK	1
--#endif
--
- #include "lmdb.h"
- #include "midl.h"
- 
-@@ -770,7 +766,7 @@
- #endif
- 		char pad[(MNAME_LEN+CACHELINE-1) & ~(CACHELINE-1)];
- 	} mt2;
--	MDB_reader	mti_readers[1];
-+	MDB_reader	mti_readers[];
- } MDB_txninfo;
- 
- 	/** Lockfile format signature: version, features and field layout */
-@@ -833,7 +829,7 @@
- 		} pb;
- 		uint32_t	pb_pages;	/**< number of overflow pages */
- 	} mp_pb;
--	indx_t		mp_ptrs[1];		/**< dynamic size */
-+	indx_t		mp_ptrs[];		/**< dynamic size */
- } MDB_page;
- 
- 	/** Size of the page header, excluding dynamic data at the end */
-@@ -916,7 +912,7 @@
- /** @} */
- 	unsigned short	mn_flags;		/**< @ref mdb_node */
- 	unsigned short	mn_ksize;		/**< key size */
--	char		mn_data[1];			/**< key and data are appended here */
-+	char		mn_data[];			/**< key and data are appended here */
- } MDB_node;
- 
- 	/** Size of the node header, excluding dynamic data at the end */
-@@ -967,9 +963,13 @@
- #else
- #if SIZE_MAX > 4294967295UL
- #define COPY_PGNO(dst,src)	do { \
--	unsigned short *s, *d;	\
--	s = (unsigned short *)&(src);	\
--	d = (unsigned short *)&(dst);	\
-+	unsigned char *s, *d;	\
-+	s = (unsigned char *)&(src);	\
-+	d = (unsigned char *)&(dst);	\
-+	*d++ = *s++;	\
-+	*d++ = *s++;	\
-+	*d++ = *s++;	\
-+	*d++ = *s++;	\
- 	*d++ = *s++;	\
- 	*d++ = *s++;	\
- 	*d++ = *s++;	\
-@@ -977,9 +977,11 @@
- } while (0)
- #else
- #define COPY_PGNO(dst,src)	do { \
--	unsigned short *s, *d;	\
--	s = (unsigned short *)&(src);	\
--	d = (unsigned short *)&(dst);	\
-+	unsigned char *s, *d;	\
-+	s = (unsigned char *)&(src);	\
-+	d = (unsigned char *)&(dst);	\
-+	*d++ = *s++;	\
-+	*d++ = *s++;	\
- 	*d++ = *s++;	\
- 	*d = *s;	\
- } while (0)
---- libraries/libldap/tls2.c
-+++ libraries/libldap/tls2.c
-@@ -37,6 +37,7 @@
- 
- #include "ldap-tls.h"
- 
-+int ldap_pvt_tls_check_hostname(LDAP *ld, void *s, const char *name_in);
- static tls_impl *tls_imp = &ldap_int_tls_impl;
- #define HAS_TLS( sb )	ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, \
- 				(void *)tls_imp->ti_sbio )
---- servers/slapd/back-mdb/back-mdb.h
-+++ servers/slapd/back-mdb/back-mdb.h
-@@ -173,11 +173,7 @@
- #define CACHELINE	64
- #endif
- 
--#if defined(__i386) || defined(__x86_64)
--#define MISALIGNED_OK	1
--#else
- #define	ALIGNER	(sizeof(size_t)-1)
--#endif
- 
- typedef struct IndexRbody {
- 	AttrInfo *ai;
diff --git a/patch/opensc.patch b/patch/opensc.patch
deleted file mode 100644
index b50e55410..000000000
--- a/patch/opensc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with OpenSC.
---- src/libopensc/pkcs15-openpgp.c
-+++ src/libopensc/pkcs15-openpgp.c
-@@ -412,14 +412,14 @@
- 	for (i = 1; i <= PGP_NUM_PRIVDO; i++) {
- 		sc_pkcs15_data_info_t dat_info;
- 		sc_pkcs15_object_t dat_obj;
--		char name[8];
--		char path[9];
-+		char name[8+10+1];
-+		char path[9+10+1];
- 		u8 content[254];
- 		memset(&dat_info, 0, sizeof(dat_info));
- 		memset(&dat_obj, 0, sizeof(dat_obj));
- 
--		snprintf(name, 8, "PrivDO%d", i);
--		snprintf(path, 9, "3F00010%d", i);
-+		snprintf(name, sizeof(name), "PrivDO%d", i);
-+		snprintf(path, sizeof(path), "3F00010%d", i);
- 
- 		/* Check if the DO can be read and is not empty. Otherwise we
- 		 * won't expose a PKCS#15 DATA object.
---- src/common/simclist.c
-+++ src/common/simclist.c
-@@ -71,8 +71,10 @@
- 
- /* disable asserts */
- #ifndef SIMCLIST_DEBUG
-+#ifndef NDEBUG
- #define NDEBUG
- #endif
-+#endif
- 
- #include <assert.h>
- 
diff --git a/patch/openssl-1.0.2.patch b/patch/openssl-1.0.2.patch
deleted file mode 100644
index 74b214d5d..000000000
--- a/patch/openssl-1.0.2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch adds Apple M1 support to OpenSSL 1.0.2u.
---- Configure
-+++ Configure
-@@ -650,6 +650,7 @@
- "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:osx64:dlfcn:darwin-shared;-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- # iPhoneOS/iOS
---- config
-+++ config
-@@ -277,6 +277,9 @@
- 	    Power*)
- 		echo "ppc-apple-darwin${VERSION}"
- 		;;
-+	    arm64*)
-+		echo "arm64-apple-darwin${VERSION}"
-+		;;
- 	    *)
- 		echo "i686-apple-darwin${VERSION}"
- 		;;
-@@ -560,6 +564,9 @@
- 	else
- 	    OUT="darwin-ppc-cc"
- 	fi ;;
-+  arm64-apple-darwin*)
-+	    OUT="darwin64-arm64-cc"
-+	    ;;
-   i?86-apple-darwin*)
- 	ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
- 	if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
diff --git a/patch/openssl-1.1.1.patch.old b/patch/openssl-1.1.1.patch.old
deleted file mode 100644
index eb52b388c..000000000
--- a/patch/openssl-1.1.1.patch.old
+++ /dev/null
@@ -1,39 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with OpenSSL 1.1.1g.
---- crypto/threads_pthread.c
-+++ crypto/threads_pthread.c
-@@ -7,6 +7,12 @@
-  * https://www.openssl.org/source/license.html
-  */
- 
-+/* https://github.com/openssl/openssl/issues/10966 */
-+#ifndef _XOPEN_SOURCE || _XOPEN_SOURCE < 500
-+# undef _XOPEN_SOURCE
-+# define _XOPEN_SOURCE 500
-+#endif
-+
- #include <openssl/crypto.h>
- #include "internal/cryptlib.h"
- 
---- crypto/rand/rand_unix.c
-+++ crypto/rand/rand_unix.c
-@@ -34,8 +34,9 @@
- #if defined(__OpenBSD__)
- # include <sys/param.h>
- #endif
--#if defined(__APPLE__)
-+#if defined(__APPLE__) && !defined(OPENSSL_NO_CCRANDOMGENERATEBYTES)
- # include <CommonCrypto/CommonRandom.h>
-+# include <CommonCrypto/CommonCryptoError.h>
- #endif
- 
- #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
-@@ -381,7 +382,7 @@
-         if (errno != ENOSYS)
-             return -1;
-     }
--#  elif defined(__APPLE__)
-+#  elif defined(__APPLE__) && !defined(OPENSSL_NO_CCRANDOMGENERATEBYTES)
-     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
- 	    return (ssize_t)buflen;
- 
diff --git a/patch/openssl.patch b/patch/openssl.patch
deleted file mode 100644
index eb52b388c..000000000
--- a/patch/openssl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with OpenSSL 1.1.1g.
---- crypto/threads_pthread.c
-+++ crypto/threads_pthread.c
-@@ -7,6 +7,12 @@
-  * https://www.openssl.org/source/license.html
-  */
- 
-+/* https://github.com/openssl/openssl/issues/10966 */
-+#ifndef _XOPEN_SOURCE || _XOPEN_SOURCE < 500
-+# undef _XOPEN_SOURCE
-+# define _XOPEN_SOURCE 500
-+#endif
-+
- #include <openssl/crypto.h>
- #include "internal/cryptlib.h"
- 
---- crypto/rand/rand_unix.c
-+++ crypto/rand/rand_unix.c
-@@ -34,8 +34,9 @@
- #if defined(__OpenBSD__)
- # include <sys/param.h>
- #endif
--#if defined(__APPLE__)
-+#if defined(__APPLE__) && !defined(OPENSSL_NO_CCRANDOMGENERATEBYTES)
- # include <CommonCrypto/CommonRandom.h>
-+# include <CommonCrypto/CommonCryptoError.h>
- #endif
- 
- #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
-@@ -381,7 +382,7 @@
-         if (errno != ENOSYS)
-             return -1;
-     }
--#  elif defined(__APPLE__)
-+#  elif defined(__APPLE__) && !defined(OPENSSL_NO_CCRANDOMGENERATEBYTES)
-     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
- 	    return (ssize_t)buflen;
- 
diff --git a/patch/openvpn.patch b/patch/openvpn.patch
deleted file mode 100644
index 3dc2a00fb..000000000
--- a/patch/openvpn.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with OpenVPN.
---- src/openvpn/tun.c
-+++ src/openvpn/tun.c
-@@ -2054,6 +2054,10 @@
- 
- #ifdef ENABLE_FEATURE_TUN_PERSIST
- 
-+#ifndef TUNSETGROUP
-+# define TUNSETGROUP  _IOW('T', 206, int)
-+#endif
-+
- void
- tuncfg(const char *dev, const char *dev_type, const char *dev_node, int persist_mode, const char *username, const char *groupname, const struct tuntap_options *options)
- {
diff --git a/patch/p11kit.patch b/patch/p11kit.patch
deleted file mode 100644
index c20efeb42..000000000
--- a/patch/p11kit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- p11-kit/lists.c
-+++ p11-kit/lists.c
-@@ -43,12 +43,20 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <stdint.h>
-+#include <limits.h>
- 
- #include "message.h"
- #include "p11-kit.h"
- #include "tool.h"
- #include "uri.h"
- 
-+#ifndef SIZE_MAX
-+# ifdef SIZE_T_MAX
-+#  define SIZE_MAX SIZE_T_MAX
-+# endif
-+#endif
-+
- int p11_kit_list_modules (int argc,
-                           char *argv[]);
- 
diff --git a/patch/parigp.patch b/patch/parigp.patch
deleted file mode 100644
index 59a29d8ea..000000000
--- a/patch/parigp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with PARI/GP.
---- config/Makefile.SH
-+++ config/Makefile.SH
-@@ -186,7 +186,7 @@
- LDFLAGS    = $LDFLAGS
- DLLD_FLAVOR  = \$(LD_FLAVOR)
- DLLD       = $DLLD \$(DLLD_FLAVOR)
--DLLDFLAGS  = $DLLDFLAGS
-+DLLDFLAGS  = $DLLDFLAGS $LDFLAGS
- EXTRADLLDFLAGS = $EXTRADLLDFLAGS
- RUNTEST    = $RUNTEST
- 
-@@ -236,8 +236,10 @@
- MT_LIBS      = $MT_LIBS
- RT_LIBS      = $RT_LIBS
- DL_LIBS      = $DL_LIBS
--DYN_LIBS     = \$(GMPLIBS) \$(DL_LIBS) \$(RT_LIBS) \$(MT_LIBS) \$(LIBS)
--STA_LIBS     = \$(GMPLIBS) \$(DL_LIBS) \$(RT_LIBS) \$(MT_LIBS) \$(LIBS)
-+EXTRALIBS    = $EXTRALIBS
-+XXX_LIBS     = $XXX_LIBS
-+DYN_LIBS     = \$(GMPLIBS) \$(DL_LIBS) \$(RT_LIBS) \$(MT_LIBS) \$(LIBS) \$(XXX_LIBS) \$(LIBS)
-+STA_LIBS     = \$(GMPLIBS) \$(DL_LIBS) \$(RT_LIBS) \$(MT_LIBS) \$(LIBS) \$(XXX_LIBS) \$(LIBS)
- 
- RM = rm -f
- MV = mv -f
---- config/get_readline
-+++ config/get_readline
-@@ -36,7 +36,7 @@
- fi
- 
- # try linking without locatelib (without -L except --with-xxx-lib)
--for tlib in "" tinfo ncurses termcap; do
-+for tlib in "" tinfow tinfo ncursesw ncurses termcap; do
-   t=$rl
-   if test -n "$tlib"; then # need a termcap compatible library?
-     eval with="\$with_${tlib}_lib"
diff --git a/patch/patch.patch b/patch/patch.patch
deleted file mode 100644
index 481434b90..000000000
--- a/patch/patch.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- tests/Makefile.in
-+++ tests/Makefile.in
-@@ -1307,7 +1307,6 @@
- 	criss-cross \
- 	crlf-handling \
- 	dash-o-append \
--	deep-directories \
- 	empty-files \
- 	false-match \
- 	fifo \
-@@ -1340,7 +1339,8 @@
- 
- XFAIL_TESTS = \
- 	dash-o-append \
--	context-format
-+	context-format \
-+	deep-directories
- 
- EXTRA_DIST = \
- 	$(TESTS) \
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -31,7 +31,6 @@
- 	criss-cross \
- 	crlf-handling \
- 	dash-o-append \
--	deep-directories \
- 	empty-files \
- 	false-match \
- 	fifo \
-@@ -64,7 +63,8 @@
- 
- XFAIL_TESTS = \
- 	dash-o-append \
--	context-format
-+	context-format \
-+	deep-directories
- 
- EXTRA_DIST = \
- 	$(TESTS) \
diff --git a/patch/patchelf.patch b/patch/patchelf.patch
deleted file mode 100644
index 56f36ad94..000000000
--- a/patch/patchelf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/patchelf.cc
-+++ src/patchelf.cc
-@@ -40,6 +40,9 @@
- 
- #include "elf.h"
- 
-+#ifndef PATCHELF_UNUSED
-+# define PATCHELF_UNUSED(x) ((void)(x))
-+#endif
- 
- static bool debugMode = false;
- 
-@@ -382,6 +385,7 @@
- {
-     unsigned char * q = (unsigned char *) p;
-     assert(q >= contents->data() && q + size <= contents->data() + contents->size());
-+    PATCHELF_UNUSED(q);
- }
- 
- 
diff --git a/patch/pcre.patch b/patch/pcre.patch
deleted file mode 100644
index 0034fa8b2..000000000
--- a/patch/pcre.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with PCRE.
-# It does not appear PCRE is going to fix the bugs.
-# https://bugs.exim.org/show_bug.cgi?id=2380
---- pcretest.c
-+++ pcretest.c
-@@ -500,7 +500,7 @@
- #if (defined (SUPPORT_PCRE8) + defined (SUPPORT_PCRE16) + \
-      defined (SUPPORT_PCRE32)) >= 2
- 
--#define CHAR_SIZE (1 << pcre_mode)
-+#define CHAR_SIZE (1U << pcre_mode)
- 
- /* There doesn't seem to be an easy way of writing these macros that can cope
- with the 3 pairs of bit sizes plus all three bit sizes. So just handle all the
-@@ -4735,7 +4735,7 @@
-         if (isdigit(*p))    /* Set copy string */
-           {
-           while(isdigit(*p)) n = n * 10 + *p++ - '0';
--          copystrings |= 1 << n;
-+          copystrings |= 1U << n;
-           }
-         else if (isalnum(*p))
-           {
-@@ -4798,7 +4798,7 @@
-         if (isdigit(*p))
-           {
-           while(isdigit(*p)) n = n * 10 + *p++ - '0';
--          getstrings |= 1 << n;
-+          getstrings |= 1U << n;
-           }
-         else if (isalnum(*p))
-           {
-@@ -5335,7 +5335,7 @@
- 
-         for (i = 0; i < 32; i++)
-           {
--          if ((copystrings & (1 << i)) != 0)
-+          if ((copystrings & (1U << i)) != 0)
-             {
-             int rc;
-             char copybuffer[256];
-@@ -5400,7 +5400,7 @@
- 
-         for (i = 0; i < 32; i++)
-           {
--          if ((getstrings & (1 << i)) != 0)
-+          if ((getstrings & (1U << i)) != 0)
-             {
-             int rc;
-             const char *substring;
---- pcre_compile.c
-+++ pcre_compile.c
-@@ -68,7 +68,7 @@
- 
- /* Macro for setting individual bits in class bitmaps. */
- 
--#define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
-+#define SETBIT(a,b) a[(b)/8] |= (1U << ((b)&7))
- 
- /* Maximum length value to check against when making sure that the integer that
- holds the compiled pattern length does not overflow. We make it a bit less than
-@@ -129,8 +129,8 @@
- 
- /* Private flags added to firstchar and reqchar. */
- 
--#define REQ_CASELESS    (1 << 0)        /* Indicates caselessness */
--#define REQ_VARY        (1 << 1)        /* Reqchar followed non-literal item */
-+#define REQ_CASELESS    (1U << 0)        /* Indicates caselessness */
-+#define REQ_VARY        (1U << 1)        /* Reqchar followed non-literal item */
- /* Negative values for the firstchar and reqchar flags */
- #define REQ_UNSET       (-2)
- #define REQ_NONE        (-1)
-@@ -3611,7 +3611,7 @@
-       if (chr > 255) break;
-       class_bitset = (pcre_uint8 *)
-         ((list_ptr == list ? code : base_end) - list_ptr[2]);
--      if ((class_bitset[chr >> 3] & (1 << (chr & 7))) != 0) return FALSE;
-+      if ((class_bitset[chr >> 3] & (1U << (chr & 7))) != 0) return FALSE;
-       break;
- 
- #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
-@@ -7456,7 +7456,7 @@
-               {
-               open_capitem *oc;
-               recno = GET2(slot, 0);
--              cd->backref_map |= (recno < 32)? (1 << recno) : 1;
-+              cd->backref_map |= (recno < 32)? (1U << recno) : 1;
-               if (recno > cd->top_backref) cd->top_backref = recno;
- 
-               /* Check to see if this back reference is recursive, that it, it
-@@ -8067,7 +8067,7 @@
-         item_hwm_offset = cd->hwm - cd->start_workspace;
-         *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
-         PUT2INC(code, 0, recno);
--        cd->backref_map |= (recno < 32)? (1 << recno) : 1;
-+        cd->backref_map |= (recno < 32)? (1U << recno) : 1;
-         if (recno > cd->top_backref) cd->top_backref = recno;
- 
-         /* Check to see if this back reference is recursive, that it, it
-@@ -8680,7 +8680,7 @@
-             op == OP_SCBRA || op == OP_SCBRAPOS)
-      {
-      int n = GET2(scode, 1+LINK_SIZE);
--     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
-+     int new_map = bracket_map | ((n < 32)? (1U << n) : 1);
-      if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE;
-      }
- 
-@@ -8808,7 +8808,7 @@
-             op == OP_SCBRA || op == OP_SCBRAPOS)
-      {
-      int n = GET2(scode, 1+LINK_SIZE);
--     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
-+     int new_map = bracket_map | ((n < 32)? (1U << n) : 1);
-      if (!is_startline(scode, new_map, cd, atomcount, inassert)) return FALSE;
-      }
- 
---- pcre_jit_compile.c
-+++ pcre_jit_compile.c
-@@ -2753,13 +2753,13 @@
- #ifdef SUPPORT_UTF
- if (common->utf && c > 65535)
-   {
--  if (bit >= (1 << 10))
-+  if (bit >= (1U << 10))
-     bit >>= 10;
-   else
-     return (bit < 256) ? ((2 << 8) | bit) : ((3 << 8) | (bit >> 8));
-   }
- #endif /* SUPPORT_UTF */
--return (bit < 256) ? ((0 << 8) | bit) : ((1 << 8) | (bit >> 8));
-+return (bit < 256) ? ((0 << 8) | bit) : ((1U << 8) | (bit >> 8));
- 
- #endif /* COMPILE_PCRE[8|16|32] */
- }
-@@ -4022,7 +4022,7 @@
- 
-   if (load_twice)
-     {
--    instruction[3] = (1 << 3) | str_ptr_ind;
-+    instruction[3] = (1U << 3) | str_ptr_ind;
-     sljit_emit_op_custom(compiler, instruction, 4);
-     }
-   }
-@@ -4036,7 +4036,7 @@
- 
-   if (load_twice)
-     {
--    instruction[4] = (1 << 3) | str_ptr_ind;
-+    instruction[4] = (1U << 3) | str_ptr_ind;
-     sljit_emit_op_custom(compiler, instruction, 5);
-     }
-   instruction[1] = 0x0f;
-@@ -4050,7 +4050,7 @@
- 
- if (load_twice)
-   {
--  instruction[3] = (1 << 3) | str_ptr_ind;
-+  instruction[3] = (1U << 3) | str_ptr_ind;
-   sljit_emit_op_custom(compiler, instruction, 4);
-   }
- 
-@@ -4071,7 +4071,7 @@
- 
- if (load_twice)
-   {
--  instruction[3] = 0xc0 | (1 << 3) | 3;
-+  instruction[3] = 0xc0 | (1U << 3) | 3;
-   sljit_emit_op_custom(compiler, instruction, 4);
-   }
- 
-@@ -4127,7 +4127,7 @@
- 
-   if (load_twice)
-     {
--    instruction[3] = (1 << 3) | str_ptr_ind;
-+    instruction[3] = (1U << 3) | str_ptr_ind;
-     sljit_emit_op_custom(compiler, instruction, 4);
-     }
-   }
-@@ -4141,7 +4141,7 @@
- 
-   if (load_twice)
-     {
--    instruction[4] = (1 << 3) | str_ptr_ind;
-+    instruction[4] = (1U << 3) | str_ptr_ind;
-     sljit_emit_op_custom(compiler, instruction, 5);
-     }
-   instruction[1] = 0x0f;
-@@ -4155,7 +4155,7 @@
- 
- if (load_twice)
-   {
--  instruction[3] = (1 << 3) | str_ptr_ind;
-+  instruction[3] = (1U << 3) | str_ptr_ind;
-   sljit_emit_op_custom(compiler, instruction, 4);
-   }
- 
-@@ -4176,7 +4176,7 @@
- 
- if (load_twice)
-   {
--  instruction[3] = 0xc0 | (1 << 3) | 3;
-+  instruction[3] = 0xc0 | (1U << 3) | 3;
-   sljit_emit_op_custom(compiler, instruction, 4);
-   }
- 
---- pcre_jit_compile.c
-+++ pcre_jit_compile.c
-@@ -3938,10 +3938,10 @@
- sljit_s32 value = (sljit_s32)chr;
- #if defined COMPILE_PCRE8
- #define SSE2_COMPARE_TYPE_INDEX 0
--return (value << 24) | (value << 16) | (value << 8) | value;
-+return (((unsigned int)value) << 24) | (((unsigned int)value) << 16) | (((unsigned int)value) << 8) | ((unsigned int)value);
- #elif defined COMPILE_PCRE16
- #define SSE2_COMPARE_TYPE_INDEX 1
--return (value << 16) | value;
-+return (((unsigned int)value) << 16) | value;
- #elif defined COMPILE_PCRE32
- #define SSE2_COMPARE_TYPE_INDEX 2
- return value;
-@@ -8507,7 +8507,7 @@
-   /* We temporarily encode the needs_control_head in the lowest bit.
-      Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
-      the same value for small signed numbers (including negative numbers). */
--  BACKTRACK_AS(bracket_backtrack)->u.framesize = (BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
-+  BACKTRACK_AS(bracket_backtrack)->u.framesize = ((unsigned int)(BACKTRACK_AS(bracket_backtrack)->u.framesize) << 1) | (needs_control_head ? 1 : 0);
-   }
- return cc + repeat_length;
- }
---- pcretest.c
-+++ pcretest.c
-@@ -4445,7 +4445,7 @@
- 
-           if (extra != NULL)
-             {
--            if (fwrite(extra->study_data, 1, true_study_size, f) <
-+            if (extra->study_data && fwrite(extra->study_data, 1, true_study_size, f) <
-                 true_study_size)
-               {
-               fprintf(outfile, "Write error on %s: %s\n", to_file,
---- sljit/sljitNativeMIPS_common.c
-+++ sljit/sljitNativeMIPS_common.c
-@@ -500,6 +500,7 @@
- 
- 	compiler->error = SLJIT_ERR_COMPILED;
- 	compiler->executable_offset = executable_offset;
-+{
- 	compiler->executable_size = (code_ptr - code) * sizeof(sljit_ins);
- 
- 	code = (sljit_ins *)SLJIT_ADD_EXEC_OFFSET(code, executable_offset);
-@@ -509,6 +510,7 @@
- 	SLJIT_CACHE_FLUSH(code, code_ptr);
- #else
- 	/* GCC workaround for invalid code generation with -O2. */
-+}
- 	sljit_cache_flush(code, code_ptr);
- #endif
- 	return code;
diff --git a/patch/perl.patch b/patch/perl.patch
deleted file mode 100644
index cfd87e8e5..000000000
--- a/patch/perl.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton
-# This patch fixes some issues with Perl 5.32.0.
---- op.c
-+++ op.c
-@@ -14836,7 +14836,7 @@
-             op_sibling_splice(parent, first, -1, NULL);
- 	op_free(entersubop);
- 
--	if (cvflags == (OP_ENTEREVAL | (1<<16)))
-+	if (cvflags == (OP_ENTEREVAL | (1U<<16)))
- 	    flags |= OPpEVAL_BYTES <<8;
- 
- 	switch (PL_opargs[opnum] & OA_CLASS_MASK) {
---- pp.c
-+++ pp.c
-@@ -32,6 +32,14 @@
- #include "reentr.h"
- #include "regcharclass.h"
- 
-+/* Inline ASM due to testing with UBsan and undefined behavior. ASM does
-+ * not suffer C rules. See https://github.com/Perl/perl5/issues/17508.
-+ * SunC added GCC inline asm support at version 12.1.
-+ */
-+#if defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER) || (__SUNPRO_C >= 0x5100)
-+# define GCC_INLINE_ASM 1
-+#endif
-+
- /* variations on pp_null */
- 
- PP(pp_stub)
-@@ -2625,7 +2633,17 @@
-     tryAMAGICbin_MG(mult_amg, AMGf_assign);
-     {
-       dPOPTOPiirl_nomg;
-+#if defined(GCC_INLINE_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(__amd64__))
-+      long int res;
-+      __asm__ ("imulq %2, %%rax;" : "=a" (res) : "a" (left), "g" (right) : "rdx", "cc" );
-+      SETi( res );
-+#elif defined(GCC_INLINE_ASM) && (defined(__i386) || defined(__i386__) || defined(__i686__))
-+      long int res;
-+      __asm__ ("imull %2, %%eax;" : "=a" (res) : "a" (left), "g" (right) : "edx", "cc" );
-+      SETi( res );
-+#else
-       SETi( left * right );
-+#endif
-       RETURN;
-     }
- }
-@@ -2644,7 +2662,7 @@
- 
-       /* avoid FPE_INTOVF on some platforms when num is IV_MIN */
-       if (value == -1)
--          value = - num;
-+          value = -(unsigned long int)num;
-       else
-           value = num / value;
-       SETi(value);
-@@ -2675,7 +2693,17 @@
-     tryAMAGICbin_MG(add_amg, AMGf_assign);
-     {
-       dPOPTOPiirl_ul_nomg;
-+#if defined(GCC_INLINE_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(__amd64__))
-+      long int res;
-+      __asm__ ("addq %2, %%rax;" : "=a" (res) : "a" (left), "g" (right) : "cc" );
-+      SETi( res );
-+#elif defined(GCC_INLINE_ASM) && (defined(__i386) || defined(__i386__) || defined(__i686__))
-+      long int res;
-+      __asm__ ("addl %2, %%eax;" : "=a" (res) : "a" (left), "g" (right) : "cc" );
-+      SETi( res );
-+#else
-       SETi( left + right );
-+#endif
-       RETURN;
-     }
- }
-@@ -2686,7 +2714,17 @@
-     tryAMAGICbin_MG(subtr_amg, AMGf_assign);
-     {
-       dPOPTOPiirl_ul_nomg;
-+#if defined(GCC_INLINE_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(__amd64__))
-+      long int res;
-+      __asm__ ("subq %2, %%rax;" : "=a" (res) : "a" (left), "g" (right) : "cc" );
-+      SETi( res );
-+#elif defined(GCC_INLINE_ASM) && (defined(__i386) || defined(__i386__) || defined(__i686__))
-+      long int res;
-+      __asm__ ("subl %2, %%eax;" : "=a" (res) : "a" (left), "g" (right) : "cc" );
-+      SETi( res );
-+#else
-       SETi( left - right );
-+#endif
-       RETURN;
-     }
- }
-@@ -2784,7 +2822,7 @@
-     {
- 	SV * const sv = TOPs;
- 	IV const i = SvIV_nomg(sv);
--	SETi(-i);
-+	SETi( -(unsigned long int)i );
- 	return NORMAL;
-     }
- }
---- sv.c
-+++ sv.c
-@@ -35,6 +35,10 @@
- # include <rms.h>
- #endif
- 
-+#ifdef __sun
-+# include <sunmath.h>
-+#endif
-+
- #ifdef __Lynx__
- /* Missing proto on LynxOS */
-   char *gconvert(double, int, int,  char *);
---- regcomp.c
-+++ regcomp.c
-@@ -20886,7 +20886,7 @@
-     ASSUME(REG_INTFLAGS_NAME_SIZE <= sizeof(flags)*8);
- 
-     for (bit=0; bit<REG_INTFLAGS_NAME_SIZE; bit++) {
--        if (flags & (1<<bit)) {
-+        if (flags & (1U<<bit)) {
-             if (!set++ && lead)
-                 Perl_re_printf( aTHX_  "%s", lead);
-             Perl_re_printf( aTHX_  "%s ", PL_reg_intflags_name[bit]);
-@@ -20910,8 +20910,8 @@
-     ASSUME(REG_EXTFLAGS_NAME_SIZE <= sizeof(flags)*8);
- 
-     for (bit=0; bit<REG_EXTFLAGS_NAME_SIZE; bit++) {
--        if (flags & (1<<bit)) {
--	    if ((1<<bit) & RXf_PMf_CHARSET) {	/* Output separately, below */
-+        if (flags & (1U<<bit)) {
-+	    if ((1U<<bit) & RXf_PMf_CHARSET) {	/* Output separately, below */
- 		continue;
- 	    }
-             if (!set++ && lead)
---- numeric.c
-+++ numeric.c
-@@ -29,6 +29,10 @@
- #define PERL_IN_NUMERIC_C
- #include "perl.h"
- 
-+#ifdef __sun
-+# include <sunmath.h>
-+#endif
-+
- #ifdef Perl_strtod
- 
- PERL_STATIC_INLINE NV
---- vms/vms.c
-+++ vms/vms.c
-@@ -11145,7 +11145,7 @@
-       sockflagsize = fdoff + 2;
-     }
-     if (fstat(fd, &sbuf.crtl_stat) == 0 && S_ISSOCK(sbuf.st_mode))
--      sockflags[fdoff] |= 1 << (fd % sizeof(unsigned int));
-+      sockflags[fdoff] |= 1U << (fd % sizeof(unsigned int));
-   }
-   return fp;
- 
-@@ -11166,7 +11166,7 @@
-     unsigned int fdoff = fd / sizeof(unsigned int);
- 
-     if (sockflagsize && fdoff < sockflagsize)
--      sockflags[fdoff] &= ~(1 << fd % sizeof(unsigned int));
-+      sockflags[fdoff] &= ~(1U << fd % sizeof(unsigned int));
-   }
-   return fclose(fp);
- }
-@@ -11193,7 +11193,7 @@
-   int bufsize = itmsz * nitm + 1;
- 
-   if (fdoff < sockflagsize &&
--      (sockflags[fdoff] | 1 << (fd % sizeof(unsigned int)))) {
-+      (sockflags[fdoff] | 1U << (fd % sizeof(unsigned int)))) {
-     if (write(fd, src, itmsz * nitm) == EOF) return EOF;
-     return nitm;
-   }
---- ext/POSIX/POSIX.xs
-+++ ext/POSIX/POSIX.xs
-@@ -19,6 +19,10 @@
- #include "perl.h"
- #include "XSUB.h"
- 
-+#ifdef __sun
-+# include <sunmath.h>
-+#endif
-+
- static int not_here(const char *s);
- 
- #if defined(PERL_IMPLICIT_SYS)
---- cpan/Compress-Raw-Zlib/zlib-src/zutil.c
-+++ cpan/Compress-Raw-Zlib/zlib-src/zutil.c
-@@ -42,70 +42,70 @@
-     }
-     switch ((int)(sizeof(uLong))) {
-     case 2:     break;
--    case 4:     flags += 1 << 2;        break;
--    case 8:     flags += 2 << 2;        break;
--    default:    flags += 3 << 2;
-+    case 4:     flags += 1U << 2;        break;
-+    case 8:     flags += 2U << 2;        break;
-+    default:    flags += 3U << 2;
-     }
-     switch ((int)(sizeof(voidpf))) {
-     case 2:     break;
--    case 4:     flags += 1 << 4;        break;
--    case 8:     flags += 2 << 4;        break;
--    default:    flags += 3 << 4;
-+    case 4:     flags += 1U << 4;        break;
-+    case 8:     flags += 2U << 4;        break;
-+    default:    flags += 3U << 4;
-     }
-     switch ((int)(sizeof(z_off_t))) {
-     case 2:     break;
--    case 4:     flags += 1 << 6;        break;
--    case 8:     flags += 2 << 6;        break;
--    default:    flags += 3 << 6;
-+    case 4:     flags += 1U << 6;        break;
-+    case 8:     flags += 2U << 6;        break;
-+    default:    flags += 3U << 6;
-     }
- #ifdef ZLIB_DEBUG
--    flags += 1 << 8;
-+    flags += 1UL << 8;
- #endif
- #if defined(ASMV) || defined(ASMINF)
--    flags += 1 << 9;
-+    flags += 1UL << 9;
- #endif
- #ifdef ZLIB_WINAPI
--    flags += 1 << 10;
-+    flags += 1UL << 10;
- #endif
- #ifdef BUILDFIXED
--    flags += 1 << 12;
-+    flags += 1UL << 12;
- #endif
- #ifdef DYNAMIC_CRC_TABLE
--    flags += 1 << 13;
-+    flags += 1UL << 13;
- #endif
- #ifdef NO_GZCOMPRESS
--    flags += 1L << 16;
-+    flags += 1UL << 16;
- #endif
- #ifdef NO_GZIP
--    flags += 1L << 17;
-+    flags += 1UL << 17;
- #endif
- #ifdef PKZIP_BUG_WORKAROUND
--    flags += 1L << 20;
-+    flags += 1UL << 20;
- #endif
- #ifdef FASTEST
--    flags += 1L << 21;
-+    flags += 1UL << 21;
- #endif
- #if defined(STDC) || defined(Z_HAVE_STDARG_H)
- #  ifdef NO_vsnprintf
--    flags += 1L << 25;
-+    flags += 1UL << 25;
- #    ifdef HAS_vsprintf_void
--    flags += 1L << 26;
-+    flags += 1UL << 26;
- #    endif
- #  else
- #    ifdef HAS_vsnprintf_void
--    flags += 1L << 26;
-+    flags += 1UL << 26;
- #    endif
- #  endif
- #else
--    flags += 1L << 24;
-+    flags += 1UL << 24;
- #  ifdef NO_snprintf
--    flags += 1L << 25;
-+    flags += 1UL << 25;
- #    ifdef HAS_sprintf_void
--    flags += 1L << 26;
-+    flags += 1UL << 26;
- #    endif
- #  else
- #    ifdef HAS_snprintf_void
--    flags += 1L << 26;
-+    flags += 1UL << 26;
- #    endif
- #  endif
- #endif
diff --git a/patch/pspp.patch b/patch/pspp.patch
deleted file mode 100644
index 4ec7a4a85..000000000
--- a/patch/pspp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure
-+++ configure
-@@ -16164,7 +16164,7 @@
- 
- 
- # Put a plausible default for CC_FOR_BUILD in Makefile.
--if test -z "$CC_FOR_BUILD"; then
-+if test "x$CC_FOR_BUILD" = "x"; then
-   if test "x$cross_compiling" = "xno"; then
-     CC_FOR_BUILD='$(CC)'
-   else
-@@ -16197,8 +16197,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pspp_cv_build_exeext" >&5
- $as_echo "$pspp_cv_build_exeext" >&6; }
-   EXEEXT_FOR_BUILD=""
--  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex
--t}
-+  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD="${pspp_cv_build_exeext}"
- fi
- 
- 
diff --git a/patch/sipwitch-rc.patch b/patch/sipwitch-rc.patch
deleted file mode 100644
index a84065e1f..000000000
--- a/patch/sipwitch-rc.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GNU SIP Witch.
---- common/voip.cpp
-+++ common/voip.cpp
-@@ -19,6 +19,9 @@
- #include <ucommon/export.h>
- #include <sipwitch/voip.h>
- 
-+// For voip::make_prack_message
-+#include <cassert>
-+
- namespace sipwitch {
- 
- static int family = AF_INET;
-@@ -133,6 +136,8 @@
-     eXosip_unlock(ctx);
- }
- 
-+// Documentation of data structures and macros at
-+// https://www.gnu.org/software/osip/doc/html/osip__message_8h-source.html
- bool voip::make_prack_message(context_t ctx, tid_t tid, msg_t *msg)
- {
-     if(!msg)
-@@ -140,7 +145,18 @@
- 
-     *msg = NULL;
-     eXosip_lock(ctx);
--    eXosip_call_build_prack(ctx, tid, msg);
-+
-+    // TODO: verify this change to fix compile error
-+    // eXosip_call_build_prack(ctx, tid, msg);
-+    osip_message_t resp;  // unused
-+    memset(&resp, 0x00, sizeof(osip_message_t));
-+    eXosip_call_build_prack(ctx, tid, &resp, msg);
-+
-+    // TODO: verify this change to fix compile error
-+    int code = osip_message_get_status_code(&resp);
-+    assert(MSG_IS_STATUS_1XX(&resp));
-+    osip_message_free(&resp);
-+
-     if(!*msg) {
-         eXosip_unlock(ctx);
-         return false;
-@@ -359,7 +375,7 @@
- void voip::send_registry_request(context_t c, reg_t r, msg_t msg) 
- {
-     if(!msg)
--	    return;
-+        return;
-     eXosip_register_send_register(c, r, msg);
-     eXosip_unlock(c);
- }
-@@ -417,7 +433,7 @@
-     port = port & 0xfffe;
-     if(tls) {
-         tlsmode = 1;
--        ++port;	// tls always next odd port...
-+        ++port;    // tls always next odd port...
-     }
- 
-     if(eXosip_listen_addr(ctx, proto, addr, port, family, tlsmode))
-@@ -438,7 +454,15 @@
- 
- #ifdef  AF_INET6
-     if(family == AF_INET6)
-+    {
-+#ifdef HAVE_EXOSIP_ENABLE_IPV6
-+        // eXosip_enable_ipv6 deprecated in 2013 at commit ff8d5b5c073d.
-         eXosip_enable_ipv6(1);
-+#else
-+        int val = 1;
-+        eXosip_set_option(*ctx, EXOSIP_OPT_ENABLE_IPV6, &val);
-+#endif
-+    }
- #endif
- }
- 
-@@ -844,7 +868,7 @@
-     port = port & 0xfffe;
-     if(tls) {
-         tlsmode = 1;
--        ++port;	// tls always next odd port...
-+        ++port;    // tls always next odd port...
-     }
- 
-     if(eXosip_listen_addr(proto, addr, port, family, tlsmode))
-@@ -870,7 +894,15 @@
- 
- #ifdef  AF_INET6
-     if(family == AF_INET6)
-+    {
-+#ifdef HAVE_EXOSIP_ENABLE_IPV6
-+        // eXosip_enable_ipv6 deprecated in 2013 at commit ff8d5b5c073d.
-         eXosip_enable_ipv6(1);
-+#else
-+        int val = 1;
-+        eXosip_set_option(*ctx, EXOSIP_OPT_ENABLE_IPV6, &val);
-+#endif
-+    }
- #endif
- }
- 
---- utils/sipquery.cpp
-+++ utils/sipquery.cpp
-@@ -224,9 +224,16 @@
-     if(eXosip_init(EXOSIP_CONTEXT))
-         shell::errexit(3, "*** sipuser: failed exosip init\n");
- 
--#ifdef  AF_INET6
--    if(family == AF_INET6) {
-+#ifdef  AF_INET6
-+    if(family == AF_INET6)
-+    {
-+#ifdef HAVE_EXOSIP_ENABLE_IPV6
-+        // eXosip_enable_ipv6 deprecated in 2013 at commit ff8d5b5c073d.
-         eXosip_enable_ipv6(1);
-+#else
-+        int val = 1;
-+        eXosip_set_option(context, EXOSIP_OPT_ENABLE_IPV6, &val);
-+#endif
-         if(binding == NULL)
-             binding = "::0";
-     }
---- server/stack.cpp
-+++ server/stack.cpp
-@@ -16,6 +16,11 @@
- 
- #include "server.h"
- 
-+#ifdef  HAVE_TLS
-+#include <eXosip2/eX_setup.h>
-+extern "C" int eXosip_set_tls_ctx(eXosip_tls_ctx_t*);
-+#endif
-+
- namespace sipwitch {
- 
- static volatile unsigned allocated_segments = 0;
-@@ -774,7 +779,8 @@
-     }
- 
- #ifdef  HAVE_TLS
--    voip::create(&tls_context, agent, family);
-+    // voip::create(&tls_context, agent, family);
-+    voip::create(&tls_context, agent, sip_family);
- #endif
- 
- #if defined(EXOSIP2_OPTION_SEND_101) && !defined(EXOSIP_API4)
diff --git a/patch/sipwitch.patch b/patch/sipwitch.patch
deleted file mode 100644
index 71660a47f..000000000
--- a/patch/sipwitch.patch
+++ /dev/null
@@ -1,2973 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with GNU SIP Witch.
---- common/voip.cpp
-+++ common/voip.cpp
-@@ -19,6 +19,9 @@
- #include <ucommon/export.h>
- #include <sipwitch/voip.h>
- 
-+// For voip::make_prack_message
-+#include <cassert>
-+
- namespace sipwitch {
- 
- static int family = AF_INET;
-@@ -133,6 +136,8 @@
-     eXosip_unlock(ctx);
- }
- 
-+// Documentation of data structures and macros at
-+// https://www.gnu.org/software/osip/doc/html/osip__message_8h-source.html
- bool voip::make_prack_message(context_t ctx, tid_t tid, msg_t *msg)
- {
-     if(!msg)
-@@ -140,7 +145,18 @@
- 
-     *msg = NULL;
-     eXosip_lock(ctx);
--    eXosip_call_build_prack(ctx, tid, msg);
-+
-+    // TODO: verify this change to fix compile error
-+    // eXosip_call_build_prack(ctx, tid, msg);
-+    osip_message_t resp;  // unused
-+    memset(&resp, 0x00, sizeof(osip_message_t));
-+    eXosip_call_build_prack(ctx, tid, &resp, msg);
-+
-+    // TODO: verify this change to fix compile error
-+    int code = osip_message_get_status_code(&resp);
-+    assert(MSG_IS_STATUS_1XX(&resp));
-+    osip_message_free(&resp);
-+
-     if(!*msg) {
-         eXosip_unlock(ctx);
-         return false;
-@@ -359,7 +375,7 @@
- void voip::send_registry_request(context_t c, reg_t r, msg_t msg) 
- {
-     if(!msg)
--	    return;
-+        return;
-     eXosip_register_send_register(c, r, msg);
-     eXosip_unlock(c);
- }
-@@ -417,7 +433,7 @@
-     port = port & 0xfffe;
-     if(tls) {
-         tlsmode = 1;
--        ++port;	// tls always next odd port...
-+        ++port;    // tls always next odd port...
-     }
- 
-     if(eXosip_listen_addr(ctx, proto, addr, port, family, tlsmode))
-@@ -438,7 +454,15 @@
- 
- #ifdef  AF_INET6
-     if(family == AF_INET6)
-+    {
-+#ifdef HAVE_EXOSIP_ENABLE_IPV6
-+        // eXosip_enable_ipv6 deprecated in 2013 at commit ff8d5b5c073d.
-         eXosip_enable_ipv6(1);
-+#else
-+        int val = 1;
-+        eXosip_set_option(*ctx, EXOSIP_OPT_ENABLE_IPV6, &val);
-+#endif
-+    }
- #endif
- }
- 
-@@ -844,7 +868,7 @@
-     port = port & 0xfffe;
-     if(tls) {
-         tlsmode = 1;
--        ++port;	// tls always next odd port...
-+        ++port;    // tls always next odd port...
-     }
- 
-     if(eXosip_listen_addr(proto, addr, port, family, tlsmode))
-@@ -870,7 +894,15 @@
- 
- #ifdef  AF_INET6
-     if(family == AF_INET6)
-+    {
-+#ifdef HAVE_EXOSIP_ENABLE_IPV6
-+        // eXosip_enable_ipv6 deprecated in 2013 at commit ff8d5b5c073d.
-         eXosip_enable_ipv6(1);
-+#else
-+        int val = 1;
-+        eXosip_set_option(*ctx, EXOSIP_OPT_ENABLE_IPV6, &val);
-+#endif
-+    }
- #endif
- }
- 
---- utils/sipquery.cpp
-+++ utils/sipquery.cpp
-@@ -224,9 +224,16 @@
-     if(eXosip_init(EXOSIP_CONTEXT))
-         shell::errexit(3, "*** sipuser: failed exosip init\n");
- 
--#ifdef  AF_INET6
--    if(family == AF_INET6) {
-+#ifdef  AF_INET6
-+    if(family == AF_INET6)
-+    {
-+#ifdef HAVE_EXOSIP_ENABLE_IPV6
-+        // eXosip_enable_ipv6 deprecated in 2013 at commit ff8d5b5c073d.
-         eXosip_enable_ipv6(1);
-+#else
-+        int val = 1;
-+        eXosip_set_option(context, EXOSIP_OPT_ENABLE_IPV6, &val);
-+#endif
-         if(binding == NULL)
-             binding = "::0";
-     }
---- server/stack.cpp
-+++ server/stack.cpp
-@@ -16,6 +16,17 @@
- 
- #include "server.h"
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static volatile unsigned allocated_segments = 0;
-@@ -505,6 +516,7 @@
-     voip::body_t body = NULL;
-     session *target = NULL;
-     call *cr = source->parent;
-+    int rc = 0;
- 
-     if(cr->source == source)
-         target = cr->target;
-@@ -522,10 +534,14 @@
-     osip_message_get_body(sevent->request, 0, &body);
-     if(!voip::make_dialog_info(target->context, did, &msg))
-         return;
--    if(ct->subtype)
--        snprintf(type, sizeof(type), "%s/%s", ct->type, ct->subtype);
--    else
--        snprintf(type, sizeof(type), "%s", ct->type);
-+    if(ct->subtype) {
-+        rc = snprintf(type, sizeof(type), "%s/%s", ct->type, ct->subtype);
-+        printf_term(type, sizeof(type), rc);
-+    }
-+    else {
-+        rc = snprintf(type, sizeof(type), "%s", ct->type);
-+        printf_term(type, sizeof(type), rc);
-+    }
-     voip::attach(msg, type, body->body);
-     voip::server_allows(msg);
-     voip::send_dialog_message(target->context, did, msg);
-@@ -1043,6 +1059,7 @@
-     assert(user == NULL || *user != 0);
-     assert(size > 0);
- 
-+    int rc = 0;
-     char pbuf[10];
-     bool ipv6 = false;
- 
-@@ -1068,10 +1085,14 @@
-         String::add(buf, size, "[");
- 
-     String::add(buf, size, sip.published);
--    if(ipv6)
--        snprintf(pbuf, sizeof(pbuf), "]:%u", sip_port);
--    else
--        snprintf(pbuf, sizeof(pbuf), ":%u", sip_port);
-+    if(ipv6) {
-+        rc = snprintf(pbuf, sizeof(pbuf), "]:%u", sip_port);
-+        printf_term(pbuf, sizeof(pbuf), rc);
-+    }
-+    else {
-+        rc = snprintf(pbuf, sizeof(pbuf), ":%u", sip_port);
-+        printf_term(pbuf, sizeof(pbuf), rc);
-+    }
-     String::add(buf, size, pbuf);
-     return buf;
- }
-@@ -1085,6 +1106,7 @@
- 
-     char pbuf[10];
-     unsigned port = 0;
-+    int rc = 0;
-     bool ipv6 = false;
-     const char *defaddr = NULL;
- 
-@@ -1135,10 +1157,14 @@
- 
-     len = strlen(buf);
-     Socket::query((struct sockaddr *)addr, buf + len, size - len);
--    if(ipv6)
--        snprintf(pbuf, sizeof(pbuf), "]:%u", port);
--    else
--        snprintf(pbuf, sizeof(pbuf), ":%u", port);
-+    if(ipv6) {
-+        rc = snprintf(pbuf, sizeof(pbuf), "]:%u", port);
-+        printf_term(pbuf, sizeof(pbuf), rc);
-+    }
-+    else {
-+        rc = snprintf(pbuf, sizeof(pbuf), ":%u", port);
-+        printf_term(pbuf, sizeof(pbuf), rc);
-+    }
-     String::add(buf, size, pbuf);
-     return buf;
- }
-@@ -1217,6 +1243,7 @@
- {
-     char route[MAX_URI_SIZE];
-     char touri[MAX_URI_SIZE];
-+    int rc = 0;
- 
-     if(!call->diverting)
-         return;
-@@ -1224,23 +1251,28 @@
-     uri::publish(call->request, route, call->divert, sizeof(route));
- 
-     if(String::equal(call->diverting, "all")) {
--        snprintf(touri, sizeof(touri), "<%s>;reason=unconditional", route);
-+        rc = snprintf(touri, sizeof(touri), "<%s>;reason=unconditional", route);
-+        printf_term(touri, sizeof(touri), rc);
-         voip::header(invite, "Diversion", touri);
-     }
-     else if(String::equal(call->diverting, "na")) {
--        snprintf(touri, sizeof(touri), "<%s>;reason=no-answer", route);
-+        rc = snprintf(touri, sizeof(touri), "<%s>;reason=no-answer", route);
-+        printf_term(touri, sizeof(touri), rc);
-         voip::header(invite, "Diversion", touri);
-     }
-     else if(String::equal(call->diverting, "busy")) {
--        snprintf(touri, sizeof(touri), "<%s>;reason=user-busy", route);
-+        rc = snprintf(touri, sizeof(touri), "<%s>;reason=user-busy", route);
-+        printf_term(touri, sizeof(touri), rc);
-         voip::header(invite, "Diversion", touri);
-     }
-     else if(String::equal(call->diverting, "dnd")) {
--        snprintf(touri, sizeof(touri), "<%s>;reason=do-not-disturb", route);
-+        rc = snprintf(touri, sizeof(touri), "<%s>;reason=do-not-disturb", route);
-+        printf_term(touri, sizeof(touri), rc);
-         voip::header(invite, "Diversion", touri);
-     }
-     else if(String::equal(call->diverting, "away")) {
--        snprintf(touri, sizeof(touri), "<%s>;reason=away", route);
-+        rc = snprintf(touri, sizeof(touri), "<%s>;reason=away", route);
-+        printf_term(touri, sizeof(touri), rc);
-         voip::header(invite, "Diversion", touri);
-     }
- }
-@@ -1260,7 +1292,7 @@
-     voip::msg_t invite = NULL;
-     char expheader[32];
-     char seqid[64];
--    int cid;
-+    int cid, rc;
-     unsigned icount = 0;
-     time_t now;
-     srv resolv;
-@@ -1290,7 +1322,8 @@
-     }
- 
-     if(schema) {
--        snprintf(rewrite, sizeof(rewrite), "%s:%s", schema, uri_target);
-+        rc = snprintf(rewrite, sizeof(rewrite), "%s:%s", schema, uri_target);
-+        printf_term(rewrite, sizeof(rewrite), rc);
-         uri_target = rewrite;
-     }
- 
-@@ -1316,7 +1349,8 @@
-         sp.next();
-     }
- 
--    snprintf(touri, sizeof(touri), "<%s>", uri_target);
-+    rc = snprintf(touri, sizeof(touri), "<%s>", uri_target);
-+    printf_term(touri, sizeof(touri), rc);
- 
-     invite = NULL;
- 
-@@ -1337,7 +1371,8 @@
-         char nounce[64];
-         char *req = NULL;
-         osip_uri_to_str(invite->req_uri, &req);
--        snprintf(authbuf, 1024, "%s:%s", invite->sip_method, req);
-+        rc = snprintf(authbuf, 1024, "%s:%s", invite->sip_method, req);
-+        printf_term(authbuf, 1024, rc);
-         Random::uuid(nounce);
- 
-         digest_t auth("md5");
-@@ -1346,11 +1381,12 @@
-         auth = registry::getDigest();
-         auth.puts(authbuf);
-         response = *auth;
--        snprintf(authbuf, 1024, "%s:%s:%s", digest, *once, *response);
-+        rc = snprintf(authbuf, 1024, "%s:%s:%s", digest, *once, *response);
-+        printf_term(authbuf, 1024, rc);
-         auth.reset();
-         auth.puts(authbuf);
-         response = *auth;
--        snprintf(authbuf, 1024,
-+        rc = snprintf(authbuf, 1024,
-             "Digest username=\"%s\""
-             ",realm=\"%s\""
-             ",uri=\"%s\""
-@@ -1358,6 +1394,7 @@
-             ",nonce=\"%s\""
-             ",algorithm=%s"
-             ,s->reg->userid, registry::getRealm(), req, *response, *once, registry::getDigest());
-+        printf_term(authbuf, 1024, rc);
-         voip::header(invite, AUTHORIZATION, authbuf);
-         delete[] authbuf;
-         osip_free(req);
-@@ -1366,7 +1403,8 @@
-         voip::header(invite, P_SIPWITCH_NODE, "no");
- 
-     if(call->expires) {
--        snprintf(expheader, sizeof(expheader), "%ld", (long)(call->expires - now));
-+        rc = snprintf(expheader, sizeof(expheader), "%ld", (long)(call->expires - now));
-+        printf_term(expheader, sizeof(expheader), rc);
-         voip::header(invite, SESSION_EXPIRES, expheader);
-     }
- 
-@@ -1383,7 +1421,8 @@
-     stack::siplog(invite);
-     cid = voip::send_invite_request(context, invite);
-     if(cid > 0) {
--        snprintf(seqid, sizeof(seqid), "%08x-%d", s->sequence, s->cid);
-+        rc = snprintf(seqid, sizeof(seqid), "%08x-%d", s->sequence, s->cid);
-+        printf_term(seqid, sizeof(seqid), rc);
-         uri::publish(call->request, route, seqid, sizeof(route));
-         voip::call_reference(context, cid, route);
-         ++icount;
-@@ -1398,7 +1437,8 @@
-     registry::incUse(NULL, stats::OUTGOING);
-     String::set(invited->identity, sizeof(invited->identity), uri_target);
-     String::set(invited->display, sizeof(invited->display), username);
--    snprintf(invited->from, sizeof(invited->from), "<%s>", uri_target);
-+    rc = snprintf(invited->from, sizeof(invited->from), "<%s>", uri_target);
-+    printf_term(invited->from, sizeof(invited->from), rc);
-     String::set(invited->network, sizeof(invited->network), network);
-     invited->nat = nat;
-     uri::identity(*resolv, invited->sysident, username, sizeof(invited->sysident));
-@@ -1419,6 +1459,7 @@
-     const char *target;
-     char buffer[MAX_URI_SIZE];
-     registry::mapped *rr = NULL;
-+    int rc = 0;
- 
-     String::set(cr->divert, sizeof(cr->divert), cr->forward);
-     cr->forwarding = NULL;
-@@ -1468,8 +1509,10 @@
-     goto test;
- 
- remote:
--    if(!String::equal(target, "sip:", 4) && !String::equal(target, "sips:", 5))
--        snprintf(buffer, sizeof(buffer), "%s:%s", getScheme(), target);
-+    if(!String::equal(target, "sip:", 4) && !String::equal(target, "sips:", 5)) {
-+        rc = snprintf(buffer, sizeof(buffer), "%s:%s", getScheme(), target);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-     else
-         String::set(buffer, sizeof(buffer), target);
-     target = buffer;
-@@ -1507,7 +1550,7 @@
-     char seqid[64];
-     char route[MAX_URI_SIZE];
-     char touri[MAX_URI_SIZE];
--    int cid;
-+    int cid, rc;
-     unsigned icount = 0;
- 
-     time(&now);
-@@ -1540,12 +1583,17 @@
- 
-         if(dest == ROUTED) {
-             stack::sipPublish(&tp->address, route, call->dialed, sizeof(route));
--            snprintf(touri, sizeof(touri), "\"%s\" <%s;user=phone>", call->dialed, route);
-+            rc = snprintf(touri, sizeof(touri), "\"%s\" <%s;user=phone>", call->dialed, route);
-+            printf_term(touri, sizeof(touri), rc);
-+        }
-+        else if(call->phone) {
-+            rc = snprintf(touri, sizeof(touri), "<%s;user=phone>", tp->contact);
-+            printf_term(touri, sizeof(touri), rc);
-+        }
-+        else {
-+            rc = snprintf(touri, sizeof(touri), "<%s>", tp->contact);
-+            printf_term(touri, sizeof(touri), rc);
-         }
--        else if(call->phone)
--            snprintf(touri, sizeof(touri), "<%s;user=phone>", tp->contact);
--        else
--            snprintf(touri, sizeof(touri), "<%s>", tp->contact);
- 
-         stack::sipPublish(&tp->address, route + 1, NULL, sizeof(route) - 5);
-         route[0] = '<';
-@@ -1562,7 +1610,8 @@
-             stack::sipPublish(&tp->address, route, call->dialed, sizeof(route));
-             if(call->phone)
-                 String::add(route, sizeof(route), ";user=phone");
--            snprintf(touri, sizeof(touri), "\"%s\" <%s>", call->dialed, route);
-+            rc = snprintf(touri, sizeof(touri), "\"%s\" <%s>", call->dialed, route);
-+            printf_term(touri, sizeof(touri), rc);
-             if(invite->to) {
-                 osip_to_free(invite->to);
-                 invite->to = NULL;
-@@ -1576,7 +1625,8 @@
-         voip::server_supports(invite, "100rel,replaces,timer");
- 
-         if(call->expires) {
--            snprintf(expheader, sizeof(expheader), "%ld", (long)(call->expires - now));
-+            rc = snprintf(expheader, sizeof(expheader), "%ld", (long)(call->expires - now));
-+            printf_term(expheader, sizeof(expheader), rc);
-             voip::header(invite, SESSION_EXPIRES, expheader);
-         }
- 
-@@ -1592,7 +1642,8 @@
-         stack::siplog(invite);
-         cid = voip::send_invite_request(tp->context, invite);
-         if(cid > 0) {
--            snprintf(seqid, sizeof(seqid), "%08x-%d", s->sequence, s->cid);
-+            rc = snprintf(seqid, sizeof(seqid), "%08x-%d", s->sequence, s->cid);
-+            printf_term(seqid, sizeof(seqid), rc);
-             stack::sipAddress((struct sockaddr_internet *)&tp->peering, route, seqid, sizeof(route));
-             voip::call_reference(tp->context, cid, route);
-             ++icount;
-@@ -1610,8 +1661,10 @@
-         invited->peering = tp->peering;
-         invited->nat = nat;
- 
--        if(rr->ext)
--            snprintf(invited->sysident, sizeof(invited->sysident), "%u", rr->ext);
-+        if(rr->ext) {
-+            rc = snprintf(invited->sysident, sizeof(invited->sysident), "%u", rr->ext);
-+            printf_term(invited->sysident, sizeof(invited->sysident), rc);
-+        }
-         else
-             String::set(invited->sysident, sizeof(invited->sysident), rr->userid);
-         if(rr->display[0])
-@@ -1619,15 +1672,21 @@
-         else
-             String::set(invited->display, sizeof(invited->display), invited->sysident);
-         stack::sipPublish((struct sockaddr_internet *)&tp->peering, invited->identity, invited->sysident, sizeof(invited->identity));
--        if(rr->ext && !rr->display[0])
--            snprintf(invited->from, sizeof(invited->from),
-+        if(rr->ext && !rr->display[0]) {
-+            rc = snprintf(invited->from, sizeof(invited->from),
-                 "\"%s\" <%s;user=phone>", invited->sysident, invited->identity);
--        else if(rr->display[0])
--            snprintf(invited->from, sizeof(invited->from),
-+            printf_term(invited->from, sizeof(invited->from), rc);
-+        }
-+        else if(rr->display[0]) {
-+            rc = snprintf(invited->from, sizeof(invited->from),
-                 "\"%s\" <%s>", rr->display, invited->identity);
--        else
--            snprintf(invited->from, sizeof(invited->from),
-+            printf_term(invited->from, sizeof(invited->from), rc);
-+        }
-+        else {
-+            rc = snprintf(invited->from, sizeof(invited->from),
-                 "<%s>", invited->identity);
-+            printf_term(invited->from, sizeof(invited->from), rc);
-+         }
-         registry::incUse(rr, stats::OUTGOING);
-         invited->reg = rr;
- 
---- server/thread.cpp
-+++ server/thread.cpp
-@@ -16,6 +16,17 @@
- 
- #include "server.h"
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static volatile bool warning_registry = false;
-@@ -138,7 +149,7 @@
- 
- void thread::publish(void)
- {
--    int error = SIP_BAD_REQUEST;
-+    int error = SIP_BAD_REQUEST, rc;
-     voip::body_t mbody = NULL;
-     voip::ctype_t ct;
-     const char *tmp = NULL;
-@@ -175,8 +186,10 @@
-     if(msgheader && msgheader->hvalue)
-         event = msgheader->hvalue;
- 
--    if(ct && ct->subtype)
--        snprintf(msgtype, sizeof(msgtype), "%s/%s", ct->type, ct->subtype);
-+    if(ct && ct->subtype) {
-+        rc = snprintf(msgtype, sizeof(msgtype), "%s/%s", ct->type, ct->subtype);
-+        printf_term(msgtype, sizeof(msgtype), rc);
-+    }
-     else if(ct && ct->type)
-         String::set(msgtype, sizeof(msgtype), ct->type);
-     else
-@@ -259,6 +272,7 @@
- {
-     voip::ctype_t ct;
-     voip::body_t body = NULL;
-+    int rc = 0;
-     char address[MAX_URI_SIZE];
-     char fromhdr[MAX_URI_SIZE];
-     char target[MAX_URI_SIZE];
-@@ -311,28 +325,40 @@
-         return;
-     }
- 
--    if(ct->subtype)
--        snprintf(msgtype, sizeof(msgtype), "%s/%s",
-+    if(ct->subtype) {
-+        rc = snprintf(msgtype, sizeof(msgtype), "%s/%s",
-             ct->type, ct->subtype);
--    else
--        snprintf(msgtype, sizeof(msgtype), "%s",
-+        printf_term(msgtype, sizeof(msgtype), rc);
-+    }
-+    else {
-+        rc = snprintf(msgtype, sizeof(msgtype), "%s",
-             ct->type);
-+        printf_term(msgtype, sizeof(msgtype), rc);
-+    }
- 
--    if(extension && !digest)
--        snprintf(sysid, sizeof(sysid), "%u", extension);
-+    if(extension && !digest) {
-+        rc = snprintf(sysid, sizeof(sysid), "%u", extension);
-+        printf_term(sysid, sizeof(sysid), rc);
-+    }
-     else
-         String::set(sysid, sizeof(sysid), identity);
- 
-     uri::publish(requesting, address, sysid, sizeof(address));
--    if(extension && !display[0])
--        snprintf(fromhdr, sizeof(fromhdr),
-+    if(extension && !display[0]) {
-+        rc = snprintf(fromhdr, sizeof(fromhdr),
-             "\"%u\" <%s;user=phone>", extension, address);
--    else if(display[0])
--        snprintf(fromhdr, sizeof(fromhdr),
-+        printf_term(fromhdr, sizeof(fromhdr), rc);
-+    }
-+    else if(display[0]) {
-+        rc = snprintf(fromhdr, sizeof(fromhdr),
-             "\"%s\" <%s>", display, address);
--    else
--        snprintf(fromhdr, sizeof(fromhdr),
-+        printf_term(fromhdr, sizeof(fromhdr), rc);
-+    }
-+    else {
-+        rc = snprintf(fromhdr, sizeof(fromhdr),
-             "<%s>", address);
-+        printf_term(fromhdr, sizeof(fromhdr), rc);
-+     }
- 
-     shell::debug(3, "sending message from %s to %s\n", sysid, target);
-     osip_content_length_to_str(sevent->request->content_length, &msglen);
-@@ -351,10 +377,11 @@
-     const char *target = dialing;
-     voip::body_t body = NULL;
-     stack::call *call = session->parent;
-+    cdr *cdrnode = NULL;
-     unsigned toext = 0;
-+    int rc = 0;
-     voip::hdr_t msgheader = NULL;
--    char fromext[32];
--    cdr *cdrnode = NULL;
-+    char fromext[64];
-     const char *domain = registry::getDomain();
- 
-     uri::serviceid(requesting, call->request, sizeof(call->request));
-@@ -382,8 +409,10 @@
-         call->failed(this, session);
-     }
- 
--    if(extension)
--        snprintf(fromext, sizeof(fromext), "%u", extension);
-+    if(extension) {
-+        rc = snprintf(fromext, sizeof(fromext), "%u", extension);
-+        printf_term(fromext, sizeof(fromext), rc);
-+    }
- 
-     msgheader = NULL;
-     osip_message_header_get_byname(sevent->request, SESSION_EXPIRES, 0, &msgheader);
-@@ -433,8 +462,10 @@
-     call->type = destination;
-     switch(destination) {
-     case LOCAL:
--        if(extension)
--            snprintf(session->sysident, sizeof(session->sysident), "%u", extension);
-+        if(extension) {
-+            rc = snprintf(session->sysident, sizeof(session->sysident), "%u", extension);
-+            printf_term(session->sysident, sizeof(session->sysident), rc);
-+        }
-         else
-             String::set(session->sysident, sizeof(session->sysident), identity);
-         if(display[0])
-@@ -446,12 +477,14 @@
-         String::set(cdrnode->ident, sizeof(cdrnode->ident), session->sysident);
-         String::set(cdrnode->dialed, sizeof(cdrnode->dialed), call->dialed);
-         String::set(cdrnode->display, sizeof(cdrnode->display), session->display);
--        snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-+        rc = snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-             stack::sip.getScheme(), session->sysident, domain);
-+        printf_term(session->identity, sizeof(session->identity), rc);
- 
-         if(toext) {
-             call->phone = true;
--            snprintf(call->dialed, sizeof(call->dialed), "%u", toext);
-+            rc = snprintf(call->dialed, sizeof(call->dialed), "%u", toext);
-+            printf_term(call->dialed, sizeof(call->dialed), rc);
-         }
-         else
-             String::set(call->dialed, sizeof(call->dialed), target);
-@@ -466,15 +499,21 @@
-             return;
-         }
- 
--        if(extension && !display[0])
--            snprintf(session->from, sizeof(session->from),
-+        if(extension && !display[0]) {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s;user=phone>", session->sysident, session->identity);
--        else if(display[0])
--            snprintf(session->from, sizeof(session->from),
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
-+        else if(display[0]) {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s>", session->display, session->identity);
--        else
--            snprintf(session->from, sizeof(session->from),
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
-+        else {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "<%s>", session->identity);
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
- 
-         session->closed = false;
-         session->reg = registry::invite(identity, stats::INCOMING);
-@@ -483,18 +522,22 @@
-         break;
-     case PUBLIC:
-         String::set(call->dialed, sizeof(call->dialed), target);
--        snprintf(session->identity, sizeof(session->identity), "%s:%s@%s:%s",
-+        rc = snprintf(session->identity, sizeof(session->identity), "%s:%s@%s:%s",
-             from->url->scheme, from->url->username, from->url->host, from->url->port);
--        snprintf(session->sysident, sizeof(session->sysident), "%s@%s", from->url->username, from->url->host);
-+        printf_term(session->identity, sizeof(session->identity), rc);
-+        rc = snprintf(session->sysident, sizeof(session->sysident), "%s@%s", from->url->username, from->url->host);
-+        printf_term(session->sysident, sizeof(session->sysident), rc);
-         if(from->displayname) {
-             String::set(session->display, sizeof(session->display), from->displayname);
--            snprintf(session->from, sizeof(session->from),
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s>", from->displayname, session->identity);
-+            printf_term(session->from, sizeof(session->from), rc);
-         }
-         else {
-             String::set(session->display, sizeof(session->display), from->url->username);
--            snprintf(session->from, sizeof(session->from),
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "<%s>", session->identity);
-+            printf_term(session->from, sizeof(session->from), rc);
-         }
-         shell::debug(1, "incoming call %08x:%u for %s from %s\n",
-             session->sequence, session->cid, call->dialed, session->sysident);
-@@ -507,8 +550,10 @@
-         break;
-     case REDIRECTED:
-     case EXTERNAL:
--        if(extension)
--            snprintf(session->sysident, sizeof(session->sysident), "%u", extension);
-+        if(extension) {
-+            rc = snprintf(session->sysident, sizeof(session->sysident), "%u", extension);
-+            printf_term(session->sysident, sizeof(session->sysident), rc);
-+        }
-         else
-             String::set(session->sysident, sizeof(session->sysident), identity);
-         session->reg = registry::invite(identity, stats::INCOMING);
-@@ -517,13 +562,16 @@
-         else
-             String::set(session->display, sizeof(session->display), identity);
- 
--        if(registry::getDomain() || destination != EXTERNAL)
--            snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-+        if(registry::getDomain() || destination != EXTERNAL) {
-+            rc = snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-                 stack::sip.getScheme(), session->sysident, domain);
-+            printf_term(session->identity, sizeof(session->identity), rc);
-+        }
-         else {
-             gethostname(buftemp, sizeof(buftemp));
--            snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-+            rc = snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-                 stack::sip.getScheme(), session->sysident, buftemp);
-+            printf_term(session->identity, sizeof(session->identity), rc);
-         }
- 
-         if(destination == EXTERNAL)
-@@ -531,15 +579,21 @@
-         else
-             String::set(call->dialed, sizeof(call->dialed), dialing);
- 
--        if(extension && !display[0])
--            snprintf(session->from, sizeof(session->from),
-+        if(extension && !display[0]) {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s;user=phone>", session->sysident, session->identity);
--        else if(display[0])
--            snprintf(session->from, sizeof(session->from),
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
-+        else if(display[0]) {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s>", display, session->identity);
--        else
--            snprintf(session->from, sizeof(session->from),
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
-+        else {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "<%s>", session->identity);
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
- 
-         shell::debug(1, "outgoing call %08x:%u from %s to %s",
-             session->sequence, session->cid, getIdent(), requesting);
-@@ -557,8 +611,10 @@
-     case ROUTED:
-         call->phone = true;
- 
--        if(extension)
--            snprintf(session->sysident, sizeof(session->sysident), "%u", extension);
-+        if(extension) {
-+            rc = snprintf(session->sysident, sizeof(session->sysident), "%u", extension);
-+            printf_term(session->sysident, sizeof(session->sysident), rc);
-+        }
-         else
-             String::set(session->sysident, sizeof(session->sysident), identity);
-         if(display[0])
-@@ -566,15 +622,20 @@
-         else
-             String::set(session->display, sizeof(session->display), session->sysident);
- 
--        snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-+        rc = snprintf(session->identity, sizeof(session->identity), "%s:%s@%s",
-             stack::sip.getScheme(), session->sysident, domain);
-+        printf_term(session->identity, sizeof(session->identity), rc);
- 
--        if(extension)
--            snprintf(session->from, sizeof(session->from),
-+        if(extension) {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s;user=phone>", session->display, session->identity);
--        else
--            snprintf(session->from, sizeof(session->from),
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
-+        else {
-+            rc = snprintf(session->from, sizeof(session->from),
-                 "\"%s\" <%s>", session->display, session->identity);
-+            printf_term(session->from, sizeof(session->from), rc);
-+        }
- 
-         String::set(call->dialed, sizeof(call->dialed), dialing);
- 
-@@ -654,14 +715,18 @@
- 
- const char *thread::getIdent(void)
- {
-+    int rc = 0;
-+
-     if(!extension)
-         return identity;
- 
-     if(registry::isExtension(identity) && (unsigned)atoi(identity) == extension)
-         return identity;
- 
--    if(!identbuf[0])
--        snprintf(identbuf, sizeof(identbuf), "%s(%u)", identity, extension);
-+    if(!identbuf[0]) {
-+        rc = snprintf(identbuf, sizeof(identbuf), "%s(%u)", identity, extension);
-+        printf_term(identbuf, sizeof(identbuf), rc);
-+    }
- 
-     return identbuf;
- }
-@@ -699,7 +764,7 @@
- 
- bool thread::authorize(void)
- {
--    int error = SIP_UNDECIPHERABLE;
-+    int error = SIP_UNDECIPHERABLE, rc;
-     const char *scheme = "sip";
-     const char *cp;
-     time_t now;
-@@ -760,20 +825,28 @@
-     }
- 
-     if(uri->username && uri->username[0]) {
--        if(uri->port && uri->port[0])
--            snprintf(requesting, sizeof(requesting), "%s:%s@%s%s%s:%s",
-+        if(uri->port && uri->port[0]) {
-+            rc = snprintf(requesting, sizeof(requesting), "%s:%s@%s%s%s:%s",
-                 uri->scheme, uri->username, sep1, uri_host, sep2, uri->port);
--        else
--            snprintf(requesting, sizeof(requesting), "%s:%s@%s%s%s",
-+            printf_term(requesting, sizeof(requesting), rc);
-+        }
-+        else {
-+            rc = snprintf(requesting, sizeof(requesting), "%s:%s@%s%s%s",
-                 uri->scheme, uri->username, sep1, uri_host, sep2);
-+            printf_term(requesting, sizeof(requesting), rc);
-+        }
-     }
-     else {
--        if(uri->port && uri->port[0])
--            snprintf(requesting, sizeof(requesting), "%s:%s%s%s:%s",
-+        if(uri->port && uri->port[0]) {
-+            rc = snprintf(requesting, sizeof(requesting), "%s:%s%s%s:%s",
-                 uri->scheme, sep1, uri_host, sep2, uri->port);
--        else
--            snprintf(requesting, sizeof(requesting), "%s:%s%s%s",
-+            printf_term(requesting, sizeof(requesting), rc);
-+        }
-+        else {
-+            rc = snprintf(requesting, sizeof(requesting), "%s:%s%s%s",
-                 uri->scheme, sep1, uri_host, sep2);
-+            printf_term(requesting, sizeof(requesting), rc);
-+        }
-     }
- 
-     if(uri->port && uri->port[0])
-@@ -1058,19 +1131,27 @@
-         if(!cp)
-             cp = service::getValue(routed, "target");
-         if(cp && !strchr(cp, '@')) {
--            if(String::equal(cp, "sip:", 4) || String::equal(cp, "sips:", 5))
--                snprintf(buffer, sizeof(buffer), "%s@%s", target, cp);
--            else
--                snprintf(buffer, sizeof(buffer), "sip:%s@%s", target, cp);
-+            if(String::equal(cp, "sip:", 4) || String::equal(cp, "sips:", 5)) {
-+                rc = snprintf(buffer, sizeof(buffer), "%s@%s", target, cp);
-+                printf_term(buffer, sizeof(buffer), rc);
-+            }
-+            else {
-+                rc = snprintf(buffer, sizeof(buffer), "sip:%s@%s", target, cp);
-+                printf_term(buffer, sizeof(buffer), rc);
-+            }
-             refer = buffer;
-             goto redirect;
-         }
-         if(!cp)
-             goto invalid;
--        if(String::equal(cp, "sip:", 4) || String::equal(cp, "sips:"))
--            snprintf(buffer, sizeof(buffer), "%s", cp);
--        else
--            snprintf(buffer, sizeof(buffer), "sip:%s", cp);
-+        if(String::equal(cp, "sip:", 4) || String::equal(cp, "sips:")) {
-+            rc = snprintf(buffer, sizeof(buffer), "%s", cp);
-+            printf_term(buffer, sizeof(buffer), rc);
-+        }
-+        else {
-+            rc = snprintf(buffer, sizeof(buffer), "sip:%s", cp);
-+            printf_term(buffer, sizeof(buffer), rc);
-+        }
-         refer = buffer;
-         goto redirect;
-     }
-@@ -1102,10 +1183,14 @@
-     }
-     if(!stricmp(routed->getId(), "rewrite")) {
-         if(strchr(dialing, '@')) {
--            if(String::equal(dialing, "sips:", 5) || String::equal("sip:", dialing, 4))
--                snprintf(dbuf, sizeof(dbuf), "%s", dialing);
--            else
--                snprintf(dbuf, sizeof(dbuf), "sip:%s", dialing);
-+            if(String::equal(dialing, "sips:", 5) || String::equal("sip:", dialing, 4)) {
-+                rc = snprintf(dbuf, sizeof(dbuf), "%s", dialing);
-+                printf_term(dbuf, sizeof(dbuf), rc);
-+            }
-+            else {
-+                rc = snprintf(dbuf, sizeof(dbuf), "sip:%s", dialing);
-+                printf_term(dbuf, sizeof(dbuf), rc);
-+            }
-             refer = dbuf;
-             goto redirect;
-         }
-@@ -1266,6 +1351,7 @@
-     service::keynode *node = NULL, *leaf;
-     stringbuf<64> digest;
-     int error = SIP_PROXY_AUTHENTICATION_REQUIRED;
-+    int rc = 0;
-     const char *cp;
-     const char *hash = NULL;
-     digest_t calc(registry::getDigest());
-@@ -1340,16 +1426,21 @@
-     }
- 
-     // compute service request digest string
--    snprintf(buffer, sizeof(buffer), "%s:%s", sevent->request->sip_method, auth->uri);
-+    rc = snprintf(buffer, sizeof(buffer), "%s:%s", sevent->request->sip_method, auth->uri);
-+    printf_term(buffer, sizeof(buffer), rc);
- 
-     calc.puts(buffer);
-     digest = *calc;
- 
-     // apply user digest pointer with nonce, and service digest string
--    if(hash)
--        snprintf(buffer, sizeof(buffer), "%s:%s:%s", hash, auth->nonce, *digest);
--    else
--        snprintf(buffer, sizeof(buffer), "%s:%s:%s", leaf->getPointer(), auth->nonce, *digest);
-+    if(hash) {
-+        rc = snprintf(buffer, sizeof(buffer), "%s:%s:%s", hash, auth->nonce, *digest);
-+        printf_term(buffer, sizeof(buffer), rc);
-+     }
-+    else {
-+        rc = snprintf(buffer, sizeof(buffer), "%s:%s:%s", leaf->getPointer(), auth->nonce, *digest);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-     digests::release(hash);
- 
-     calc.reset();
-@@ -1374,14 +1465,17 @@
- void thread::challenge(void)
- {
-     voip::msg_t reply = NULL;
-+    int rc = 0;
-     char nonce[32];
-     time_t now;
- 
-     time(&now);
--    snprintf(nonce, sizeof(nonce), "%08lx", (long)now);
--    snprintf(buffer, sizeof(buffer),
-+    rc = snprintf(nonce, sizeof(nonce), "%08lx", (long)now);
-+    printf_term(nonce, sizeof(nonce), rc);
-+    rc = snprintf(buffer, sizeof(buffer),
-         "Digest realm=\"%s\", nonce=\"%s\", algorithm=%s",
-                 registry::getRealm(), nonce, registry::getDigest());
-+    printf_term(buffer, sizeof(buffer), rc);
- 
-     switch(authorizing) {
-     case REGISTRAR:
-@@ -1462,6 +1556,7 @@
-     service::keynode *node = NULL, *leaf;
-     stringbuf<64> digest;
-     int error = SIP_PROXY_AUTHENTICATION_REQUIRED;
-+    int rc = 0;
-     const char *cp;
-     char temp[64];
-     voip::msg_t reply = NULL;
-@@ -1507,15 +1602,21 @@
-     }
- 
-     // compute a method/uri hash
--    snprintf(buffer, sizeof(buffer), "%s:%s", sevent->request->sip_method, auth->uri);
-+    rc = snprintf(buffer, sizeof(buffer), "%s:%s", sevent->request->sip_method, auth->uri);
-+    printf_term(buffer, sizeof(buffer), rc);
-+
-     calc.puts(buffer);
-     digest = *calc;
- 
-     // compute with user digest
--    if(hash)
--        snprintf(buffer, sizeof(buffer), "%s:%s:%s", hash, auth->nonce, *digest);
--    else
--        snprintf(buffer, sizeof(buffer), "%s:%s:%s", leaf->getPointer(), auth->nonce, *digest);
-+    if(hash) {
-+        rc = snprintf(buffer, sizeof(buffer), "%s:%s:%s", hash, auth->nonce, *digest);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-+    else {
-+        rc = snprintf(buffer, sizeof(buffer), "%s:%s:%s", leaf->getPointer(), auth->nonce, *digest);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
- 
-     digests::release(hash);
- 
-@@ -1535,9 +1636,11 @@
-     server::release(user);
-     if(voip::make_response_message(context, sevent->tid, error, &reply)) {
-         if(error == SIP_OK) {
--            snprintf(temp, sizeof(temp), ";expires=%lu", (long)registry::getExpires());
-+            rc = snprintf(temp, sizeof(temp), ";expires=%lu", (long)registry::getExpires());
-+            printf_term(temp, sizeof(temp), rc);
-             osip_message_set_contact(reply, temp);
--            snprintf(temp, sizeof(temp), "%lu", (long)registry::getExpires());
-+            rc = snprintf(temp, sizeof(temp), "%lu", (long)registry::getExpires());
-+            printf_term(temp, sizeof(temp), rc);
-             osip_message_set_expires(reply, temp);
-         }
-         voip::server_allows(reply);
-@@ -1557,6 +1660,7 @@
-     int interval = -1;
-     int pos = 0;
-     int error = SIP_ADDRESS_INCOMPLETE;
-+    int rc = 0;
-     voip::msg_t reply = NULL;
-     struct sockaddr_internet iface;
- 
-@@ -1572,9 +1676,11 @@
- 
-     if(registry::getDomain())
-         String::set(binding, sizeof(binding), registry::getDomain());
--    else if(sevent->request->req_uri->port && !eq(sevent->request->req_uri->port, "5060"))
--        snprintf(binding, sizeof(binding), "%s:%s",
-+    else if(sevent->request->req_uri->port && !eq(sevent->request->req_uri->port, "5060")) {
-+        rc = snprintf(binding, sizeof(binding), "%s:%s",
-             sevent->request->req_uri->host, sevent->request->req_uri->port);
-+        printf_term(binding, sizeof(binding), rc);
-+    }
-     else
-         String::set(binding, sizeof(binding), sevent->request->req_uri->host);
- 
-@@ -1591,8 +1697,9 @@
-         port = reguri->port;
-         if(!port || !port[0])
-             port = (char *)"5060";
--        snprintf(buffer, sizeof(buffer), "%s:%s@%s:%s",
-+        rc = snprintf(buffer, sizeof(buffer), "%s:%s@%s:%s",
-             reguri->scheme, reguri->username, reguri->host, port);
-+        printf_term(buffer, sizeof(buffer), rc);
- 
-         // auto-detect registration from ephemerial ports...
-         contact_port = atoi(port);
-@@ -1644,8 +1751,9 @@
-             shell::debug(3, "query rejected for %s; error=%d", reguri->username, error);
-         if(voip::make_response_message(context, sevent->tid, error, &reply)) {
-             if(error == SIP_OK) {
--                snprintf(buftemp, sizeof(buftemp), "<%s:%s@%s>",
-+                rc = snprintf(buftemp, sizeof(buftemp), "<%s:%s@%s>",
-                     stack::getScheme(), reguri->username, binding);
-+                printf_term(buftemp, sizeof(buftemp), rc);
-                 osip_message_set_contact(reply, buftemp);
-             }
-             voip::server_allows(reply);
-@@ -1680,6 +1788,7 @@
-     unsigned count = 0;
-     voip::contact_t c = NULL;
-     int pos = 0;
-+    int rc = 0;
-     bool refresh;
- 
-     if(extension && (extension < registry::getPrefix() || extension >= registry::getPrefix() + registry::getRange())) {
-@@ -1743,13 +1852,15 @@
-     if(voip::make_response_message(context, sevent->tid, answer, &reply)) {
-         if(answer == SIP_OK) {
-             if(reginfo->ext) {
--                snprintf(buftemp, sizeof(buftemp), "<%s:%d@%s>;expires=%ld",
-+                rc = snprintf(buftemp, sizeof(buftemp), "<%s:%d@%s>;expires=%ld",
-                     stack::getScheme(), reginfo->ext, binding, (long)interval);
-+                printf_term(buftemp, sizeof(buftemp), rc);
-                 osip_message_set_contact(reply, buftemp);
-             }
- 
--            snprintf(buftemp, sizeof(buftemp), "<%s:%s@%s>;expires=%ld",
-+            rc = snprintf(buftemp, sizeof(buftemp), "<%s:%s@%s>;expires=%ld",
-                 stack::getScheme(), reginfo->userid, binding, (long)interval);
-+            printf_term(buftemp, sizeof(buftemp), rc);
-             osip_message_set_contact(reply, buftemp);
-         }
-         voip::server_allows(reply);
---- common/uri.cpp
-+++ common/uri.cpp
-@@ -20,6 +20,17 @@
- #include <sipwitch/uri.h>
- #include <sipwitch/service.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- void uri::serviceid(const char *addr, char *buf, size_t size)
-@@ -133,6 +144,7 @@
- 
-     const char *schema = "sip";
-     const char *cp;
-+    int rc = 0;
- 
-     if(String::equal(uri, "sip:", 4)) {
-         uri += 4;
-@@ -147,10 +159,14 @@
-     if(cp && user != NULL)
-         uri = ++cp;
- 
--    if(user)
--        snprintf(buf, size, "%s:%s@%s", schema, user, uri);
--    else
--        snprintf(buf, size, "%s:%s", schema, uri);
-+    if(user) {
-+        rc = snprintf(buf, size, "%s:%s@%s", schema, user, uri);
-+        printf_term(buf, size, rc);
-+    }
-+    else {
-+        rc = snprintf(buf, size, "%s:%s", schema, uri);
-+        printf_term(buf, size, rc);
-+    }
- }
- 
- voip::context_t uri::route(const char *uri, char *buf, size_t size)
-@@ -158,7 +174,8 @@
-     buf[0] = 0;
-     const char *schema="sip:";
-     voip::context_t ctx = service::callback::out_context;
--    
-+    int rc = 0;
-+
-     if(eq(uri, "sips:", 5)) {
-         ctx = service::callback::tls_context;
-         schema="sips:";
-@@ -179,7 +196,9 @@
-     if(sp)
-         uri = ++sp;
- 
--    snprintf(buf, size, "%s%s", schema, uri);
-+    rc = snprintf(buf, size, "%s%s", schema, uri);    
-+    printf_term(buf, size, rc);
-+
-     return ctx;
- }
- 
-@@ -190,6 +209,7 @@
-     assert(size > 0);
- 
-     char host[256];
-+    int rc = 0;
- 
-     buf[0] = 0;
- 
-@@ -197,11 +217,17 @@
-         return false;
- 
- #ifdef  AF_INET6
--    if(addr->sa_family == AF_INET6)
--        snprintf(buf, size, "sip:[%s]:%u", host, (unsigned)ntohs(((struct sockaddr_in6 *)(addr))->sin6_port) & 0xffff);
-+    if(addr->sa_family == AF_INET6) {
-+        rc = snprintf(buf, size, "sip:[%s]:%u", host, (unsigned)ntohs(((struct sockaddr_in6 *)(addr))->sin6_port) & 0xffff);
-+        printf_term(buf, size, rc);
-+    }
-     else
- #endif
--        snprintf(buf, size, "sip:%s:%u", host, (unsigned)ntohs(((struct sockaddr_in *)(addr))->sin_port) & 0xffff);
-+    {
-+        rc = snprintf(buf, size, "sip:%s:%u", host, (unsigned)ntohs(((struct sockaddr_in *)(addr))->sin_port) & 0xffff);
-+        printf_term(buf, size, rc);
-+    }
-+
-     return true;
- }
- 
---- common/control.cpp
-+++ common/control.cpp
-@@ -26,6 +26,17 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static const char *replytarget = NULL;
-@@ -222,6 +233,7 @@
-     char *sid;
-     fsys fd;
-     char buffer[256];
-+    int rc = 0;
- 
-     if(msg)
-         shell::log(shell::ERR, "control failed; %s", msg);
-@@ -245,10 +257,14 @@
- 
-         else
-             sid = (char *)"-";
--        if(msg)
--            snprintf(buffer, sizeof(buffer), "%s msg %s\n", sid, msg);
--        else
--            snprintf(buffer, sizeof(buffer), "%s ok\n", sid);
-+        if(msg) {
-+            rc = snprintf(buffer, sizeof(buffer), "%s msg %s\n", sid, msg);
-+            printf_term(buffer, sizeof(buffer), rc);
-+        }
-+        else {
-+            rc = snprintf(buffer, sizeof(buffer), "%s ok\n", sid);
-+            printf_term(buffer, sizeof(buffer), rc);
-+        }
-         fd.open(replytarget, fsys::WRONLY);
-         if(is(fd)) {
-             fd.write(buffer, strlen(buffer));
-@@ -264,10 +280,13 @@
- 
-     va_list vargs;
-     char buf[256];
-+    int rc = 0;
- 
-     va_start(vargs, fmt);
--    if(fmt)
--        vsnprintf(buf, sizeof(buf), fmt, vargs);
-+    if(fmt) {
-+        rc = vsnprintf(buf, sizeof(buf), fmt, vargs);
-+        printf_term(buf, sizeof(buf), rc);
-+    }
-     va_end(vargs);
- 
-     shell::debug(5, "executing %s", buf);
-@@ -312,7 +331,7 @@
- 
-     char buf[512];
-     fd_t fd;
--    int len;
-+    int len, rc;
-     bool rtn = true;
-     va_list vargs;
- 
-@@ -332,7 +351,8 @@
-     }
- #endif
- 
--    vsnprintf(buf, sizeof(buf) - 1, fmt, vargs);
-+    rc = vsnprintf(buf, sizeof(buf) - 1, fmt, vargs);
-+    printf_term(buf, sizeof(buf) - 1, rc);
-     va_end(vargs);
-     len = strlen(buf);
-     if(buf[len - 1] != '\n')
---- common/srv.cpp
-+++ common/srv.cpp
-@@ -35,19 +35,30 @@
- #define MAXPACKET PACKETSZ
- #else
- #define MAXPACKET 1024
--#endif 
-+#endif
- 
- typedef union {
-         HEADER hdr;
-         char buf[MAXPACKET];
- } query;
- 
--#ifndef T_SRV 
-+#ifndef T_SRV
- #define T_SRV           33
- #endif
- 
- #endif
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- srv::srv(const char *uri) : Socket::address()
-@@ -98,7 +109,7 @@
-         ++index;
-     }
-     return result;
--}        
-+}
- 
- struct sockaddr *srv::find(uint16_t priority, uint32_t weight)
- {
-@@ -121,6 +132,7 @@
- {
-     int protocol = IPPROTO_UDP;
-     int port = uri::portid(uri);
-+    int rc = 0;
-     char host[256], svc[10];
-     struct addrinfo hint;
- 
-@@ -139,7 +151,8 @@
- #ifdef  HAVE_RESOLV_H
-         nosrv = true;
- #endif
--        snprintf(svc, sizeof(svc), "%d", port);
-+        rc = snprintf(svc, sizeof(svc), "%d", port);
-+        printf_term(svc, sizeof(svc), rc);
-     }
-     else if(eq(uri, "sips:", 5)) {
-         protocol = IPPROTO_TCP;
-@@ -147,11 +160,11 @@
-     }
-     else if(eq(uri, "tcp:", 4)) {
-         protocol = IPPROTO_TCP;
--        uri += 4;    
-+        uri += 4;
-     }
-     else if(eq(uri, "udp:", 4)) {
-         protocol = IPPROTO_UDP;
--        uri += 4;    
-+        uri += 4;
-     }
- 
-     uri::hostid(uri, host, sizeof(host));
-@@ -213,11 +226,15 @@
- 
-     query reply;
-     char zone[256];
--    
--    if(hint.ai_protocol == IPPROTO_TCP)
--        snprintf(zone, sizeof(zone), "_%s._tcp.%s", svc, host);
--    else
--        snprintf(zone, sizeof(zone), "_%s._udp.%s", svc, host);
-+
-+    if(hint.ai_protocol == IPPROTO_TCP) {
-+        rc = snprintf(zone, sizeof(zone), "_%s._tcp.%s", svc, host);
-+        printf_term(zone, sizeof(zone), rc);
-+    }
-+    else {
-+        rc = snprintf(zone, sizeof(zone), "_%s._udp.%s", svc, host);
-+        printf_term(zone, sizeof(zone), rc);
-+    }
- 
-     result = res_query(zone, C_IN, T_SRV, (unsigned char *)&reply, sizeof(reply));
-     if(result < (int)sizeof(HEADER))
-@@ -245,38 +262,38 @@
-         result = dn_expand(mp, ep, cp, hbuf, sizeof(hbuf));
-         if(result < 0)
-             goto nosrv;
--        
-+
-         cp += result;
- 
-         type = ntohs(*((uint16_t *)cp));
-         cp += sizeof(uint16_t);
- 
--		// class
--		cp += sizeof(uint16_t);
-+        // class
-+        cp += sizeof(uint16_t);
- 
-         // ttl
-         cp += sizeof(uint32_t);
- 
-         dlen = ntohs(*((uint16_t *)cp));
-         cp += sizeof(uint16_t);
--        
--		if(type != T_SRV) {
--	        cp += dlen;
--			continue;
--		}
--		
-+
-+        if(type != T_SRV) {
-+            cp += dlen;
-+            continue;
-+        }
-+
-         priority = ntohs(*((uint16_t *)cp));
--		cp += sizeof(uint16_t);
--	
--		weight = ntohs(*((uint16_t *)cp));
--		cp += sizeof(uint16_t);
--
--		hport = ntohs(*((uint16_t *)cp));
--		cp += sizeof(uint16_t);
--
--		result = dn_expand(mp, ep, cp, hbuf, sizeof(hbuf));
--		if(result < 0)
--			break;
-+        cp += sizeof(uint16_t);
-+
-+        weight = ntohs(*((uint16_t *)cp));
-+        cp += sizeof(uint16_t);
-+
-+        hport = ntohs(*((uint16_t *)cp));
-+        cp += sizeof(uint16_t);
-+
-+        result = dn_expand(mp, ep, cp, hbuf, sizeof(hbuf));
-+        if(result < 0)
-+            break;
- 
-         Socket::address resolv(hbuf, hport);
-         const struct sockaddr *sp = resolv.getAddr();
-@@ -288,7 +305,7 @@
-             rand &= 0x7fff;
-             if(weight)
-                 weight = (1 + rand) % ( 10000 * weight);
--        
-+
-             srvlist[count].weight = weight;
-             srvlist[count].priority = priority;
-             Socket::store(&srvlist[count].addr, sp);
-@@ -299,10 +316,10 @@
-             }
-             ++count;
-         }
--		cp += result;
-+        cp += result;
-     }
--	
--	return;
-+
-+    return;
- nosrv:
-     if(srvlist) {
-         delete[] srvlist;
-@@ -315,15 +332,15 @@
-     else if(eq(svc, "sip"))
-         String::set(svc, sizeof(svc), "5060");
-     getaddrinfo(host, svc, &hint, &list);
--	struct addrinfo *ap = list;
-+    struct addrinfo *ap = list;
-     count = 0;
- 
-     if(ap)
-         entry = ap->ai_addr;
--	while(ap) {
--		++count;
--		ap = ap->ai_next;
--	}
-+    while(ap) {
-+        ++count;
-+        ap = ap->ai_next;
-+    }
- }
- 
- srv::~srv()
-@@ -341,11 +358,11 @@
-     if(list) {
-         freeaddrinfo(list);
-         list = NULL;
--    } 
-+    }
- 
-     entry = NULL;
--	count = 0;
--}       
-+    count = 0;
-+}
- 
- struct sockaddr *srv::next(void)
- {
-@@ -379,6 +396,7 @@
-     const char *sid = uri;
-     unsigned short port = uri::portid(uri);
-     voip::context_t ctx = service::callback::out_context;
-+    int rc = 0;
- 
-     if(!uri::hostid(uri, host, sizeof(host)))
-         return NULL;
-@@ -403,10 +421,14 @@
-             else
-                 port = 5060;
-         }
--        if(strchr(host, ':'))
--            snprintf(buf, size, "%s:[%s]:%u", schema, host, port);
--        else
--            snprintf(buf, size, "%s:%s:%u", schema, host, port);
-+        if(strchr(host, ':')) {
-+            rc = snprintf(buf, size, "%s:[%s]:%u", schema, host, port);
-+            printf_term(buf, size, rc);
-+        }
-+        else {
-+            rc = snprintf(buf, size, "%s:%s:%u", schema, host, port);
-+            printf_term(buf, size, rc);
-+        }
-         sid = buf;
-     }
-     set(sid);
-@@ -414,12 +436,17 @@
-         return NULL;
-     if(!Socket::query(entry, host, sizeof(host)))
-         return NULL;
--#ifdef	AF_INET6
--	if(entry->sa_family == AF_INET6)
--		snprintf(buf, size, "%s:[%s]:%u", schema, host, (unsigned)ntohs(((struct sockaddr_in6 *)(entry))->sin6_port) & 0xffff);
--	else
-+#ifdef  AF_INET6
-+    if(entry->sa_family == AF_INET6) {
-+        rc = snprintf(buf, size, "%s:[%s]:%u", schema, host, (unsigned)ntohs(((struct sockaddr_in6 *)(entry))->sin6_port) & 0xffff);
-+        printf_term(buf, size, rc);
-+    }
-+    else
- #endif
--		snprintf(buf, size, "%s:%s:%u", schema, host, (unsigned)ntohs(((struct sockaddr_in *)(entry))->sin_port) & 0xffff);
-+    {
-+        rc = snprintf(buf, size, "%s:%s:%u", schema, host, (unsigned)ntohs(((struct sockaddr_in *)(entry))->sin_port) & 0xffff);
-+        printf_term(buf, size, rc);
-+    }
-     return ctx;
- }
- 
---- common/stats.cpp
-+++ common/stats.cpp
-@@ -20,6 +20,17 @@
- #include <sipwitch/stats.h>
- #include <sipwitch/control.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static unsigned used = 0, total = 7;
-@@ -59,12 +70,15 @@
- stats *stats::request(const char *id)
- {
-     assert(id && *id);
-+    int rc = 0;
- 
-     if(used >= total)
-         return NULL;
- 
-     stats *node = shm(used++);
--    snprintf(node->id, sizeof(node->id), "%s", id);
-+    rc = snprintf(node->id, sizeof(node->id), "%s", id);
-+    printf_term(node->id, sizeof(node->id), rc);
-+
-     return node;
- }
- 
-@@ -120,6 +134,7 @@
-     char text[80];
-     size_t len;
-     time_t last;
-+    int rc = 0;
- 
-     while(pos < total) {
-         stats *node = shm(pos++);
-@@ -127,7 +142,8 @@
-             continue;
- 
-         if(fp) {
--            snprintf(text, sizeof(text), " %-12s", node->id);
-+            rc = snprintf(text, sizeof(text), " %-12s", node->id);
-+            printf_term(text, sizeof(text), rc);
-             len = strlen(text);
-         }
-         else
-@@ -136,8 +152,10 @@
-         Mutex::protect(node);
-         for(unsigned entry = 0; entry < 2; ++entry) {
-             if(fp) {
--                snprintf(text + len, sizeof(text) - len, " %09lu %05hu %05hu",
--                node->data[entry].period, node->data[entry].min, node->data[entry].max);
-+                rc = snprintf(text + len, sizeof(text) - len, " %09lu %05hu %05hu",
-+                    node->data[entry].period, node->data[entry].min, node->data[entry].max);
-+                // I don't quite follow this loop. Play it safe.
-+                // printf_term(text + len, sizeof(text) - len, rc);
-                 len = strlen(text);
-             }
-             node->data[entry].pperiod = node->data[entry].period;
-@@ -146,6 +164,9 @@
-             node->data[entry].min = node->data[entry].max = node->data[entry].current;
-             node->data[entry].period = 0;
-         }
-+        // Terminate text buffer at full buffer size.
-+        printf_term(text, sizeof(text), (int)sizeof(text));
-+
-         last = node->lastcall;
-         Mutex::release(node);
-         if(fp)
---- server/registry.cpp
-+++ server/registry.cpp
-@@ -16,6 +16,17 @@
- 
- #include "server.h"
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static volatile unsigned active_routes = 0;
-@@ -253,6 +264,7 @@
- 
-     mapped *rr;
-     unsigned regcount = 0;
-+    int rc = 0;
-     time_t now;
-     linked_pointer<target> tp;
-     linked_pointer<route> rp;
-@@ -276,8 +288,10 @@
-             fprintf(fp, "  temp %s; use=%d\n", rr->userid, rr->inuse);
-         }
-         else if(rr->type != MappedRegistry::EXPIRED && (!rr->expires || rr->expires >= now)) {
--            if(rr->ext)
--                snprintf(buffer, sizeof(buffer), "%d", rr->ext);
-+            if(rr->ext) {
-+                rc = snprintf(buffer, sizeof(buffer), "%d", rr->ext);
-+                printf_term(buffer, sizeof(buffer), rc);
-+            }
-             else
-                 String::set(buffer, sizeof(buffer), "none");
-             if(rr->type == MappedRegistry::USER)
---- server/server.cpp
-+++ server/server.cpp
-@@ -37,6 +37,17 @@
- #include <sys/sockio.h>
- #endif
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static mempager mempool(PAGING_SIZE);
-@@ -243,6 +254,7 @@
-     const char *dirpath = ".";
-     const char *fn;
-     digest_t digest(registry::getDigest());
-+    int rc = 0;
- 
-     // add any missing keys
-     getPath("devices");
-@@ -311,13 +323,15 @@
-         if(!ext || !String::equal(ext, ".xml"))
-             continue;
-         if(state) {
--            snprintf(buf, sizeof(buf), "%s/%s/%s", dirpath, state, filename);
-+            rc = snprintf(buf, sizeof(buf), "%s/%s/%s", dirpath, state, filename);
-+            printf_term(buf, sizeof(buf), rc);
-             fp = fopen(buf, "r");
-         }
-         else
-             fp = NULL;
-         if(!fp) {
--            snprintf(buf, sizeof(buf), "%s/%s", dirpath, filename);
-+            rc = snprintf(buf, sizeof(buf), "%s/%s", dirpath, filename);
-+            printf_term(buf, sizeof(buf), rc);
-             fp = fopen(buf, "r");
-         }
-         fn = strrchr(buf, '/');
-@@ -369,7 +383,8 @@
-         if(ifr->ifr_addr.sa_family != AF_INET)
-             continue;
-         struct sockaddr_in *saddr = (struct sockaddr_in *)&(ifr->ifr_addr);
--        snprintf(buf, sizeof(buf), "%s/", inet_ntoa(saddr->sin_addr));
-+        rc = snprintf(buf, sizeof(buf), "%s/", inet_ntoa(saddr->sin_addr));
-+        printf_term(buf, sizeof(buf), rc);
-         if(ioctl(ifd, SIOCGIFNETMASK, ifr) == 0) {
-             saddr = (struct sockaddr_in *)&(ifr->ifr_addr);
-             String::add(buf, sizeof(buf), inet_ntoa(saddr->sin_addr));
-@@ -533,7 +548,8 @@
-                 extmap[number - prefix] = *node;
- 
-             if(number) {
--                snprintf(buf, 16, "%d", number);
-+                rc = snprintf(buf, 16, "%d", number);
-+                printf_term(buf, 16, rc);
-                 addNode(*node, "extension", buf);
-             }
-         }
-@@ -915,14 +931,17 @@
-     FILE *state = NULL;
-     const char *cp;
-     keynode *node;
-+    int rc = 0;
- 
- #ifdef _MSWINDOWS_
-     GetEnvironmentVariable("APPDATA", buf, 192);
-     unsigned len = strlen(buf);
--    snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\state.xml");
-+    rc = snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\state.xml");
-+    printf_term(buf + len, sizeof(buf) - len, rc);
-     state = fopen(buf, "r");
- #else
--    snprintf(buf, sizeof(buf), DEFAULT_VARPATH "/run/sipwitch/state.xml");
-+    rc = snprintf(buf, sizeof(buf), DEFAULT_VARPATH "/run/sipwitch/state.xml");
-+    printf_term(buf, sizeof(buf), rc);
-     state = fopen(buf, "r");
- #endif
- 
-@@ -990,7 +1009,8 @@
-             continue;
-         if(!String::equal(filename, "user-", 5))
-             continue; 
--        snprintf(buf, sizeof(buf), "%s/%s", dirpath, filename);
-+        rc = snprintf(buf, sizeof(buf), "%s/%s", dirpath, filename);
-+        printf_term(buf, sizeof(buf), rc);
-         fp = fopen(buf, "r");
-         if(!fp)
-             continue;
-@@ -1060,6 +1080,7 @@
-     dir_t   dir;
-     char *ep;
-     unsigned el;
-+    int rc = 0;
- 
-     if(!list || !*list || eq(list, "none"))
-         return;
-@@ -1074,7 +1095,8 @@
-                 continue;
-             if(eq(buffer, "lib", 3))
-                 continue;
--            snprintf(path + el, sizeof(path) - el, "/%s", buffer);
-+            rc = snprintf(path + el, sizeof(path) - el, "/%s", buffer);
-+            printf_term(path + el, sizeof(path) - el, rc);
-             shell::log(shell::INFO, "loading %s%s", buffer, MODULE_EXT);
-             if(fsys::load(path))
-                 shell::log(shell::ERR, "failed loading %s", path);
-@@ -1084,7 +1106,8 @@
-     else {
-         String::set(buffer, sizeof(buffer), list);
-         while(NULL != (cp = String::token(buffer, &tp, ", ;:\r\n"))) {
--            snprintf(path, sizeof(path), "%s/%s%s", prefix, cp, MODULE_EXT);
-+            rc = snprintf(path, sizeof(path), "%s/%s%s", prefix, cp, MODULE_EXT);
-+            printf_term(path, sizeof(path), rc);
-             shell::log(shell::INFO, "loading %s" MODULE_EXT, cp);
-             if(fsys::load(path))
-                 shell::log(shell::ERR, "failed loading %s", path);
-@@ -1377,13 +1400,14 @@
-     fsys_t log;
-     va_list vargs;
-     char buf[1024];
--    int len;
-+    int len, rc;
-     char *cp;
- 
-     va_start(vargs, fmt);
- 
-     log.open(control::env("logfile"), fsys::GROUP_PRIVATE, fsys::APPEND);
--    vsnprintf(buf, sizeof(buf) - 1, fmt, vargs);
-+    rc = vsnprintf(buf, sizeof(buf) - 1, fmt, vargs);
-+    printf_term(buf, sizeof(buf) - 1, rc);
-     len = strlen(buf);
-     if(buf[len - 1] != '\n')
-         buf[len++] = '\n';
---- server/scripting.cpp
-+++ server/scripting.cpp
-@@ -17,6 +17,17 @@
- #include <sipwitch-config.h>
- #include <sipwitch/sipwitch.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static const char *dirpath = NULL;
-@@ -70,13 +81,15 @@
- 
-     static char buf[256];
-     const char *home = control::env("HOME");
-+    int rc = 0;
- 
-     if(fsys::is_dir(DEFAULT_CFGPATH "/sysconfig/sipwitch-scripts"))
-         dirpath = DEFAULT_CFGPATH "/sysconfig/sipwitch-scripts";
-     else if(fsys::is_dir(DEFAULT_LIBEXEC "/sipwitch"))
-         dirpath = DEFAULT_LIBEXEC "/sipwitch";
-     else if(home) {
--        snprintf(buf, sizeof(buf), "%s/.sipwitch-scripts", home);
-+        rc = snprintf(buf, sizeof(buf), "%s/.sipwitch-scripts", home);
-+        printf_term(buf, sizeof(buf), rc);
-         if(fsys::is_dir(buf))
-             dirpath = buf;
-     }
---- server/zeroconf.cpp
-+++ server/zeroconf.cpp
-@@ -17,6 +17,17 @@
- #include <sipwitch-config.h>
- #include <sipwitch/sipwitch.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- #ifdef  ZEROCONF_AVAHI
-@@ -113,8 +124,8 @@
- 
- void zeroconf::setClient(AvahiClientState state)
- {
--    int ret;
-     AvahiProtocol avifamily = AVAHI_PROTO_UNSPEC;
-+    int ret = 0, rc;
- 
-     switch(state) {
-     case AVAHI_CLIENT_S_RUNNING:
-@@ -145,10 +156,14 @@
-         char range[32];
-         char uuid[64];
- 
--        snprintf(domain, sizeof(domain), "domain=%s", sip_domain);
--        snprintf(prefix, sizeof(prefix), "prefix=%u", sip_prefix);
--        snprintf(range, sizeof(range), "range=%u", sip_range);
--        snprintf(uuid, sizeof(uuid), "uuid=%s", session_uuid);
-+        rc = snprintf(domain, sizeof(domain), "domain=%s", sip_domain);
-+        printf_term(domain, sizeof(domain), rc);
-+        rc = snprintf(prefix, sizeof(prefix), "prefix=%u", sip_prefix);
-+        printf_term(prefix, sizeof(prefix), rc);
-+        rc = snprintf(range, sizeof(range), "range=%u", sip_range);
-+        printf_term(range, sizeof(range), rc);
-+        rc = snprintf(uuid, sizeof(uuid), "uuid=%s", session_uuid);
-+        printf_term(uuid, sizeof(uuid), rc);
-         ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, avifamily,
-             (AvahiPublishFlags)0, name, protocol, NULL, NULL, sip_port,
-             "type=sipwitch", domain, prefix, range, uuid, NULL);
-@@ -218,13 +233,17 @@
- 
-     static bool started = false;
-     AvahiProtocol avifamily = AVAHI_PROTO_UNSPEC;
--    int ret = 0;
-+    int ret = 0, rc;
- 
-     if(started && group && sip_domain) {
--        snprintf(domain, sizeof(domain), "domain=%s", sip_domain);
--        snprintf(prefix, sizeof(prefix), "prefix=%u", sip_prefix);
--        snprintf(range, sizeof(range), "range=%u", sip_range);
--        snprintf(uuid, sizeof(uuid), "uuid=%s", session_uuid);
-+        rc = snprintf(domain, sizeof(domain), "domain=%s", sip_domain);
-+        printf_term(domain, sizeof(domain), rc);
-+        rc = snprintf(prefix, sizeof(prefix), "prefix=%u", sip_prefix);
-+        printf_term(prefix, sizeof(prefix), rc);
-+        rc = snprintf(range, sizeof(range), "range=%u", sip_range);
-+        printf_term(range, sizeof(range), rc);
-+        rc = snprintf(uuid, sizeof(uuid), "uuid=%s", session_uuid);
-+        printf_term(uuid, sizeof(uuid), rc);
-         ret = avahi_entry_group_update_service_txt(group, AVAHI_IF_UNSPEC, avifamily,
-             (AvahiPublishFlags)0, name, protocol, NULL,
-             "type=sipwitch", domain, prefix, range, uuid, NULL);
---- server/history.cpp
-+++ server/history.cpp
-@@ -16,6 +16,17 @@
- 
- #include "server.h"
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static mutex_t histlock;
-@@ -34,10 +45,12 @@
- {
-     Time now;
-     char buf[20];
-+    int rc;
- 
-     now.put(buf);
--    snprintf(text, sizeof(text), "%s %02d %s",
-+    rc = snprintf(text, sizeof(text), "%s %02d %s",
-         buf, (int)lid, msg);
-+    printf_term(text, sizeof(text), rc);
- 
-     char *cp = strchr(text, '\n');
-     if(cp)
---- server/media.cpp
-+++ server/media.cpp
-@@ -16,6 +16,17 @@
- 
- #include "server.h"
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static unsigned tpriority = 0;
-@@ -305,6 +316,7 @@
-     char mtype[32];
-     unsigned tport;
-     unsigned tcount = 1;
-+    int rc = 0;
-     media::proxy *pp;
- 
-     if(strnicmp(buffer, "m=", 2))
-@@ -360,12 +372,16 @@
- 
-     *sp = 0;
-     String::set(mtype, sizeof(mtype), buffer);
--    if(mediacount > 1)
--        snprintf(buffer, len, "%s %u/%u %s",
-+    if(mediacount > 1) {
-+        rc = snprintf(buffer, len, "%s %u/%u %s",
-             mtype, tport, mediacount, tmp);
--    else
--        snprintf(buffer, len, "%s %u %s",
-+        printf_term(buffer, len, rc);
-+    }
-+    else {
-+        rc = snprintf(buffer, len, "%s %u %s",
-             mtype, tport, tmp);
-+        printf_term(buffer, len, rc);
-+    }
- 
-     mediacount = align(mediacount);
- }
---- server/subscriber.cpp
-+++ server/subscriber.cpp
-@@ -19,6 +19,17 @@
- #include <ucommon/secure.h>
- #include <stddef.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static class __LOCAL subscriber : private modules::sipwitch
-@@ -71,19 +82,24 @@
-     char uri[MAX_URI_SIZE];
-     char reg[MAX_URI_SIZE];
-     unsigned len;
-+    int rc = 0;
-     Socket::address dest = server;
- 
-     Random::uuid(provider.remote);
--    snprintf(uri, sizeof(uri), "%s:%s@%s", schema, userid, server);
--    snprintf(reg, sizeof(reg), "%s:%s", schema, server);
--    snprintf(contact, sizeof(contact), "%s:%s@", schema, provider.remote);
-+    rc = snprintf(uri, sizeof(uri), "%s:%s@%s", schema, userid, server);
-+    printf_term(uri, sizeof(uri), rc);
-+    rc = snprintf(reg, sizeof(reg), "%s:%s", schema, server);
-+    printf_term(reg, sizeof(reg), rc);
-+    rc = snprintf(contact, sizeof(contact), "%s:%s@", schema, provider.remote);
-+    printf_term(contact, sizeof(contact), rc);
- 
-     changed = false;
-     len = strlen(contact);
-     Socket::via((struct sockaddr *)&provider.contact, dest.getAddr());
-     Socket::query((struct sockaddr *)&provider.contact, contact + len, sizeof(contact) - len);
-     len = strlen(contact);
--    snprintf(contact + len, sizeof(contact) - len, ":%u", sip_port);
-+    rc = snprintf(contact + len, sizeof(contact) - len, ":%u", sip_port);
-+    printf_term(contact + len, sizeof(contact) - len, rc);
-     shell::debug(3, "registering %s with %s", contact, server);
- 
-     voip::msg_t msg = NULL;
---- server/forward.cpp
-+++ server/forward.cpp
-@@ -17,6 +17,17 @@
- #include <sipwitch-config.h>
- #include <sipwitch/sipwitch.h>
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- #define INDEX_SIZE  177
-@@ -302,19 +313,24 @@
-     char uri[MAX_URI_SIZE];
-     char reg[MAX_URI_SIZE];
-     unsigned len;
-+    int rc = 0;
- 
-     if(!enabled || rr->rid != -1)
-         return;
- 
-     // must also have extension to forward...
-     if(rr->remote[0] && rr->ext && rr->type == MappedRegistry::USER) {
--        snprintf(uri, sizeof(uri), "%s:%s@%s", schema, rr->userid, server);
--        snprintf(reg, sizeof(reg), "%s:%s", schema, server);
--        snprintf(contact, sizeof(contact), "%s:%s@", schema, rr->remote);
-+        rc = snprintf(uri, sizeof(uri), "%s:%s@%s", schema, rr->userid, server);
-+        printf_term(uri, sizeof(uri), rc);
-+        rc = snprintf(reg, sizeof(reg), "%s:%s", schema, server);
-+        printf_term(reg, sizeof(reg), rc);
-+        rc = snprintf(contact, sizeof(contact), "%s:%s@", schema, rr->remote);
-+        printf_term(contact, sizeof(contact), rc);
-         len = strlen(contact);
-         Socket::query((struct sockaddr *)&rr->contact, contact + len, sizeof(contact) - len);
-         len = strlen(contact);
--        snprintf(contact + len, sizeof(contact) - len, ":%d", Socket::address::getPort((struct sockaddr *)&rr->contact));
-+        rc = snprintf(contact + len, sizeof(contact) - len, ":%d", Socket::address::getPort((struct sockaddr *)&rr->contact));
-+        printf_term(contact + len, sizeof(contact) - len, rc);
-         shell::debug(3, "registering %s with %s", contact, server);
-         voip::msg_t msg = NULL;
-         rr->rid = voip::make_registry_request(context, uri, reg, contact, (unsigned)expires, &msg);
-@@ -333,16 +349,20 @@
-     char uri_to[MAX_URI_SIZE];
-     char contact[MAX_URI_SIZE];
-     size_t len;
-+    int rc = 0;
- 
-     if(!isActive(rr->rid) || !rr->remote[0])
-         return false;
- 
--    snprintf(uri_to, sizeof(uri_to), "sip:%s@%s", rr->userid, server);
--    snprintf(contact, sizeof(contact), "sip:%s@", rr->remote);
-+    rc = snprintf(uri_to, sizeof(uri_to), "sip:%s@%s", rr->userid, server);
-+    printf_term(uri_to, sizeof(uri_to), rc);
-+    rc = snprintf(contact, sizeof(contact), "sip:%s@", rr->remote);
-+    printf_term(contact, sizeof(contact), rc);
-     len = strlen(contact);
-     Socket::query((struct sockaddr *)&rr->contact, contact + len, sizeof(contact) - len);
-     len = strlen(contact);
--    snprintf(contact + len, sizeof(contact) - len, ":%d", Socket::address::getPort((struct sockaddr *)&rr->contact));
-+    rc = snprintf(contact + len, sizeof(contact) - len, ":%d", Socket::address::getPort((struct sockaddr *)&rr->contact));
-+    printf_term(contact + len, sizeof(contact) - len, rc);
-     shell::debug(3, "publishing %s with %s", contact, server);
- 
-     voip::publish(context, uri_to, contact, event, expiration, msgtype, body);
-@@ -366,16 +386,22 @@
- 
- char *forward::referLocal(MappedRegistry *rr, const char *target, char *buffer, size_t size)
- {
-+    int rc = 0;
-+
-     if(!refer)
-         return NULL;
- 
-     if(!isActive(rr->rid))
-         return NULL;
- 
--    if(sip_tlsmode)
--        snprintf(buffer, size, "sips:%s@%s", target, refer);
--    else
--        snprintf(buffer, size, "sip:%s@%s", target, refer);
-+    if(sip_tlsmode) {
-+        rc = snprintf(buffer, size, "sips:%s@%s", target, refer);
-+        printf_term(buffer, size, rc);
-+    }
-+    else {
-+        rc = snprintf(buffer, size, "sip:%s@%s", target, refer);
-+        printf_term(buffer, size, rc);
-+    }
-     return buffer;
- }
- 
---- utils/sipquery.cpp
-+++ utils/sipquery.cpp
-@@ -56,9 +56,20 @@
- static Socket::address localhost("127.0.0.1");
- #endif
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- PROGRAM_MAIN(argc, argv)
- {
--    int error = 2;
-+    int error = 2, rc;
-     eXosip_event_t *sevent;
-     const char *cp, *user;
-     char buffer[256];
-@@ -277,21 +288,33 @@
-         proxy = server;
- 
-     if(strncmp(proxy, "sip:", 4) && strncmp(proxy, "sips:", 5)) {
--        if(tls)
--            snprintf(pbuffer, sizeof(pbuffer), "sips:%s", proxy);
--        else
--            snprintf(pbuffer, sizeof(pbuffer), "sip:%s", proxy);
-+        if(tls) {
-+            rc = snprintf(pbuffer, sizeof(pbuffer), "sips:%s", proxy);
-+            printf_term(pbuffer, sizeof(pbuffer), rc);
-+        }
-+        else {
-+            rc = snprintf(pbuffer, sizeof(pbuffer), "sip:%s", proxy);
-+            printf_term(pbuffer, sizeof(pbuffer), rc);
-+        }
-         proxy = pbuffer;
-     }
- 
--    if(tls && !strchr(user, '@'))
--        snprintf(buffer, sizeof(buffer), "sips:%s@%s", user, server);
--    else if(!strchr(user, '@'))
--        snprintf(buffer, sizeof(buffer), "sip:%s@%s", user, server);
--    else if(tls)
--        snprintf(buffer, sizeof(buffer), "sips:%s", user);
--    else
--        snprintf(buffer, sizeof(buffer), "sip:%s", user);
-+    if(tls && !strchr(user, '@')) {
-+        rc = snprintf(buffer, sizeof(buffer), "sips:%s@%s", user, server);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-+    else if(!strchr(user, '@')) {
-+        rc = snprintf(buffer, sizeof(buffer), "sip:%s@%s", user, server);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-+    else if(tls) {
-+        rc = snprintf(buffer, sizeof(buffer), "sips:%s", user);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-+    else {
-+        rc = snprintf(buffer, sizeof(buffer), "sip:%s", user);
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
- 
- 
-     EXOSIP_LOCK
-@@ -300,7 +323,8 @@
-         EXOSIP_UNLOCK
-         shell::errexit(3, "*** sipuser: cannot create query for %s\n", user);
-     }
--    snprintf(tbuffer, sizeof(tbuffer), "<%s>", buffer);
-+    rc = snprintf(tbuffer, sizeof(tbuffer), "<%s>", buffer);
-+    printf_term(tbuffer, sizeof(tbuffer), rc);
-     osip_message_set_to(msg, tbuffer);
-     osip_list_ofchar_free(&msg->contacts);
-     eXosip_register_send_register(OPTION_CONTEXT rid, msg);
---- server/messages.cpp
-+++ server/messages.cpp
-@@ -16,6 +16,17 @@
- 
- #include "server.h"
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- namespace sipwitch {
- 
- static mutex_t msglock;
-@@ -185,6 +196,7 @@
-     const char *sysid = stack::sip.system;
-     const char *host = stack::sip.published;
-     unsigned short port  = sip_port;
-+    int rc = 0;
- 
-     if(stack::sip_tlsmode)
-         scheme = "sips";
-@@ -199,12 +211,16 @@
- #endif
-     }
- 
--    if(strchr(host, ':'))
--        snprintf(from, sizeof(from), "<%s:%s@[%s]:%u>",
-+    if(strchr(host, ':')) {
-+        rc = snprintf(from, sizeof(from), "<%s:%s@[%s]:%u>",
-             scheme, sysid, host, port);
--    else
--        snprintf(from, sizeof(from), "<%s:%s@%s:%u>",
-+        printf_term(from, sizeof(from), rc);
-+    }
-+    else {
-+        rc = snprintf(from, sizeof(from), "<%s:%s@%s:%u>",
-             scheme, sysid, host, port);
-+        printf_term(from, sizeof(from), rc);
-+    }
- 
-     return deliver(to, sysid, from, (caddr_t)text, strlen(text), "text/plain");
- }
-@@ -220,6 +236,7 @@
-     voip::context_t ctx = resolv.route(to, route, sizeof(route));
-     char rewrite[MAX_URI_SIZE];
-     const char *schema = NULL;
-+    int rc = 0;
- 
-     if(!ctx)
-         return error;
-@@ -234,7 +251,8 @@
-     }
- 
-     if(schema) {
--        snprintf(rewrite, sizeof(rewrite), "%s:%s", schema, to);
-+        rc = snprintf(rewrite, sizeof(rewrite), "%s:%s", schema, to);
-+        printf_term(rewrite, sizeof(rewrite), rc);
-         to = rewrite;
-     }
- 
-@@ -245,7 +263,8 @@
-         char nounce[64];
-         char *req = NULL;
-         osip_uri_to_str(im->req_uri, &req);
--        snprintf(authbuf, 1024, "%s:%s", im->sip_method, req);
-+        rc = snprintf(authbuf, 1024, "%s:%s", im->sip_method, req);
-+        printf_term(authbuf, 1024, rc);
-         Random::uuid(nounce);
- 
-         digest_t auth("md5");
-@@ -254,11 +273,12 @@
-         auth = registry::getDigest();
-         auth.puts(authbuf);
-         response = *auth;
--        snprintf(authbuf, 1024, "%s:%s:%s", digest, *once, *response);
-+        rc = snprintf(authbuf, 1024, "%s:%s:%s", digest, *once, *response);
-+        printf_term(authbuf, 1024, rc);
-         auth.reset();
-         auth.puts(authbuf);
-         response = *auth;
--        snprintf(authbuf, 1024,
-+        rc = snprintf(authbuf, 1024,
-             "Digest username=\"%s\""
-             ",realm=\"%s\""
-             ",uri=\"%s\""
-@@ -266,6 +286,7 @@
-             ",nonce=\"%s\""
-             ",algorithm=%s"
-             ,msg->reply, registry::getRealm(), req, *response, *once, registry::getDigest());
-+        printf_term(authbuf, 1024, rc);
-         voip::header(im, AUTHORIZATION, authbuf);
-         delete[] authbuf;
-         osip_free(req);
---- utils/sipcontrol.cpp
-+++ utils/sipcontrol.cpp
-@@ -31,6 +31,17 @@
- #include <sys/un.h>
- #endif
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- using namespace sipwitch;
- 
- static string_t statmap = STAT_MAP;
-@@ -64,8 +75,10 @@
- {
-     char buffer[512];
-     FILE *fp;
-+    int rc = 0;
- 
--    snprintf(buffer, sizeof(buffer), "/tmp/.sipwitch.%ld", (long)getpid());
-+    rc = snprintf(buffer, sizeof(buffer), "/tmp/.sipwitch.%ld", (long)getpid());
-+    printf_term(buffer, sizeof(buffer), rc);
-     fp = fopen(buffer, "r");
-     fsys::erase(buffer);
-     while(fp && fgets(buffer, sizeof(buffer), fp) != NULL)
-@@ -248,6 +261,7 @@
-     char replace[256];
-     char *cp = NULL;
-     FILE *fp;
-+    int rc = 0;
- 
- #ifdef  _MSWINDOWS_
-     const char *control = "\\\\.\\mailslot\\sipwitch_ctrl";
-@@ -293,8 +307,10 @@
-     // create replacement realm string...
-     if(eq(mode, "md5"))
-         String::set(replace, sizeof(replace), realm);
--    else
--        snprintf(replace, sizeof(replace), "%s:%s", realm, mode);
-+    else {
-+        rc = snprintf(replace, sizeof(replace), "%s:%s", realm, mode);
-+        printf_term(replace, sizeof(replace), rc);
-+    }
- 
-     ::remove(DEFAULT_CFGPATH "/siprealm");
-     fs.open(DEFAULT_CFGPATH "/siprealm", fsys::GROUP_PUBLIC, fsys::WRONLY);
-@@ -346,6 +362,8 @@
- 
- static void calls(char **argv)
- {
-+    int rc = 0;
-+
-     if(argv[1])
-         shell::errexit(1, "*** sipcontrol: calls: no arguments used\n");
- 
-@@ -378,6 +396,7 @@
- static void periodic(char **argv)
- {
-     char text[80];
-+    int rc = 0;
- 
-     if(argv[1])
-         shell::errexit(1, "*** sipcontrol: pstats: no arguments used\n");
-@@ -398,18 +417,23 @@
-         if(!map->id[0])
-             continue;
- 
--        if(map->limit)
--            snprintf(text, sizeof(text), "%-12s %05hu", map->id, map->limit);
--        else
--            snprintf(text, sizeof(text), "%-12s -    ", map->id);
-+        if(map->limit) {
-+            rc = snprintf(text, sizeof(text), "%-12s %05hu", map->id, map->limit);
-+            printf_term(text, sizeof(text), rc);
-+        }
-+        else {
-+            rc = snprintf(text, sizeof(text), "%-12s -    ", map->id);
-+            printf_term(text, sizeof(text), rc);
-+        }
- 
-         for(unsigned entry = 0; entry < 2; ++entry) {
-             size_t len = strlen(text);
--            snprintf(text + len, sizeof(text) - len, " %07lu %05hu %05hu",
-+            rc = snprintf(text + len, sizeof(text) - len, " %07lu %05hu %05hu",
-                 map->data[entry].pperiod,
-                 map->data[entry].pmin,
-                 map->data[entry].pmax);
-         }
-+        printf_term(text, sizeof(text), (int)sizeof(text));
-         printf("%s\n", text);
-     }
-     exit(0);
-@@ -429,6 +453,7 @@
- 
-     static string_t contact = "-";
-     static string_t publish = "-";
-+    int rc = 0;
- 
-     if(argv[1])
-         shell::errexit(1, "*** sipcontrol: events: no arguments used\n");
-@@ -477,7 +502,8 @@
- 
-         memset(&addr, 0, sizeof(addr));
-         addr.sun_family = AF_UNIX;
--        snprintf(addr.sun_path, sizeof(addr.sun_path), "/tmp/sipwitch-%s/events", userid);
-+        rc = snprintf(addr.sun_path, sizeof(addr.sun_path), "/tmp/sipwitch-%s/events", userid);
-+        printf_term(addr.sun_path, sizeof(addr.sun_path), rc);
-         if(::connect(ipc, (struct sockaddr *)&addr, SUN_LEN(&addr)) < 0)
-             shell::errexit(10, "*** sipcontrol: events: server offline\n");
-     }
-@@ -555,6 +581,7 @@
- {
-     char text[80];
-     time_t now;
-+    int rc = 0;
- 
-     if(argv[1])
-         shell::errexit(1, "*** sipcontrol: stats: no arguments used\n");
-@@ -576,18 +603,24 @@
-         if(!map.id[0])
-             continue;
- 
--        if(map.limit)
--            snprintf(text, sizeof(text), "%-12s %05hu", map.id, map.limit);
--        else
--            snprintf(text, sizeof(text), "%-12s -    ", map.id);
-+        if(map.limit) {
-+            rc = snprintf(text, sizeof(text), "%-12s %05hu", map.id, map.limit);
-+            printf_term(text, sizeof(text), rc);
-+        }
-+        else {
-+            rc = snprintf(text, sizeof(text), "%-12s -    ", map.id);
-+            printf_term(text, sizeof(text), rc);
-+        }
- 
-         for(unsigned entry = 0; entry < 2; ++entry) {
-             size_t len = strlen(text);
--            snprintf(text + len, sizeof(text) - len, " %09lu %05hu %05hu",
-+            rc = snprintf(text + len, sizeof(text) - len, " %09lu %05hu %05hu",
-                 map.data[entry].total,
-                 map.data[entry].current,
-                 map.data[entry].peak);
-         }
-+        printf_term(text, sizeof(text), (int)sizeof(text));
-+
-         current = map.data[0].current + map.data[1].current;
-         if(current)
-             printf("%s 0s\n", text);
-@@ -607,6 +640,8 @@
- 
- static void registry(char **argv)
- {
-+    int rc = 0;
-+
-     mapinit();
- 
-     mapped_view<MappedRegistry> reg(*regmap);
-@@ -634,13 +669,18 @@
-         if(!found++)
-             printf("%7s %-30s type %-30s  use expires address\n", "ext", "user", "profile");
-         ext[0] = 0;
--        if(buffer.ext)
--            snprintf(ext, sizeof(ext), "%7d", buffer.ext);
-+        if(buffer.ext) {
-+            rc = snprintf(ext, sizeof(ext), "%7d", buffer.ext);
-+            printf_term(ext, sizeof(ext), rc);
-+        }
-         exp[0] = '-';
-         exp[1] = 0;
--        snprintf(use, sizeof(use), "%u", buffer.inuse);
--        if(buffer.expires && buffer.type != MappedRegistry::TEMPORARY)
--            snprintf(exp, sizeof(exp), "%ld", (long)(buffer.expires - now));
-+        rc = snprintf(use, sizeof(use), "%u", buffer.inuse);
-+        printf_term(use, sizeof(use), rc);
-+        if(buffer.expires && buffer.type != MappedRegistry::TEMPORARY) {
-+            rc = snprintf(exp, sizeof(exp), "%ld", (long)(buffer.expires - now));
-+            printf_term(exp, sizeof(exp), rc);
-+        }
-         switch(buffer.type) {
-         case MappedRegistry::REJECT:
-             type = "rej";
-@@ -674,9 +714,11 @@
-     char buffer[512];
-     size_t len;
-     fd_t fd;
-+    int rc = 0;
- 
- #ifdef  _MSWINDOWS_
--    snprintf(buffer, sizeof(buffer), "\\\\.\\mailslot\\sipwitch_ctrl");
-+    rc = snprintf(buffer, sizeof(buffer), "\\\\.\\mailslot\\sipwitch_ctrl");
-+    printf_term(buffer, sizeof(buffer), rc);
-     fd = CreateFile(buffer, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- #else
-     sigset_t sigs;
-@@ -697,7 +739,8 @@
-         if(!pwd || !userid)
-             shell::errexit(4, "*** sipcontrol: events: invalid login\n");
- 
--        snprintf(buffer, sizeof(buffer), "/tmp/sipwitch-%s/control", userid);
-+        rc = snprintf(buffer, sizeof(buffer), "/tmp/sipwitch-%s/control", userid);
-+        printf_term(buffer, sizeof(buffer), rc);
-         fd = ::open(buffer, O_WRONLY | O_NONBLOCK);
-     }
- #endif
-@@ -706,16 +749,21 @@
-         shell::errexit(10, "*** sipcontrol: command: offline\n");
- 
- #ifndef _MSWINDOWS_
--    if(timeout)
--        snprintf(buffer, sizeof(buffer), "%ld", (long)getpid());
-+    if(timeout) {
-+        rc = snprintf(buffer, sizeof(buffer), "%ld", (long)getpid());
-+        printf_term(buffer, sizeof(buffer), rc);
-+    }
-     else
- #endif
-+    {
-         buffer[0] = 0;
-+    }
- 
-     while(*argv) {
-         len = strlen(buffer);
--        snprintf(buffer + len, sizeof(buffer) - len - 1, " %s", *(argv++));
-+        rc = snprintf(buffer + len, sizeof(buffer) - len - 1, " %s", *(argv++));
-     }
-+    printf_term(buffer, sizeof(buffer), (int)sizeof(buffer));
- 
- #ifdef  _MSWINDOWS_
-     if(!WriteFile(fd, buffer, (DWORD)strlen(buffer) + 1, NULL, NULL))
-@@ -905,6 +953,7 @@
- static void message(char **argv)
- {
-     char buffer[500];
-+    int rc = 0;
- 
-     if(!argv[1])
-         shell::errexit(1, "*** sipcontrol: message: extension missing\n");
-@@ -916,7 +965,8 @@
-         shell::errexit(1, "*** sipcontrol: message: too many arguments\n");
- 
-     if(argv[2][0] != '{') {
--        snprintf(buffer, sizeof(buffer), "{%s}", argv[2]);
-+        rc = snprintf(buffer, sizeof(buffer), "{%s}", argv[2]);
-+        printf_term(buffer, sizeof(buffer), rc);
-         argv[2] = buffer;
-     }
-     command(argv, 10);
-@@ -978,13 +1028,16 @@
- static void enable(char **argv)
- {
-     char source[128], target[128];
-+    int rc = 0;
- 
-     if(!argv[1])
-         shell::errexit(1, "*** sipcontrol: enable: no configs specified\n");
- 
-     while(*(++argv)) {
--        snprintf(source, sizeof(source), "%s/sipwitch.d/%s.xml", DEFAULT_CFGPATH, *argv);
--        snprintf(target, sizeof(target), "%s/lib/sipwitch/%s.xml", DEFAULT_VARPATH, *argv);
-+        rc = snprintf(source, sizeof(source), "%s/sipwitch.d/%s.xml", DEFAULT_CFGPATH, *argv);
-+        printf_term(source, sizeof(source), rc);
-+        rc = snprintf(target, sizeof(target), "%s/lib/sipwitch/%s.xml", DEFAULT_VARPATH, *argv);
-+        printf_term(target, sizeof(target), rc);
-         fsys::link(source, target);
-     }
-     exit(0);
-@@ -993,12 +1046,14 @@
- static void disable(char **argv)
- {
-     char target[128];
-+    int rc = 0;
- 
-     if(!argv[1])
-         shell::errexit(1, "*** sipcontrol: disable: no configs specified\n");
- 
-     while(*(++argv)) {
--        snprintf(target, sizeof(target), "%s/lib/sipwitch/%s.xml", DEFAULT_VARPATH, *argv);
-+        rc = snprintf(target, sizeof(target), "%s/lib/sipwitch/%s.xml", DEFAULT_VARPATH, *argv);
-+        printf_term(target, sizeof(target), rc);
-         fsys::erase(target);
-     }
-     exit(0);
---- utils/sippasswd.cpp
-+++ utils/sippasswd.cpp
-@@ -22,6 +22,17 @@
- #include <pwd.h>
- #endif
- 
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+}
-+
- using namespace sipwitch;
- 
- #ifdef  _MSWINDOWS_
-@@ -56,6 +67,7 @@
-     string_t digestbuf;
-     fpos_t pos;
-     FILE *fp;
-+    int rc = 0;
- 
- #ifdef  _MSWINDOWS_
-     const char *control = "\\\\.\\mailslot\\sipwitch_ctrl";
-@@ -137,7 +149,8 @@
-     else
-         digestbuf = *digest;
- 
--    snprintf(replace, sizeof(replace), "%s:%s\n", user, *digestbuf);
-+    rc = snprintf(replace, sizeof(replace), "%s:%s\n", user, *digestbuf);
-+    printf_term(replace, sizeof(replace), rc);
- 
-     // create work directory if it does not exist
-     dir::create(DEFAULT_VARPATH "/lib/sipwitch", fsys::GROUP_PRIVATE);
---- utils/cgiserver.cpp
-+++ utils/cgiserver.cpp
-@@ -16,8 +16,39 @@
- 
- #include <sipwitch-config.h>
- #include <sipwitch/sipwitch.h>
--#include <ctype.h>
- #include <sys/stat.h>
-+#include <ctype.h>
-+#include <assert.h>
-+
-+namespace {
-+    // printf family does not add terminating NULL if data fills buffer
-+    inline void printf_term(void* buffer, size_t size, int written)
-+    {
-+        // printf family returns -1 on error
-+        char * p = (char *) buffer;
-+        size_t w = (size_t) written;
-+        written == -1 ? p[0] = '\0' : size >= w ? p[w-1] = '\0' : p[w] = '\0';
-+    }
-+
-+    // This is a std::min function for {int, size_t}
-+    inline unsigned int min_length(int a, size_t b)
-+    {
-+        return static_cast<unsigned int>(a < 0 ? 0 : a < b ? a : b);
-+    }
-+
-+    // This is a short memcpy for escaped XML characters. It only needs to
-+    // handle 6 chars. This version produces the shortest code on x86. A
-+    // switch statement is 120 bytes longer. A memcpy is 42 bytes longer.
-+    inline void copy_bytes(char* dest, const char* src, unsigned int count) {
-+        assert(count > 0 && count <= 6);
-+        if (count >= 6) dest[5] = src[5];
-+        if (count >= 5) dest[4] = src[4];
-+        if (count >= 4) dest[3] = src[3];
-+        if (count >= 3) dest[2] = src[2];
-+        if (count >= 2) dest[1] = src[1];
-+        if (count >= 1) dest[0] = src[0];
-+    }
-+}
- 
- using namespace sipwitch;
- 
-@@ -96,13 +127,15 @@
- static size_t xmlformat(char *dp, size_t max, const char *fmt, ...)
- {
-     va_list args;
-+    int rc;
- 
-     if(max < 1)
-         return 0;
- 
-     va_start(args, fmt);
--    vsnprintf(dp, max, fmt, args);
-+    rc = vsnprintf(dp, max, fmt, args);
-     va_end(args);
-+    printf_term(dp, max, rc);
-     return strlen(dp);
- }
- 
-@@ -181,40 +214,72 @@
- 
- */
- 
-+/**
-+ * Adds XML escaping to a text string. xmltext() provides full data
-+ * escaping, but it does not handle comments properly. xmltext()
-+ * returns the strlen() of the C-string in dp. The C-string is
-+ * always NULL-terminated, and may truncate the original string.
-+ * @author David Sugar <dyfet@gnutelephony.org>
-+ */
- static size_t xmltext(char *dp, size_t max, const char *src)
- {
-+    // GCC analyzer findings
-+    if (! dp) return 0;
-+    dp[0] = '\0';
-+    if (! src) return 0;
-+
-+    char ch;
-     unsigned count = 0;
--    while(*src && count < max) {
--        switch(*src) {
-+    unsigned elems = 0;
-+    const char* escaped;
-+
-+    while((ch = *src++) && count < max) {
-+        switch(ch) {
-         case '&':
--            snprintf(dp + count, max - count, "&amp;");
--            count += strlen(dp + count);
--            ++src;
-+            //rc = snprintf(dp + count, max - count, "&amp;");
-+            //count += strlen(dp + count);
-+            //++src;
-+            elems = min_length(5, max - count);
-+            escaped = "&amp;";
-             break;
-         case '<':
--            snprintf(dp + count, max - count, "&lt;");
--            count += strlen(dp + count);
--            ++src;
-+            //rc = snprintf(dp + count, max - count, "&lt;");
-+            //count += strlen(dp + count);
-+            //++src;
-+            elems = min_length(4, max - count);
-+            escaped = "&lt;";
-             break;
-         case '>':
--            snprintf(dp + count, max - count, "&gt;");
--            count += strlen(dp + count);
--            ++src;
-+            //rc = snprintf(dp + count, max - count, "&gt;");
-+            //count += strlen(dp + count);
-+            //++src;
-+            elems = min_length(4, max - count);
-+            escaped = "&gt;";
-             break;
-         case '\"':
--            snprintf(dp + count, max - count, "&quot;");
--            count += strlen(dp + count);
--            ++src;
-+            //rc = snprintf(dp + count, max - count, "&quot;");
-+            //count += strlen(dp + count);
-+            //++src;
-+            elems = min_length(6, max - count);
-+            escaped = "&quot;";
-             break;
-          case '\'':
--            snprintf(dp + count, max - count, "&apos;");
--            count = strlen(dp + count);
--            ++src;
-+            //rc = snprintf(dp + count, max - count, "&apos;");
-+            //count = strlen(dp + count);
-+            //++src;
-+            elems = min_length(6, max - count);
-+            escaped = "&apos;";
-             break;
-         default:
--            dp[count++] = *(src++);
-+            //dp[count++] = *(src++);
-+            dp[count++] = ch;
-+            continue; // don't fallthrough
-         }
-+
-+        copy_bytes(dp + count, escaped, elems);
-+        count += elems;
-     }
-+    count < max ? dp[count] = '\0' : count = max-1, dp[count] = '\0';
-     return count;
- }
- 
-@@ -276,7 +341,7 @@
-         if(*cp != '&') {
-             *(dp++) = *(cp++);
-             continue;
--            }
-+        }
-         if(!strncmp(cp, "&amp;", 5)) {
-                     *(dp++) = '&';
-             cp += 5;
-@@ -464,6 +529,7 @@
-     pid_t opid;
-     fd_t fd;
-     char buf[65];
-+    int rc = 0;
- 
- retry:
-     fd = open(DEFAULT_VARPATH "/run/sipwitch/cgilock", O_CREAT|O_WRONLY|O_TRUNC|O_EXCL, fsys::OWNER_PUBLIC);
-@@ -481,7 +547,8 @@
-             error(408, "Lock timed out");
-     }
- 
--    snprintf(buf, sizeof(buf), "%ld\n", (long)getpid());
-+    rc = snprintf(buf, sizeof(buf), "%ld\n", (long)getpid());
-+    printf_term(buf, sizeof(buf), rc);
-     if(write(fd, buf, strlen(buf)) < (ssize_t)strlen(buf))
-         error(500, "Failed Lock");
-     close(fd);
-@@ -495,6 +562,7 @@
-     unsigned len = 0;
-     va_list args;
-     FILE *fp;
-+    int rc = 0;
- 
- #ifndef _MSWINDOWS_
-     int signo;
-@@ -504,13 +572,16 @@
-     sigaddset(&sigs, SIGUSR2);
-     sigaddset(&sigs, SIGALRM);
-     sigprocmask(SIG_BLOCK, &sigs, NULL);
--    snprintf(buf, sizeof(buf), "%ld ", (long)getpid());
-+    rc = snprintf(buf, sizeof(buf), "%ld ", (long)getpid());
-+    printf_term(buf, sizeof(buf), rc);
-     len = strlen(buf);
- #endif
- 
-     va_start(args, fmt);
--    vsnprintf(buf + len, sizeof(buf) - len, fmt, args);
-+    rc = vsnprintf(buf + len, sizeof(buf) - len, fmt, args);
-     va_end(args);
-+    printf_term(buf + len, sizeof(buf) - len, rc);
-+
-     if(!strchr(buf, '\n'))
-         String::add(buf, sizeof(buf), "\n");
- 
-@@ -965,10 +1036,14 @@
- {
-     char buffer[512];
-     FILE *fp;
-+    int rc = 0;
-+
- #ifdef  _MSWINDOWS_
--    snprintf(buffer, sizeof(buffer), "%s\n", cmd);
-+    rc = snprintf(buffer, sizeof(buffer), "%s\n", cmd);
-+    printf_term(buffer, sizeof(buffer), rc);
- #else
--    snprintf(buffer, sizeof(buffer), "%ld %s\n", (long)getpid(), cmd);
-+    rc = snprintf(buffer, sizeof(buffer), "%ld %s\n", (long)getpid(), cmd);
-+    printf_term(buffer, sizeof(buffer), rc);
- #endif
-     char *ep = strchr(buffer, '\n');
-     if(ep)
-@@ -1029,6 +1104,7 @@
-     char buffer[1024];
-     rpcint_t diff = 0;
-     time_t now;
-+    int rc = 0;
- 
-     if(params.argc != 1)
-         fault(3, "Invalid Parameters");
-@@ -1048,7 +1124,8 @@
-         if(!map.created)
-             continue;
- 
--        snprintf(id, sizeof(id), "%08x:%d", map.sequence, map.cid);
-+        rc = snprintf(id, sizeof(id), "%08x:%d", map.sequence, map.cid);
-+        printf_term(id, sizeof(id), rc);
-         if(!eq(id, cid))
-             continue;
- 
-@@ -1062,6 +1139,8 @@
-             map.source, map.target, map.display, diff);
-         reply(buffer);
-     }
-+    printf_term(id, sizeof(id), (int)sizeof(id));
-+
-     fault(6, "Unknown Call");
-     reset_unsafe<MappedCall>(map);
- }
-@@ -1073,6 +1152,7 @@
-     unsigned index = 0;
-     char id[32];
-     MappedCall map;
-+    int rc = 0;
- 
-     if(params.argc != 0)
-         fault(3, "Invalid Parameters");
-@@ -1091,7 +1171,8 @@
-         if(!map.created)
-             continue;
- 
--        snprintf(id, sizeof(id), "%08x:%d", map.sequence, map.cid);
-+        rc = snprintf(id, sizeof(id), "%08x:%d", map.sequence, map.cid);
-+        printf_term(id, sizeof(id), rc);
-         response(buffer, size, "!s", buffer);
-     }
-     response(buffer, size, "]");
-@@ -1204,6 +1285,7 @@
-     char buffer[2048];
-     time_t now;
-     const char *status = "idle";
-+    int rc = 0;
- 
-     if(params.argc != 1)
-         fault(3, "Invalid Parameters");
-@@ -1229,8 +1311,10 @@
-         if(!eq(map.userid, id))
-             continue;
- 
--        if(map.ext)
--            snprintf(ext, sizeof(ext), "%u", map.ext);
-+        if(map.ext) {
-+            rc = snprintf(ext, sizeof(ext), "%u", map.ext);
-+            printf_term(ext, sizeof(ext), rc);
-+        }
-         else
-             String::set(ext, sizeof(ext), map.userid);
- 
-@@ -1656,6 +1740,7 @@
-     MappedCall buffer;
-     char idbuf[32];
-     time_t now;
-+    int rc = 0;
- 
-     if(!count)
-         error(405, "Server unavailable");
-@@ -1674,7 +1759,8 @@
-         if(!buffer.created)
-             continue;
- 
--        snprintf(idbuf, sizeof(idbuf), "%08x:%u", buffer.sequence, buffer.cid);
-+        rc = snprintf(idbuf, sizeof(idbuf), "%08x:%u", buffer.sequence, buffer.cid);
-+        printf_term(idbuf, sizeof(idbuf), rc);
-         if(id && !String::equal(id, idbuf))
-             continue;
-         printf(" <call id=\"%s\">\n", idbuf);
-@@ -1834,13 +1920,17 @@
-     char buf[256];
-     GetEnvironmentVariable("APPDATA", buf, 192);
-     unsigned len = strlen(buf);
--    snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\config.xml");
-+    rc = snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\config.xml");
-+    printf_term(buf + len, sizeof(buf) - len, rc);
-     save_file = strdup(buf);
--    snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\config.tmp");
-+    rc = snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\config.tmp");
-+    printf_term(buf + len, sizeof(buf) - len, rc);
-     temp_file = strdup(buf);
--    snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\snapshot.log");
-+    rc = snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\snapshot.log");
-+    printf_term(buf + len, sizeof(buf) - len, rc);
-     snapshot_file = strdup(buf);
--    snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\dumpfile.log");
-+    rc = snprintf(buf + len, sizeof(buf) - len, "\\sipwitch\\dumpfile.log");
-+    printf_term(buf + len, sizeof(buf) - len, rc);
-     dump_file = strdup(buf);
-     if(GetEnvironmentVariable("GATEWAY_INTERFACE", buf, sizeof(buf)) > 0)
-         cgi_version = strdup(buf);
diff --git a/patch/sslscan.patch b/patch/sslscan.patch
deleted file mode 100644
index 6fd9dc090..000000000
--- a/patch/sslscan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sslscan.c
-+++ sslscan.c
-@@ -36,6 +36,10 @@
- 
- #define _GNU_SOURCE
- 
-+#ifndef VERSION
-+# define VERSION "2.0.0"
-+#endif
-+
- // Includes...
- #ifdef _WIN32
-   #define WIN32_LEAN_AND_MEAN
diff --git a/patch/ucommon.patch b/patch/ucommon.patch
deleted file mode 100644
index d5feef423..000000000
--- a/patch/ucommon.patch
+++ /dev/null
@@ -1,2738 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with uCommon C/C++ libraries.
-#
-# This patch includes at least two other fixes and patches.
-# - https://lists.gnu.org/archive/html/bug-commoncpp/2020-05/msg00000.html
-# - https://lists.gnu.org/archive/html/bug-commoncpp/2019-05/msg00000.html
-# - https://lists.gnu.org/archive/html/bug-commoncpp/2017-10/msg00000.html
---- ucommon.pc.in
-+++ ucommon.pc.in
-@@ -1,6 +1,6 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
- includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
--prefix=@CMAKE_INSTALL_PREFIX@
- modflags="@MODULE_FLAGS@"
- minimal="-lucommon @PKG_UCOMMON_LIBS@"
- cmake_macros=@CMAKE_INSTALL_FULL_DATADIR@/ucommon/cmake
---- inc/ucommon/Makefile.am
-+++ inc/ucommon/Makefile.am
-@@ -18,7 +18,7 @@
- 	timers.h socket.h access.h export.h thread.h mapped.h \
- 	keydata.h memory.h platform.h fsys.h ucommon.h stream.h \
- 	shell.h protocols.h atomic.h numbers.h condition.h \
--	datetime.h unicode.h secure.h generics.h stl.h \
-+	datetime.h unicode.h secure.h generics.h nullptr.h stl.h \
- 	typeref.h arrayref.h mapref.h shared.h temporary.h
- 
- 
---- inc/ucommon/Makefile.in
-+++ inc/ucommon/Makefile.in
-@@ -340,7 +340,7 @@
- 	timers.h socket.h access.h export.h thread.h mapped.h \
- 	keydata.h memory.h platform.h fsys.h ucommon.h stream.h \
- 	shell.h protocols.h atomic.h numbers.h condition.h \
--	datetime.h unicode.h secure.h generics.h stl.h \
-+	datetime.h unicode.h secure.h generics.h nullptr.h stl.h \
- 	typeref.h arrayref.h mapref.h shared.h temporary.h
- 
- all: all-am
---- openssl/digest.cpp
-+++ openssl/digest.cpp
-@@ -18,6 +18,21 @@
- 
- #include "local.h"
- 
-+#ifdef HAVE_OPENSSL_OPENSSLV_H
-+#include <openssl/opensslv.h>
-+#endif
-+
-+#ifdef HAVE_OPENSSL_CRYPTO_H
-+#include <openssl/crypto.h>
-+#endif
-+
-+#ifdef HAVE_OPENSSL_EVP_H
-+#include <openssl/evp.h>
-+#endif
-+
-+#include <stdexcept>
-+#include <cassert>
-+
- namespace ucommon {
- 
- bool Digest::has(const char *id)
-@@ -36,26 +51,49 @@
-         type = "sha1";
- 
-     hashtype = (void *)EVP_get_digestbyname(type);
--    if(hashtype) {
-+    assert(hashtype != NULL);
-+
-+    if (hashtype)
-+    {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+        context = EVP_MD_CTX_new();
-+        assert(context != NULL);
-+
-+        if (context) {
-+            int rc = EVP_DigestInit_ex((EVP_MD_CTX*)context, (const EVP_MD*)hashtype, NULL);
-+            if (rc != 1) throw std::runtime_error("EVP_DigestInit_ex failed");
-+        }
-+#else
-         context = new EVP_MD_CTX;
--        EVP_MD_CTX_init((EVP_MD_CTX *)context);
--        EVP_DigestInit_ex((EVP_MD_CTX *)context, (const EVP_MD *)hashtype, NULL);
-+        assert(context != NULL);
-+
-+        if (context) {
-+            EVP_MD_CTX_init((EVP_MD_CTX *)context);
-+            EVP_DigestInit_ex((EVP_MD_CTX *)context, (const EVP_MD *)hashtype, NULL);
-+        }
-+#endif
-     }
- }
- 
- void Digest::release(void)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if(context)
-+        EVP_MD_CTX_free((EVP_MD_CTX *)context);
-+    context = NULL;
-+#else
-     if(context)
-         EVP_MD_CTX_cleanup((EVP_MD_CTX *)context);
- 
-     if(context) {
--        memset(context, 0, sizeof(EVP_MD_CTX));
-+        OPENSSL_cleanse(context, sizeof(EVP_MD_CTX));
-         delete (EVP_MD_CTX *)context;
-         context = NULL;
-     }
-+#endif
- 
-     bufsize = 0;
--    memset(textbuf, 0, sizeof(textbuf));
-+    OPENSSL_cleanse(textbuf, sizeof(textbuf));
- }
- 
- bool Digest::put(const void *address, size_t size)
-@@ -63,23 +101,48 @@
-     if(!context)
-         return false;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    int rc = EVP_DigestUpdate((EVP_MD_CTX *)context, address, size);
-+    return rc == 1;
-+#else
-     EVP_DigestUpdate((EVP_MD_CTX *)context, address, size);
-     return true;
-+#endif
- }
- 
- void Digest::reset(void)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if(!context) {
-+        if(hashtype) {
-+            context = EVP_MD_CTX_new();
-+            assert(context != NULL);
-+        }
-+        else
-+            return;
-+    }
-+
-+    if (context) {
-+        int rc = EVP_DigestInit_ex((EVP_MD_CTX*)context, (const EVP_MD*)hashtype, NULL);
-+        if (rc != 1) throw std::runtime_error("EVP_DigestInit_ex failed");
-+        bufsize = 0;
-+    }
-+#else
-     if(!context) {
-         if(hashtype) {
-             context = new EVP_MD_CTX;
-+            assert(context != NULL);
-             EVP_MD_CTX_init((EVP_MD_CTX *)context);
-         }
-         else
-             return;
-     }
- 
--    EVP_DigestInit_ex((EVP_MD_CTX *)context, (const EVP_MD *)hashtype, NULL);
--    bufsize = 0;
-+    if (context) {
-+        EVP_DigestInit_ex((EVP_MD_CTX *)context, (const EVP_MD *)hashtype, NULL);
-+        bufsize = 0;
-+    }
-+#endif
- }
- 
- void Digest::recycle(bool bin)
-@@ -89,6 +152,31 @@
-     if(!context)
-         return;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    int rc;
-+    if(!bufsize) {
-+        rc = EVP_DigestFinal_ex((EVP_MD_CTX *)context, buffer, &size);
-+        if (rc != 1) throw std::runtime_error("EVP_DigestFinal_ex failed");
-+    }
-+
-+    rc = EVP_DigestInit_ex((EVP_MD_CTX *)context, (const EVP_MD *)hashtype, NULL);
-+    if (rc != 1) throw std::runtime_error("EVP_DigestInit_ex failed");
-+
-+    if(bin) {
-+        rc = EVP_DigestUpdate((EVP_MD_CTX *)context, buffer, size);
-+        if (rc != 1) throw std::runtime_error("EVP_DigestUpdate failed");
-+    }
-+    else {
-+        unsigned count = 0;
-+        while(count < size) {
-+            snprintf(textbuf + (count * 2), 3, "%2.2x", buffer[count]);
-+            ++count;
-+        }
-+        rc = EVP_DigestUpdate((EVP_MD_CTX *)context, textbuf, size * 2);
-+        if (rc != 1) throw std::runtime_error("EVP_DigestUpdate failed");
-+    }
-+    bufsize = 0;
-+#else
-     if(!bufsize)
-         EVP_DigestFinal_ex((EVP_MD_CTX *)context, buffer, &size);
- 
-@@ -99,15 +187,13 @@
-     else {
-         unsigned count = 0;
-         while(count < size) {
--            snprintf(textbuf + (count * 2), 3, "%2.2x",
--buffer[count]);
-+            snprintf(textbuf + (count * 2), 3, "%2.2x", buffer[count]);
-             ++count;
-         }
--        EVP_DigestUpdate((EVP_MD_CTX *)context, textbuf, size *
--2);
-+        EVP_DigestUpdate((EVP_MD_CTX *)context, textbuf, size * 2);
-     }
-     bufsize = 0;
--
-+#endif
- }
- 
- const uint8_t *Digest::get(void)
-@@ -121,7 +207,12 @@
-     if(!context)
-         return NULL;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    int rc = EVP_DigestFinal_ex((EVP_MD_CTX *)context, buffer, &size);
-+    if (rc != 1) throw std::runtime_error("EVP_DigestFinal_ex failed");
-+#else
-     EVP_DigestFinal_ex((EVP_MD_CTX *)context, buffer, &size);
-+#endif
- 
-     release();
- 
---- openssl/random.cpp
-+++ openssl/random.cpp
-@@ -18,6 +18,14 @@
- 
- #include "local.h"
- 
-+#ifdef HAVE_OPENSSL_OPENSSLV_H
-+#include <openssl/opensslv.h>
-+#endif
-+
-+#ifdef HAVE_OPENSSL_RAND_H
-+#include <openssl/rand.h>
-+#endif
-+
- namespace ucommon {
- 
- void Random::seed(void)
-@@ -47,9 +55,15 @@
- {
-     secure::init();
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if(RAND_bytes(buf, (int)size))
-+        return size;
-+    return 0;
-+#else
-     if(RAND_pseudo_bytes(buf, (int)size))
-         return size;
-     return 0;
-+#endif
- }
- 
- bool Random::status(void)
---- openssl/cipher.cpp
-+++ openssl/cipher.cpp
-@@ -18,6 +18,17 @@
- 
- #include "local.h"
- 
-+#ifdef HAVE_OPENSSL_OPENSSLV_H
-+#include <openssl/opensslv.h>
-+#endif
-+
-+#ifdef HAVE_OPENSSL_EVP_H
-+#include <openssl/evp.h>
-+#endif
-+
-+#include <stdexcept>
-+#include <cassert>
-+
- static const uint8_t *_salt = NULL;
- static unsigned _rounds = 1;
- 
-@@ -76,6 +87,7 @@
-         String::set(fpart, sizeof(algoname), fpart + 1);
- 
-     algotype = EVP_get_cipherbyname(algoname);
-+    assert(algotype != NULL);
- 
-     if(!algotype)
-         return;
-@@ -96,7 +108,10 @@
-     if(fpart && fpart == lpart)
-         String::set(fpart, sizeof(algoname), fpart + 1);
- 
--    return (EVP_get_cipherbyname(algoname) != NULL);
-+    const EVP_CIPHER * cipher = EVP_get_cipherbyname(algoname);
-+    assert(cipher != NULL);
-+
-+    return (cipher != NULL);
- }
- 
- void Cipher::push(uint8_t *address, size_t size)
-@@ -105,12 +120,19 @@
- 
- void Cipher::release(void)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    keys.clear();
-+    if(context)
-+        EVP_CIPHER_CTX_free((EVP_CIPHER_CTX*)context);
-+    context = NULL;
-+#else
-     keys.clear();
-     if(context) {
-         EVP_CIPHER_CTX_cleanup((EVP_CIPHER_CTX*)context);
-         delete (EVP_CIPHER_CTX*)context;
-         context = NULL;
-     }
-+#endif
- }
- 
- void Cipher::set(const key_t key, mode_t mode, uint8_t *address, size_t size)
-@@ -125,10 +147,23 @@
-     if(!keys.keysize)
-         return;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    context = EVP_CIPHER_CTX_new();
-+    assert(context != NULL);
-+
-+    if (context)
-+    {
-+        int rc = EVP_CipherInit_ex((EVP_CIPHER_CTX *)context, (EVP_CIPHER *)keys.algotype, NULL, keys.keybuf, keys.ivbuf, (int)mode);
-+        if (rc != 1) throw std::runtime_error("EVP_CipherInit_ex failed");
-+        rc = EVP_CIPHER_CTX_set_padding((EVP_CIPHER_CTX *)context, 0);
-+        if (rc != 1) throw std::runtime_error("EVP_CIPHER_CTX_set_padding failed");
-+    }
-+#else
-     context = new EVP_CIPHER_CTX;
-     EVP_CIPHER_CTX_init((EVP_CIPHER_CTX *)context);
-     EVP_CipherInit_ex((EVP_CIPHER_CTX *)context, (EVP_CIPHER *)keys.algotype, NULL, keys.keybuf, keys.ivbuf, (int)mode);
-     EVP_CIPHER_CTX_set_padding((EVP_CIPHER_CTX *)context, 0);
-+#endif
- }
- 
- size_t Cipher::put(const uint8_t *data, size_t size)
---- openssl/hmac.cpp
-+++ openssl/hmac.cpp
-@@ -18,75 +18,128 @@
- 
- #include "local.h"
- 
-+#ifdef HAVE_OPENSSL_OPENSSLV_H
-+#include <openssl/opensslv.h>
-+#endif
-+
-+#ifdef HAVE_OPENSSL_CRYPTO_H
-+#include <openssl/crypto.h>
-+#endif
-+
-+#ifdef HAVE_OPENSSL_EVP_H
-+#include <openssl/evp.h>
-+#endif
-+
-+#include <stdexcept>
-+#include <cassert>
-+
- namespace ucommon {
- 
- bool HMAC::has(const char *id)
- {
--    return (EVP_get_digestbyname(id) != NULL);
-+	return (EVP_get_digestbyname(id) != NULL);
- }
- 
- void HMAC::set(const char *digest, const secure::keybytes& key)
- {
--    secure::init();
-+	secure::init();
- 
--    release();
-+	release();
- 
--    size_t len = key.size() / 8;
-+	size_t len = key.size() / 8;
- 
--    hmactype = EVP_get_digestbyname(digest);
--    if(hmactype && len) {
--        context = new ::HMAC_CTX;
--        HMAC_CTX_init((HMAC_CTX *)context);
--        HMAC_Init((HMAC_CTX *)context, *key, (int)len, (const EVP_MD *)hmactype);
--    }
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	hmactype = EVP_get_digestbyname(digest);
-+	assert(hmactype != NULL);
-+
-+	if(hmactype && len) {
-+		context = HMAC_CTX_new();
-+		assert(context != NULL);
-+
-+		if (context) {
-+			int rc = HMAC_Init_ex((HMAC_CTX *)context, *key, (int)len, (const EVP_MD *)hmactype, NULL);
-+			if (rc != 1) throw std::runtime_error("HMAC_Init_ex failed");
-+		}
-+	}
-+#else
-+	hmactype = EVP_get_digestbyname(digest);
-+	assert(hmactype != NULL);
-+
-+	if(hmactype && len) {
-+		context = new HMAC_CTX;
-+		assert(context != NULL);
-+
-+		if (context) {
-+			HMAC_CTX_init((HMAC_CTX *)context);
-+			HMAC_Init((HMAC_CTX *)context, *key, (int)len, (const EVP_MD *)hmactype);
-+		}
-+	}
-+#endif
- }
- 
- void HMAC::release(void)
- {
--    if(context) {
--        HMAC_cleanup((HMAC_CTX *)context);
--        memset(context, 0, sizeof(HMAC_CTX));
--        delete (HMAC_CTX *)context;
--        context = NULL;
--    }
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	if(context)
-+		HMAC_CTX_free((HMAC_CTX *)context);
-+	context = NULL;
-+#else
-+	if(context) {
-+		HMAC_cleanup((HMAC_CTX *)context);
-+		OPENSSL_cleanse(context, sizeof(HMAC_CTX));
-+		delete (HMAC_CTX *)context;
-+		context = NULL;
-+	}
-+#endif
- 
--    bufsize = 0;
--    memset(textbuf, 0, sizeof(textbuf));
-+	bufsize = 0;
-+	OPENSSL_cleanse(textbuf, sizeof(textbuf));
- }
- 
- bool HMAC::put(const void *address, size_t size)
- {
--    if(!context)
--        return false;
-+	if(!context)
-+		return false;
- 
--    HMAC_Update((HMAC_CTX *)context, (const uint8_t *)address, size);
--    return true;
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	int rc = HMAC_Update((HMAC_CTX *)context, (const uint8_t *)address, size);
-+	return rc == 1;
-+#else
-+	HMAC_Update((HMAC_CTX *)context, (const uint8_t *)address, size);
-+	return true;
-+#endif
- }
- 
- const uint8_t *HMAC::get(void)
- {
--    unsigned count = 0;
--    unsigned size = 0;
-+	unsigned count = 0;
-+	unsigned size = 0;
- 
--    if(bufsize)
--        return buffer;
-+	if(bufsize)
-+		return buffer;
- 
--    if(!context)
--        return NULL;
-+	if(!context)
-+		return NULL;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	int rc = HMAC_Final((HMAC_CTX *)context, buffer, &size);
-+	if (rc != 1) throw std::runtime_error("HMAC_Final failed");
-+#else
- 	HMAC_Final((HMAC_CTX *)context, buffer, &size);
-+#endif
-+
- 	release();
- 
- 	if(!size)
- 		return NULL;
- 
--    bufsize = size;
-+	bufsize = size;
- 
--    while(count < bufsize) {
--        snprintf(textbuf + (count * 2), 3, "%2.2x", buffer[count]);
--        ++count;
--    }
--    return buffer;
-+	while(count < bufsize) {
-+		snprintf(textbuf + (count * 2), 3, "%2.2x", buffer[count]);
-+		++count;
-+	}
-+	return buffer;
- }
- 
- } // namespace ucommon
---- corelib/arrayref.cpp
-+++ corelib/arrayref.cpp
-@@ -17,6 +17,7 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/typeref.h>
- #include <ucommon/string.h>
- #include <ucommon/thread.h>
-@@ -212,7 +213,7 @@
- 
- void ArrayRef::clear(void)
- {
--    reset(nullptr);
-+    reset(UCOMMON_NULLPTR);
- }
- 
- ArrayRef::Array *ArrayRef::create(arraytype_t mode, size_t size)
---- corelib/atomic.cpp
-+++ corelib/atomic.cpp
-@@ -18,8 +18,10 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/atomic.h>
- #include <ucommon/thread.h>
-+#include <cstdlib>
- 
- #if __cplusplus >= 201103l
- #include <atomic>
-@@ -468,7 +470,7 @@
-             --base;
-         }
-         ::free(base);
--        address = nullptr;
-+        address = UCOMMON_NULLPTR;
-     }
- }
- 
---- corelib/linked.cpp
-+++ corelib/linked.cpp
-@@ -18,6 +18,7 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/linked.h>
- #include <ucommon/string.h>
- #include <ucommon/thread.h>
-@@ -26,7 +27,7 @@
- 
- LinkedObject::LinkedObject(LinkedObject **root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
-     enlist(root);
- }
- 
-@@ -38,7 +39,7 @@
- {
-     LinkedObject *after;
- 
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
-     while(root) {
-         after = root->Next;
-@@ -49,7 +50,7 @@
- 
- bool LinkedObject::is_member(LinkedObject *list) const
- {
--    assert(list != nullptr);
-+    assert(list != UCOMMON_NULLPTR);
- 
-     while(list) {
-         if(list == this)
-@@ -61,7 +62,7 @@
- 
- void LinkedObject::enlist(LinkedObject **root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
-     Next = *root;
-     *root = this;
-@@ -69,9 +70,9 @@
- 
- void LinkedObject::delist(LinkedObject **root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
--    LinkedObject *prior = nullptr, *node = *root;
-+    LinkedObject *prior = UCOMMON_NULLPTR, *node = *root;
- 
-     while(node && node != this) {
-         prior = node;
-@@ -89,22 +90,22 @@
- 
- void ReusableObject::release(void)
- {
--    Next = nullptr;
-+    Next = UCOMMON_NULLPTR;
- }
- 
- NamedObject::NamedObject() :
- OrderedObject()
- {
--    Id = nullptr;
-+    Id = UCOMMON_NULLPTR;
- }
- 
- NamedObject::NamedObject(OrderedIndex *root, char *nid) :
- OrderedObject()
- {
--    assert(root != nullptr);
--    assert(nid != nullptr && *nid != 0);
-+    assert(root != UCOMMON_NULLPTR);
-+    assert(nid != UCOMMON_NULLPTR && *nid != 0);
- 
--    NamedObject *node = static_cast<NamedObject*>(root->head), *prior = nullptr;
-+    NamedObject *node = static_cast<NamedObject*>(root->head), *prior = UCOMMON_NULLPTR;
- 
-     while(node) {
-         if(node->equal(nid)) {
-@@ -118,7 +119,7 @@
-         prior = node;
-         node = node->getNext();
-     }
--    Next = nullptr;
-+    Next = UCOMMON_NULLPTR;
-     Id = nid;
-     if(!root->head)
-         root->head = this;
-@@ -135,23 +136,23 @@
- NamedObject::NamedObject(NamedObject **root, char *nid, unsigned max) :
- OrderedObject()
- {
--    assert(root != nullptr);
--    assert(nid != nullptr && *nid != 0);
-+    assert(root != UCOMMON_NULLPTR);
-+    assert(nid != UCOMMON_NULLPTR && *nid != 0);
-     assert(max > 0);
- 
--    Id = nullptr;
-+    Id = UCOMMON_NULLPTR;
-     add(root, nid, max);
- }
- 
- void NamedObject::add(NamedObject **root, char *nid, unsigned max)
- {
--    assert(root != nullptr);
--    assert(nid != nullptr && *nid != 0);
-+    assert(root != UCOMMON_NULLPTR);
-+    assert(nid != UCOMMON_NULLPTR && *nid != 0);
-     assert(max > 0);
- 
-     clearId();
- 
--    NamedObject *node, *prior = nullptr;
-+    NamedObject *node, *prior = UCOMMON_NULLPTR;
- 
-     if(max < 2)
-         max = 0;
-@@ -185,7 +186,7 @@
- {
-     if(Id) {
-         free(Id);
--        Id = nullptr;
-+        Id = UCOMMON_NULLPTR;
-     }
- }
- 
-@@ -217,7 +218,7 @@
- 
- LinkedObject *LinkedObject::getIndexed(LinkedObject *root, unsigned index)
- {
--    while(index-- && root != nullptr)
-+    while(index-- && root != UCOMMON_NULLPTR)
-         root = root->Next;
- 
-     return root;
-@@ -225,7 +226,7 @@
- 
- unsigned LinkedObject::count(const LinkedObject *root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
-     unsigned c = 0;
-     while(root) {
-@@ -237,7 +238,7 @@
- 
- unsigned NamedObject::keyindex(const char *id, unsigned max)
- {
--    assert(id != nullptr && *id != 0);
-+    assert(id != UCOMMON_NULLPTR && *id != 0);
-     assert(max > 1);
- 
-     unsigned val = 0;
-@@ -250,7 +251,7 @@
- 
- int NamedObject::compare(const char *cid) const
- {
--    assert(cid != nullptr && *cid != 0);
-+    assert(cid != UCOMMON_NULLPTR && *cid != 0);
- 
- #ifdef  HAVE_STRCOLL
-     return strcoll(Id, cid);
-@@ -263,17 +264,17 @@
- 
-     static int ncompare(const void *o1, const void *o2)
-     {
--        assert(o1 != nullptr);
--        assert(o2 != nullptr);
-+        assert(o1 != UCOMMON_NULLPTR);
-+        assert(o2 != UCOMMON_NULLPTR);
-         const NamedObject * const *n1 = static_cast<const NamedObject * const*>(o1);
--        const NamedObject * const*n2 = static_cast<const NamedObject * const*>(o2);
-+        const NamedObject * const *n2 = static_cast<const NamedObject * const*>(o2);
-         return ((*n1)->compare((*n2)->getId()));
-     }
- }
- 
- NamedObject **NamedObject::sort(NamedObject **list, size_t size)
- {
--    assert(list != nullptr);
-+    assert(list != UCOMMON_NULLPTR);
- 
-     if(!size) {
-         while(list[size])
-@@ -286,23 +287,23 @@
- 
- NamedObject **NamedObject::index(NamedObject **idx, unsigned max)
- {
--    assert(idx != nullptr);
-+    assert(idx != UCOMMON_NULLPTR);
-     assert(max > 0);
-     NamedObject **op = new NamedObject *[count(idx, max) + 1];
-     unsigned pos = 0;
--    NamedObject *node = skip(idx, nullptr, max);
-+    NamedObject *node = skip(idx, UCOMMON_NULLPTR, max);
- 
-     while(node) {
-         op[pos++] = node;
-         node = skip(idx, node, max);
-     }
--    op[pos] = nullptr;
-+    op[pos] = UCOMMON_NULLPTR;
-     return op;
- }
- 
- NamedObject *NamedObject::skip(NamedObject **idx, NamedObject *rec, unsigned max)
- {
--    assert(idx != nullptr);
-+    assert(idx != UCOMMON_NULLPTR);
-     assert(max > 0);
- 
-     unsigned key = 0;
-@@ -313,7 +314,7 @@
-         while(key < max && !idx[key])
-             ++key;
-         if(key >= max)
--            return nullptr;
-+            return UCOMMON_NULLPTR;
-         return idx[key];
-     }
- 
-@@ -322,7 +323,7 @@
- 
- void NamedObject::purge(NamedObject **idx, unsigned max)
- {
--    assert(idx != nullptr);
-+    assert(idx != UCOMMON_NULLPTR);
-     assert(max > 0);
- 
-     LinkedObject *root;
-@@ -338,7 +339,7 @@
- 
- unsigned NamedObject::count(NamedObject **idx, unsigned max)
- {
--    assert(idx != nullptr);
-+    assert(idx != UCOMMON_NULLPTR);
-     assert(max > 0);
- 
-     unsigned count = 0;
-@@ -359,8 +360,8 @@
- 
- NamedObject *NamedObject::remove(NamedObject **idx, const char *id, unsigned max)
- {
--    assert(idx != nullptr);
--    assert(id != nullptr && *id != 0);
-+    assert(idx != UCOMMON_NULLPTR);
-+    assert(id != UCOMMON_NULLPTR && *id != 0);
-     assert(max > 0);
- 
-     if(max < 2)
-@@ -371,8 +372,8 @@
- 
- NamedObject *NamedObject::map(NamedObject **idx, const char *id, unsigned max)
- {
--    assert(idx != nullptr);
--    assert(id != nullptr && *id != 0);
-+    assert(idx != UCOMMON_NULLPTR);
-+    assert(id != UCOMMON_NULLPTR && *id != 0);
-     assert(max > 0);
- 
-     if(max < 2)
-@@ -383,7 +384,7 @@
- 
- NamedObject *NamedObject::find(NamedObject *root, const char *id)
- {
--    assert(id != nullptr && *id != 0);
-+    assert(id != UCOMMON_NULLPTR && *id != 0);
- 
-     while(root) {
-         if(root->equal(id))
-@@ -395,10 +396,10 @@
- 
- NamedObject *NamedObject::remove(NamedObject **root, const char *id)
- {
--    assert(id != nullptr && *id != 0);
--    assert(root != nullptr);
-+    assert(id != UCOMMON_NULLPTR && *id != 0);
-+    assert(root != UCOMMON_NULLPTR);
- 
--    NamedObject *prior = nullptr;
-+    NamedObject *prior = UCOMMON_NULLPTR;
-     NamedObject *node = *root;
- 
-     while(node) {
-@@ -409,9 +410,9 @@
-     }
- 
-     if(!node)
--        return nullptr;
-+        return UCOMMON_NULLPTR;
- 
--    if(prior == nullptr)
-+    if(prior == UCOMMON_NULLPTR)
-         *root = node->getNext();
-     else
-         prior->Next = node->getNext();
-@@ -427,21 +428,21 @@
- NamedObject(), Child()
- {
-     Id = nid;
--    Parent = nullptr;
-+    Parent = UCOMMON_NULLPTR;
- }
- 
- NamedTree::NamedTree(const NamedTree& source)
- {
-     Id = source.Id;
--    Parent = nullptr;
-+    Parent = UCOMMON_NULLPTR;
-     Child = source.Child;
- }
- 
- NamedTree::NamedTree(NamedTree *p, char *nid) :
- NamedObject(), Child()
- {
--    assert(p != nullptr);
--    assert(nid != nullptr && *nid != 0);
-+    assert(p != UCOMMON_NULLPTR);
-+    assert(nid != UCOMMON_NULLPTR && *nid != 0);
- 
-     enlistTail(&p->Child);
-     Id = nid;
-@@ -450,13 +451,13 @@
- 
- NamedTree::~NamedTree()
- {
--    Id = nullptr;
-+    Id = UCOMMON_NULLPTR;
-     purge();
- }
- 
- NamedTree *NamedTree::getChild(const char *tid) const
- {
--    assert(tid != nullptr && *tid != 0);
-+    assert(tid != UCOMMON_NULLPTR && *tid != 0);
- 
-     linked_pointer<NamedTree> node = Child.begin();
- 
-@@ -465,7 +466,7 @@
-             return *node;
-         node.next();
-     }
--    return nullptr;
-+    return UCOMMON_NULLPTR;
- }
- 
- void NamedTree::relistTail(NamedTree *trunk)
-@@ -495,7 +496,7 @@
- 
- NamedTree *NamedTree::path(const char *tid) const
- {
--    assert(tid != nullptr && *tid != 0);
-+    assert(tid != UCOMMON_NULLPTR && *tid != 0);
- 
-     const char *np;
-     char buf[65];
-@@ -507,7 +508,7 @@
- 
-     while(*tid == '.') {
-         if(!node->Parent)
--            return nullptr;
-+            return UCOMMON_NULLPTR;
-         node = node->Parent;
- 
-         ++tid;
-@@ -522,7 +523,7 @@
-         if(np)
-             tid = ++np;
-         else
--            tid = nullptr;
-+            tid = UCOMMON_NULLPTR;
-         node = node->getChild(buf);
-     }
-     return node;
-@@ -530,7 +531,7 @@
- 
- NamedTree *NamedTree::getLeaf(const char *tid) const
- {
--    assert(tid != nullptr && *tid != 0);
-+    assert(tid != UCOMMON_NULLPTR && *tid != 0);
- 
-     linked_pointer<NamedTree> node = Child.begin();
- 
-@@ -539,12 +540,12 @@
-             return *node;
-         node.next();
-     }
--    return nullptr;
-+    return UCOMMON_NULLPTR;
- }
- 
- NamedTree *NamedTree::leaf(const char *tid) const
- {
--    assert(tid != nullptr && *tid != 0);
-+    assert(tid != UCOMMON_NULLPTR && *tid != 0);
- 
-     linked_pointer<NamedTree> node = Child.begin();
-     NamedTree *obj;
-@@ -552,19 +553,19 @@
-     while(node) {
-         if(node->is_leaf() && eq(node->Id, tid))
-             return *node;
--        obj = nullptr;
-+        obj = UCOMMON_NULLPTR;
-         if(!node->is_leaf())
-             obj = node->leaf(tid);
-         if(obj)
-             return obj;
-         node.next();
-     }
--    return nullptr;
-+    return UCOMMON_NULLPTR;
- }
- 
- NamedTree *NamedTree::find(const char *tid) const
- {
--    assert(tid != nullptr && *tid != 0);
-+    assert(tid != UCOMMON_NULLPTR && *tid != 0);
- 
-     linked_pointer<NamedTree> node = Child.begin();
-     NamedTree *obj;
-@@ -579,12 +580,12 @@
-         }
-         node.next();
-     }
--    return nullptr;
-+    return UCOMMON_NULLPTR;
- }
- 
- void NamedTree::setId(char *nid)
- {
--    assert(nid != nullptr && *nid != 0);
-+    assert(nid != UCOMMON_NULLPTR && *nid != 0);
- 
-     Id = nid;
- }
-@@ -597,7 +598,7 @@
-     if(Parent)
-         delist(&Parent->Child);
- 
--    Id = nullptr;
-+    Id = UCOMMON_NULLPTR;
- }
- 
- void NamedTree::purge(void)
-@@ -612,7 +613,7 @@
-         obj = *node;
- 		if (!obj)
- 			break;
--        obj->Parent = nullptr; // save processing
-+        obj->Parent = UCOMMON_NULLPTR; // save processing
-         node = obj->getNext();
-         delete obj;
-     }
-@@ -624,12 +625,12 @@
- 
- LinkedObject::LinkedObject()
- {
--    Next = nullptr;
-+    Next = UCOMMON_NULLPTR;
- }
- 
- LinkedObject::LinkedObject(const LinkedObject& from)
- {
--    Next = nullptr;
-+    Next = UCOMMON_NULLPTR;
- }
- 
- OrderedObject::OrderedObject() : LinkedObject()
-@@ -643,16 +644,16 @@
- OrderedObject::OrderedObject(OrderedIndex *root) :
- LinkedObject()
- {
--    assert(root != nullptr);
--    Next = nullptr;
-+    assert(root != UCOMMON_NULLPTR);
-+    Next = UCOMMON_NULLPTR;
-     enlistTail(root);
- }
- 
- void OrderedObject::delist(OrderedIndex *root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
--    OrderedObject *prior = nullptr, *node;
-+    OrderedObject *prior = UCOMMON_NULLPTR, *node;
- 
-     node = root->head;
- 
-@@ -675,17 +676,17 @@
- 
- void OrderedObject::enlist(OrderedIndex *root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
--    Next = nullptr;
-+    Next = UCOMMON_NULLPTR;
-     enlistTail(root);
- }
- 
- void OrderedObject::enlistTail(OrderedIndex *root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
--    if(root->head == nullptr)
-+    if(root->head == UCOMMON_NULLPTR)
-         root->head = this;
-     else if(root->tail)
-         root->tail->Next = this;
-@@ -695,10 +696,10 @@
- 
- void OrderedObject::enlistHead(OrderedIndex *root)
- {
--    assert(root != nullptr);
-+    assert(root != UCOMMON_NULLPTR);
- 
--    Next = nullptr;
--    if(root->tail == nullptr)
-+    Next = UCOMMON_NULLPTR;
-+    if(root->tail == UCOMMON_NULLPTR)
-         root->tail = this;
-     else if(root->head)
-         Next = root->head;
-@@ -708,43 +709,43 @@
- 
- DLinkedObject::DLinkedObject()
- {
--    Root = nullptr;
--    Prev = nullptr;
--    Next = nullptr;
-+    Root = UCOMMON_NULLPTR;
-+    Prev = UCOMMON_NULLPTR;
-+    Next = UCOMMON_NULLPTR;
- }
- 
- DLinkedObject::DLinkedObject(const DLinkedObject& from)
- {
--    Root = nullptr;
--    Prev = nullptr;
--    Next = nullptr;
-+    Root = UCOMMON_NULLPTR;
-+    Prev = UCOMMON_NULLPTR;
-+    Next = UCOMMON_NULLPTR;
- }
- 
- DLinkedObject::DLinkedObject(OrderedIndex *r)
- {
--    Root = nullptr;
--    Next = Prev = nullptr;
-+    Root = UCOMMON_NULLPTR;
-+    Next = Prev = UCOMMON_NULLPTR;
-     if(r)
-         enlist(r);
- }
- 
- void DLinkedObject::enlist(OrderedIndex *r)
- {
--    assert(r != nullptr);
-+    assert(r != UCOMMON_NULLPTR);
- 
-     enlistTail(r);
- }
- 
- void DLinkedObject::insert(DLinkedObject *o)
- {
--    assert(o != nullptr);
-+    assert(o != UCOMMON_NULLPTR);
- 
-     insertTail(o);
- }
- 
- void DLinkedObject::insertHead(DLinkedObject *o)
- {
--    assert(o != nullptr);
-+    assert(o != UCOMMON_NULLPTR);
- 
-     if(o->Root)
-         o->delist();
-@@ -755,7 +756,7 @@
-     }
-     else {
-         Root->head = o;
--        o->Prev = nullptr;
-+        o->Prev = UCOMMON_NULLPTR;
-     }
-     o->Root = Root;
-     o->Next = this;
-@@ -764,7 +765,7 @@
- 
- void DLinkedObject::insertTail(DLinkedObject *o)
- {
--    assert(o != nullptr);
-+    assert(o != UCOMMON_NULLPTR);
- 
-     if(o->Root)
-         o->delist();
-@@ -775,7 +776,7 @@
-     }
-     else {
-         Root->tail = o;
--        o->Next = nullptr;
-+        o->Next = UCOMMON_NULLPTR;
-     }
-     o->Root = Root;
-     o->Prev = this;
-@@ -784,14 +785,14 @@
- 
- void DLinkedObject::enlistHead(OrderedIndex *r)
- {
--    assert(r != nullptr);
-+    assert(r != UCOMMON_NULLPTR);
- 
-     if(Root)
-         delist();
- 
-     Root = r;
--    Prev = nullptr; 
--    Next = nullptr;
-+    Prev = UCOMMON_NULLPTR; 
-+    Next = UCOMMON_NULLPTR;
- 
-     if(!Root->tail) {
-         Root->tail = Root->head = static_cast<OrderedObject *>(this);
-@@ -806,13 +807,13 @@
- 
- void DLinkedObject::enlistTail(OrderedIndex *r)
- {
--    assert(r != nullptr);
-+    assert(r != UCOMMON_NULLPTR);
- 
-     if(Root)
-         delist();
- 
-     Root = r;
--    Next = Prev = nullptr;
-+    Next = Prev = UCOMMON_NULLPTR;
- 
-     if(!Root->head) {
-         Root->head = Root->tail = static_cast<OrderedObject *>(this);
-@@ -839,8 +840,8 @@
-     else if(Root->tail == static_cast<OrderedObject *>(this))
-         Root->tail = static_cast<OrderedObject *>(Prev);
- 
--    Root = nullptr;
--    Next = Prev = nullptr;
-+    Root = UCOMMON_NULLPTR;
-+    Next = Prev = UCOMMON_NULLPTR;
- }
- 
- DLinkedObject::~DLinkedObject()
-@@ -850,12 +851,12 @@
- 
- OrderedIndex::OrderedIndex()
- {
--    head = tail = nullptr;
-+    head = tail = UCOMMON_NULLPTR;
- }
- 
- OrderedIndex::~OrderedIndex()
- {
--    head = tail = nullptr;
-+    head = tail = UCOMMON_NULLPTR;
- }
- 
- void OrderedIndex::copy(const OrderedIndex& source)
-@@ -866,14 +867,14 @@
- 
- void OrderedIndex::operator*=(OrderedObject *object)
- {
--    assert(object != nullptr);
-+    assert(object != UCOMMON_NULLPTR);
- 
-     object->enlist(this);
- }
- 
- void OrderedIndex::add(OrderedObject *object)
- {
--    assert(object != nullptr);
-+    assert(object != UCOMMON_NULLPTR);
- 
-     object->enlist(this);
- }
-@@ -883,12 +884,12 @@
-     LinkedObject *node;
- 
-     if(!head)
--        return nullptr;
-+        return UCOMMON_NULLPTR;
- 
-     node = head;
-     head = static_cast<OrderedObject *>(node->getNext());
-     if(!head)
--        tail = nullptr;
-+        tail = UCOMMON_NULLPTR;
- 
-     return static_cast<LinkedObject *>(node);
- }
-@@ -897,13 +898,13 @@
- {
-     if(head) {
-         LinkedObject::purge((LinkedObject *)head);
--        head = tail = nullptr;
-+        head = tail = UCOMMON_NULLPTR;
-     }
- }
- 
- void OrderedIndex::reset(void)
- {
--    head = tail = nullptr;
-+    head = tail = UCOMMON_NULLPTR;
- }
- 
- void OrderedIndex::lock_index(void)
-@@ -925,7 +926,7 @@
-         op[idx++] = node;
-         node = node->Next;
-     }
--    op[idx] = nullptr;
-+    op[idx] = UCOMMON_NULLPTR;
-     return op;
- }
- 
---- corelib/memory.cpp
-+++ corelib/memory.cpp
-@@ -18,6 +18,7 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/object.h>
- #include <ucommon/memory.h>
- #include <ucommon/thread.h>
-@@ -688,7 +689,7 @@
- {
-     const char *out = NULL;
- 
--    if(root == nullptr) {
-+    if(root == UCOMMON_NULLPTR) {
-         __THROW_RUNTIME("no root");
-         return NULL;
-     }
-@@ -898,7 +899,7 @@
- }
- 
- PagerObject::PagerObject() :
--LinkedObject(nullptr), CountedObject()
-+LinkedObject(UCOMMON_NULLPTR), CountedObject()
- {
- }
- 
---- corelib/shared.cpp
-+++ corelib/shared.cpp
-@@ -17,6 +17,7 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/typeref.h>
- #include <ucommon/string.h>
- #include <ucommon/thread.h>
-@@ -97,7 +98,7 @@
- 
- void MappedPointer::release(void *object)
- {
--	if(object != nullptr)
-+	if(object != UCOMMON_NULLPTR)
- 		lock->release();
- }
- 
---- corelib/socket.cpp
-+++ corelib/socket.cpp
-@@ -34,6 +34,12 @@
- #ifdef  HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
-+#ifdef  HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef  HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
- #include <errno.h>
- 
- #if defined(HAVE_POLL_H)
-@@ -62,6 +68,10 @@
- #define MSG_NOSIGNAL 0
- #endif
- 
-+#ifndef AI_NUMERICSERV
-+#define AI_NUMERICSERV 0
-+#endif
-+
- #ifdef  __FreeBSD__
- #ifdef  AI_V4MAPPED
- #undef  AI_V4MAPPED
---- corelib/thread.cpp
-+++ corelib/thread.cpp
-@@ -18,6 +18,7 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/object.h>
- #include <ucommon/thread.h>
- #include <ucommon/timers.h>
-@@ -26,8 +27,9 @@
- #include <string.h>
- #include <stdarg.h>
- #include <limits.h>
-+#include <sys/sysctl.h>
- 
--#if _POSIX_PRIORITY_SCHEDULING > 0
-+#if _POSIX_PRIORITY_SCHEDULING+0 > 0
- #include <sched.h>
- static int realtime_policy = SCHED_FIFO;
- #endif
-@@ -211,7 +213,7 @@
- 
- void *Thread::Local::allocate()
- {
--    return nullptr;
-+    return UCOMMON_NULLPTR;
- }
- 
- void Thread::release(void)
-@@ -1311,13 +1313,14 @@
-     free(buffer);
-     return line_size;
- #elif defined(__APPLE__)
--    size_t line_size = 0;
--    size_t sizeof_line_size = sizeof(line_size);
--    sysctlbyname("hw.cachelinesize", &line_size, &sizeof_line_size, 0, 0);
--    return line_size;
-+    size_t lsize = 0;
-+    size_t sizeof_line_size = sizeof(lsize);
-+    sysctlbyname("hw.cachelinesize", &lsize, &sizeof_line_size, 0, 0);
-+    return lsize;
- #elif defined(_SC_LEVEL1_DCACHE_LINESIZE)
-+    const size_t neg_one = (size_t) -1;
-     line_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
--    if(!line_size)
-+    if(line_size == neg_one || line_size == 0)
-         line_size = 64;
-     return line_size;
- #elif defined(linux)
---- corelib/typeref.cpp
-+++ corelib/typeref.cpp
-@@ -17,6 +17,7 @@
- 
- #include <ucommon-config.h>
- #include <ucommon/export.h>
-+#include <ucommon/nullptr.h>
- #include <ucommon/typeref.h>
- #include <ucommon/string.h>
- #include <ucommon/thread.h>
-@@ -36,7 +37,7 @@
- {
-     TypeRelease *rel = autorelease;
-     if(rel) {
--        autorelease = nullptr;
-+        autorelease = UCOMMON_NULLPTR;
-         rel->dealloc(this);
-         return;
-     }
-@@ -225,7 +226,7 @@
- {
-     value *v1 = polystatic_cast<value *>(ref);
-     const char *str1 = "";
--    TypeRelease *ar = nullptr;
-+    TypeRelease *ar = UCOMMON_NULLPTR;
- 
-     if(v1) {
-         str1 = &v1->mem[0];
-@@ -401,7 +402,7 @@
- TypeRef()
- {
-     caddr_t p = ar->allocate(sizeof(value) + size);
--    TypeRef::set(new(mem(p)) value(p, size, nullptr, ar));
-+    TypeRef::set(new(mem(p)) value(p, size, UCOMMON_NULLPTR, ar));
- }
- 
- typeref<const uint8_t *>::typeref(bool mode, size_t bits, TypeRelease *ar) :
-@@ -412,7 +413,7 @@
-         ++size;
- 
-     caddr_t p = ar->allocate(sizeof(value) + size);
--    TypeRef::set(new(mem(p)) value(p, size, nullptr, ar));
-+    TypeRef::set(new(mem(p)) value(p, size, UCOMMON_NULLPTR, ar));
-     set(mode, 0, bits);
- }
- 
-@@ -449,7 +450,7 @@
-         return 0;
- 
-     caddr_t p = ar->allocate(sizeof(value) + size);
--    TypeRef::set(new(mem(p)) value(p, size, nullptr, ar));
-+    TypeRef::set(new(mem(p)) value(p, size, UCOMMON_NULLPTR, ar));
-     String::hex2bin(str, data(), size, ws);
-     return size;
- }
-@@ -462,7 +463,7 @@
-         return 0;
- 
-     caddr_t p = ar->allocate(sizeof(value) + size);
--    TypeRef::set(new(mem(p)) value(p, size, nullptr, ar));
-+    TypeRef::set(new(mem(p)) value(p, size, UCOMMON_NULLPTR, ar));
-     String::b64decode(data(), str, size, ws);
-     return size;
- }
-@@ -492,7 +493,7 @@
- typeref<const uint8_t *>::value *typeref<const uint8_t *>::create(size_t size, TypeRelease *ar)
- {
-     caddr_t p = ar->allocate(sizeof(value) + size);
--    return new(mem(p)) value(p, size, nullptr, ar);
-+    return new(mem(p)) value(p, size, UCOMMON_NULLPTR, ar);
- }
- 
- void typeref<const uint8_t *>::destroy(typeref<const uint8_t *>::value *bytes)
-@@ -561,7 +562,7 @@
-     uint8_t *out;
-     size_t s1 = 0, s2 = 0, max;
-     typeref<const uint8_t*> result;
--    TypeRelease *ar = nullptr;
-+    TypeRelease *ar = UCOMMON_NULLPTR;
- 
-     if(v1) {
-         s1 = v1->max();
-@@ -658,7 +659,7 @@
- 
- void TypeRelease::release(TypeRef::Counted *obj)
- {
--    obj->autorelease = nullptr;
-+    obj->autorelease = UCOMMON_NULLPTR;
-     obj->dealloc();
- }
- 
-@@ -680,10 +681,10 @@
-     TypeRef::Counted *obj = *root;
-     if(obj) {
-         *root = obj->linkrelease;
--        obj->autorelease = nullptr;
-+        obj->autorelease = UCOMMON_NULLPTR;
-     }
-     else
--        *root = nullptr;
-+        *root = UCOMMON_NULLPTR;
-     return obj;
- }
- 
-@@ -714,7 +715,7 @@
- 
- public:
-     TypeReleaseLater() { 
--        list = nullptr; 
-+        list = UCOMMON_NULLPTR; 
-     }
- 
-     unsigned purge(void) __FINAL;
-@@ -734,10 +735,10 @@
-     TypeRef::Counted *pool;
-     lock.acquire();
-     pool = list;
--    list = nullptr;
-+    list = UCOMMON_NULLPTR;
-     lock.release();
- 
--    while((obj = delist(&pool)) != nullptr) {
-+    while((obj = delist(&pool)) != UCOMMON_NULLPTR) {
-         TypeRelease::release(obj);
-         ++count;
-     }
---- inc/ucommon/arrayref.h
-+++ inc/ucommon/arrayref.h
-@@ -33,6 +33,10 @@
- #include <ucommon/atomic.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- #ifndef _UCOMMON_PROTOCOLS_H_
- #include <ucommon/protocols.h>
- #endif
-@@ -151,7 +155,7 @@
- 	}
- 
- 	inline void release(void) {
--		TypeRef::set(nullptr);
-+		TypeRef::set(UCOMMON_NULLPTR);
- 	}
- 
- 	inline typeref<T> pull() {
-@@ -219,7 +223,7 @@
- 	}
- 
- 	inline void release(void) {
--		TypeRef::set(nullptr);
-+		TypeRef::set(UCOMMON_NULLPTR);
- 	}
- 
- 	inline typeref<T> pull() {
-@@ -325,7 +329,7 @@
- 	}
- 
- 	inline void release(void) {
--		TypeRef::set(nullptr);
-+		TypeRef::set(UCOMMON_NULLPTR);
- 	}
- };
- 
---- inc/ucommon/generics.h
-+++ inc/ucommon/generics.h
-@@ -29,13 +29,19 @@
- #include <ucommon/cpr.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- #include <cstdlib>
- #include <cstring>
- #include <stdexcept>
- 
-+// Do not declare an exception specification. It is an anti-pattern.
-+// Also see https://stackoverflow.com/q/1055387.
- #ifndef UCOMMON_SYSRUNTIME
- #define THROW(x)    throw x
--#define THROWS(x)   throw(x)
-+#define THROWS(x)
- #define THROWS_ANY  throw()
- #else
- #define THROW(x)    ::abort()
-@@ -63,8 +69,8 @@
-             delete counter;
-             delete object;
-         }
--        object = NULL;
--        counter = NULL;
-+        object = UCOMMON_NULLPTR;
-+        counter = UCOMMON_NULLPTR;
-     }
- 
-     inline void retain(void) {
-@@ -96,17 +102,17 @@
-     }
- 
-     inline pointer() {
--        counter = NULL;
--        object = NULL;
-+        counter = UCOMMON_NULLPTR;
-+        object = UCOMMON_NULLPTR;
-     }
- 
--    inline explicit pointer(T* ptr = NULL) : object(ptr) {
-+    inline explicit pointer(T* ptr = UCOMMON_NULLPTR) : object(ptr) {
-         if(object) {
-             counter = new unsigned;
-             *counter = 1;
-         }
-         else
--            counter = NULL;
-+            counter = UCOMMON_NULLPTR;
-     }
- 
-     inline pointer(const pointer<T> &ref) {
-@@ -139,11 +145,11 @@
-     }
- 
-     inline bool operator!() const {
--        return (counter == NULL);
-+        return (counter == UCOMMON_NULLPTR);
-     }
- 
-     inline operator bool() const {
--        return counter != NULL;
-+        return counter != UCOMMON_NULLPTR;
-     }
- };
- 
-@@ -165,8 +171,8 @@
-             delete counter;
-             delete[] array;
-         }
--        array = NULL;
--        counter = NULL;
-+        array = UCOMMON_NULLPTR;
-+        counter = UCOMMON_NULLPTR;
-     }
- 
-     inline void retain(void) {
-@@ -198,17 +204,17 @@
-     }
- 
-     inline array_pointer() {
--        counter = NULL;
--        array = NULL;
-+        counter = UCOMMON_NULLPTR;
-+        array = UCOMMON_NULLPTR;
-     }
- 
--    inline explicit array_pointer(T* ptr = NULL) : array(ptr) {
-+    inline explicit array_pointer(T* ptr = UCOMMON_NULLPTR) : array(ptr) {
-         if(array) {
-             counter = new unsigned;
-             *counter = 1;
-         }
-         else
--            counter = NULL;
-+            counter = UCOMMON_NULLPTR;
-     }
- 
-     inline array_pointer(const array_pointer<T> &ref) {
-@@ -245,11 +251,11 @@
-     }
- 
-     inline bool operator!() const {
--        return (counter == NULL);
-+        return (counter == UCOMMON_NULLPTR);
-     }
- 
-     inline operator bool() const {
--        return counter != NULL;
-+        return counter != UCOMMON_NULLPTR;
-     }
- };
- 
-@@ -297,22 +303,22 @@
-  * Convenience function to test pointer object.  This solves issues where
-  * some compilers get confused between bool and pointer operators.
-  * @param object we are testing.
-- * @return true if object points to NULL.
-+ * @return true if object points to nullptr or NULL.
-  */
- template<typename T>
- inline bool isnull(T& object) {
--    return (bool)(object.operator*() == nullptr);
-+    return (bool)(object.operator*() == UCOMMON_NULLPTR);
- }
- 
- /**
-  * Convenience function to test pointer-pointer object.  This solves issues
-  * where some compilers get confused between bool and pointer operators.
-  * @param object we are testing.
-- * @return true if object points to NULL.
-+ * @return true if object points to nullptr or NULL.
-  */
- template<typename T>
- inline bool isnullp(T *object) {
--    return (bool)(object->operator*() == nullptr);
-+    return (bool)(object->operator*() == UCOMMON_NULLPTR);
- }
- 
- /**
---- /dev/null
-+++ inc/ucommon/nullptr.h
-@@ -0,0 +1,76 @@
-+// Copyright (C) 2020 Jeffrey Walton
-+//
-+// This file is part of GNU uCommon C++.
-+//
-+// GNU uCommon C is free software: you can redistribute it and/or modify
-+// it under the terms of the GNU Lesser General Public License as published
-+// by the Free Software Foundation, either version 3 of the License, or
-+// (at your option) any later version.
-+//
-+// GNU uCommon C is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU Lesser General Public License for more details.
-+//
-+// You should have received a copy of the GNU Lesser General Public License
-+// along with GNU uCommon C.  If not, see <http://www.gnu.org/licenses/>.
-+
-+/**
-+ * Provides UCOMMON_NULLPTR. UCOMMON_NULLPTR is nullptr for C++11 and above,
-+ * and NULL otherwise. std::nullptr_t and nullptr are too new for some older
-+ * distributions still found in the field.
-+ * @file ucommon/nullptr.h
-+ */
-+
-+#ifndef _UCOMMON_NULLPTR_H_
-+#define _UCOMMON_NULLPTR_H_
-+
-+// std::nullptr_t, nullptr and NULL
-+#include <cstddef>
-+
-+// https://clang.llvm.org/docs/LanguageExtensions.html
-+#ifndef __has_feature
-+# define __has_feature(x) 0
-+#endif
-+
-+// Clang depends on __has_feature
-+#if (_MSC_VER >= 1600) || __has_feature(cxx_nullptr) || \
-+    ((__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || \
-+    (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5130) || \
-+    defined(__IBMCPP_NULLPTR)
-+# undef  HAVE_NULLPTR
-+# define HAVE_NULLPTR 1
-+#endif
-+
-+// TODO: add configure.ac test
-+#ifdef HAVE_NULLPTR
-+# define UCOMMON_NULLPTR nullptr
-+#else
-+# define UCOMMON_NULLPTR NULL
-+#endif
-+
-+// uCommon C++ provided the following class for non-C++11 implementations.
-+// Unfortunately, we need more than a class file since one of the features
-+// of nullptr is to distinguish between ints, longs and pointers while
-+// still being convertible to bool. That requires compiler support.
-+#if 0
-+const class nullptr_t 
-+{
-+public:
-+    template<class T>
-+    inline operator T*() const {
-+        return 0; 
-+    }
-+
-+    template<class C, class T>
-+    inline operator T C::*() const {
-+        return 0; 
-+    }
-+
-+private:
-+    void operator&() const;
-+
-+} nullptr = {};
-+#endif
-+
-+#endif
-
---- inc/ucommon/platform.h
-+++ inc/ucommon/platform.h
-@@ -36,6 +36,10 @@
- #include <malloc.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- #ifndef _UCOMMON_PLATFORM_H_
- #define _UCOMMON_PLATFORM_H_
- #define UCOMMON_ABI 7
-@@ -50,16 +54,16 @@
- #define __THROW_RANGE(x)      throw std::out_of_range(x)
- #define __THROW_RUNTIME(x)    throw std::runtime_error(x)
- #define __THROW_ALLOC()       throw std::bad_alloc()
--#define __THROW_DEREF(v)      if(v == nullptr) \
-+#define __THROW_DEREF(v)      if(v == UCOMMON_NULLPTR) \
-                                 throw std::runtime_error("Dereference NULL")
--#define __THROW_UNDEF(v,x)    if(v == nullptr) throw std::runtime_error(x)
-+#define __THROW_UNDEF(v,x)    if(v == UCOMMON_NULLPTR) throw std::runtime_error(x)
- #else
- #define __THROW_RANGE(x)      abort()
- #define __THROW_SIZE(x)       abort()
- #define __THROW_RUNTIME(x)    abort()
- #define __THROW_ALLOC()       abort()
--#define __THROW_DEREF(v)      if(v == nullptr) abort()
--#define __THROW_UNDEF(v,x)    if(v == nullptr) abort()
-+#define __THROW_DEREF(v)      if(v == UCOMMON_NULLPTR) abort()
-+#define __THROW_UNDEF(v,x)    if(v == UCOMMON_NULLPTR) abort()
- #endif
- 
- /**
-@@ -90,7 +94,7 @@
- #endif
- #endif
- 
--#if !defined(__GNUC__) && !defined(__has_feature) && !defined(_MSC_VER)
-+#if !defined(__GNUC__) && !defined(_MSC_VER)
- #define UCOMMON_RTTI    1
- #endif
- 
-@@ -102,11 +106,9 @@
- #define UCOMMON_RTTI    1
- #endif
- 
--#if defined(__has_feature)
- #if __has_feature(cxx_rtti)
- #define UCOMMON_RTTI    1
- #endif
--#endif
- 
- #ifdef  UCOMMON_RTTI
- #define __PROTOCOL   virtual
-@@ -171,30 +173,6 @@
-                                 __DELETE_COPY(x)
- #endif
- 
--#if __cplusplus <= 199711L && !defined(_MSC_VER)
--#if defined(__GNUC_MINOR__) && !defined(__clang__)
--#define nullptr __null
--#elif !defined(__clang__) || (defined(__clang__) && defined(__linux__))
--const class nullptr_t 
--{
--public:
--    template<class T>
--    inline operator T*() const {
--        return 0; 
--    }
--
--    template<class C, class T>
--    inline operator T C::*() const {
--        return 0; 
--    }
--
--private:
--    void operator&() const;
--
--} nullptr = {};
--#endif
--#endif
--
- #ifndef __MALLOC
- #define __PRINTF(x, y)
- #define __SCANF(x, y)
-@@ -392,13 +370,13 @@
-     {};
- 
- inline void pthread_mutex_lock(pthread_mutex_t *mutex)
--    {pth_mutex_acquire(mutex, 0, nullptr);};
-+    {pth_mutex_acquire(mutex, 0, UCOMMON_NULLPTR);};
- 
- inline void pthread_mutex_unlock(pthread_mutex_t *mutex)
-     {pth_mutex_release(mutex);};
- 
- inline void pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
--    {pth_cond_await(cond, mutex, nullptr);};
-+    {pth_cond_await(cond, mutex, UCOMMON_NULLPTR);};
- 
- inline void pthread_cond_signal(pthread_cond_t *cond)
-     {pth_cond_notify(cond, FALSE);};
-@@ -549,7 +527,7 @@
-  */
- template<class T>
- inline T *init(T *memory)
--    {return ((memory) ? new(((void *)memory)) T : nullptr);}
-+    {return ((memory) ? new(((void *)memory)) T : UCOMMON_NULLPTR);}
- 
- typedef long Integer;
- typedef unsigned long Unsigned;
-@@ -567,8 +545,8 @@
- inline T polypointer_cast(S *s)
- {
- #if defined(DEBUG) && defined(UCOMMON_RTTI)
--    if(s == nullptr)
--        return nullptr;
-+    if(s == UCOMMON_NULLPTR)
-+        return UCOMMON_NULLPTR;
-     T ptr = dynamic_cast<T>(s);
-     __THROW_DEREF(ptr);
-     return ptr;
---- inc/ucommon/secure.h
-+++ inc/ucommon/secure.h
-@@ -50,6 +50,10 @@
- #include <ucommon/ucommon.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- #define MAX_CIPHER_KEYSIZE  512
- #define MAX_DIGEST_HASHSIZE 512
- 
-@@ -216,7 +220,7 @@
-      * @param authority path to use or NULL if none.
-      * @return a security context that is cast from derived library.
-      */
--    static server_t server(const char *keyfile = NULL, const char *authority = NULL);
-+    static server_t server(const char *keyfile = UCOMMON_NULLPTR, const char *authority = UCOMMON_NULLPTR);
- 
-     /**
-      * Create an anonymous client context with an optional authority to
-@@ -225,7 +229,7 @@
-      * @param paths of certificates to use.
-      * @return a basic client security context.
-      */
--    static client_t client(const char *authority = NULL, const char *paths = NULL);
-+    static client_t client(const char *authority = UCOMMON_NULLPTR, const char *paths = UCOMMON_NULLPTR);
- 
-     /**
-      * Create a peer user client context.  This assumes a user certificate
-@@ -328,7 +332,7 @@
-     public:
-         Key();
- 
--        Key(const char *cipher, const char *digest, const char *text, size_t size = 0, const uint8_t *salt = NULL, unsigned rounds = 1);
-+        Key(const char *cipher, const char *digest, const char *text, size_t size = 0, const uint8_t *salt = UCOMMON_NULLPTR, unsigned rounds = 1);
- 
-         Key(const char *cipher, const uint8_t *iv, size_t ivsize);
- 
-@@ -366,7 +370,7 @@
- 
-         void b64(const char *string);
- 
--        size_t get(uint8_t *key, uint8_t *ivout = NULL);
-+        size_t get(uint8_t *key, uint8_t *ivout = UCOMMON_NULLPTR);
- 
-         inline size_t size(void) const {
-             return keysize;
-@@ -395,7 +399,7 @@
-             return !operator==(other);
-         }
- 
--        static void options(const uint8_t *salt = NULL, unsigned rounds = 1);
-+        static void options(const uint8_t *salt = UCOMMON_NULLPTR, unsigned rounds = 1);
-     };
- 
-     typedef Key *key_t;
-@@ -417,7 +421,7 @@
- public:
-     Cipher();
- 
--    Cipher(const key_t key, mode_t mode, uint8_t *address = NULL, size_t size = 0);
-+    Cipher(const key_t key, mode_t mode, uint8_t *address = UCOMMON_NULLPTR, size_t size = 0);
- 
-     virtual ~Cipher();
- 
-@@ -596,11 +600,11 @@
-     }
- 
-     inline bool operator!() const {
--        return !bufsize && context == NULL;
-+        return !bufsize && context == UCOMMON_NULLPTR;
-     }
- 
-     inline operator bool() const {
--        return bufsize > 0 || context != NULL;
-+        return bufsize > 0 || context != UCOMMON_NULLPTR;
-     }
- 
-     /**
-@@ -622,7 +626,7 @@
-      */
-     static bool has(const char *name);
- 
--    static secure::string uuid(const char *name, const uint8_t *ns = NULL);
-+    static secure::string uuid(const char *name, const uint8_t *ns = UCOMMON_NULLPTR);
- 
-     /**
-      * Shortcut for short md5 digests if supported...
-@@ -738,11 +742,11 @@
-     }
- 
-     inline bool operator!() const {
--        return !bufsize && context == NULL;
-+        return !bufsize && context == UCOMMON_NULLPTR;
-     }
- 
-     inline operator bool() const {
--        return bufsize > 0 || context != NULL;
-+        return bufsize > 0 || context != UCOMMON_NULLPTR;
-     }
- 
-     /**
-@@ -971,7 +975,7 @@
- 
-     /**
-      * Get peer (x509) certificate for current stream if present.
--     * @return certificate of peer or nullptr if none.
-+     * @return certificate of peer or NULL if none.
-      */
-     inline secure::cert_t certificate(void) const {
-         return cert;
-@@ -982,7 +986,7 @@
-      * @return true if ssl session.
-      */
-     inline bool is_secure(void) const {
--        return bio != NULL;
-+        return bio != UCOMMON_NULLPTR;
-     }
- 
-     /**
-@@ -990,7 +994,7 @@
-      * @return true if peer certificate.
-      */
-     inline bool is_certificate(void) const {
--        return cert != NULL;
-+        return cert != UCOMMON_NULLPTR;
-     }
- 
-     /**
---- inc/ucommon/shared.h
-+++ inc/ucommon/shared.h
-@@ -188,7 +188,7 @@
- }
- 
- template<>
--inline size_t mapped_keypath<struct sockaddr>(const struct sockaddr *addr)
-+inline size_t mapped_keypath<sockaddr>(const sockaddr *addr)
- {
- 	if(!addr)
- 		return 0;
-@@ -197,7 +197,7 @@
- }
- 
- template<>
--inline bool mapped_keyequal<struct sockaddr>(const struct sockaddr *s1, const struct sockaddr *s2)
-+inline bool mapped_keyequal<sockaddr>(const sockaddr *s1, const sockaddr *s2)
- {
- 	if(!s1 || !s2)
- 		return false;
-@@ -236,7 +236,7 @@
- 			ip.next();
- 		}
- 		lock->release();
--		return nullptr;
-+		return UCOMMON_NULLPTR;
- 	}
- 
- 	void set(const K* key, V* ptr) {
---- inc/ucommon/socket.h
-+++ inc/ucommon/socket.h
-@@ -43,6 +43,10 @@
- #include <ucommon/typeref.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- extern "C" {
-     struct addrinfo;
- }
-@@ -55,6 +59,7 @@
- typedef uint32_t in_addr_t;
- #else
- #include <unistd.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if.h>
- #include <netinet/in.h>
-@@ -391,7 +396,7 @@
-          * @param hostname or ip address.  The socket family is used for hostnames.
-          * @param service port or name we are referencing or NULL.
-          */
--        address(int family, const char *hostname, const char *service = NULL);
-+        address(int family, const char *hostname, const char *service = UCOMMON_NULLPTR);
- 
-         /**
-          * Construct a socket address list for a service.
-@@ -423,14 +428,14 @@
-         /**
-          * Construct a socket address from a sockaddr object.
-          */
--        address(const sockaddr& address) : list(NULL) {
-+        address(const sockaddr& address) : list(UCOMMON_NULLPTR) {
-             insert(&address);
-         }
- 
-         /**
-          * Construct a socket address from an addrinfo structure.
-          */
--        address(const addrinfo* address) : list(NULL) {
-+        address(const addrinfo* address) : list(UCOMMON_NULLPTR) {
-             insert(address);
-         }
- 
-@@ -603,15 +608,15 @@
-          * @return true if we have an address list.
-          */
-         inline operator bool() const {
--            return list != nullptr;
-+            return list != UCOMMON_NULLPTR;
-         }
- 
-         inline bool is_valid() const {
--            return list != nullptr;
-+            return list != UCOMMON_NULLPTR;
-         }
- 
-         inline bool isValid() const {
--            return list != nullptr;
-+            return list != UCOMMON_NULLPTR;
-         }
- 
-         /**
-@@ -619,7 +624,7 @@
-          * @return true if we have no address list.
-          */
-         inline bool operator!() const {
--            return list == nullptr;
-+            return list == UCOMMON_NULLPTR;
-         }
- 
-         /**
-@@ -675,7 +680,7 @@
-          * @param service name or port number, or NULL if not used.
-          * @param type of socket (stream or dgram) to filter list by.
-          */
--        void set(const char *hostname, const char *service = NULL, int type = SOCK_STREAM);
-+        void set(const char *hostname, const char *service = UCOMMON_NULLPTR, int type = SOCK_STREAM);
- 
-         /**
-          * Append additional host addresses to our list.
-@@ -683,7 +688,7 @@
-          * @param service name or port number, or NULL if not used.
-          * @param type of socket (stream or dgram).
-          */
--        void add(const char *hostname, const char *service = NULL, int type = SOCK_STREAM);
-+        void add(const char *hostname, const char *service = UCOMMON_NULLPTR, int type = SOCK_STREAM);
- 
-         /**
-          * Set an entry for host binding.
-@@ -1194,7 +1199,7 @@
-      * @param address of peer data was received from.
-      * @return number of bytes actually read, 0 if none, -1 if error.
-      */
--    size_t readfrom(void *data, size_t number, struct sockaddr_storage *address = NULL);
-+    size_t readfrom(void *data, size_t number, struct sockaddr_storage *address = UCOMMON_NULLPTR);
- 
-     /**
-      * Write data to the socket send buffer.  This will be used in abi 4.
-@@ -1203,7 +1208,7 @@
-      * @param address of peer to send data to if not connected.
-      * @return number of bytes actually sent, 0 if none, -1 if error.
-      */
--    size_t writeto(const void *data, size_t number, const struct sockaddr *address = NULL);
-+    size_t writeto(const void *data, size_t number, const struct sockaddr *address = UCOMMON_NULLPTR);
- 
-     /**
-      * Read a newline of text data from the socket and save in NULL terminated
-@@ -1482,7 +1487,7 @@
-      * @param address of source.
-      * @return number of bytes received, -1 if error.
-      */
--    static ssize_t recvfrom(socket_t socket, void *buffer, size_t size, int flags = 0, struct sockaddr_storage *address = NULL);
-+    static ssize_t recvfrom(socket_t socket, void *buffer, size_t size, int flags = 0, struct sockaddr_storage *address = UCOMMON_NULLPTR);
- 
-     /**
-      * Send data on socket.
-@@ -1493,7 +1498,7 @@
-      * @param address of destination, NULL if connected.
-      * @return number of bytes sent, -1 if error.
-      */
--    static ssize_t sendto(socket_t socket, const void *buffer, size_t size, int flags = 0, const struct sockaddr *address = NULL);
-+    static ssize_t sendto(socket_t socket, const void *buffer, size_t size, int flags = 0, const struct sockaddr *address = UCOMMON_NULLPTR);
- 
-     /**
-      * Send reply on socket.  Used to reply to a recvfrom message.
-@@ -1541,7 +1546,7 @@
-      * @param address of socket accepting.
-      * @return new socket accepted.
-      */
--    static socket_t acceptfrom(socket_t socket, struct sockaddr_storage *address = NULL);
-+    static socket_t acceptfrom(socket_t socket, struct sockaddr_storage *address = UCOMMON_NULLPTR);
- 
-     /**
-      * Create a socket object unbound.
-@@ -1851,7 +1856,7 @@
-      * @param address to save peer connecting.
-      * @return socket descriptor of connected socket.
-      */
--    socket_t accept(struct sockaddr_storage *address = NULL) const;
-+    socket_t accept(struct sockaddr_storage *address = UCOMMON_NULLPTR) const;
- 
-     /**
-      * Wait for a pending connection.
-@@ -1959,7 +1964,7 @@
-     }
- 
-     inline linked_pointer() {
--        ptr = nullptr;
-+        ptr = UCOMMON_NULLPTR;
-     }
- 
-     inline linked_pointer(Socket::address& list) {
-@@ -2012,7 +2017,7 @@
-      * @return true if we have an address list.
-      */
-     inline operator bool() const {
--        return ptr != nullptr;
-+        return ptr != UCOMMON_NULLPTR;
-     }
- 
-     /**
-@@ -2063,7 +2068,7 @@
-      * @return true if we have no address list.
-      */
-     inline bool operator!() const {
--        return ptr == nullptr;
-+        return ptr == UCOMMON_NULLPTR;
-     }
- 
-     inline void next(void) {
---- inc/ucommon/string.h
-+++ inc/ucommon/string.h
-@@ -52,6 +52,10 @@
- #include <ucommon/object.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -123,11 +127,11 @@
-         bool operator*=(const char *string);
- 
-         operator bool() const {
--            return object != NULL;
-+            return object != UCOMMON_NULLPTR;
-         }
- 
-         bool operator!() const {
--            return object == NULL;
-+            return object == UCOMMON_NULLPTR;
-         }
-     };
- 
-@@ -584,9 +588,9 @@
- 
-     const char *search(regex& expr, unsigned instance = 0, unsigned flags = 0) const;
- 
--    unsigned replace(const char *string, const char *text = NULL, unsigned flags = 0);
-+    unsigned replace(const char *string, const char *text = UCOMMON_NULLPTR, unsigned flags = 0);
- 
--    unsigned replace(regex& expr, const char *text = NULL, unsigned flags = 0);
-+    unsigned replace(regex& expr, const char *text = UCOMMON_NULLPTR, unsigned flags = 0);
- 
-     /**
-      * Find a character in the string.
-@@ -983,7 +987,7 @@
-      * @param end of line marker characters or NULL if not used.
-      * @return token extracted from string or NULL if no more tokens found.
-      */
--    static char *token(char *text, char **last, const char *list, const char *quote = NULL, const char *end = NULL);
-+    static char *token(char *text, char **last, const char *list, const char *quote = UCOMMON_NULLPTR, const char *end = UCOMMON_NULLPTR);
- 
-     /**
-      * Skip after lead characters in a null terminated string.
-@@ -1259,7 +1263,7 @@
-      * @param end of line marker characters or NULL if not used.
-      * @return token extracted from string or NULL if no more tokens found.
-      */
--    inline char *token(char **last, const char *list, const char *quote = NULL, const char *end = NULL) {
-+    inline char *token(char **last, const char *list, const char *quote = UCOMMON_NULLPTR, const char *end = UCOMMON_NULLPTR) {
-         return token(data(), last, list, quote, end);
-     }
- 
-@@ -1269,7 +1273,7 @@
-      * @param pointer to update with end of parsed value.
-      * @return double value of object.
-      */
--    inline double tod(char **pointer = NULL) {
-+    inline double tod(char **pointer = UCOMMON_NULLPTR) {
-         return strtod(data(), pointer);
-     }
- 
-@@ -1279,7 +1283,7 @@
-      * @param pointer to update with end of parsed value.
-      * @return long value of object.
-      */
--    inline long tol(char **pointer = NULL) {
-+    inline long tol(char **pointer = UCOMMON_NULLPTR) {
-         return strtol(data(), pointer, 0);
-     }
- 
-@@ -1289,7 +1293,7 @@
-      * @param pointer to update with end of parsed value.
-      * @return double value of object.
-      */
--    inline static double tod(const char *text, char **pointer = NULL) {
-+    inline static double tod(const char *text, char **pointer = UCOMMON_NULLPTR) {
-         return strtod(text, pointer);
-     }
- 
-@@ -1299,7 +1303,7 @@
-      * @param pointer to update with end of parsed value.
-      * @return long value of object.
-      */
--    inline static long tol(const char *text, char **pointer = NULL) {
-+    inline static long tol(const char *text, char **pointer = UCOMMON_NULLPTR) {
-         return strtol(text, pointer, 0);
-     }
- 
-@@ -1754,7 +1758,7 @@
- 
- public:
-     inline strdup_t() {
--        data = NULL;
-+        data = UCOMMON_NULLPTR;
-     }
- 
-     inline strdup_t(char *str) {
-@@ -1774,11 +1778,11 @@
-     }
- 
-     inline operator bool() const {
--        return data != nullptr;
-+        return data != UCOMMON_NULLPTR;
-     }
- 
-     inline bool operator!() const {
--        return data == nullptr;
-+        return data == UCOMMON_NULLPTR;
-     }
- 
-     inline operator char*() const {
---- inc/ucommon/temporary.h
-+++ inc/ucommon/temporary.h
-@@ -53,9 +53,11 @@
- #include <cstring>
- #include <stdexcept>
- 
-+// Do not declare an exception specification. It is an anti-pattern.
-+// Also see https://stackoverflow.com/q/1055387.
- #ifndef UCOMMON_SYSRUNTIME
- #define THROW(x)    throw x
--#define THROWS(x)   throw(x)
-+#define THROWS(x)
- #define THROWS_ANY  throw()
- #else
- #define THROW(x)    ::abort()
---- inc/ucommon/thread.h
-+++ inc/ucommon/thread.h
-@@ -63,6 +63,10 @@
- #include <ucommon/condition.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- namespace ucommon {
- 
- /**
-@@ -593,11 +597,11 @@
-     ~AutoProtect();
- 
-     inline operator bool() const {
--        return object != NULL;
-+        return object != UCOMMON_NULLPTR;
-     }
- 
-     inline bool operator!() const {
--        return object == NULL;
-+        return object == UCOMMON_NULLPTR;
-     }    
- };
- 
-@@ -706,7 +710,7 @@
-         void *get(void);
- 
-         inline void clear() {
--            set(nullptr);
-+            set(UCOMMON_NULLPTR);
-         }
-     };
- 
---- inc/ucommon/typeref.h
-+++ inc/ucommon/typeref.h
-@@ -52,6 +52,10 @@
- #include <ucommon/thread.h>
- #endif
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- namespace ucommon {
- 
- class TypeRelease;
-@@ -109,7 +113,7 @@
- 		 * @param size of object allocated.
- 		 * @param ar pool to use
- 		 */
--		explicit Counted(void *address, size_t size, TypeRelease *ar = NULL);
-+		explicit Counted(void *address, size_t size, TypeRelease *ar = UCOMMON_NULLPTR);
- 
- 		/**
- 		 * Release memory and delete object when no longer referenced.
-@@ -236,7 +240,7 @@
- 	 * @return true if we are referencing a container.
- 	 */
- 	inline operator bool() const {
--		return ref != NULL;
-+		return ref != UCOMMON_NULLPTR;
- 	}
- 
- 	/**
-@@ -244,7 +248,7 @@
- 	 * @return true if not referencing a container.
- 	 */
- 	inline bool operator!() const {
--		return ref == NULL;
-+		return ref == UCOMMON_NULLPTR;
- 	}
- 
- 	/**
-@@ -267,7 +271,7 @@
- {
- public:
- 	inline TypeRelease() {
--		delegate = nullptr;
-+		delegate = UCOMMON_NULLPTR;
- 	}
- 
- 	inline TypeRelease(TypeRelease *target) {
-@@ -358,7 +362,7 @@
- 
- 	inline const T* operator->() const {
- 		if(!ref)
--			return NULL;
-+			return UCOMMON_NULLPTR;
- 		value *v = polystatic_cast<value *>(ref);
- 		return &(v->data);
- 	}
-@@ -372,7 +376,7 @@
- 	inline const T* operator()() const {
- 		value *v = polystatic_cast<value*>(ref);
- 		if(!v)
--			return nullptr;
-+			return UCOMMON_NULLPTR;
- 
- 		return &(v->data);
- 	}
-@@ -566,7 +570,7 @@
- 
- 		uint8_t mem[1];
- 
--		value(caddr_t addr, size_t size, const uint8_t *data = nullptr, TypeRelease *ar = &auto_release);
-+		value(caddr_t addr, size_t size, const uint8_t *data = UCOMMON_NULLPTR, TypeRelease *ar = &auto_release);
- 
- 		void destroy(void);
- 
---- test/datetime.cpp
-+++ test/datetime.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/digest.cpp
-+++ test/digest.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/keydata.cpp
-+++ test/keydata.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/linked.cpp
-+++ test/linked.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/memory.cpp
-+++ test/memory.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
-@@ -24,6 +28,10 @@
- 
- #include <stdio.h>
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- using namespace ucommon;
- 
- static int tval = 100;
-@@ -188,7 +196,7 @@
-     stringref_t sr = map(3);
-     assert(eq(*sr, "hello"));
-     sr = map(2);
--    assert(*sr == nullptr);
-+    assert(*sr == UCOMMON_NULLPTR);
-     typeref<int> ki(3);
-     sr = "goodbye";
-     map(ki, sr);
-@@ -213,7 +221,7 @@
-     map(9, "9");
-     assert(map.used() == 2);
-     sr = map(7);
--    assert(*sr == nullptr);
-+    assert(*sr == UCOMMON_NULLPTR);
- 
-     listref<int> intlist;
-     intlist << 3 << 5 << 7 << 9;
-@@ -228,7 +236,7 @@
- 
-     mapped_pointer<char, maptest> pmap;
-     maptest *out = pmap.get("bye");
--    assert(out == nullptr);
-+    assert(out == UCOMMON_NULLPTR);
-     pmap.release(out);
-     pmap.set(mt[0].key, &mt[0]);
-     pmap.set(mt[1].key, &mt[1]);
-@@ -237,7 +245,7 @@
-     pmap.release(out);
-     pmap.remove("bye");
-     out = pmap.get("bye");
--    assert(out == nullptr);
-+    assert(out == UCOMMON_NULLPTR);
-     pmap.release(out);
- 
-     int a = 1, b = 2;
---- test/shell.cpp
-+++ test/shell.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/socket.cpp
-+++ test/socket.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU ucommon.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/stdcpp.cpp
-+++ test/stdcpp.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/stream.cpp
-+++ test/stream.cpp
-@@ -17,6 +17,10 @@
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
- #ifndef UCOMMON_SYSRUNTIME
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/string.cpp
-+++ test/string.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
---- test/thread.cpp
-+++ test/thread.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
-@@ -24,6 +28,10 @@
- 
- #include <stdio.h>
- 
-+#ifndef _UCOMMON_NULLPTR_H_
-+#include <ucommon/nullptr.h>
-+#endif
-+
- using namespace ucommon;
- 
- static unsigned count = 0;
-@@ -48,8 +56,8 @@
-     testThread() : JoinableThread() {};
- 
-     void run(void) {
--        assert(local.get() == nullptr);
--        assert(*local != nullptr);
-+        assert(local.get() == UCOMMON_NULLPTR);
-+        assert(*local != UCOMMON_NULLPTR);
- 
-         ++count;
-         ::sleep(2);
-@@ -62,9 +70,9 @@
-     testThread *thr;
-     void *mem;
- 
--    assert(local.get() == nullptr);
-+    assert(local.get() == UCOMMON_NULLPTR);
-     mem = *local;
--    assert(mem != nullptr);
-+    assert(mem != UCOMMON_NULLPTR);
-     assert(mem == *local);
- 
-     time(&now);
---- test/unicode.cpp
-+++ test/unicode.cpp
-@@ -16,6 +16,10 @@
- // You should have received a copy of the GNU Lesser General Public License
- // along with GNU uCommon C++.  If not, see <http://www.gnu.org/licenses/>.
- 
-+#ifdef NDEBUG
-+#undef NDEBUG
-+#endif
-+
- #ifndef DEBUG
- #define DEBUG
- #endif
diff --git a/patch/unbound.patch b/patch/unbound.patch
deleted file mode 100644
index 87c220c88..000000000
--- a/patch/unbound.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Unbound.
---- cachedb/cachedb.c
-+++ cachedb/cachedb.c
-@@ -85,6 +85,16 @@
- #endif
- #endif /* be64toh */
- 
-+# if __BIG_ENDIAN__
-+#  define OUR_BE64TOH(n) (n)
-+#  define OUR_HTOBE64(n) (n)
-+# else
-+#  define OUR_HI32(n)  ((uint32_t)(((uint64_t)(n)) >> 32))
-+#  define OUR_LO32(n)  ((uint32_t)(n))
-+#  define OUR_BE64TOH(n) ((((uint64_t)htonl(OUR_LO32(n)) << 32)) | htonl(OUR_HI32(n)))
-+#  define OUR_HTOBE64(n) ((((uint64_t)htonl(OUR_LO32(n)) << 32)) | htonl(OUR_HI32(n)))
-+# endif
-+
- /** the unit test testframe for cachedb, its module state contains
-  * a cache for a couple queries (in memory). */
- struct testframe_moddata {
-@@ -407,8 +426,8 @@
- 	/* qstate->return_msg->rep->ttl contains that relative shortest ttl */
- 	timestamp = (uint64_t)*qstate->env->now;
- 	expiry = timestamp + (uint64_t)qstate->return_msg->rep->ttl;
--	timestamp = htobe64(timestamp);
--	expiry = htobe64(expiry);
-+	timestamp = OUR_HTOBE64(timestamp);
-+	expiry = OUR_HTOBE64(expiry);
- 	oldlim = sldns_buffer_limit(buf);
- 	if(oldlim + sizeof(timestamp)+sizeof(expiry) >=
- 		sldns_buffer_capacity(buf))
-@@ -431,7 +450,7 @@
- 		return 0;
- 	sldns_buffer_read_at(buf, sldns_buffer_limit(buf)-sizeof(expiry),
- 		&expiry, sizeof(expiry));
--	expiry = be64toh(expiry);
-+	expiry = OUR_BE64TOH(expiry);
- 
- 	if((time_t)expiry < *qstate->env->now &&
- 		!qstate->env->cfg->serve_expired)
-@@ -491,8 +510,8 @@
- 	sldns_buffer_read_at(buf, lim-sizeof(expiry), &expiry, sizeof(expiry));
- 	sldns_buffer_read_at(buf, lim-sizeof(expiry)-sizeof(timestamp),
- 		&timestamp, sizeof(timestamp));
--	expiry = be64toh(expiry);
--	timestamp = be64toh(timestamp);
-+	expiry = OUR_BE64TOH(expiry);
-+	timestamp = OUR_BE64TOH(timestamp);
- 
- 	/* parse DNS packet */
- 	regional_free_all(qstate->env->scratch);
---- services/listen_dnsport.c
-+++ services/listen_dnsport.c
-@@ -817,6 +817,12 @@
- {
- 	int ds;
- 
-+#ifndef IPV6_TCLASS
-+	/* define to continue the compile */
-+	#define IPV6_TCLASS 0
-+	return NULL;
-+#endif
-+
- 	if(dscp == 0)
- 		return NULL;
- 	ds = dscp << 2;
diff --git a/patch/unistring.patch.old b/patch/unistring.patch.old
deleted file mode 100644
index ab26f43f0..000000000
--- a/patch/unistring.patch.old
+++ /dev/null
@@ -1,1454 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with libunistring.
---- lib/unictype/bidi_of.c
-+++ lib/unictype/bidi_of.c
-@@ -48,7 +48,7 @@ uc_bidi_class (ucs4_t uc)
-               unsigned int index3 = ((uc & bidi_category_header_4) + lookup2) * 5;
-               /* level3 contains 5-bit values, packed into 16-bit words.  */
-               unsigned int lookup3 =
--                ((u_bidi_category.level3[index3>>4]
-+                (((unsigned int) u_bidi_category.level3[index3>>4]
-                   | ((unsigned int) u_bidi_category.level3[(index3>>4)+1] << 16))
-                  >> (index3 % 16))
-                 & 0x1f;
---- lib/unictype/categ_of.c
-+++ lib/unictype/categ_of.c
-@@ -48,7 +48,7 @@ lookup_withtable (ucs4_t uc)
-               unsigned int index3 = ((uc & category_header_4) + lookup2) * 5;
-               /* level3 contains 5-bit values, packed into 16-bit words.  */
-               unsigned int lookup3 =
--                ((u_category.level3[index3>>4]
-+                (((unsigned int) u_category.level3[index3>>4]
-                   | ((unsigned int) u_category.level3[(index3>>4)+1] << 16))
-                  >> (index3 % 16))
-                 & 0x1f;
---- lib/unictype/joininggroup_of.c
-+++ lib/unictype/joininggroup_of.c
-@@ -48,7 +48,7 @@ uc_joining_group (ucs4_t uc)
-               unsigned int index3 = ((uc & joining_group_header_4) + lookup2) * 7;
-               /* level3 contains 7-bit values, packed into 16-bit words.  */
-               unsigned int lookup3 =
--                ((u_joining_group.level3[index3>>4]
-+                (((unsigned int) u_joining_group.level3[index3>>4]
-                   | ((unsigned int) u_joining_group.level3[(index3>>4)+1] << 16))
-                  >> (index3 % 16))
-                 & 0x7f;
---- lib/unictype/numeric.c
-+++ lib/unictype/numeric.c
-@@ -48,8 +48,8 @@ uc_numeric_value (ucs4_t uc)
-               unsigned int index3 = ((uc & numeric_header_4) + lookup2) * 8;
-               /* level3 contains 8-bit values, packed into 16-bit words.  */
-               unsigned int lookup3 =
--                ((u_numeric.level3[index3>>4]
--                  | (u_numeric.level3[(index3>>4)+1] << 16))
-+                (((unsigned int) u_numeric.level3[index3>>4]
-+                  | ((unsigned int) u_numeric.level3[(index3>>4)+1] << 16))
-                  >> (index3 % 16))
-                 & 0xff;
-
---- lib/unistr/u8-cmp.c
-+++ lib/unistr/u8-cmp.c
-@@ -35,5 +35,5 @@ int
- u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n)
- {
-   /* Use the fact that the UTF-8 encoding preserves lexicographic order.  */
--  return memcmp ((const char *) s1, (const char *) s2, n);
-+  return n == 0 ? 0 : memcmp ((const char *) s1, (const char *) s2, n);
- }
---- lib/uniconv/u8-conv-from-enc.c
-+++ lib/uniconv/u8-conv-from-enc.c
-@@ -86,7 +86,8 @@ u8_conv_from_encoding (const char *fromcode,
-             }
-         }
- 
--      memcpy ((char *) result, src, srclen);
-+      if (result && src)
-+        memcpy ((char *) result, src, srclen);
-       *lengthp = srclen;
-       return result;
-     }
---- lib/uniconv/u8-conv-to-enc.c
-+++ lib/uniconv/u8-conv-to-enc.c
-@@ -69,7 +69,8 @@ u8_conv_to_encoding (const char *tocode,
-             }
-         }
- 
--      memcpy (result, (const char *) src, srclen);
-+      if (result && src)
-+        memcpy (result, (const char *) src, srclen);
-       *lengthp = srclen;
-       return result;
-     }
---- lib/unistr/u-cpy-alloc.h
-+++ lib/unistr/u-cpy-alloc.h
-@@ -42,7 +42,8 @@ FUNC (const UNIT *s, size_t n)
-       for (; n > 0; n--)
-         *destptr++ = *s++;
- #else
--      memcpy ((char *) dest, (const char *) s, n * sizeof (UNIT));
-+      if (dest && s)
-+        memcpy ((char *) dest, (const char *) s, n * sizeof (UNIT));
- #endif
-     }
-   return dest;
---- lib/unistr/u-cpy.h
-+++ lib/unistr/u-cpy.h
-@@ -35,7 +35,8 @@ FUNC (UNIT *dest, const UNIT *src, size_t n)
-   for (; n > 0; n--)
-     *destptr++ = *src++;
- #else
--  memcpy ((char *) dest, (const char *) src, n * sizeof (UNIT));
-+  if (dest && src)
-+    memcpy ((char *) dest, (const char *) src, n * sizeof (UNIT));
- #endif
-   return dest;
- }
- --- lib/unilbrk/u16-possible-linebreaks.c
-+++ lib/unilbrk/u16-possible-linebreaks.c
-@@ -39,135 +39,139 @@
- void
- u16_possible_linebreaks (const uint16_t *s, size_t n, const char *encoding, char *p)
- {
--  int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL);
--  const uint16_t *s_end = s + n;
--  int last_prop = LBP_BK; /* line break property of last non-space character */
--  char *seen_space = NULL; /* Was a space seen after the last non-space character? */
--  char *seen_space2 = NULL; /* At least two spaces after the last non-space? */
--
--  /* Don't break inside multibyte characters.  */
--  memset (p, UC_BREAK_PROHIBITED, n);
--
--  while (s < s_end)
-+  if (n > 0)
-     {
--      ucs4_t uc;
--      int count = u16_mbtouc_unsafe (&uc, s, s_end - s);
--      int prop = unilbrkprop_lookup (uc);
-+      int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL);
-+      const uint16_t *s_end = s + n;
-+      int last_prop = LBP_BK; /* line break property of last non-space character */
-+      char *seen_space = NULL; /* Was a space seen after the last non-space character? */
-+      char *seen_space2 = NULL; /* At least two spaces after the last non-space? */
- 
--      if (prop == LBP_BK)
--        {
--          /* Mandatory break.  */
--          *p = UC_BREAK_MANDATORY;
--          last_prop = LBP_BK;
--          seen_space = NULL;
--          seen_space2 = NULL;
--        }
--      else
--        {
--          char *q;
-+      /* Don't break inside multibyte characters.  */
-+      memset (p, UC_BREAK_PROHIBITED, n);
- 
--          /* Resolve property values whose behaviour is not fixed.  */
--          switch (prop)
--            {
--            case LBP_AI:
--              /* Resolve ambiguous.  */
--              prop = LBP_AI_REPLACEMENT;
--              break;
--            case LBP_CB:
--              /* This is arbitrary.  */
--              prop = LBP_ID;
--              break;
--            case LBP_SA:
--              /* We don't handle complex scripts yet.
--                 Treat LBP_SA like LBP_XX.  */
--            case LBP_XX:
--              /* This is arbitrary.  */
--              prop = LBP_AL;
--              break;
--            }
-+      do
-+        {
-+          ucs4_t uc;
-+          int count = u16_mbtouc_unsafe (&uc, s, s_end - s);
-+          int prop = unilbrkprop_lookup (uc);
- 
--          /* Deal with spaces and combining characters.  */
--          q = p;
--          if (prop == LBP_SP)
--            {
--              /* Don't break just before a space.  */
--              *p = UC_BREAK_PROHIBITED;
--              seen_space2 = seen_space;
--              seen_space = p;
--            }
--          else if (prop == LBP_ZW)
-+          if (prop == LBP_BK)
-             {
--              /* Don't break just before a zero-width space.  */
--              *p = UC_BREAK_PROHIBITED;
--              last_prop = LBP_ZW;
-+              /* Mandatory break.  */
-+              *p = UC_BREAK_MANDATORY;
-+              last_prop = LBP_BK;
-               seen_space = NULL;
-               seen_space2 = NULL;
-             }
--          else if (prop == LBP_CM)
-+          else
-             {
--              /* Don't break just before a combining character, except immediately after a
--                 zero-width space.  */
--              if (last_prop == LBP_ZW)
-+              char *q;
-+
-+              /* Resolve property values whose behaviour is not fixed.  */
-+              switch (prop)
-                 {
--                  /* Break after zero-width space.  */
--                  *p = UC_BREAK_POSSIBLE;
--                  /* A combining character turns a preceding space into LBP_ID.  */
--                  last_prop = LBP_ID;
-+                case LBP_AI:
-+                  /* Resolve ambiguous.  */
-+                  prop = LBP_AI_REPLACEMENT;
-+                  break;
-+                case LBP_CB:
-+                  /* This is arbitrary.  */
-+                  prop = LBP_ID;
-+                  break;
-+                case LBP_SA:
-+                  /* We don't handle complex scripts yet.
-+                     Treat LBP_SA like LBP_XX.  */
-+                case LBP_XX:
-+                  /* This is arbitrary.  */
-+                  prop = LBP_AL;
-+                  break;
-                 }
--              else
-+
-+              /* Deal with spaces and combining characters.  */
-+              q = p;
-+              if (prop == LBP_SP)
-                 {
-+                  /* Don't break just before a space.  */
-                   *p = UC_BREAK_PROHIBITED;
--                  /* A combining character turns a preceding space into LBP_ID.  */
--                  if (seen_space != NULL)
--                    {
--                      q = seen_space;
--                      seen_space = seen_space2;
--                      prop = LBP_ID;
--                      goto lookup_via_table;
--                    }
-+                  seen_space2 = seen_space;
-+                  seen_space = p;
-                 }
--            }
--          else
--            {
--             lookup_via_table:
--              /* prop must be usable as an index for table 7.3 of UTR #14.  */
--              if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
--                abort ();
--
--              if (last_prop == LBP_BK)
-+              else if (prop == LBP_ZW)
-                 {
--                  /* Don't break at the beginning of a line.  */
--                  *q = UC_BREAK_PROHIBITED;
-+                  /* Don't break just before a zero-width space.  */
-+                  *p = UC_BREAK_PROHIBITED;
-+                  last_prop = LBP_ZW;
-+                  seen_space = NULL;
-+                  seen_space2 = NULL;
-                 }
--              else if (last_prop == LBP_ZW)
-+              else if (prop == LBP_CM)
-                 {
--                  /* Break after zero-width space.  */
--                  *q = UC_BREAK_POSSIBLE;
-+                  /* Don't break just before a combining character, except immediately
-+                     after a zero-width space.  */
-+                  if (last_prop == LBP_ZW)
-+                    {
-+                      /* Break after zero-width space.  */
-+                      *p = UC_BREAK_POSSIBLE;
-+                      /* A combining character turns a preceding space into LBP_ID.  */
-+                      last_prop = LBP_ID;
-+                    }
-+                  else
-+                    {
-+                      *p = UC_BREAK_PROHIBITED;
-+                      /* A combining character turns a preceding space into LBP_ID.  */
-+                      if (seen_space != NULL)
-+                        {
-+                          q = seen_space;
-+                          seen_space = seen_space2;
-+                          prop = LBP_ID;
-+                          goto lookup_via_table;
-+                        }
-+                    }
-                 }
-               else
-                 {
--                  switch (unilbrk_table [last_prop] [prop])
-+                 lookup_via_table:
-+                  /* prop must be usable as an index for table 7.3 of UTR #14.  */
-+                  if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
-+                    abort ();
-+
-+                  if (last_prop == LBP_BK)
-                     {
--                    case D:
--                      *q = UC_BREAK_POSSIBLE;
--                      break;
--                    case I:
--                      *q = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
--                      break;
--                    case P:
-+                      /* Don't break at the beginning of a line.  */
-                       *q = UC_BREAK_PROHIBITED;
--                      break;
--                    default:
--                      abort ();
-                     }
-+                  else if (last_prop == LBP_ZW)
-+                    {
-+                      /* Break after zero-width space.  */
-+                      *q = UC_BREAK_POSSIBLE;
-+                    }
-+                  else
-+                    {
-+                      switch (unilbrk_table [last_prop] [prop])
-+                        {
-+                        case D:
-+                          *q = UC_BREAK_POSSIBLE;
-+                          break;
-+                        case I:
-+                          *q = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
-+                          break;
-+                        case P:
-+                          *q = UC_BREAK_PROHIBITED;
-+                          break;
-+                        default:
-+                          abort ();
-+                        }
-+                    }
-+                  last_prop = prop;
-+                  seen_space = NULL;
-+                  seen_space2 = NULL;
-                 }
--              last_prop = prop;
--              seen_space = NULL;
--              seen_space2 = NULL;
-             }
--        }
- 
--      s += count;
--      p += count;
-+          s += count;
-+          p += count;
-+        }
-+      while (s < s_end);
-     }
- }
---- lib/unilbrk/u32-possible-linebreaks.c
-+++ lib/unilbrk/u32-possible-linebreaks.c
-@@ -37,131 +37,135 @@
- void
- u32_possible_linebreaks (const uint32_t *s, size_t n, const char *encoding, char *p)
- {
--  int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL);
--  const uint32_t *s_end = s + n;
--  int last_prop = LBP_BK; /* line break property of last non-space character */
--  char *seen_space = NULL; /* Was a space seen after the last non-space character? */
--  char *seen_space2 = NULL; /* At least two spaces after the last non-space? */
--
--  while (s < s_end)
-+  if (n > 0)
-     {
--      ucs4_t uc = *s;
--      int prop = unilbrkprop_lookup (uc);
-+      int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL);
-+      const uint32_t *s_end = s + n;
-+      int last_prop = LBP_BK; /* line break property of last non-space character */
-+      char *seen_space = NULL; /* Was a space seen after the last non-space character? */
-+      char *seen_space2 = NULL; /* At least two spaces after the last non-space? */
- 
--      if (prop == LBP_BK)
--        {
--          /* Mandatory break.  */
--          *p = UC_BREAK_MANDATORY;
--          last_prop = LBP_BK;
--          seen_space = NULL;
--          seen_space2 = NULL;
--        }
--      else
-+      do
-         {
--          char *q;
-+          ucs4_t uc = *s;
-+          int prop = unilbrkprop_lookup (uc);
- 
--          /* Resolve property values whose behaviour is not fixed.  */
--          switch (prop)
-+          if (prop == LBP_BK)
-             {
--            case LBP_AI:
--              /* Resolve ambiguous.  */
--              prop = LBP_AI_REPLACEMENT;
--              break;
--            case LBP_CB:
--              /* This is arbitrary.  */
--              prop = LBP_ID;
--              break;
--            case LBP_SA:
--              /* We don't handle complex scripts yet.
--                 Treat LBP_SA like LBP_XX.  */
--            case LBP_XX:
--              /* This is arbitrary.  */
--              prop = LBP_AL;
--              break;
--            }
--
--          /* Deal with spaces and combining characters.  */
--          q = p;
--          if (prop == LBP_SP)
--            {
--              /* Don't break just before a space.  */
--              *p = UC_BREAK_PROHIBITED;
--              seen_space2 = seen_space;
--              seen_space = p;
--            }
--          else if (prop == LBP_ZW)
--            {
--              /* Don't break just before a zero-width space.  */
--              *p = UC_BREAK_PROHIBITED;
--              last_prop = LBP_ZW;
-+              /* Mandatory break.  */
-+              *p = UC_BREAK_MANDATORY;
-+              last_prop = LBP_BK;
-               seen_space = NULL;
-               seen_space2 = NULL;
-             }
--          else if (prop == LBP_CM)
-+          else
-             {
--              /* Don't break just before a combining character, except immediately after a
--                 zero-width space.  */
--              if (last_prop == LBP_ZW)
-+              char *q;
-+
-+              /* Resolve property values whose behaviour is not fixed.  */
-+              switch (prop)
-                 {
--                  /* Break after zero-width space.  */
--                  *p = UC_BREAK_POSSIBLE;
--                  /* A combining character turns a preceding space into LBP_ID.  */
--                  last_prop = LBP_ID;
-+                case LBP_AI:
-+                  /* Resolve ambiguous.  */
-+                  prop = LBP_AI_REPLACEMENT;
-+                  break;
-+                case LBP_CB:
-+                  /* This is arbitrary.  */
-+                  prop = LBP_ID;
-+                  break;
-+                case LBP_SA:
-+                  /* We don't handle complex scripts yet.
-+                     Treat LBP_SA like LBP_XX.  */
-+                case LBP_XX:
-+                  /* This is arbitrary.  */
-+                  prop = LBP_AL;
-+                  break;
-                 }
--              else
-+
-+              /* Deal with spaces and combining characters.  */
-+              q = p;
-+              if (prop == LBP_SP)
-                 {
-+                  /* Don't break just before a space.  */
-                   *p = UC_BREAK_PROHIBITED;
--                  /* A combining character turns a preceding space into LBP_ID.  */
--                  if (seen_space != NULL)
--                    {
--                      q = seen_space;
--                      seen_space = seen_space2;
--                      prop = LBP_ID;
--                      goto lookup_via_table;
--                    }
-+                  seen_space2 = seen_space;
-+                  seen_space = p;
-                 }
--            }
--          else
--            {
--             lookup_via_table:
--              /* prop must be usable as an index for table 7.3 of UTR #14.  */
--              if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
--                abort ();
--
--              if (last_prop == LBP_BK)
-+              else if (prop == LBP_ZW)
-                 {
--                  /* Don't break at the beginning of a line.  */
--                  *q = UC_BREAK_PROHIBITED;
-+                  /* Don't break just before a zero-width space.  */
-+                  *p = UC_BREAK_PROHIBITED;
-+                  last_prop = LBP_ZW;
-+                  seen_space = NULL;
-+                  seen_space2 = NULL;
-                 }
--              else if (last_prop == LBP_ZW)
-+              else if (prop == LBP_CM)
-                 {
--                  /* Break after zero-width space.  */
--                  *q = UC_BREAK_POSSIBLE;
-+                  /* Don't break just before a combining character, except immediately
-+                     after a zero-width space.  */
-+                  if (last_prop == LBP_ZW)
-+                    {
-+                      /* Break after zero-width space.  */
-+                      *p = UC_BREAK_POSSIBLE;
-+                      /* A combining character turns a preceding space into LBP_ID.  */
-+                      last_prop = LBP_ID;
-+                    }
-+                  else
-+                    {
-+                      *p = UC_BREAK_PROHIBITED;
-+                      /* A combining character turns a preceding space into LBP_ID.  */
-+                      if (seen_space != NULL)
-+                        {
-+                          q = seen_space;
-+                          seen_space = seen_space2;
-+                          prop = LBP_ID;
-+                          goto lookup_via_table;
-+                        }
-+                    }
-                 }
-               else
-                 {
--                  switch (unilbrk_table [last_prop] [prop])
-+                 lookup_via_table:
-+                  /* prop must be usable as an index for table 7.3 of UTR #14.  */
-+                  if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
-+                    abort ();
-+
-+                  if (last_prop == LBP_BK)
-                     {
--                    case D:
--                      *q = UC_BREAK_POSSIBLE;
--                      break;
--                    case I:
--                      *q = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
--                      break;
--                    case P:
-+                      /* Don't break at the beginning of a line.  */
-                       *q = UC_BREAK_PROHIBITED;
--                      break;
--                    default:
--                      abort ();
-                     }
-+                  else if (last_prop == LBP_ZW)
-+                    {
-+                      /* Break after zero-width space.  */
-+                      *q = UC_BREAK_POSSIBLE;
-+                    }
-+                  else
-+                    {
-+                      switch (unilbrk_table [last_prop] [prop])
-+                        {
-+                        case D:
-+                          *q = UC_BREAK_POSSIBLE;
-+                          break;
-+                        case I:
-+                          *q = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
-+                          break;
-+                        case P:
-+                          *q = UC_BREAK_PROHIBITED;
-+                          break;
-+                        default:
-+                          abort ();
-+                        }
-+                    }
-+                  last_prop = prop;
-+                  seen_space = NULL;
-+                  seen_space2 = NULL;
-                 }
--              last_prop = prop;
--              seen_space = NULL;
--              seen_space2 = NULL;
-             }
--        }
- 
--      s++;
--      p++;
-+          s++;
-+          p++;
-+        }
-+      while (s < s_end);
-     }
- }
---- lib/unilbrk/u8-possible-linebreaks.c
-+++ lib/unilbrk/u8-possible-linebreaks.c
-@@ -39,136 +39,140 @@
- void
- u8_possible_linebreaks (const uint8_t *s, size_t n, const char *encoding, char *p)
- {
--  int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL);
--  const uint8_t *s_end = s + n;
--  int last_prop = LBP_BK; /* line break property of last non-space character */
--  char *seen_space = NULL; /* Was a space seen after the last non-space character? */
--  char *seen_space2 = NULL; /* At least two spaces after the last non-space? */
--
--  /* Don't break inside multibyte characters.  */
--  memset (p, UC_BREAK_PROHIBITED, n);
--
--  while (s < s_end)
-+  if (n > 0)
-     {
--      ucs4_t uc;
--      int count = u8_mbtouc_unsafe (&uc, s, s_end - s);
--      int prop = unilbrkprop_lookup (uc);
-+      int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL);
-+      const uint8_t *s_end = s + n;
-+      int last_prop = LBP_BK; /* line break property of last non-space character */
-+      char *seen_space = NULL; /* Was a space seen after the last non-space character? */
-+      char *seen_space2 = NULL; /* At least two spaces after the last non-space? */
- 
--      if (prop == LBP_BK)
--        {
--          /* Mandatory break.  */
--          *p = UC_BREAK_MANDATORY;
--          last_prop = LBP_BK;
--          seen_space = NULL;
--          seen_space2 = NULL;
--        }
--      else
--        {
--          char *q;
-+      /* Don't break inside multibyte characters.  */
-+      memset (p, UC_BREAK_PROHIBITED, n);
- 
--          /* Resolve property values whose behaviour is not fixed.  */
--          switch (prop)
--            {
--            case LBP_AI:
--              /* Resolve ambiguous.  */
--              prop = LBP_AI_REPLACEMENT;
--              break;
--            case LBP_CB:
--              /* This is arbitrary.  */
--              prop = LBP_ID;
--              break;
--            case LBP_SA:
--              /* We don't handle complex scripts yet.
--                 Treat LBP_SA like LBP_XX.  */
--            case LBP_XX:
--              /* This is arbitrary.  */
--              prop = LBP_AL;
--              break;
--            }
-+      do
-+        {
-+          ucs4_t uc;
-+          int count = u8_mbtouc_unsafe (&uc, s, s_end - s);
-+          int prop = unilbrkprop_lookup (uc);
- 
--          /* Deal with spaces and combining characters.  */
--          q = p;
--          if (prop == LBP_SP)
--            {
--              /* Don't break just before a space.  */
--              *p = UC_BREAK_PROHIBITED;
--              seen_space2 = seen_space;
--              seen_space = p;
--            }
--          else if (prop == LBP_ZW)
-+          if (prop == LBP_BK)
-             {
--              /* Don't break just before a zero-width space.  */
--              *p = UC_BREAK_PROHIBITED;
--              last_prop = LBP_ZW;
-+              /* Mandatory break.  */
-+              *p = UC_BREAK_MANDATORY;
-+              last_prop = LBP_BK;
-               seen_space = NULL;
-               seen_space2 = NULL;
-             }
--          else if (prop == LBP_CM)
-+          else
-             {
--              /* Don't break just before a combining character, except immediately after a
--                 zero-width space.  */
--              if (last_prop == LBP_ZW)
-+              char *q;
-+
-+              /* Resolve property values whose behaviour is not fixed.  */
-+              switch (prop)
-                 {
--                  /* Break after zero-width space.  */
--                  *p = UC_BREAK_POSSIBLE;
--                  /* A combining character turns a preceding space into LBP_ID.  */
--                  last_prop = LBP_ID;
-+                case LBP_AI:
-+                  /* Resolve ambiguous.  */
-+                  prop = LBP_AI_REPLACEMENT;
-+                  break;
-+                case LBP_CB:
-+                  /* This is arbitrary.  */
-+                  prop = LBP_ID;
-+                  break;
-+                case LBP_SA:
-+                  /* We don't handle complex scripts yet.
-+                     Treat LBP_SA like LBP_XX.  */
-+                case LBP_XX:
-+                  /* This is arbitrary.  */
-+                  prop = LBP_AL;
-+                  break;
-                 }
--              else
-+
-+              /* Deal with spaces and combining characters.  */
-+              q = p;
-+              if (prop == LBP_SP)
-                 {
-+                  /* Don't break just before a space.  */
-                   *p = UC_BREAK_PROHIBITED;
--                  /* A combining character turns a preceding space into LBP_ID.  */
--                  if (seen_space != NULL)
--                    {
--                      q = seen_space;
--                      seen_space = seen_space2;
--                      prop = LBP_ID;
--                      goto lookup_via_table;
--                    }
-+                  seen_space2 = seen_space;
-+                  seen_space = p;
-                 }
--            }
--          else
--            {
--             lookup_via_table:
--              /* prop must be usable as an index for table 7.3 of UTR #14.  */
--              if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
--                abort ();
--
--              if (last_prop == LBP_BK)
-+              else if (prop == LBP_ZW)
-                 {
--                  /* Don't break at the beginning of a line.  */
--                  *q = UC_BREAK_PROHIBITED;
-+                  /* Don't break just before a zero-width space.  */
-+                  *p = UC_BREAK_PROHIBITED;
-+                  last_prop = LBP_ZW;
-+                  seen_space = NULL;
-+                  seen_space2 = NULL;
-                 }
--              else if (last_prop == LBP_ZW)
-+              else if (prop == LBP_CM)
-                 {
--                  /* Break after zero-width space.  */
--                  *q = UC_BREAK_POSSIBLE;
-+                  /* Don't break just before a combining character, except immediately
-+                     after a zero-width space.  */
-+                  if (last_prop == LBP_ZW)
-+                    {
-+                      /* Break after zero-width space.  */
-+                      *p = UC_BREAK_POSSIBLE;
-+                      /* A combining character turns a preceding space into LBP_ID.  */
-+                      last_prop = LBP_ID;
-+                    }
-+                  else
-+                    {
-+                      *p = UC_BREAK_PROHIBITED;
-+                      /* A combining character turns a preceding space into LBP_ID.  */
-+                      if (seen_space != NULL)
-+                        {
-+                          q = seen_space;
-+                          seen_space = seen_space2;
-+                          prop = LBP_ID;
-+                          goto lookup_via_table;
-+                        }
-+                    }
-                 }
-               else
-                 {
--                  switch (unilbrk_table [last_prop] [prop])
-+                 lookup_via_table:
-+                  /* prop must be usable as an index for table 7.3 of UTR #14.  */
-+                  if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
-+                    abort ();
-+
-+                  if (last_prop == LBP_BK)
-                     {
--                    case D:
--                      *q = UC_BREAK_POSSIBLE;
--                      break;
--                    case I:
--                      *q = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
--                      break;
--                    case P:
-+                      /* Don't break at the beginning of a line.  */
-                       *q = UC_BREAK_PROHIBITED;
--                      break;
--                    default:
--                      abort ();
-                     }
-+                  else if (last_prop == LBP_ZW)
-+                    {
-+                      /* Break after zero-width space.  */
-+                      *q = UC_BREAK_POSSIBLE;
-+                    }
-+                  else
-+                    {
-+                      switch (unilbrk_table [last_prop] [prop])
-+                        {
-+                        case D:
-+                          *q = UC_BREAK_POSSIBLE;
-+                          break;
-+                        case I:
-+                          *q = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
-+                          break;
-+                        case P:
-+                          *q = UC_BREAK_PROHIBITED;
-+                          break;
-+                        default:
-+                          abort ();
-+                        }
-+                    }
-+                  last_prop = prop;
-+                  seen_space = NULL;
-+                  seen_space2 = NULL;
-                 }
--              last_prop = prop;
--              seen_space = NULL;
--              seen_space2 = NULL;
-             }
--        }
- 
--      s += count;
--      p += count;
-+          s += count;
-+          p += count;
-+        }
-+      while (s < s_end);
-     }
- }
- 
---- lib/unicase/u-ct-totitle.h
-+++ lib/unicase/u-ct-totitle.h
-@@ -109,7 +109,7 @@
-         ucs4_t mapped_uc[3];
-         unsigned int mapped_count;
- 
--        if (*wp)
-+        if (wp && *wp)
-           /* Crossing a word boundary.  */
-           in_word_first_part = true;
- 
---- tests/test-float.c
-+++ tests/test-float.c
-@@ -315,6 +315,11 @@
-     volatile long double m = LDBL_MAX;
-     int n;
- 
-+    /* The library source code handles the case LDBL_MANT_DIG=106.   */
-+    /* It appears the library's tests don't reflect the changes      */
-+    /* made to the library proper. What I am not sure about is, are  */
-+    /* the changes in the library applicable to Apple PPC platforms. */
-+#if !defined(__APPLE__) || !defined(_ARCH_PPC)
-     ASSERT (m + m > m);
-     for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
-       {
-@@ -325,6 +330,7 @@
-         else
-           ASSERT (!(x + x == x));
-       }
-+#endif
-   }
- 
-   /* Check the value of LDBL_MIN.  */
---- tests/test-striconveh.c
-+++ tests/test-striconveh.c
-@@ -737,13 +737,23 @@
-     }
- 
-   if (cd_88591_to_88592 != (iconv_t)(-1))
-+  {
-     iconv_close (cd_88591_to_88592);
-+    cd_88591_to_88592 = (iconv_t)(-1);
-+  }
-   if (cd_88592_to_88591 != (iconv_t)(-1))
-+  {
-     iconv_close (cd_88592_to_88591);
-+    cd_88592_to_88591 = (iconv_t)(-1);
-+  }
-   iconv_close (cd_88591_to_utf8);
-+  cd_88591_to_utf8 = (iconv_t)(-1);
-   iconv_close (cd_utf8_to_88591);
-+  cd_utf8_to_88591 = (iconv_t)(-1);
-   iconv_close (cd_88592_to_utf8);
-+  cd_88592_to_utf8 = (iconv_t)(-1);
-   iconv_close (cd_utf8_to_88592);
-+  cd_utf8_to_88592 = (iconv_t)(-1);
- 
-   /* ------------------------- Test mem_iconveh() ------------------------- */
- 
-@@ -1108,5 +1118,28 @@
- 
- #endif
- 
-+#if HAVE_ICONV
-+
-+  if (cd_ascii_to_88591 != (iconv_t)-1)
-+    iconv_close(cd_ascii_to_88591);
-+  if (cd_88591_to_88592 != (iconv_t)-1)
-+    iconv_close(cd_88591_to_88592);
-+  if (cd_88592_to_88591 != (iconv_t)-1)
-+    iconv_close(cd_88592_to_88591);
-+  if (cd_ascii_to_utf8 != (iconv_t)-1)
-+    iconv_close(cd_ascii_to_utf8);
-+  if (cd_88591_to_utf8 != (iconv_t)-1)
-+    iconv_close(cd_88591_to_utf8);
-+  if (cd_utf8_to_88591 != (iconv_t)-1)
-+    iconv_close(cd_utf8_to_88591);
-+  if (cd_88592_to_utf8 != (iconv_t)-1)
-+    iconv_close(cd_88592_to_utf8);
-+  if (cd_utf8_to_88592 != (iconv_t)-1)
-+    iconv_close(cd_utf8_to_88592);
-+  if (cd_utf7_to_utf8 != (iconv_t)-1)
-+    iconv_close(cd_utf7_to_utf8);
-+
-+#endif
-+
-   return 0;
- }
- 
---- tests/uniconv/test-u8-conv-to-enc.c
-+++ tests/uniconv/test-u8-conv-to-enc.c
-@@ -81,9 +81,11 @@
-                                        i == 40 ? (size_t)(-1) :
-                                        i - 4));
-               ASSERT (offsets[41] == MAGIC);
--              free (offsets);
-             }
--          free (result);
-+          if (offsets)
-+            free (offsets);
-+          if (result)
-+            free (result);
-         }
-     }
- 
-@@ -122,9 +124,7 @@
-                                              i == 5 ? (size_t)(-1) :
-                                              i - 1));
-                     ASSERT (offsets[17] == MAGIC);
--                    free (offsets);
-                   }
--                free (result);
-               }
-               break;
-             case iconveh_escape_sequence:
-@@ -140,12 +140,14 @@
-                                              i == 5 ? (size_t)(-1) :
-                                              i + 4));
-                     ASSERT (offsets[17] == MAGIC);
--                    free (offsets);
-                   }
--                free (result);
-               }
-               break;
-             }
-+          if (offsets)
-+            free (offsets);
-+          if (result)
-+            free (result);
-         }
-     }
- 
-@@ -168,9 +170,11 @@
-             {
-               ASSERT (offsets[0] == 0);
-               ASSERT (offsets[1] == MAGIC);
--              free (offsets);
-             }
--          free (result);
-+          if (offsets)
-+            free (offsets);
-+          if (result)
-+            free (result);
-         }
-     }
- 
---- tests/uniconv/test-u16-conv-to-enc.c
-+++ tests/uniconv/test-u16-conv-to-enc.c
-@@ -120,9 +120,7 @@
-                     for (i = 0; i < 16; i++)
-                       ASSERT (offsets[i] == i);
-                     ASSERT (offsets[16] == MAGIC);
--                    free (offsets);
-                   }
--                free (result);
-               }
-               break;
-             case iconveh_escape_sequence:
-@@ -136,12 +134,14 @@
-                     for (i = 0; i < 16; i++)
-                       ASSERT (offsets[i] == (i < 5 ? i : i + 5));
-                     ASSERT (offsets[16] == MAGIC);
--                    free (offsets);
-                   }
--                free (result);
-               }
-               break;
-             }
-+          if (offsets)
-+            free (offsets);
-+          if (result)
-+            free (result);
-         }
-     }
- 
---- tests/uniconv/test-u32-conv-to-enc.c
-+++ tests/uniconv/test-u32-conv-to-enc.c
-@@ -120,9 +120,7 @@
-                     for (i = 0; i < 16; i++)
-                       ASSERT (offsets[i] == i);
-                     ASSERT (offsets[16] == MAGIC);
--                    free (offsets);
-                   }
--                free (result);
-               }
-               break;
-             case iconveh_escape_sequence:
-@@ -136,12 +134,14 @@
-                     for (i = 0; i < 16; i++)
-                       ASSERT (offsets[i] == (i < 5 ? i : i + 5));
-                     ASSERT (offsets[16] == MAGIC);
--                    free (offsets);
-                   }
--                free (result);
-               }
-               break;
-             }
-+          if (offsets)
-+            free (offsets);
-+          if (result)
-+            free (result);
-         }
-     }
- 
---- tests/uninorm/test-u32-normalize-big.c
-+++ tests/uninorm/test-u32-normalize-big.c
-@@ -297,6 +297,7 @@
-           input[0] = uc;
-           result = u32_normalize (nf, input, 1, NULL, &length);
-           ASSERT (result != NULL && length == 1 && result[0] == uc);
-+          free (result);
-         }
-     }
- }
---- tests/unistr/test-strchr.h
-+++ tests/unistr/test-strchr.h
-@@ -157,5 +157,7 @@
-   }
- #endif
- 
--  free (input);
-+  if ((const uint32_t*)input != input32)
-+    free (input);
-+  free (input32);
- }
---- tests/unistr/test-chr.h
-+++ tests/unistr/test-chr.h
-@@ -131,7 +131,9 @@
-       }
-   }
- 
--  free (input);
-+  if ((const uint32_t*)input != input32)
-+    free (input);
-+  free (input32);
- 
-   return 0;
- }
---- tests/uninorm/test-u32-normalize-big.h
-+++ tests/uninorm/test-u32-normalize-big.h
-@@ -48,7 +48,7 @@
-      sentinel value of 0x110000 at the end.  */
-   ucs4_t *part1_c1_sorted;
-   /* The filename of the NormalizationTest.txt file.  */
--  const char *filename;
-+  char *filename;
- };
- 
- /* Read the NormalizationTest.txt file and return its contents.  */
-@@ -56,6 +56,10 @@
-        read_normalization_test_file (const char *filename,
-                                      struct normalization_test_file *file);
- 
-+/* Free normalization_test_file contents.  */
-+extern void
-+       free_normalization_test_file (struct normalization_test_file *file);
-+
- /* Perform the first compliance test.  */
- extern void
-        test_specific (const struct normalization_test_file *file,
---- tests/uninorm/test-u32-normalize-big.c
-+++ tests/uninorm/test-u32-normalize-big.c
-@@ -239,6 +239,39 @@
- }
- 
- void
-+free_normalization_test_file (struct normalization_test_file *file)
-+{
-+  if (file == NULL)
-+    return;
-+
-+  unsigned int i, j, k;
-+  for (i=0; i<4; ++i)
-+  {
-+    for (j=0; j<file->parts[i].lines_length; ++j)
-+    {
-+      for (k=0; k<5; ++k)
-+      {
-+        uint32_t *sequence = file->parts[i].lines[j].sequences[k];
-+        if (sequence)
-+          free (sequence);
-+        file->parts[i].lines[j].sequences[k] = NULL;
-+      }
-+    }
-+  
-+    free(file->parts[i].lines);
-+    file->parts[i].lines = NULL;
-+  }
-+
-+  if (file->part1_c1_sorted)
-+    free (file->part1_c1_sorted);
-+  file->part1_c1_sorted = NULL;
-+
-+  if (file->filename)
-+    free (file->filename);
-+  file->filename = NULL;
-+}
-+
-+void
- test_specific (const struct normalization_test_file *file,
-                int (*check) (const uint32_t *c1, size_t c1_length,
-                              const uint32_t *c2, size_t c2_length,
---- tests/uninorm/test-u32-nfc-big.c
-+++ tests/uninorm/test-u32-nfc-big.c
-@@ -46,7 +46,10 @@
-     if (!(result != NULL
-           && length == c2_length
-           && u32_cmp (result, c2, c2_length) == 0))
-+    {
-+      free (result);
-       return 1;
-+    }
-     free (result);
-   }
-   {
-@@ -57,7 +60,10 @@
-     if (!(result != NULL
-           && length == c2_length
-           && u32_cmp (result, c2, c2_length) == 0))
-+    {
-+      free (result);
-       return 2;
-+    }
-     free (result);
-   }
-   {
-@@ -68,7 +74,10 @@
-     if (!(result != NULL
-           && length == c2_length
-           && u32_cmp (result, c2, c2_length) == 0))
-+    {
-+      free (result);
-       return 3;
-+    }
-     free (result);
-   }
-   {
-@@ -79,7 +88,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 4;
-+    }
-     free (result);
-   }
-   {
-@@ -90,7 +102,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 5;
-+    }
-     free (result);
-   }
-   return 0;
-@@ -106,6 +121,8 @@
-   test_specific (&file, check);
-   test_other (&file, UNINORM_NFC);
- 
-+  free_normalization_test_file(&file);
-+
-   return 0;
- }
- 
---- tests/uninorm/test-u32-nfd-big.c
-+++ tests/uninorm/test-u32-nfd-big.c
-@@ -46,7 +46,10 @@
-     if (!(result != NULL
-           && length == c3_length
-           && u32_cmp (result, c3, c3_length) == 0))
-+    {
-+      free (result);
-       return 1;
-+    }
-     free (result);
-   }
-   {
-@@ -57,7 +60,10 @@
-     if (!(result != NULL
-           && length == c3_length
-           && u32_cmp (result, c3, c3_length) == 0))
-+    {
-+      free (result);
-       return 2;
-+    }
-     free (result);
-   }
-   {
-@@ -68,7 +74,10 @@
-     if (!(result != NULL
-           && length == c3_length
-           && u32_cmp (result, c3, c3_length) == 0))
-+    {
-+      free (result);
-       return 3;
-+    }
-     free (result);
-   }
-   {
-@@ -79,7 +88,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 4;
-+    }
-     free (result);
-   }
-   {
-@@ -90,7 +102,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 5;
-+    }
-     free (result);
-   }
-   return 0;
-@@ -106,6 +121,8 @@
-   test_specific (&file, check);
-   test_other (&file, UNINORM_NFD);
- 
-+  free_normalization_test_file(&file);
-+
-   return 0;
- }
- 
---- tests/uninorm/test-u32-nfkc-big.c
-+++ tests/uninorm/test-u32-nfkc-big.c
-@@ -43,7 +43,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 1;
-+    }
-     free (result);
-   }
-   {
-@@ -54,7 +57,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 2;
-+    }
-     free (result);
-   }
-   {
-@@ -65,7 +71,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 3;
-+    }
-     free (result);
-   }
-   {
-@@ -76,7 +85,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 4;
-+    }
-     free (result);
-   }
-   {
-@@ -87,7 +99,10 @@
-     if (!(result != NULL
-           && length == c4_length
-           && u32_cmp (result, c4, c4_length) == 0))
-+    {
-+      free (result);
-       return 5;
-+    }
-     free (result);
-   }
-   return 0;
-@@ -103,6 +118,8 @@
-   test_specific (&file, check);
-   test_other (&file, UNINORM_NFKC);
- 
-+  free_normalization_test_file(&file);
-+
-   return 0;
- }
- 
---- tests/uninorm/test-u32-nfkd-big.c
-+++ tests/uninorm/test-u32-nfkd-big.c
-@@ -43,7 +43,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 1;
-+    }
-     free (result);
-   }
-   {
-@@ -54,7 +57,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 2;
-+    }
-     free (result);
-   }
-   {
-@@ -65,7 +71,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 3;
-+    }
-     free (result);
-   }
-   {
-@@ -76,7 +85,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 4;
-+    }
-     free (result);
-   }
-   {
-@@ -87,7 +99,10 @@
-     if (!(result != NULL
-           && length == c5_length
-           && u32_cmp (result, c5, c5_length) == 0))
-+    {
-+      free (result);
-       return 5;
-+    }
-     free (result);
-   }
-   return 0;
-@@ -103,6 +118,8 @@
-   test_specific (&file, check);
-   test_other (&file, UNINORM_NFKD);
- 
-+  free_normalization_test_file(&file);
-+
-   return 0;
- }
- 
---- tests/test-intprops.c
-+++ tests/test-intprops.c
-@@ -52,6 +52,17 @@
- 
- #define DONTCARE __LINE__
- 
-+/* Early versions of GCC don't define these */
-+#ifndef LLONG_MIN
-+#  define LLONG_MIN    LONG_LONG_MIN
-+#endif
-+#ifndef LLONG_MAX
-+#  define LLONG_MAX    LONG_LONG_MAX
-+#endif
-+#ifndef ULLONG_MAX
-+#  define ULLONG_MAX   ULONG_LONG_MAX
-+#endif
-+
- int
- main (void)
- {
---- tests/test-limits-h.c
-+++ tests/test-limits-h.c
-@@ -26,6 +26,17 @@
- # pragma GCC diagnostic ignored "-Woverlength-strings"
- #endif
- 
-+/* Early versions of GCC don't define these */
-+#ifndef LLONG_MIN
-+#  define LLONG_MIN    LONG_LONG_MIN
-+#endif
-+#ifndef LLONG_MAX
-+#  define LLONG_MAX    LONG_LONG_MAX
-+#endif
-+#ifndef ULLONG_MAX
-+#  define ULLONG_MAX   ULONG_LONG_MAX
-+#endif
-+
- /* Macros specified by ISO/IEC TS 18661-1:2014.  */
- 
- #define verify_width(width, min, max) \
---- tests/test-localename.c
-+++ tests/test-localename.c
-@@ -478,7 +478,9 @@
-             {
-               ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
-               free (saved_names[j][i]);
-+              saved_names[j][i] = NULL;
-             }
-+          available[j] = 0;
-         }
-   }
- #else
diff --git a/patch/uthash.patch b/patch/uthash.patch
deleted file mode 100644
index 7d81d1e3b..000000000
--- a/patch/uthash.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with UTHash.
---- tests/Makefile
-+++ tests/Makefile
-@@ -13,22 +13,22 @@
-         test74 test75 test76 test77 test78 test79 test80 test81 \
-         test82 test83 test84 test85 test86 test87 test88 test89 \
-         test90 test91 test92 test93 test94 test95
--CFLAGS += -I$(HASHDIR)
--#CFLAGS += -DHASH_BLOOM=16
--#CFLAGS += -O2
--CFLAGS += -g
--#CFLAGS += -Wstrict-aliasing=2
--CFLAGS += -Wall
--#CFLAGS += -Wextra
--#CFLAGS += -std=c89
--CFLAGS += ${EXTRA_CFLAGS}
-+UTH_CFLAGS += -I$(HASHDIR)
-+#UTH_CFLAGS += -DHASH_BLOOM=16
-+#UTH_CFLAGS += -O2
-+UTH_CFLAGS += -g
-+#UTH_CFLAGS += -Wstrict-aliasing=2
-+UTH_CFLAGS += -Wall
-+#UTH_CFLAGS += -Wextra
-+#UTH_CFLAGS += -std=c89
-+UTH_CFLAGS += ${EXTRA_CFLAGS}
- 
- ifeq ($(HASH_DEBUG),1)
--CFLAGS += -DHASH_DEBUG=1
-+UTH_CFLAGS += -DHASH_DEBUG=1
- endif
- 
- ifeq ($(HASH_PEDANTIC),1)
--CFLAGS += -pedantic
-+UTH_CFLAGS += -pedantic
- endif
- 
- TEST_TARGET=run_tests
-@@ -87,28 +87,28 @@
- 	$(MAKE) clean && CC=$(CXX) $(MAKE) tests_only EXTRA_CFLAGS='-pedantic -DHASH_USING_NO_STRICT_ALIASING -fno-strict-aliasing -DHASH_FUNCTION=HASH_MUR'
- 
- example: example.c $(HASHDIR)/uthash.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(@).c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(@).c
- 
- $(PROGS) $(UTILS) : $(HASHDIR)/uthash.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(@).c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(@).c
- 	@$(MKGITIGN)
- 
- hashscan : $(HASHDIR)/uthash.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(MUR_CFLAGS) $(LDFLAGS) -o $@ $(@).c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) $(MUR_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(@).c
- 	@$(MKGITIGN)
- 
- sleep_test : $(HASHDIR)/uthash.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_BLOOM=16 $(LDFLAGS) -o $@ $(@).c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_BLOOM=16 $(CFLAGS) $(LDFLAGS) -o $@ $(@).c
- 	@$(MKGITIGN)
- 
- keystat : $(HASHDIR)/uthash.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_FUNCTION=HASH_BER $(LDFLAGS) -o keystat.BER keystat.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_FUNCTION=HASH_FNV $(LDFLAGS) -o keystat.FNV keystat.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_FUNCTION=HASH_JEN $(LDFLAGS) -o keystat.JEN keystat.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_FUNCTION=HASH_OAT $(LDFLAGS) -o keystat.OAT keystat.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_FUNCTION=HASH_SAX $(LDFLAGS) -o keystat.SAX keystat.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -DHASH_FUNCTION=HASH_SFH $(LDFLAGS) -o keystat.SFH keystat.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(MUR_CFLAGS) -DHASH_FUNCTION=HASH_MUR $(LDFLAGS) -o keystat.MUR keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_FUNCTION=HASH_BER $(CFLAGS) $(LDFLAGS) -o keystat.BER keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_FUNCTION=HASH_FNV $(CFLAGS) $(LDFLAGS) -o keystat.FNV keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_FUNCTION=HASH_JEN $(CFLAGS) $(LDFLAGS) -o keystat.JEN keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_FUNCTION=HASH_OAT $(CFLAGS) $(LDFLAGS) -o keystat.OAT keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_FUNCTION=HASH_SAX $(CFLAGS) $(LDFLAGS) -o keystat.SAX keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) -DHASH_FUNCTION=HASH_SFH $(CFLAGS) $(LDFLAGS) -o keystat.SFH keystat.c
-+	$(CC) $(CPPFLAGS) $(UTH_CFLAGS) $(MUR_CFLAGS) -DHASH_FUNCTION=HASH_MUR $(CFLAGS) $(LDFLAGS) -o keystat.MUR keystat.c
- 
- run_tests: $(PROGS)
- 	perl $(TESTS)
diff --git a/patch/wget.patch b/patch/wget.patch
deleted file mode 100644
index ba8106b75..000000000
--- a/patch/wget.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Wget 1.21.
---- lib/tempname.c
-+++ lib/tempname.c
-@@ -89,7 +89,11 @@
-   __clock_gettime64 (CLOCK_MONOTONIC, &tv);
-   var ^= tv.tv_nsec;
- #endif
-+#if defined(__APPLE__) && defined(_ARCH_PPC)
-+  return 2862933555777941757ull * var + 3037000493u;
-+#else
-   return 2862933555777941757 * var + 3037000493;
-+#endif
- }
- 
- #if _LIBC
-@@ -287,7 +291,8 @@
- 
-   for (count = 0; count < attempts; ++count)
-     {
--      for (size_t i = 0; i < x_suffix_len; i++)
-+      size_t i;
-+      for (i = 0; i < x_suffix_len; i++)
-         {
-           if (vdigits == 0)
-             {
---- lib/utime.c
-+++ lib/utime.c
-@@ -21,6 +21,10 @@
- /* Specification.  */
- #include <utime.h>
- 
-+#if defined(__APPLE__)
-+# include <errno.h>
-+#endif
-+
- #if defined _WIN32 && ! defined __CYGWIN__
- 
- # include <errno.h>
---- src/progress.c
-+++ src/progress.c
-@@ -1375,7 +1375,8 @@
- #endif
-   if (params)
-     {
--      for (const char *param = params; *param; )
-+      const char* param;
-+      for (param = params; *param; )
-         {
-           if (!strncmp (param, "force", 5))
-             current_impl_locked = 1;
diff --git a/patch/zlib.patch.old b/patch/zlib.patch.old
deleted file mode 100644
index dc9ab7f54..000000000
--- a/patch/zlib.patch.old
+++ /dev/null
@@ -1,305 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -26,7 +26,7 @@
- 
- SFLAGS=-O
- LDFLAGS=
--TEST_LDFLAGS=-L. libz.a
-+TEST_LDFLAGS=-L. ./libz.a
- LDSHARED=$(CC)
- CPP=$(CC) -E
- 
-@@ -117,10 +117,10 @@
- 	@rm -f tmp64_$$
- 
- infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
--	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
- 
- infcover: infcover.o libz.a
--	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ infcover.o libz.a
- 
- cover: infcover
- 	rm -f *.gcda
-@@ -144,137 +144,137 @@
- 	rm -f _match.s
- 
- example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
--	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
- 
- minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
--	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
- 
- example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
--	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
- 
- minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
--	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
- 
- 
- adler32.o: $(SRCDIR)adler32.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
- 
- crc32.o: $(SRCDIR)crc32.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
- 
- deflate.o: $(SRCDIR)deflate.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
- 
- infback.o: $(SRCDIR)infback.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
- 
- inffast.o: $(SRCDIR)inffast.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
- 
- inflate.o: $(SRCDIR)inflate.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
- 
- inftrees.o: $(SRCDIR)inftrees.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
- 
- trees.o: $(SRCDIR)trees.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
- 
- zutil.o: $(SRCDIR)zutil.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
- 
- compress.o: $(SRCDIR)compress.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
- 
- uncompr.o: $(SRCDIR)uncompr.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
- 
- gzclose.o: $(SRCDIR)gzclose.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
- 
- gzlib.o: $(SRCDIR)gzlib.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
- 
- gzread.o: $(SRCDIR)gzread.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
- 
- gzwrite.o: $(SRCDIR)gzwrite.c
--	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
- 
- 
- adler32.lo: $(SRCDIR)adler32.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
- 	-@mv objs/adler32.o $@
- 
- crc32.lo: $(SRCDIR)crc32.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
- 	-@mv objs/crc32.o $@
- 
- deflate.lo: $(SRCDIR)deflate.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
- 	-@mv objs/deflate.o $@
- 
- infback.lo: $(SRCDIR)infback.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
- 	-@mv objs/infback.o $@
- 
- inffast.lo: $(SRCDIR)inffast.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
- 	-@mv objs/inffast.o $@
- 
- inflate.lo: $(SRCDIR)inflate.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
- 	-@mv objs/inflate.o $@
- 
- inftrees.lo: $(SRCDIR)inftrees.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
- 	-@mv objs/inftrees.o $@
- 
- trees.lo: $(SRCDIR)trees.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
- 	-@mv objs/trees.o $@
- 
- zutil.lo: $(SRCDIR)zutil.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
- 	-@mv objs/zutil.o $@
- 
- compress.lo: $(SRCDIR)compress.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
- 	-@mv objs/compress.o $@
- 
- uncompr.lo: $(SRCDIR)uncompr.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
- 	-@mv objs/uncompr.o $@
- 
- gzclose.lo: $(SRCDIR)gzclose.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
- 	-@mv objs/gzclose.o $@
- 
- gzlib.lo: $(SRCDIR)gzlib.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
- 	-@mv objs/gzlib.o $@
- 
- gzread.lo: $(SRCDIR)gzread.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
- 	-@mv objs/gzread.o $@
- 
- gzwrite.lo: $(SRCDIR)gzwrite.c
- 	-@mkdir objs 2>/dev/null || test -d objs
--	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
-+	$(CC) $(CPPFLAGS) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
- 	-@mv objs/gzwrite.o $@
- 
- 
-@@ -286,34 +286,37 @@
- 	-@rmdir objs
- 
- example$(EXE): example.o $(STATICLIB)
--	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
- 
- minigzip$(EXE): minigzip.o $(STATICLIB)
--	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
- 
- examplesh$(EXE): example.o $(SHAREDLIBV)
--	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
- 
- minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
--	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
- 
- example64$(EXE): example64.o $(STATICLIB)
--	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
- 
- minigzip64$(EXE): minigzip64.o $(STATICLIB)
--	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
- 
--install-libs: $(LIBS)
-+installdirs:
- 	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
- 	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
- 	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-+	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
- 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
-+
-+install-libs: installdirs $(LIBS)
- 	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
- 	cp $(STATICLIB) $(DESTDIR)$(libdir)
- 	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
- 	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
--	-@if test -n "$(SHAREDLIBV)"; then \
-+	-@if true; then \
- 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
- 	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
- 	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
-@@ -321,8 +324,9 @@
- 	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
- 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
- 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-+	  echo "ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB)"; \
- 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
--	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
-+	  echo "ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM)"; \
- 	fi
- 	rm -f $(DESTDIR)$(man3dir)/zlib.3
- 	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
-@@ -333,8 +337,7 @@
- # The ranlib in install is needed on NeXTSTEP which checks file times
- # ldconfig is for Linux
- 
--install: install-libs
--	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
-+install: installdirs install-libs
- 	rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
- 	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
- 	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
---- configure
-+++ configure
-@@ -190,6 +190,7 @@
- if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
-   echo ... using gcc >> configure.log
-   CC="$cc"
-+  CPPFLAGS="${CPPFLAGS--DNDEBUG}"
-   CFLAGS="${CFLAGS--O3}"
-   SFLAGS="${CFLAGS--O3} -fPIC"
-   if test "$ARCHS"; then
-@@ -470,6 +471,7 @@
- cat > $test.c <<EOF
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- size_t dummy = 0;
- EOF
- if try $CC -c $CFLAGS $test.c; then
-@@ -839,6 +841,7 @@
- echo AR = $AR >> configure.log
- echo ARFLAGS = $ARFLAGS >> configure.log
- echo CC = $CC >> configure.log
-+echo CPPFLAGS = $CPPFLAGS >> configure.log
- echo CFLAGS = $CFLAGS >> configure.log
- echo CPP = $CPP >> configure.log
- echo EXE = $EXE >> configure.log
-@@ -868,6 +871,7 @@
- # udpate Makefile with the configure results
- sed < ${SRCDIR}Makefile.in "
- /^CC *=/s#=.*#=$CC#
-+/^CPPFLAGS *=/s#=.*#=$CPPFLAGS#
- /^CFLAGS *=/s#=.*#=$CFLAGS#
- /^SFLAGS *=/s#=.*#=$SFLAGS#
- /^LDFLAGS *=/s#=.*#=$LDFLAGS#
-@@ -901,6 +905,7 @@
- # create zlib.pc with the configure results
- sed < ${SRCDIR}zlib.pc.in "
- /^CC *=/s#=.*#=$CC#
-+/^CPPFLAGS *=/s#=.*#=$CPPFLAGS#
- /^CFLAGS *=/s#=.*#=$CFLAGS#
- /^CPP *=/s#=.*#=$CPP#
- /^LDSHARED *=/s#=.*#=$LDSHARED#
diff --git a/patch/zstd.patch b/patch/zstd.patch
deleted file mode 100644
index 33625319c..000000000
--- a/patch/zstd.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-# Written and placed in public domain by Jeffrey Walton.
-# This patch fixes some issues with Zstd library.
---- programs/Makefile
-+++ programs/Makefile
-@@ -322,7 +322,7 @@
- 
- $(BUILD_DIR)/%.o : %.S | $(BUILD_DIR)
- 	@echo AS $@
--	$(COMPILE.c) $(OUTPUT_OPTION) $<
-+	$(COMPILE.S) $(OUTPUT_OPTION) $<
- 
- MKDIR ?= mkdir
- $(BUILD_DIR): ; $(MKDIR) -p $@
---- tests/Makefile
-+++ tests/Makefile
-@@ -118,7 +118,7 @@
- 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
- 
- zstdd_%.o : $(ZSTDDIR)/decompress/%.S
--	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
-+	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $(CFLAGS) $< -o $@
- 
- zstdmt%.o : CPPFLAGS += $(MULTITHREAD_CPP)
- 
-@@ -132,7 +132,7 @@
- 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
- 
- zstdmt_d_%.o : $(ZSTDDIR)/decompress/%.S
--	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
-+	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $(CFLAGS) $< -o $@
- 
- fullbench32: CPPFLAGS += -m32
- fullbench fullbench32 : CPPFLAGS += $(MULTITHREAD_CPP) -Wno-deprecated-declarations
---- tests/fuzz/Makefile
-+++ tests/fuzz/Makefile
-@@ -12,6 +12,7 @@
- CFLAGS ?= -O3
- CXXFLAGS ?= -O3
- CPPFLAGS ?=
-+ASFLAGS ?= -Wa,--noexecstack
- LDFLAGS ?=
- ARFLAGS ?=
- LIB_FUZZING_ENGINE ?= libregression.a
-@@ -44,6 +45,7 @@
- 	-g -fno-omit-frame-pointer
- FUZZ_CFLAGS := $(FUZZ_EXTRA_FLAGS) $(CFLAGS)
- FUZZ_CXXFLAGS := $(FUZZ_EXTRA_FLAGS) -std=c++11 $(CXXFLAGS)
-+FUZZ_ASFLAGS := $(ASFLAGS)
- FUZZ_LDFLAGS := -pthread $(LDFLAGS)
- FUZZ_ARFLAGS := $(ARFLAGS)
- FUZZ_TARGET_FLAGS = $(FUZZ_CPPFLAGS) $(FUZZ_CXXFLAGS) $(FUZZ_LDFLAGS)
-@@ -127,7 +129,7 @@
- 	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $(FUZZ_ROUND_TRIP_FLAGS) $< -c -o $@
- 
- rt_lib_decompress_%.o: $(ZSTDDIR)/decompress/%.S
--	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $(FUZZ_ROUND_TRIP_FLAGS) $< -c -o $@
-+	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_ASFLAGS) $(FUZZ_CFLAGS) $(FUZZ_ROUND_TRIP_FLAGS) $< -c -o $@
- 
- rt_lib_dictBuilder_%.o: $(ZSTDDIR)/dictBuilder/%.c
- 	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $(FUZZ_ROUND_TRIP_FLAGS) $< -c -o $@
-@@ -151,7 +153,7 @@
- 	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $< -c -o $@
- 
- d_lib_decompress_%.o: $(ZSTDDIR)/decompress/%.S
--	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $< -c -o $@
-+	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_ASFLAGS) $(FUZZ_CFLAGS) $< -c -o $@
- 
- d_lib_dictBuilder_%.o: $(ZSTDDIR)/dictBuilder/%.c
- 	$(CC) $(FUZZ_CPPFLAGS) $(FUZZ_CFLAGS) $< -c -o $@
---- lib/Makefile
-+++ lib/Makefile
-@@ -212,11 +212,11 @@
- 
- $(ZSTD_DYNLIB_DIR)/%.o : %.S | $(ZSTD_DYNLIB_DIR)
- 	@echo AS $@
--	$(COMPILE.c) $(OUTPUT_OPTION) $<
-+	$(COMPILE.S) $(OUTPUT_OPTION) $<
- 
- $(ZSTD_STATLIB_DIR)/%.o : %.S | $(ZSTD_STATLIB_DIR)
- 	@echo AS $@
--	$(COMPILE.c) $(OUTPUT_OPTION) $<
-+	$(COMPILE.S) $(OUTPUT_OPTION) $<
- 
- MKDIR ?= mkdir
- $(BUILD_DIR) $(ZSTD_DYNLIB_DIR) $(ZSTD_STATLIB_DIR):
---- contrib/linux-kernel/test/Makefile
-+++ contrib/linux-kernel/test/Makefile
-@@ -24,7 +24,7 @@
- LINUX_ZSTD_OBJECTS    := $(LINUX_ZSTD_OBJECTS0:.S=.o)
- 
- %.o: %.S
--	$(CC) -c $(CPPFLAGS) $(CFLAGS) $^ -o $@
-+	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $(CFLAGS) $^ -o $@
- 
- liblinuxzstd.a: $(LINUX_ZSTD_OBJECTS)
- 	$(AR) $(ARFLAGS) $@ $^
diff --git a/programs/config.guess b/programs/config.guess
deleted file mode 100755
index f6d217a49..000000000
--- a/programs/config.guess
+++ /dev/null
@@ -1,1812 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2024 Free Software Foundation, Inc.
-
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2024-01-01'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX.  However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system '$me' is run on.
-
-Options:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2024 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try '$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-# Just in case it came from the environment.
-GUESS=
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
-# use 'HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-tmp=
-# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
-
-set_cc_for_build() {
-    # prevent multiple calls if $tmp is already set
-    test "$tmp" && return 0
-    : "${TMPDIR=/tmp}"
-    # shellcheck disable=SC2039,SC3028
-    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
-	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
-    dummy=$tmp/dummy
-    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
-	,,)    echo "int x;" > "$dummy.c"
-	       for driver in cc gcc c89 c99 ; do
-		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-		       CC_FOR_BUILD=$driver
-		       break
-		   fi
-	       done
-	       if test x"$CC_FOR_BUILD" = x ; then
-		   CC_FOR_BUILD=no_compiler_found
-	       fi
-	       ;;
-	,,*)   CC_FOR_BUILD=$CC ;;
-	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-    esac
-}
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if test -f /.attbin/uname ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case $UNAME_SYSTEM in
-Linux|GNU|GNU/*)
-	LIBC=unknown
-
-	set_cc_for_build
-	cat <<-EOF > "$dummy.c"
-	#if defined(__ANDROID__)
-	LIBC=android
-	#else
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#elif defined(__GLIBC__)
-	LIBC=gnu
-	#elif defined(__LLVM_LIBC__)
-	LIBC=llvm
-	#else
-	#include <stdarg.h>
-	/* First heuristic to detect musl libc.  */
-	#ifdef __DEFINED_va_list
-	LIBC=musl
-	#endif
-	#endif
-	#endif
-	EOF
-	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	eval "$cc_set_libc"
-
-	# Second heuristic to detect musl libc.
-	if [ "$LIBC" = unknown ] &&
-	   command -v ldd >/dev/null &&
-	   ldd --version 2>&1 | grep -q ^musl; then
-		LIBC=musl
-	fi
-
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	if [ "$LIBC" = unknown ]; then
-		LIBC=gnu
-	fi
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
-	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
-	    echo unknown)`
-	case $UNAME_MACHINE_ARCH in
-	    aarch64eb) machine=aarch64_be-unknown ;;
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
-	    *) machine=$UNAME_MACHINE_ARCH-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case $UNAME_MACHINE_ARCH in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case $UNAME_MACHINE_ARCH in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case $UNAME_VERSION in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	GUESS=$machine-${os}${release}${abi-}
-	;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
-	;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
-	;;
-    *:SecBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
-	;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
-	;;
-    *:MidnightBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
-	;;
-    *:ekkoBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
-	;;
-    *:SolidBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
-	;;
-    *:OS108:*:*)
-	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
-	;;
-    macppc:MirBSD:*:*)
-	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
-	;;
-    *:MirBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
-	;;
-    *:Sortix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-sortix
-	;;
-    *:Twizzler:*:*)
-	GUESS=$UNAME_MACHINE-unknown-twizzler
-	;;
-    *:Redox:*:*)
-	GUESS=$UNAME_MACHINE-unknown-redox
-	;;
-    mips:OSF1:*.*)
-	GUESS=mips-dec-osf1
-	;;
-    alpha:OSF1:*:*)
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	trap '' 0
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case $ALPHA_CPU_TYPE in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
-	;;
-    Amiga*:UNIX_System_V:4.0:*)
-	GUESS=m68k-unknown-sysv4
-	;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	GUESS=$UNAME_MACHINE-unknown-amigaos
-	;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	GUESS=$UNAME_MACHINE-unknown-morphos
-	;;
-    *:OS/390:*:*)
-	GUESS=i370-ibm-openedition
-	;;
-    *:z/VM:*:*)
-	GUESS=s390-ibm-zvmoe
-	;;
-    *:OS400:*:*)
-	GUESS=powerpc-ibm-os400
-	;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	GUESS=arm-acorn-riscix$UNAME_RELEASE
-	;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	GUESS=arm-unknown-riscos
-	;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	GUESS=hppa1.1-hitachi-hiuxmpp
-	;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	case `(/bin/universe) 2>/dev/null` in
-	    att) GUESS=pyramid-pyramid-sysv3 ;;
-	    *)   GUESS=pyramid-pyramid-bsd   ;;
-	esac
-	;;
-    NILE*:*:*:dcosx)
-	GUESS=pyramid-pyramid-svr4
-	;;
-    DRS?6000:unix:4.0:6*)
-	GUESS=sparc-icl-nx6
-	;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) GUESS=sparc-icl-nx7 ;;
-	esac
-	;;
-    s390x:SunOS:*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
-	;;
-    sun4H:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=sparc-hal-solaris2$SUN_REL
-	;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=sparc-sun-solaris2$SUN_REL
-	;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	GUESS=i386-pc-auroraux$UNAME_RELEASE
-	;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	set_cc_for_build
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
-	;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=sparc-sun-solaris3$SUN_REL
-	;;
-    sun4*:SunOS:*:*)
-	case `/usr/bin/arch -k` in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like '4.1.3-JL'.
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
-	GUESS=sparc-sun-sunos$SUN_REL
-	;;
-    sun3*:SunOS:*:*)
-	GUESS=m68k-sun-sunos$UNAME_RELEASE
-	;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
-	case `/bin/arch` in
-	    sun3)
-		GUESS=m68k-sun-sunos$UNAME_RELEASE
-		;;
-	    sun4)
-		GUESS=sparc-sun-sunos$UNAME_RELEASE
-		;;
-	esac
-	;;
-    aushp:SunOS:*:*)
-	GUESS=sparc-auspex-sunos$UNAME_RELEASE
-	;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	GUESS=m68k-milan-mint$UNAME_RELEASE
-	;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	GUESS=m68k-hades-mint$UNAME_RELEASE
-	;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	GUESS=m68k-unknown-mint$UNAME_RELEASE
-	;;
-    m68k:machten:*:*)
-	GUESS=m68k-apple-machten$UNAME_RELEASE
-	;;
-    powerpc:machten:*:*)
-	GUESS=powerpc-apple-machten$UNAME_RELEASE
-	;;
-    RISC*:Mach:*:*)
-	GUESS=mips-dec-mach_bsd4.3
-	;;
-    RISC*:ULTRIX:*:*)
-	GUESS=mips-dec-ultrix$UNAME_RELEASE
-	;;
-    VAX*:ULTRIX*:*:*)
-	GUESS=vax-dec-ultrix$UNAME_RELEASE
-	;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	GUESS=clipper-intergraph-clix$UNAME_RELEASE
-	;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	set_cc_for_build
-	sed 's/^	//' << EOF > "$dummy.c"
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	GUESS=mips-mips-riscos$UNAME_RELEASE
-	;;
-    Motorola:PowerMAX_OS:*:*)
-	GUESS=powerpc-motorola-powermax
-	;;
-    Motorola:*:4.3:PL8-*)
-	GUESS=powerpc-harris-powermax
-	;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	GUESS=powerpc-harris-powermax
-	;;
-    Night_Hawk:Power_UNIX:*:*)
-	GUESS=powerpc-harris-powerunix
-	;;
-    m88k:CX/UX:7*:*)
-	GUESS=m88k-harris-cxux7
-	;;
-    m88k:*:4*:R4*)
-	GUESS=m88k-motorola-sysv4
-	;;
-    m88k:*:3*:R3*)
-	GUESS=m88k-motorola-sysv3
-	;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
-	then
-	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
-	       test "$TARGET_BINARY_INTERFACE"x = x
-	    then
-		GUESS=m88k-dg-dgux$UNAME_RELEASE
-	    else
-		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
-	    fi
-	else
-	    GUESS=i586-dg-dgux$UNAME_RELEASE
-	fi
-	;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	GUESS=m88k-dolphin-sysv3
-	;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	GUESS=m88k-motorola-sysv3
-	;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	GUESS=m88k-tektronix-sysv3
-	;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	GUESS=m68k-tektronix-bsd
-	;;
-    *:IRIX*:*:*)
-	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
-	GUESS=mips-sgi-irix$IRIX_REL
-	;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
-	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	GUESS=i386-ibm-aix
-	;;
-    ia64:AIX:*:*)
-	if test -x /usr/bin/oslevel ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
-	fi
-	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
-	;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		set_cc_for_build
-		sed 's/^		//' << EOF > "$dummy.c"
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
-		then
-			GUESS=$SYSTEM_NAME
-		else
-			GUESS=rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		GUESS=rs6000-ibm-aix3.2.4
-	else
-		GUESS=rs6000-ibm-aix3.2
-	fi
-	;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if test -x /usr/bin/lslpp ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
-	fi
-	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
-	;;
-    *:AIX:*:*)
-	GUESS=rs6000-ibm-aix
-	;;
-    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-	GUESS=romp-ibm-bsd4.4
-	;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
-	;;                                  # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	GUESS=rs6000-bull-bosx
-	;;
-    DPX/2?00:B.O.S.:*:*)
-	GUESS=m68k-bull-sysv3
-	;;
-    9000/[34]??:4.3bsd:1.*:*)
-	GUESS=m68k-hp-bsd
-	;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	GUESS=m68k-hp-bsd4.4
-	;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
-	case $UNAME_MACHINE in
-	    9000/31?)            HP_ARCH=m68000 ;;
-	    9000/[34]??)         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if test -x /usr/bin/getconf; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case $sc_cpu_version in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case $sc_kernel_bits in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if test "$HP_ARCH" = ""; then
-		    set_cc_for_build
-		    sed 's/^		//' << EOF > "$dummy.c"
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if test "$HP_ARCH" = hppa2.0w
-	then
-	    set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
-	;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
-	GUESS=ia64-hp-hpux$HPUX_REV
-	;;
-    3050*:HI-UX:*:*)
-	set_cc_for_build
-	sed 's/^	//' << EOF > "$dummy.c"
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	GUESS=unknown-hitachi-hiuxwe2
-	;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
-	GUESS=hppa1.1-hp-bsd
-	;;
-    9000/8??:4.3bsd:*:*)
-	GUESS=hppa1.0-hp-bsd
-	;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	GUESS=hppa1.0-hp-mpeix
-	;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
-	GUESS=hppa1.1-hp-osf
-	;;
-    hp8??:OSF1:*:*)
-	GUESS=hppa1.0-hp-osf
-	;;
-    i*86:OSF1:*:*)
-	if test -x /usr/sbin/sysversion ; then
-	    GUESS=$UNAME_MACHINE-unknown-osf1mk
-	else
-	    GUESS=$UNAME_MACHINE-unknown-osf1
-	fi
-	;;
-    parisc*:Lites*:*:*)
-	GUESS=hppa1.1-hp-lites
-	;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	GUESS=c1-convex-bsd
-	;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	GUESS=c34-convex-bsd
-	;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	GUESS=c38-convex-bsd
-	;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	GUESS=c4-convex-bsd
-	;;
-    CRAY*Y-MP:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=ymp-cray-unicos$CRAY_REL
-	;;
-    CRAY*[A-Z]90:*:*:*)
-	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=t90-cray-unicos$CRAY_REL
-	;;
-    CRAY*T3E:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=alphaev5-cray-unicosmk$CRAY_REL
-	;;
-    CRAY*SV1:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=sv1-cray-unicos$CRAY_REL
-	;;
-    *:UNICOS/mp:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=craynv-cray-unicosmp$CRAY_REL
-	;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
-	;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
-	;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
-	;;
-    sparc*:BSD/OS:*:*)
-	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
-	;;
-    *:BSD/OS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
-	;;
-    arm:FreeBSD:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	set_cc_for_build
-	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_PCS_VFP
-	then
-	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
-	else
-	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
-	fi
-	;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	case $UNAME_PROCESSOR in
-	    amd64)
-		UNAME_PROCESSOR=x86_64 ;;
-	    i386)
-		UNAME_PROCESSOR=i586 ;;
-	esac
-	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
-	;;
-    i*:CYGWIN*:*)
-	GUESS=$UNAME_MACHINE-pc-cygwin
-	;;
-    *:MINGW64*:*)
-	GUESS=$UNAME_MACHINE-pc-mingw64
-	;;
-    *:MINGW*:*)
-	GUESS=$UNAME_MACHINE-pc-mingw32
-	;;
-    *:MSYS*:*)
-	GUESS=$UNAME_MACHINE-pc-msys
-	;;
-    i*:PW*:*)
-	GUESS=$UNAME_MACHINE-pc-pw32
-	;;
-    *:SerenityOS:*:*)
-        GUESS=$UNAME_MACHINE-pc-serenity
-        ;;
-    *:Interix*:*)
-	case $UNAME_MACHINE in
-	    x86)
-		GUESS=i586-pc-interix$UNAME_RELEASE
-		;;
-	    authenticamd | genuineintel | EM64T)
-		GUESS=x86_64-unknown-interix$UNAME_RELEASE
-		;;
-	    IA64)
-		GUESS=ia64-unknown-interix$UNAME_RELEASE
-		;;
-	esac ;;
-    i*:UWIN*:*)
-	GUESS=$UNAME_MACHINE-pc-uwin
-	;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	GUESS=x86_64-pc-cygwin
-	;;
-    prep*:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=powerpcle-unknown-solaris2$SUN_REL
-	;;
-    *:GNU:*:*)
-	# the GNU system
-	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
-	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
-	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
-	;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
-	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
-	;;
-    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
-	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
-	;;
-    *:[Mm]anagarm:*:*)
-	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
-	;;
-    *:Minix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-minix
-	;;
-    aarch64:Linux:*:*)
-	set_cc_for_build
-	CPU=$UNAME_MACHINE
-	LIBCABI=$LIBC
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    ABI=64
-	    sed 's/^	    //' << EOF > "$dummy.c"
-	    #ifdef __ARM_EABI__
-	    #ifdef __ARM_PCS_VFP
-	    ABI=eabihf
-	    #else
-	    ABI=eabi
-	    #endif
-	    #endif
-EOF
-	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
-	    eval "$cc_set_abi"
-	    case $ABI in
-		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
-	    esac
-	fi
-	GUESS=$CPU-unknown-linux-$LIBCABI
-	;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    arm*:Linux:*:*)
-	set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
-	    else
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	;;
-    avr32*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    cris:Linux:*:*)
-	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-	;;
-    crisv32:Linux:*:*)
-	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-	;;
-    e2k:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    frv:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    hexagon:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    i*86:Linux:*:*)
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
-	;;
-    ia64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    k1om:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    kvx:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    kvx:cos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-cos
-	;;
-    kvx:mbr:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mbr
-	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    m32r*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    m68*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	set_cc_for_build
-	IS_GLIBC=0
-	test x"${LIBC}" = xgnu && IS_GLIBC=1
-	sed 's/^	//' << EOF > "$dummy.c"
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#undef mips64
-	#undef mips64el
-	#if ${IS_GLIBC} && defined(_ABI64)
-	LIBCABI=gnuabi64
-	#else
-	#if ${IS_GLIBC} && defined(_ABIN32)
-	LIBCABI=gnuabin32
-	#else
-	LIBCABI=${LIBC}
-	#endif
-	#endif
-
-	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-	CPU=mipsisa64r6
-	#else
-	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-	CPU=mipsisa32r6
-	#else
-	#if defined(__mips64)
-	CPU=mips64
-	#else
-	CPU=mips
-	#endif
-	#endif
-	#endif
-
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	MIPS_ENDIAN=el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	MIPS_ENDIAN=
-	#else
-	MIPS_ENDIAN=
-	#endif
-	#endif
-EOF
-	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
-	eval "$cc_set_vars"
-	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
-	;;
-    mips64el:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    openrisc*:Linux:*:*)
-	GUESS=or1k-unknown-linux-$LIBC
-	;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    padre:Linux:*:*)
-	GUESS=sparc-unknown-linux-$LIBC
-	;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	GUESS=hppa64-unknown-linux-$LIBC
-	;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
-	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
-	  *)    GUESS=hppa-unknown-linux-$LIBC ;;
-	esac
-	;;
-    ppc64:Linux:*:*)
-	GUESS=powerpc64-unknown-linux-$LIBC
-	;;
-    ppc:Linux:*:*)
-	GUESS=powerpc-unknown-linux-$LIBC
-	;;
-    ppc64le:Linux:*:*)
-	GUESS=powerpc64le-unknown-linux-$LIBC
-	;;
-    ppcle:Linux:*:*)
-	GUESS=powerpcle-unknown-linux-$LIBC
-	;;
-    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
-	;;
-    sh64*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    sh*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    tile*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    vax:Linux:*:*)
-	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
-	;;
-    x86_64:Linux:*:*)
-	set_cc_for_build
-	CPU=$UNAME_MACHINE
-	LIBCABI=$LIBC
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    ABI=64
-	    sed 's/^	    //' << EOF > "$dummy.c"
-	    #ifdef __i386__
-	    ABI=x86
-	    #else
-	    #ifdef __ILP32__
-	    ABI=x32
-	    #endif
-	    #endif
-EOF
-	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
-	    eval "$cc_set_abi"
-	    case $ABI in
-		x86) CPU=i686 ;;
-		x32) LIBCABI=${LIBC}x32 ;;
-	    esac
-	fi
-	GUESS=$CPU-pc-linux-$LIBCABI
-	;;
-    xtensa*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	GUESS=i386-sequent-sysv4
-	;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
-	;;
-    i*86:OS/2:*:*)
-	# If we were able to find 'uname', then EMX Unix compatibility
-	# is probably installed.
-	GUESS=$UNAME_MACHINE-pc-os2-emx
-	;;
-    i*86:XTS-300:*:STOP)
-	GUESS=$UNAME_MACHINE-unknown-stop
-	;;
-    i*86:atheos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-atheos
-	;;
-    i*86:syllable:*:*)
-	GUESS=$UNAME_MACHINE-pc-syllable
-	;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	GUESS=i386-unknown-lynxos$UNAME_RELEASE
-	;;
-    i*86:*DOS:*:*)
-	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
-	;;
-    i*86:*:4.*:*)
-	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
-	else
-		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
-	fi
-	;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
-	else
-		GUESS=$UNAME_MACHINE-pc-sysv32
-	fi
-	;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	GUESS=i586-pc-msdosdjgpp
-	;;
-    Intel:Mach:3*:*)
-	GUESS=i386-pc-mach3
-	;;
-    paragon:*:*:*)
-	GUESS=i860-intel-osf1
-	;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
-	fi
-	;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	GUESS=m68010-convergent-sysv
-	;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	GUESS=m68k-convergent-sysv
-	;;
-    M680?0:D-NIX:5.3:*)
-	GUESS=m68k-diab-dnix
-	;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
-	;;
-    mc68030:UNIX_System_V:4.*:*)
-	GUESS=m68k-atari-sysv4
-	;;
-    TSUNAMI:LynxOS:2.*:*)
-	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
-	;;
-    rs6000:LynxOS:2.*:*)
-	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
-	;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
-	;;
-    SM[BE]S:UNIX_SV:*:*)
-	GUESS=mips-dde-sysv$UNAME_RELEASE
-	;;
-    RM*:ReliantUNIX-*:*:*)
-	GUESS=mips-sni-sysv4
-	;;
-    RM*:SINIX-*:*:*)
-	GUESS=mips-sni-sysv4
-	;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		GUESS=$UNAME_MACHINE-sni-sysv4
-	else
-		GUESS=ns32k-sni-sysv
-	fi
-	;;
-    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	GUESS=i586-unisys-sysv4
-	;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	GUESS=hppa1.1-stratus-sysv4
-	;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	GUESS=i860-stratus-sysv4
-	;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	GUESS=$UNAME_MACHINE-stratus-vos
-	;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	GUESS=hppa1.1-stratus-vos
-	;;
-    mc68*:A/UX:*:*)
-	GUESS=m68k-apple-aux$UNAME_RELEASE
-	;;
-    news*:NEWS-OS:6*:*)
-	GUESS=mips-sony-newsos6
-	;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if test -d /usr/nec; then
-		GUESS=mips-nec-sysv$UNAME_RELEASE
-	else
-		GUESS=mips-unknown-sysv$UNAME_RELEASE
-	fi
-	;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	GUESS=powerpc-be-beos
-	;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	GUESS=powerpc-apple-beos
-	;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	GUESS=i586-pc-beos
-	;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	GUESS=i586-pc-haiku
-	;;
-    ppc:Haiku:*:*)	# Haiku running on Apple PowerPC
-	GUESS=powerpc-apple-haiku
-	;;
-    *:Haiku:*:*)	# Haiku modern gcc (not bound by BeOS compat)
-	GUESS=$UNAME_MACHINE-unknown-haiku
-	;;
-    SX-4:SUPER-UX:*:*)
-	GUESS=sx4-nec-superux$UNAME_RELEASE
-	;;
-    SX-5:SUPER-UX:*:*)
-	GUESS=sx5-nec-superux$UNAME_RELEASE
-	;;
-    SX-6:SUPER-UX:*:*)
-	GUESS=sx6-nec-superux$UNAME_RELEASE
-	;;
-    SX-7:SUPER-UX:*:*)
-	GUESS=sx7-nec-superux$UNAME_RELEASE
-	;;
-    SX-8:SUPER-UX:*:*)
-	GUESS=sx8-nec-superux$UNAME_RELEASE
-	;;
-    SX-8R:SUPER-UX:*:*)
-	GUESS=sx8r-nec-superux$UNAME_RELEASE
-	;;
-    SX-ACE:SUPER-UX:*:*)
-	GUESS=sxace-nec-superux$UNAME_RELEASE
-	;;
-    Power*:Rhapsody:*:*)
-	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
-	;;
-    *:Rhapsody:*:*)
-	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
-	;;
-    arm64:Darwin:*:*)
-	GUESS=aarch64-apple-darwin$UNAME_RELEASE
-	;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	if command -v xcode-select > /dev/null 2> /dev/null && \
-		! xcode-select --print-path > /dev/null 2> /dev/null ; then
-	    # Avoid executing cc if there is no toolchain installed as
-	    # cc will be a stub that puts up a graphical alert
-	    # prompting the user to install developer tools.
-	    CC_FOR_BUILD=no_compiler_found
-	else
-	    set_cc_for_build
-	fi
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		   grep IS_64BIT_ARCH >/dev/null
-	    then
-		case $UNAME_PROCESSOR in
-		    i386) UNAME_PROCESSOR=x86_64 ;;
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
-	    fi
-	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		   grep IS_PPC >/dev/null
-	    then
-		UNAME_PROCESSOR=powerpc
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # uname -m returns i386 or x86_64
-	    UNAME_PROCESSOR=$UNAME_MACHINE
-	fi
-	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
-	;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
-	;;
-    *:QNX:*:4*)
-	GUESS=i386-pc-qnx
-	;;
-    NEO-*:NONSTOP_KERNEL:*:*)
-	GUESS=neo-tandem-nsk$UNAME_RELEASE
-	;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	GUESS=nse-tandem-nsk$UNAME_RELEASE
-	;;
-    NSR-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsr-tandem-nsk$UNAME_RELEASE
-	;;
-    NSV-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsv-tandem-nsk$UNAME_RELEASE
-	;;
-    NSX-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsx-tandem-nsk$UNAME_RELEASE
-	;;
-    *:NonStop-UX:*:*)
-	GUESS=mips-compaq-nonstopux
-	;;
-    BS2000:POSIX*:*:*)
-	GUESS=bs2000-siemens-sysv
-	;;
-    DS/*:UNIX_System_V:*:*)
-	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
-	;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "${cputype-}" = 386; then
-	    UNAME_MACHINE=i386
-	elif test "x${cputype-}" != x; then
-	    UNAME_MACHINE=$cputype
-	fi
-	GUESS=$UNAME_MACHINE-unknown-plan9
-	;;
-    *:TOPS-10:*:*)
-	GUESS=pdp10-unknown-tops10
-	;;
-    *:TENEX:*:*)
-	GUESS=pdp10-unknown-tenex
-	;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	GUESS=pdp10-dec-tops20
-	;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	GUESS=pdp10-xkl-tops20
-	;;
-    *:TOPS-20:*:*)
-	GUESS=pdp10-unknown-tops20
-	;;
-    *:ITS:*:*)
-	GUESS=pdp10-unknown-its
-	;;
-    SEI:*:*:SEIUX)
-	GUESS=mips-sei-seiux$UNAME_RELEASE
-	;;
-    *:DragonFly:*:*)
-	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
-	;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case $UNAME_MACHINE in
-	    A*) GUESS=alpha-dec-vms ;;
-	    I*) GUESS=ia64-dec-vms ;;
-	    V*) GUESS=vax-dec-vms ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	GUESS=i386-pc-xenix
-	;;
-    i*86:skyos:*:*)
-	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
-	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
-	;;
-    i*86:rdos:*:*)
-	GUESS=$UNAME_MACHINE-pc-rdos
-	;;
-    i*86:Fiwix:*:*)
-	GUESS=$UNAME_MACHINE-pc-fiwix
-	;;
-    *:AROS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-aros
-	;;
-    x86_64:VMkernel:*:*)
-	GUESS=$UNAME_MACHINE-unknown-esx
-	;;
-    amd64:Isilon\ OneFS:*:*)
-	GUESS=x86_64-unknown-onefs
-	;;
-    *:Unleashed:*:*)
-	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
-	;;
-    *:Ironclad:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ironclad
-	;;
-esac
-
-# Do we have a guess based on uname results?
-if test "x$GUESS" != x; then
-    echo "$GUESS"
-    exit
-fi
-
-# No uname command or uname output not recognized.
-set_cc_for_build
-cat > "$dummy.c" <<EOF
-#ifdef _SEQUENT_
-#include <sys/types.h>
-#include <sys/utsname.h>
-#endif
-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#include <signal.h>
-#if defined(_SIZE_T_) || defined(SIGLOST)
-#include <sys/utsname.h>
-#endif
-#endif
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-  "4"
-#else
-  ""
-#endif
-  ); exit (0);
-#endif
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-  struct utsname un;
-
-  uname(&un);
-  if (strncmp(un.version, "V2", 2) == 0) {
-    printf ("i386-sequent-ptx2\n"); exit (0);
-  }
-  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-    printf ("i386-sequent-ptx1\n"); exit (0);
-  }
-  printf ("i386-sequent-ptx\n"); exit (0);
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
-#include <sys/param.h>
-#if defined (BSD)
-#if BSD == 43
-  printf ("vax-dec-bsd4.3\n"); exit (0);
-#else
-#if BSD == 199006
-  printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#else
-  printf ("vax-dec-bsd\n"); exit (0);
-#endif
-#endif
-#else
-  printf ("vax-dec-bsd\n"); exit (0);
-#endif
-#else
-#if defined(_SIZE_T_) || defined(SIGLOST)
-  struct utsname un;
-  uname (&un);
-  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-#endif
-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#if defined(_SIZE_T_) || defined(SIGLOST)
-  struct utsname *un;
-  uname (&un);
-  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
-#else
-  printf ("mips-dec-ultrix\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
-
-echo "$0: unable to guess system type" >&2
-
-case $UNAME_MACHINE:$UNAME_SYSTEM in
-    mips:Linux | mips64:Linux)
-	# If we got here on MIPS GNU/Linux, output extra information.
-	cat >&2 <<EOF
-
-NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
-the system type. Please install a C compiler and try again.
-EOF
-	;;
-esac
-
-cat >&2 <<EOF
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite *all*
-copies of config.guess and config.sub with the latest versions from:
-
-  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
-and
-  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-EOF
-
-our_year=`echo $timestamp | sed 's,-.*,,'`
-thisyear=`date +%Y`
-# shellcheck disable=SC2003
-script_age=`expr "$thisyear" - "$our_year"`
-if test "$script_age" -lt 3 ; then
-   cat >&2 <<EOF
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = "$UNAME_MACHINE"
-UNAME_RELEASE = "$UNAME_RELEASE"
-UNAME_SYSTEM  = "$UNAME_SYSTEM"
-UNAME_VERSION = "$UNAME_VERSION"
-EOF
-fi
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/programs/config.sub b/programs/config.sub
deleted file mode 100755
index 2c6a07ab3..000000000
--- a/programs/config.sub
+++ /dev/null
@@ -1,1971 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2024 Free Software Foundation, Inc.
-
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2024-01-01'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX.  However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
-
-Canonicalize a configuration name.
-
-Options:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2024 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try '$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo "$1"
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Split fields of configuration type
-# shellcheck disable=SC2162
-saved_IFS=$IFS
-IFS="-" read field1 field2 field3 field4 <<EOF
-$1
-EOF
-IFS=$saved_IFS
-
-# Separate into logical components for further validation
-case $1 in
-	*-*-*-*-*)
-		echo "Invalid configuration '$1': more than four components" >&2
-		exit 1
-		;;
-	*-*-*-*)
-		basic_machine=$field1-$field2
-		basic_os=$field3-$field4
-		;;
-	*-*-*)
-		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-		# parts
-		maybe_os=$field2-$field3
-		case $maybe_os in
-			nto-qnx* | linux-* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
-			| windows-* )
-				basic_machine=$field1
-				basic_os=$maybe_os
-				;;
-			android-linux)
-				basic_machine=$field1-unknown
-				basic_os=linux-android
-				;;
-			*)
-				basic_machine=$field1-$field2
-				basic_os=$field3
-				;;
-		esac
-		;;
-	*-*)
-		# A lone config we happen to match not fitting any pattern
-		case $field1-$field2 in
-			decstation-3100)
-				basic_machine=mips-dec
-				basic_os=
-				;;
-			*-*)
-				# Second component is usually, but not always the OS
-				case $field2 in
-					# Prevent following clause from handling this valid os
-					sun*os*)
-						basic_machine=$field1
-						basic_os=$field2
-						;;
-					zephyr*)
-						basic_machine=$field1-unknown
-						basic_os=$field2
-						;;
-					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
-						basic_machine=$field1-$field2
-						basic_os=
-						;;
-					*)
-						basic_machine=$field1
-						basic_os=$field2
-						;;
-				esac
-			;;
-		esac
-		;;
-	*)
-		# Convert single-component short-hands not valid as part of
-		# multi-component configurations.
-		case $field1 in
-			386bsd)
-				basic_machine=i386-pc
-				basic_os=bsd
-				;;
-			a29khif)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			adobe68k)
-				basic_machine=m68010-adobe
-				basic_os=scout
-				;;
-			alliant)
-				basic_machine=fx80-alliant
-				basic_os=
-				;;
-			altos | altos3068)
-				basic_machine=m68k-altos
-				basic_os=
-				;;
-			am29k)
-				basic_machine=a29k-none
-				basic_os=bsd
-				;;
-			amdahl)
-				basic_machine=580-amdahl
-				basic_os=sysv
-				;;
-			amiga)
-				basic_machine=m68k-unknown
-				basic_os=
-				;;
-			amigaos | amigados)
-				basic_machine=m68k-unknown
-				basic_os=amigaos
-				;;
-			amigaunix | amix)
-				basic_machine=m68k-unknown
-				basic_os=sysv4
-				;;
-			apollo68)
-				basic_machine=m68k-apollo
-				basic_os=sysv
-				;;
-			apollo68bsd)
-				basic_machine=m68k-apollo
-				basic_os=bsd
-				;;
-			aros)
-				basic_machine=i386-pc
-				basic_os=aros
-				;;
-			aux)
-				basic_machine=m68k-apple
-				basic_os=aux
-				;;
-			balance)
-				basic_machine=ns32k-sequent
-				basic_os=dynix
-				;;
-			blackfin)
-				basic_machine=bfin-unknown
-				basic_os=linux
-				;;
-			cegcc)
-				basic_machine=arm-unknown
-				basic_os=cegcc
-				;;
-			convex-c1)
-				basic_machine=c1-convex
-				basic_os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				basic_os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				basic_os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				basic_os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				basic_os=bsd
-				;;
-			cray)
-				basic_machine=j90-cray
-				basic_os=unicos
-				;;
-			crds | unos)
-				basic_machine=m68k-crds
-				basic_os=
-				;;
-			da30)
-				basic_machine=m68k-da30
-				basic_os=
-				;;
-			decstation | pmax | pmin | dec3100 | decstatn)
-				basic_machine=mips-dec
-				basic_os=
-				;;
-			delta88)
-				basic_machine=m88k-motorola
-				basic_os=sysv3
-				;;
-			dicos)
-				basic_machine=i686-pc
-				basic_os=dicos
-				;;
-			djgpp)
-				basic_machine=i586-pc
-				basic_os=msdosdjgpp
-				;;
-			ebmon29k)
-				basic_machine=a29k-amd
-				basic_os=ebmon
-				;;
-			es1800 | OSE68k | ose68k | ose | OSE)
-				basic_machine=m68k-ericsson
-				basic_os=ose
-				;;
-			gmicro)
-				basic_machine=tron-gmicro
-				basic_os=sysv
-				;;
-			go32)
-				basic_machine=i386-pc
-				basic_os=go32
-				;;
-			h8300hms)
-				basic_machine=h8300-hitachi
-				basic_os=hms
-				;;
-			h8300xray)
-				basic_machine=h8300-hitachi
-				basic_os=xray
-				;;
-			h8500hms)
-				basic_machine=h8500-hitachi
-				basic_os=hms
-				;;
-			harris)
-				basic_machine=m88k-harris
-				basic_os=sysv3
-				;;
-			hp300 | hp300hpux)
-				basic_machine=m68k-hp
-				basic_os=hpux
-				;;
-			hp300bsd)
-				basic_machine=m68k-hp
-				basic_os=bsd
-				;;
-			hppaosf)
-				basic_machine=hppa1.1-hp
-				basic_os=osf
-				;;
-			hppro)
-				basic_machine=hppa1.1-hp
-				basic_os=proelf
-				;;
-			i386mach)
-				basic_machine=i386-mach
-				basic_os=mach
-				;;
-			isi68 | isi)
-				basic_machine=m68k-isi
-				basic_os=sysv
-				;;
-			m68knommu)
-				basic_machine=m68k-unknown
-				basic_os=linux
-				;;
-			magnum | m3230)
-				basic_machine=mips-mips
-				basic_os=sysv
-				;;
-			merlin)
-				basic_machine=ns32k-utek
-				basic_os=sysv
-				;;
-			mingw64)
-				basic_machine=x86_64-pc
-				basic_os=mingw64
-				;;
-			mingw32)
-				basic_machine=i686-pc
-				basic_os=mingw32
-				;;
-			mingw32ce)
-				basic_machine=arm-unknown
-				basic_os=mingw32ce
-				;;
-			monitor)
-				basic_machine=m68k-rom68k
-				basic_os=coff
-				;;
-			morphos)
-				basic_machine=powerpc-unknown
-				basic_os=morphos
-				;;
-			moxiebox)
-				basic_machine=moxie-unknown
-				basic_os=moxiebox
-				;;
-			msdos)
-				basic_machine=i386-pc
-				basic_os=msdos
-				;;
-			msys)
-				basic_machine=i686-pc
-				basic_os=msys
-				;;
-			mvs)
-				basic_machine=i370-ibm
-				basic_os=mvs
-				;;
-			nacl)
-				basic_machine=le32-unknown
-				basic_os=nacl
-				;;
-			ncr3000)
-				basic_machine=i486-ncr
-				basic_os=sysv4
-				;;
-			netbsd386)
-				basic_machine=i386-pc
-				basic_os=netbsd
-				;;
-			netwinder)
-				basic_machine=armv4l-rebel
-				basic_os=linux
-				;;
-			news | news700 | news800 | news900)
-				basic_machine=m68k-sony
-				basic_os=newsos
-				;;
-			news1000)
-				basic_machine=m68030-sony
-				basic_os=newsos
-				;;
-			necv70)
-				basic_machine=v70-nec
-				basic_os=sysv
-				;;
-			nh3000)
-				basic_machine=m68k-harris
-				basic_os=cxux
-				;;
-			nh[45]000)
-				basic_machine=m88k-harris
-				basic_os=cxux
-				;;
-			nindy960)
-				basic_machine=i960-intel
-				basic_os=nindy
-				;;
-			mon960)
-				basic_machine=i960-intel
-				basic_os=mon960
-				;;
-			nonstopux)
-				basic_machine=mips-compaq
-				basic_os=nonstopux
-				;;
-			os400)
-				basic_machine=powerpc-ibm
-				basic_os=os400
-				;;
-			OSE68000 | ose68000)
-				basic_machine=m68000-ericsson
-				basic_os=ose
-				;;
-			os68k)
-				basic_machine=m68k-none
-				basic_os=os68k
-				;;
-			paragon)
-				basic_machine=i860-intel
-				basic_os=osf
-				;;
-			parisc)
-				basic_machine=hppa-unknown
-				basic_os=linux
-				;;
-			psp)
-				basic_machine=mipsallegrexel-sony
-				basic_os=psp
-				;;
-			pw32)
-				basic_machine=i586-unknown
-				basic_os=pw32
-				;;
-			rdos | rdos64)
-				basic_machine=x86_64-pc
-				basic_os=rdos
-				;;
-			rdos32)
-				basic_machine=i386-pc
-				basic_os=rdos
-				;;
-			rom68k)
-				basic_machine=m68k-rom68k
-				basic_os=coff
-				;;
-			sa29200)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			sei)
-				basic_machine=mips-sei
-				basic_os=seiux
-				;;
-			sequent)
-				basic_machine=i386-sequent
-				basic_os=
-				;;
-			sps7)
-				basic_machine=m68k-bull
-				basic_os=sysv2
-				;;
-			st2000)
-				basic_machine=m68k-tandem
-				basic_os=
-				;;
-			stratus)
-				basic_machine=i860-stratus
-				basic_os=sysv4
-				;;
-			sun2)
-				basic_machine=m68000-sun
-				basic_os=
-				;;
-			sun2os3)
-				basic_machine=m68000-sun
-				basic_os=sunos3
-				;;
-			sun2os4)
-				basic_machine=m68000-sun
-				basic_os=sunos4
-				;;
-			sun3)
-				basic_machine=m68k-sun
-				basic_os=
-				;;
-			sun3os3)
-				basic_machine=m68k-sun
-				basic_os=sunos3
-				;;
-			sun3os4)
-				basic_machine=m68k-sun
-				basic_os=sunos4
-				;;
-			sun4)
-				basic_machine=sparc-sun
-				basic_os=
-				;;
-			sun4os3)
-				basic_machine=sparc-sun
-				basic_os=sunos3
-				;;
-			sun4os4)
-				basic_machine=sparc-sun
-				basic_os=sunos4
-				;;
-			sun4sol2)
-				basic_machine=sparc-sun
-				basic_os=solaris2
-				;;
-			sun386 | sun386i | roadrunner)
-				basic_machine=i386-sun
-				basic_os=
-				;;
-			sv1)
-				basic_machine=sv1-cray
-				basic_os=unicos
-				;;
-			symmetry)
-				basic_machine=i386-sequent
-				basic_os=dynix
-				;;
-			t3e)
-				basic_machine=alphaev5-cray
-				basic_os=unicos
-				;;
-			t90)
-				basic_machine=t90-cray
-				basic_os=unicos
-				;;
-			toad1)
-				basic_machine=pdp10-xkl
-				basic_os=tops20
-				;;
-			tpf)
-				basic_machine=s390x-ibm
-				basic_os=tpf
-				;;
-			udi29k)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			ultra3)
-				basic_machine=a29k-nyu
-				basic_os=sym1
-				;;
-			v810 | necv810)
-				basic_machine=v810-nec
-				basic_os=none
-				;;
-			vaxv)
-				basic_machine=vax-dec
-				basic_os=sysv
-				;;
-			vms)
-				basic_machine=vax-dec
-				basic_os=vms
-				;;
-			vsta)
-				basic_machine=i386-pc
-				basic_os=vsta
-				;;
-			vxworks960)
-				basic_machine=i960-wrs
-				basic_os=vxworks
-				;;
-			vxworks68)
-				basic_machine=m68k-wrs
-				basic_os=vxworks
-				;;
-			vxworks29k)
-				basic_machine=a29k-wrs
-				basic_os=vxworks
-				;;
-			xbox)
-				basic_machine=i686-pc
-				basic_os=mingw32
-				;;
-			ymp)
-				basic_machine=ymp-cray
-				basic_os=unicos
-				;;
-			*)
-				basic_machine=$1
-				basic_os=
-				;;
-		esac
-		;;
-esac
-
-# Decode 1-component or ad-hoc basic machines
-case $basic_machine in
-	# Here we handle the default manufacturer of certain CPU types.  It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		cpu=hppa1.1
-		vendor=winbond
-		;;
-	op50n)
-		cpu=hppa1.1
-		vendor=oki
-		;;
-	op60c)
-		cpu=hppa1.1
-		vendor=oki
-		;;
-	ibm*)
-		cpu=i370
-		vendor=ibm
-		;;
-	orion105)
-		cpu=clipper
-		vendor=highlevel
-		;;
-	mac | mpw | mac-mpw)
-		cpu=m68k
-		vendor=apple
-		;;
-	pmac | pmac-mpw)
-		cpu=powerpc
-		vendor=apple
-		;;
-
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		cpu=m68000
-		vendor=att
-		;;
-	3b*)
-		cpu=we32k
-		vendor=att
-		;;
-	bluegene*)
-		cpu=powerpc
-		vendor=ibm
-		basic_os=cnk
-		;;
-	decsystem10* | dec10*)
-		cpu=pdp10
-		vendor=dec
-		basic_os=tops10
-		;;
-	decsystem20* | dec20*)
-		cpu=pdp10
-		vendor=dec
-		basic_os=tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		cpu=m68k
-		vendor=motorola
-		;;
-	dpx2*)
-		cpu=m68k
-		vendor=bull
-		basic_os=sysv3
-		;;
-	encore | umax | mmax)
-		cpu=ns32k
-		vendor=encore
-		;;
-	elxsi)
-		cpu=elxsi
-		vendor=elxsi
-		basic_os=${basic_os:-bsd}
-		;;
-	fx2800)
-		cpu=i860
-		vendor=alliant
-		;;
-	genix)
-		cpu=ns32k
-		vendor=ns
-		;;
-	h3050r* | hiux*)
-		cpu=hppa1.1
-		vendor=hitachi
-		basic_os=hiuxwe2
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		cpu=m68000
-		vendor=hp
-		;;
-	hp9k3[2-9][0-9])
-		cpu=m68k
-		vendor=hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
-		;;
-	i*86v32)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv32
-		;;
-	i*86v4*)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv4
-		;;
-	i*86v)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv
-		;;
-	i*86sol2)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=solaris2
-		;;
-	j90 | j90-cray)
-		cpu=j90
-		vendor=cray
-		basic_os=${basic_os:-unicos}
-		;;
-	iris | iris4d)
-		cpu=mips
-		vendor=sgi
-		case $basic_os in
-		    irix*)
-			;;
-		    *)
-			basic_os=irix4
-			;;
-		esac
-		;;
-	miniframe)
-		cpu=m68000
-		vendor=convergent
-		;;
-	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		cpu=m68k
-		vendor=atari
-		basic_os=mint
-		;;
-	news-3600 | risc-news)
-		cpu=mips
-		vendor=sony
-		basic_os=newsos
-		;;
-	next | m*-next)
-		cpu=m68k
-		vendor=next
-		case $basic_os in
-		    openstep*)
-		        ;;
-		    nextstep*)
-			;;
-		    ns2*)
-		      basic_os=nextstep2
-			;;
-		    *)
-		      basic_os=nextstep3
-			;;
-		esac
-		;;
-	np1)
-		cpu=np1
-		vendor=gould
-		;;
-	op50n-* | op60c-*)
-		cpu=hppa1.1
-		vendor=oki
-		basic_os=proelf
-		;;
-	pa-hitachi)
-		cpu=hppa1.1
-		vendor=hitachi
-		basic_os=hiuxwe2
-		;;
-	pbd)
-		cpu=sparc
-		vendor=tti
-		;;
-	pbb)
-		cpu=m68k
-		vendor=tti
-		;;
-	pc532)
-		cpu=ns32k
-		vendor=pc532
-		;;
-	pn)
-		cpu=pn
-		vendor=gould
-		;;
-	power)
-		cpu=power
-		vendor=ibm
-		;;
-	ps2)
-		cpu=i386
-		vendor=ibm
-		;;
-	rm[46]00)
-		cpu=mips
-		vendor=siemens
-		;;
-	rtpc | rtpc-*)
-		cpu=romp
-		vendor=ibm
-		;;
-	sde)
-		cpu=mipsisa32
-		vendor=sde
-		basic_os=${basic_os:-elf}
-		;;
-	simso-wrs)
-		cpu=sparclite
-		vendor=wrs
-		basic_os=vxworks
-		;;
-	tower | tower-32)
-		cpu=m68k
-		vendor=ncr
-		;;
-	vpp*|vx|vx-*)
-		cpu=f301
-		vendor=fujitsu
-		;;
-	w65)
-		cpu=w65
-		vendor=wdc
-		;;
-	w89k-*)
-		cpu=hppa1.1
-		vendor=winbond
-		basic_os=proelf
-		;;
-	none)
-		cpu=none
-		vendor=none
-		;;
-	leon|leon[3-9])
-		cpu=sparc
-		vendor=$basic_machine
-		;;
-	leon-*|leon[3-9]-*)
-		cpu=sparc
-		vendor=`echo "$basic_machine" | sed 's/-.*//'`
-		;;
-
-	*-*)
-		# shellcheck disable=SC2162
-		saved_IFS=$IFS
-		IFS="-" read cpu vendor <<EOF
-$basic_machine
-EOF
-		IFS=$saved_IFS
-		;;
-	# We use 'pc' rather than 'unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-		cpu=$basic_machine
-		vendor=pc
-		;;
-	# These rules are duplicated from below for sake of the special case above;
-	# i.e. things that normalized to x86 arches should also default to "pc"
-	pc98)
-		cpu=i386
-		vendor=pc
-		;;
-	x64 | amd64)
-		cpu=x86_64
-		vendor=pc
-		;;
-	# Recognize the basic CPU types without company name.
-	*)
-		cpu=$basic_machine
-		vendor=unknown
-		;;
-esac
-
-unset -v basic_machine
-
-# Decode basic machines in the full and proper CPU-Company form.
-case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	craynv-unknown)
-		vendor=cray
-		basic_os=${basic_os:-unicosmp}
-		;;
-	c90-unknown | c90-cray)
-		vendor=cray
-		basic_os=${Basic_os:-unicos}
-		;;
-	fx80-unknown)
-		vendor=alliant
-		;;
-	romp-unknown)
-		vendor=ibm
-		;;
-	mmix-unknown)
-		vendor=knuth
-		;;
-	microblaze-unknown | microblazeel-unknown)
-		vendor=xilinx
-		;;
-	rs6000-unknown)
-		vendor=ibm
-		;;
-	vax-unknown)
-		vendor=dec
-		;;
-	pdp11-unknown)
-		vendor=dec
-		;;
-	we32k-unknown)
-		vendor=att
-		;;
-	cydra-unknown)
-		vendor=cydrome
-		;;
-	i370-ibm*)
-		vendor=ibm
-		;;
-	orion-unknown)
-		vendor=highlevel
-		;;
-	xps-unknown | xps100-unknown)
-		cpu=xps100
-		vendor=honeywell
-		;;
-
-	# Here we normalize CPU types with a missing or matching vendor
-	armh-unknown | armh-alt)
-		cpu=armv7l
-		vendor=alt
-		basic_os=${basic_os:-linux-gnueabihf}
-		;;
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
-		basic_os=${basic_os:-bosx}
-		;;
-
-	# Here we normalize CPU types irrespective of the vendor
-	amd64-*)
-		cpu=x86_64
-		;;
-	blackfin-*)
-		cpu=bfin
-		basic_os=linux
-		;;
-	c54x-*)
-		cpu=tic54x
-		;;
-	c55x-*)
-		cpu=tic55x
-		;;
-	c6x-*)
-		cpu=tic6x
-		;;
-	e500v[12]-*)
-		cpu=powerpc
-		basic_os=${basic_os}"spe"
-		;;
-	mips3*-*)
-		cpu=mips64
-		;;
-	ms1-*)
-		cpu=mt
-		;;
-	m68knommu-*)
-		cpu=m68k
-		basic_os=linux
-		;;
-	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-		cpu=s12z
-		;;
-	openrisc-*)
-		cpu=or32
-		;;
-	parisc-*)
-		cpu=hppa
-		basic_os=linux
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		cpu=i586
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
-		cpu=i686
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		cpu=i686
-		;;
-	pentium4-*)
-		cpu=i786
-		;;
-	pc98-*)
-		cpu=i386
-		;;
-	ppc-* | ppcbe-*)
-		cpu=powerpc
-		;;
-	ppcle-* | powerpclittle-*)
-		cpu=powerpcle
-		;;
-	ppc64-*)
-		cpu=powerpc64
-		;;
-	ppc64le-* | powerpc64little-*)
-		cpu=powerpc64le
-		;;
-	sb1-*)
-		cpu=mipsisa64sb1
-		;;
-	sb1el-*)
-		cpu=mipsisa64sb1el
-		;;
-	sh5e[lb]-*)
-		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
-		;;
-	spur-*)
-		cpu=spur
-		;;
-	strongarm-* | thumb-*)
-		cpu=arm
-		;;
-	tx39-*)
-		cpu=mipstx39
-		;;
-	tx39el-*)
-		cpu=mipstx39el
-		;;
-	x64-*)
-		cpu=x86_64
-		;;
-	xscale-* | xscalee[bl]-*)
-		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
-		;;
-	arm64-* | aarch64le-*)
-		cpu=aarch64
-		;;
-
-	# Recognize the canonical CPU Types that limit and/or modify the
-	# company names they are paired with.
-	cr16-*)
-		basic_os=${basic_os:-elf}
-		;;
-	crisv32-* | etraxfs*-*)
-		cpu=crisv32
-		vendor=axis
-		;;
-	cris-* | etrax*-*)
-		cpu=cris
-		vendor=axis
-		;;
-	crx-*)
-		basic_os=${basic_os:-elf}
-		;;
-	neo-tandem)
-		cpu=neo
-		vendor=tandem
-		;;
-	nse-tandem)
-		cpu=nse
-		vendor=tandem
-		;;
-	nsr-tandem)
-		cpu=nsr
-		vendor=tandem
-		;;
-	nsv-tandem)
-		cpu=nsv
-		vendor=tandem
-		;;
-	nsx-tandem)
-		cpu=nsx
-		vendor=tandem
-		;;
-	mipsallegrexel-sony)
-		cpu=mipsallegrexel
-		vendor=sony
-		;;
-	tile*-*)
-		basic_os=${basic_os:-linux-gnu}
-		;;
-
-	*)
-		# Recognize the canonical CPU types that are allowed with any
-		# company name.
-		case $cpu in
-			1750a | 580 \
-			| a29k \
-			| aarch64 | aarch64_be | aarch64c | arm64ec \
-			| abacus \
-			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-			| alphapca5[67] | alpha64pca5[67] \
-			| am33_2.0 \
-			| amdgcn \
-			| arc | arceb | arc32 | arc64 \
-			| arm | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
-			| asmjs \
-			| ba \
-			| be32 | be64 \
-			| bfin | bpf | bs2000 \
-			| c[123]* | c30 | [cjt]90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| javascript \
-			| h8300 | h8500 \
-			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
-			| k1om \
-			| kvx \
-			| le32 | le64 \
-			| lm32 \
-			| loongarch32 | loongarch64 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
-			| mips* \
-			| mmix \
-			| mn10200 | mn10300 \
-			| moxie \
-			| mt \
-			| msp430 \
-			| nanomips* \
-			| nds32 | nds32le | nds32be \
-			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k | nvptx \
-			| open8 \
-			| or1k* \
-			| or32 \
-			| orion \
-			| picochip \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
-			| pru \
-			| pyramid \
-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
-			| rl78 | romp | rs6000 | rx \
-			| s390 | s390x \
-			| score \
-			| sh | shl \
-			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
-			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
-			| spu \
-			| tahoe \
-			| thumbv7* \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-			| tron \
-			| ubicom32 \
-			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-			| vax \
-			| vc4 \
-			| visium \
-			| w65 \
-			| wasm32 | wasm64 \
-			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
-			| ymp \
-			| z8k | z80)
-				;;
-
-			*)
-				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
-				exit 1
-				;;
-		esac
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $vendor in
-	digital*)
-		vendor=dec
-		;;
-	commodore*)
-		vendor=cbm
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if test x"$basic_os" != x
-then
-
-# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
-# set os.
-obj=
-case $basic_os in
-	gnu/linux*)
-		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
-		;;
-	os2-emx)
-		kernel=os2
-		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
-		;;
-	nto-qnx*)
-		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
-		;;
-	*-*)
-		# shellcheck disable=SC2162
-		saved_IFS=$IFS
-		IFS="-" read kernel os <<EOF
-$basic_os
-EOF
-		IFS=$saved_IFS
-		;;
-	# Default OS when just kernel was specified
-	nto*)
-		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
-		;;
-	linux*)
-		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
-		;;
-	managarm*)
-		kernel=managarm
-		os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
-		;;
-	*)
-		kernel=
-		os=$basic_os
-		;;
-esac
-
-# Now, normalize the OS (knowing we just have one component, it's not a kernel,
-# etc.)
-case $os in
-	# First match some system type aliases that might get confused
-	# with valid system types.
-	# solaris* is a basic system type, with this one exception.
-	auroraux)
-		os=auroraux
-		;;
-	bluegene*)
-		os=cnk
-		;;
-	solaris1 | solaris1.*)
-		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
-		;;
-	solaris)
-		os=solaris2
-		;;
-	unixware*)
-		os=sysv4.2uw
-		;;
-	# es1800 is here to avoid being matched by es* (a different OS)
-	es1800*)
-		os=ose
-		;;
-	# Some version numbers need modification
-	chorusos*)
-		os=chorusos
-		;;
-	isc)
-		os=isc2.2
-		;;
-	sco6)
-		os=sco5v6
-		;;
-	sco5)
-		os=sco3.2v5
-		;;
-	sco4)
-		os=sco3.2v4
-		;;
-	sco3.2.[4-9]*)
-		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
-		;;
-	sco*v* | scout)
-		# Don't match below
-		;;
-	sco*)
-		os=sco3.2v2
-		;;
-	psos*)
-		os=psos
-		;;
-	qnx*)
-		os=qnx
-		;;
-	hiux*)
-		os=hiuxwe2
-		;;
-	lynx*178)
-		os=lynxos178
-		;;
-	lynx*5)
-		os=lynxos5
-		;;
-	lynxos*)
-		# don't get caught up in next wildcard
-		;;
-	lynx*)
-		os=lynxos
-		;;
-	mac[0-9]*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
-		;;
-	opened*)
-		os=openedition
-		;;
-	os400*)
-		os=os400
-		;;
-	sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
-		;;
-	sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
-		;;
-	wince*)
-		os=wince
-		;;
-	utek*)
-		os=bsd
-		;;
-	dynix*)
-		os=bsd
-		;;
-	acis*)
-		os=aos
-		;;
-	atheos*)
-		os=atheos
-		;;
-	syllable*)
-		os=syllable
-		;;
-	386bsd)
-		os=bsd
-		;;
-	ctix* | uts*)
-		os=sysv
-		;;
-	nova*)
-		os=rtmk-nova
-		;;
-	ns2)
-		os=nextstep2
-		;;
-	# Preserve the version number of sinix5.
-	sinix5.*)
-		os=`echo "$os" | sed -e 's|sinix|sysv|'`
-		;;
-	sinix*)
-		os=sysv4
-		;;
-	tpf*)
-		os=tpf
-		;;
-	triton*)
-		os=sysv3
-		;;
-	oss*)
-		os=sysv3
-		;;
-	svr4*)
-		os=sysv4
-		;;
-	svr3)
-		os=sysv3
-		;;
-	sysvr4)
-		os=sysv4
-		;;
-	ose*)
-		os=ose
-		;;
-	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
-		os=mint
-		;;
-	dicos*)
-		os=dicos
-		;;
-	pikeos*)
-		# Until real need of OS specific support for
-		# particular features comes up, bare metal
-		# configurations are quite functional.
-		case $cpu in
-		    arm*)
-			os=eabi
-			;;
-		    *)
-			os=
-			obj=elf
-			;;
-		esac
-		;;
-	aout* | coff* | elf* | pe*)
-		# These are machine code file formats, not OSes
-		obj=$os
-		os=
-		;;
-	*)
-		# No normalization, but not necessarily accepted, that comes below.
-		;;
-esac
-
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-kernel=
-obj=
-case $cpu-$vendor in
-	score-*)
-		os=
-		obj=elf
-		;;
-	spu-*)
-		os=
-		obj=elf
-		;;
-	*-acorn)
-		os=riscix1.2
-		;;
-	arm*-rebel)
-		kernel=linux
-		os=gnu
-		;;
-	arm*-semi)
-		os=
-		obj=aout
-		;;
-	c4x-* | tic4x-*)
-		os=
-		obj=coff
-		;;
-	c8051-*)
-		os=
-		obj=elf
-		;;
-	clipper-intergraph)
-		os=clix
-		;;
-	hexagon-*)
-		os=
-		obj=elf
-		;;
-	tic54x-*)
-		os=
-		obj=coff
-		;;
-	tic55x-*)
-		os=
-		obj=coff
-		;;
-	tic6x-*)
-		os=
-		obj=coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=tops20
-		;;
-	pdp11-*)
-		os=none
-		;;
-	*-dec | vax-*)
-		os=ultrix4.2
-		;;
-	m68*-apollo)
-		os=domain
-		;;
-	i386-sun)
-		os=sunos4.0.2
-		;;
-	m68000-sun)
-		os=sunos3
-		;;
-	m68*-cisco)
-		os=
-		obj=aout
-		;;
-	mep-*)
-		os=
-		obj=elf
-		;;
-	mips*-cisco)
-		os=
-		obj=elf
-		;;
-	mips*-*|nanomips*-*)
-		os=
-		obj=elf
-		;;
-	or32-*)
-		os=
-		obj=coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=sysv3
-		;;
-	sparc-* | *-sun)
-		os=sunos4.1.1
-		;;
-	pru-*)
-		os=
-		obj=elf
-		;;
-	*-be)
-		os=beos
-		;;
-	*-ibm)
-		os=aix
-		;;
-	*-knuth)
-		os=mmixware
-		;;
-	*-wec)
-		os=proelf
-		;;
-	*-winbond)
-		os=proelf
-		;;
-	*-oki)
-		os=proelf
-		;;
-	*-hp)
-		os=hpux
-		;;
-	*-hitachi)
-		os=hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=sysv
-		;;
-	*-cbm)
-		os=amigaos
-		;;
-	*-dg)
-		os=dgux
-		;;
-	*-dolphin)
-		os=sysv3
-		;;
-	m68k-ccur)
-		os=rtu
-		;;
-	m88k-omron*)
-		os=luna
-		;;
-	*-next)
-		os=nextstep
-		;;
-	*-sequent)
-		os=ptx
-		;;
-	*-crds)
-		os=unos
-		;;
-	*-ns)
-		os=genix
-		;;
-	i370-*)
-		os=mvs
-		;;
-	*-gould)
-		os=sysv
-		;;
-	*-highlevel)
-		os=bsd
-		;;
-	*-encore)
-		os=bsd
-		;;
-	*-sgi)
-		os=irix
-		;;
-	*-siemens)
-		os=sysv4
-		;;
-	*-masscomp)
-		os=rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=uxpv
-		;;
-	*-rom68k)
-		os=
-		obj=coff
-		;;
-	*-*bug)
-		os=
-		obj=coff
-		;;
-	*-apple)
-		os=macos
-		;;
-	*-atari*)
-		os=mint
-		;;
-	*-wrs)
-		os=vxworks
-		;;
-	*)
-		os=none
-		;;
-esac
-
-fi
-
-# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
-
-case $os in
-	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	llvm* | musl* | newlib* | relibc* | uclibc*)
-		;;
-	# Likewise for "kernel-abi"
-	eabi* | gnueabi*)
-		;;
-	# VxWorks passes extra cpu info in the 4th filed.
-	simlinux | simwindows | spe)
-		;;
-	# See `case $cpu-$os` validation below
-	ghcjs)
-		;;
-	# Now accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
-	     | mpw* | magic* | mmixware* | mon960* | lnews* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
-	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | oabi* \
-	     | ptx* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | mint* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
-	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
-		;;
-	# This one is extra strict with allowed versions
-	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	# This refers to builds using the UEFI calling convention
-	# (which depends on the architecture) and PE file format.
-	# Note that this is both a different calling convention and
-	# different file format than that of GNU-EFI
-	# (x86_64-w64-mingw32).
-	uefi)
-		;;
-	none)
-		;;
-	kernel* | msvc* )
-		# Restricted further below
-		;;
-	'')
-		if test x"$obj" = x
-		then
-			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
-		fi
-		;;
-	*)
-		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
-		exit 1
-		;;
-esac
-
-case $obj in
-	aout* | coff* | elf* | pe*)
-		;;
-	'')
-		# empty is fine
-		;;
-	*)
-		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
-		exit 1
-		;;
-esac
-
-# Here we handle the constraint that a (synthetic) cpu and os are
-# valid only in combination with each other and nowhere else.
-case $cpu-$os in
-	# The "javascript-unknown-ghcjs" triple is used by GHC; we
-	# accept it here in order to tolerate that, but reject any
-	# variations.
-	javascript-ghcjs)
-		;;
-	javascript-* | *-ghcjs)
-		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
-		exit 1
-		;;
-esac
-
-# As a final step for OS-related things, validate the OS-kernel combination
-# (given a valid OS), if there is a kernel.
-case $kernel-$os-$obj in
-	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
-		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
-		    | linux-relibc*- | linux-uclibc*- )
-		;;
-	uclinux-uclibc*- )
-		;;
-	managarm-mlibc*- | managarm-kernel*- )
-		;;
-	windows*-msvc*-)
-		;;
-	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
-		    | -uclibc*- )
-		# These are just libc implementations, not actual OSes, and thus
-		# require a kernel.
-		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
-		exit 1
-		;;
-	-kernel*- )
-		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
-		exit 1
-		;;
-	*-kernel*- )
-		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
-		exit 1
-		;;
-	*-msvc*- )
-		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
-		exit 1
-		;;
-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
-		;;
-	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
-		;;
-	nto-qnx*-)
-		;;
-	os2-emx-)
-		;;
-	*-eabi*- | *-gnueabi*-)
-		;;
-	none--*)
-		# None (no kernel, i.e. freestanding / bare metal),
-		# can be paired with an machine code file format
-		;;
-	-*-)
-		# Blank kernel with real OS is always fine.
-		;;
-	--*)
-		# Blank kernel and OS with real machine code file format is always fine.
-		;;
-	*-*-*)
-		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
-		exit 1
-		;;
-esac
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-case $vendor in
-	unknown)
-		case $cpu-$os in
-			*-riscix*)
-				vendor=acorn
-				;;
-			*-sunos*)
-				vendor=sun
-				;;
-			*-cnk* | *-aix*)
-				vendor=ibm
-				;;
-			*-beos*)
-				vendor=be
-				;;
-			*-hpux*)
-				vendor=hp
-				;;
-			*-mpeix*)
-				vendor=hp
-				;;
-			*-hiux*)
-				vendor=hitachi
-				;;
-			*-unos*)
-				vendor=crds
-				;;
-			*-dgux*)
-				vendor=dg
-				;;
-			*-luna*)
-				vendor=omron
-				;;
-			*-genix*)
-				vendor=ns
-				;;
-			*-clix*)
-				vendor=intergraph
-				;;
-			*-mvs* | *-opened*)
-				vendor=ibm
-				;;
-			*-os400*)
-				vendor=ibm
-				;;
-			s390-* | s390x-*)
-				vendor=ibm
-				;;
-			*-ptx*)
-				vendor=sequent
-				;;
-			*-tpf*)
-				vendor=ibm
-				;;
-			*-vxsim* | *-vxworks* | *-windiss*)
-				vendor=wrs
-				;;
-			*-aux*)
-				vendor=apple
-				;;
-			*-hms*)
-				vendor=hitachi
-				;;
-			*-mpw* | *-macos*)
-				vendor=apple
-				;;
-			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
-				vendor=atari
-				;;
-			*-vos*)
-				vendor=stratus
-				;;
-		esac
-		;;
-esac
-
-echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
-exit
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/programs/file-magic.c b/programs/file-magic.c
deleted file mode 100644
index 7cda2f183..000000000
--- a/programs/file-magic.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Written and placed in public domain by Jeffrey Walton */
-/* This program prints the first four bytes of a file.   */
-/* The program avoids shell portability problems by      */
-/* padding short reads with 0. The program always writes */
-/* four bytes to stdout. ELF is 7F454C46.                */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-int main(int argc, char* argv[])
-{
-    int fd = -1, ret = -1;
-    unsigned char vals[4];
-
-    if (argc == 1 || (argc == 2 && argv[1][0] == '-' && argv[1][1] == '\0'))
-    {
-        fd = STDIN_FILENO;
-    }
-    else if (argc == 2)
-    {
-        fd = open(argv[1], O_RDONLY);
-        if (fd == -1)
-        {
-            ret = errno;
-            goto done;
-        }
-    }
-    else
-    {
-        fprintf(stderr, "file-magic <fdname>\n");
-        ret = EBADF;
-        goto done;
-    }
-
-    vals[0] = vals[1] = vals[2] = vals[3] = 0;
-    ret = read(fd, vals, 4);
-
-    fprintf(stdout, "%02X%02X%02X%02X\n",
-        vals[0], vals[1], vals[2], vals[3]);
-
-    ret = 0;
-
-done:
-
-    if (fd != -1)
-        close (fd);
-
-    return ret;
-}
\ No newline at end of file
diff --git a/programs/fix-configure.cpp b/programs/fix-configure.cpp
deleted file mode 100644
index 1587acd67..000000000
--- a/programs/fix-configure.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// Written and placed in public domain by Jeffrey Walton
-
-// This program cleans up fodder in configure and
-// configure.ac files. It attempts to place our $libdir
-// first in the linker search path. It also understands
-// Red Hat based systems, which use /lib64 and /usr/lib64.
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <cstdlib>
-
-void usage_exit();
-void process_stream(std::istream&);
-
-std::string fix_core(std::string);
-std::string fix_dlsearch_path(std::string);
-
-int main(int argc, char* argv[])
-{
-    if (argc > 2)
-        usage_exit();
-
-    if (argc == 1)
-    {
-        process_stream(std::cin);
-    }
-    else
-    {
-        std::ifstream infile (argv[1]);
-        process_stream(infile);
-    }
-
-    return 0;
-}
-
-void process_stream(std::istream& stream)
-{
-    std::string line;
-    while (std::getline(stream, line))
-    {
-        line = fix_core(line);
-        line = fix_dlsearch_path(line);
-
-        std::cout << line << std::endl;
-    }
-}
-
-std::string fix_core(std::string line)
-{
-    std::string old_val, new_val;
-    std::string::size_type pos;
-
-    old_val = "rm -f core";
-    new_val = "rm -rf core";
-    while ((pos = line.find(old_val)) != std::string::npos)
-    {
-        line.replace(pos, old_val.length(), new_val);
-        pos += new_val.length();
-    }
-
-    return line;
-}
-
-std::string fix_dlsearch_path(std::string line)
-{
-    std::string old_val, new_val;
-    std::string::size_type pos;
-
-    old_val = "sys_lib_dlsearch_path_spec=\"/lib /usr/lib\"";
-    new_val = "sys_lib_dlsearch_path_spec=\"%{_libdir} /lib /usr/lib\"";
-    while ((pos = line.find(old_val)) != std::string::npos)
-    {
-        line.replace(pos, old_val.length(), new_val);
-        pos += new_val.length();
-    }
-
-    old_val = "sys_lib_dlsearch_path_spec=\"/lib64 /usr/lib64\"";
-    new_val = "sys_lib_dlsearch_path_spec=\"%{_libdir} /lib64 /usr/lib64\"";
-    while ((pos = line.find(old_val)) != std::string::npos)
-    {
-        line.replace(pos, old_val.length(), new_val);
-        pos += new_val.length();
-    }
-
-    return line;
-}
-
-void usage_exit()
-{
-    std::cerr << "Usage: fix-configure <pc_file>" << std::endl;
-    std::cerr << "   or: cat <configure_file> | fix-configure" << std::endl;
-    std::exit(1);
-}
diff --git a/programs/fix-pkgconfig.cpp b/programs/fix-pkgconfig.cpp
deleted file mode 100644
index 16f9067d5..000000000
--- a/programs/fix-pkgconfig.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// Written and placed in public domain by Jeffrey Walton
-
-// This program cleans up fodder in *.pc files. After
-// cleaning Libs: and Libs.private: will only have
-// libraries, and not runpaths and shared objects.
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cstdlib>
-#include <cctype>
-
-void usage_exit();
-void process_stream(std::istream&);
-std::string fix_options(std::string);
-std::string trim_trailing(std::string);
-std::string fold_path(std::string);
-bool read_continued_line(std::istream&, std::string&);
-
-std::string get_prefix(const std::vector<std::string>&);
-void fold_prefix(const std::string&, std::vector<std::string>&);
-
-inline char last_char(const std::string& str)
-{
-    if (str.empty()) {
-        return '\0';
-    }
-
-    return *(str.end()-1);
-}
-
-inline std::string rm_last_char(const std::string& str)
-{
-    if (str.empty())
-        return str;
-
-    return std::string(str.begin(), str.end()-1);
-}
-
-// do we want to handle Solaris here? Solaris uses
-// /usr/local/lib/32 and /usr/local/lib/64. The 32 and 64
-// are links to an arch, like i386, amd64 and sparcv9.
-inline std::string fold_path(std::string str)
-{
-    std::string::size_type pos = 0;
-    while ((pos = str.find("lib/../lib", pos)) != std::string::npos)
-    {
-        str.replace(pos, 10, "lib");
-        pos += 3;
-    }
-
-    pos = 0;
-    while ((pos = str.find("lib32/../lib32", pos)) != std::string::npos)
-    {
-        str.replace(pos, 14, "lib32");
-        pos += 5;
-    }
-
-    pos = 0;
-    while ((pos = str.find("lib64/../lib64", pos)) != std::string::npos)
-    {
-        str.replace(pos, 14, "lib64");
-        pos += 5;
-    }
-
-    return str;
-}
-
-int main(int argc, char* argv[])
-{
-    if (argc > 2)
-        usage_exit();
-
-    if (argc == 1)
-    {
-        process_stream(std::cin);
-    }
-    else
-    {
-        std::ifstream infile (argv[1]);
-        process_stream(infile);
-    }
-
-    return 0;
-}
-
-void process_stream(std::istream& stream)
-{
-    std::string line, prefix;
-    std::vector<std::string> accum;
-
-    while (read_continued_line(stream, line))
-    {
-        accum.push_back(line);
-        line.erase();
-    }
-
-    // Later we will replace an expanded prefix with ${prefix}.
-    prefix = get_prefix(accum);
-
-    // fold use of expanded ${prefix}
-    fold_prefix(prefix, accum);
-
-    // now fix the options
-    for (size_t i=0; i<accum.size(); ++i)
-    {
-        accum[i] = fold_path(accum[i]);
-        accum[i] = fix_options(accum[i]);
-    }
-
-    // output the stream
-    for (size_t i=0; i<accum.size(); ++i)
-        std::cout << accum[i] << std::endl;
-}
-
-// tail recursive for continued lines
-bool read_continued_line(std::istream& stream, std::string& line)
-{
-    std::string temp;
-    if (! std::getline(stream, temp))
-        return false;
-
-    temp = trim_trailing(temp);
-    if (last_char(temp) == '\\')
-    {
-        temp = rm_last_char(temp);
-
-        std::string next;
-        if (read_continued_line(stream, next))
-            temp += next;
-    }
-
-    line += temp;
-    line = trim_trailing(line);
-
-    return true;
-}
-
-std::string get_prefix(const std::vector<std::string>& accum)
-{
-    for (size_t i=0; i<accum.size(); ++i)
-    {
-        if (accum[i].substr(0, 7) == "prefix=")
-        {
-            return accum[i].substr(7);
-        }
-    }
-
-    return "";
-}
-
-void fold_prefix(const std::string& prefix, std::vector<std::string>& accum)
-{
-    if (prefix.empty())
-        return;
-
-    const std::string new_prefix = "${prefix}";
-    for (size_t i=0; i<accum.size(); ++i)
-    {
-        if (accum[i].substr(0, 7) == "prefix=")
-            continue;
-
-        std::string::size_type pos = 0;
-        while ((pos = accum[i].find(prefix, pos)) != std::string::npos)
-        {
-            accum[i].replace(pos, prefix.length(), new_prefix);
-            pos += new_prefix.length();
-        }
-    }
-
-    // Remove ${prefix}/${prefix}. This shows up in a couple of *.pc files.
-    for (size_t i=0; i<accum.size(); ++i)
-    {
-        const std::string two_prefix = "${prefix}/${prefix}";
-        std::string::size_type pos = 0;
-
-        while ((pos = accum[i].find(two_prefix, pos)) != std::string::npos)
-        {
-            accum[i].replace(pos, two_prefix.length(), new_prefix);
-            pos += new_prefix.length();
-        }
-    }
-}
-
-std::string fix_options(std::string line)
-{
-    std::string new_line;
-
-    if (line.substr(0, 5) == "Libs:")
-        new_line = "Libs:";
-    else if (line.substr(0, 13) == "Libs.private:")
-        new_line = "Libs.private:";
-    else
-        return line;
-
-    std::string t;
-    std::istringstream stream(line);
-
-    while (std::getline(stream, t, ' '))
-    {
-        if (t.empty())
-            continue;
-
-        if (t.substr(0,2) == "-l")
-            new_line += std::string(" ") + t;
-        else if (t.substr(0,2) == "-L")
-            new_line += std::string(" ") + t;
-    }
-
-    return new_line;
-}
-
-// Guile uses continuation characters
-std::string trim_trailing(std::string str)
-{
-    while (! str.empty() && std::isspace(last_char(str)))
-    {
-        str.erase(str.end()-1);
-    }
-
-    return str;
-}
-
-void usage_exit()
-{
-    std::cerr << "Usage: fix-pkgconfig <pc_file>" << std::endl;
-    std::cerr << "   or: cat <pc_file> | fix-pkgconfig" << std::endl;
-    std::exit(1);
-}
diff --git a/programs/test-128bit-double.c b/programs/test-128bit-double.c
deleted file mode 100644
index 6ba31be94..000000000
--- a/programs/test-128bit-double.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-#include <float.h>
-int main(int argc, char* argv[])
-{
-#if defined(__APPLE__)
-	int x[1] = {LDBL_MANT_DIG};
-	printf("%d\n", x[0]);
-#else
-	int x[-1] = {0};
-#endif
-	return x[0] != 0 ? 0 : 1;
-}
diff --git a/programs/test-64bit.c b/programs/test-64bit.c
deleted file mode 100644
index ee2fb66d8..000000000
--- a/programs/test-64bit.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stddef.h>
-int main(int argc, char* argv[])
-{
-    enum {N = (sizeof(size_t) == 8 ? 8 : -1)};
-    int x[N] = {N};
-    return x[0];
-}
diff --git a/programs/test-cxx11-atomic.cpp b/programs/test-cxx11-atomic.cpp
deleted file mode 100644
index 32ba6f60c..000000000
--- a/programs/test-cxx11-atomic.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <atomic>
-struct A
-{
-    A() : x(0) {}
-    std::atomic<int> x;
-};
-
-int main(int argc, char* argv[])
-{
-    std::atomic_flag lock = ATOMIC_FLAG_INIT;
-
-    A a;
-
-    while (lock.test_and_set()) {}
-
-    a.x++; a.x--;
-
-    lock.clear();
-
-    return a.x;
-}
diff --git a/programs/test-cxx11.cpp b/programs/test-cxx11.cpp
deleted file mode 100644
index e27a63a8a..000000000
--- a/programs/test-cxx11.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <array>
-int main(int argc, char* argv[])
-{
-    std::array<unsigned int, 4*1024> x;
-    return x[0];
-}
diff --git a/programs/test-cxx14.cpp b/programs/test-cxx14.cpp
deleted file mode 100644
index e9007f701..000000000
--- a/programs/test-cxx14.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <string>
-int main(int argc, char* argv[])
-{
-#if __cplusplus >= 201300
-  int x[1] = {0};
-#else
-  int x[-1];
-fi
-
-  return x[0];
-}
diff --git a/programs/test-stdc.c b/programs/test-stdc.c
deleted file mode 100644
index 8825e258f..000000000
--- a/programs/test-stdc.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdlib.h>
-int main(int argc, char* argv[])
-{
-    return 0;
-}
diff --git a/programs/update.sh b/programs/update.sh
deleted file mode 100755
index b85524522..000000000
--- a/programs/update.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ -z "${WGET}" ]]; then
-    WGET=$(command -v wget 2>/dev/null)
-fi
-
-ca_zoo='../bootstrap/cacert.pem'
-if [[ ! -f "${ca_zoo}" ]]; then
-    echo "CA Zoo does not exist. Run this script from the program/ directory"
-    exit 1
-fi
-
-echo "Updating config.sub"
-if ! ${WGET} -q -O config.sub.new --ca-certificate="${ca_zoo}" \
-    'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD';
-then
-    echo "config.sub download failed"
-    exit 1
-fi
-
-if [[ $(wc -c < config.sub.new) -eq 0 ]]; then
-    echo "config.sub download failed"
-    exit 1
-fi
-
-if ! mv config.sub.new config.sub; then
-    echo "Failed to copy config.sub"
-fi
-
-echo "Fixing config.sub permissions"
-chmod +x config.sub
-xattr -d com.apple.quarantine config.sub 2>/dev/null
-
-echo "Updating config.guess"
-if ! ${WGET} -q -O config.guess.new --ca-certificate="${ca_zoo}" \
-    'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD';
-then
-    echo "config.sub download failed"
-    exit 1
-fi
-
-if [[ $(wc -c < config.guess.new) -eq 0 ]]; then
-    echo "config.sub download failed"
-    exit 1
-fi
-
-if ! mv config.guess.new config.guess; then
-    echo "Failed to copy config.guess"
-fi
-
-echo "Fixing config.guess permissions"
-chmod +x config.guess
-xattr -d com.apple.quarantine config.guess 2>/dev/null
-
-echo "Updating bootstrap cacert.pem"
-if ! ${WGET} -q -O ../bootstrap/cacert.pem.new --ca-certificate="${ca_zoo}" \
-    'https://curl.se/ca/cacert.pem';
-then
-    echo "cacert.pem download failed"
-    exit 1
-fi
-
-if [[ $(wc -c < ../bootstrap/cacert.pem.new) -eq 0 ]]; then
-    echo "cacert.pem download failed"
-    exit 1
-fi
-
-if ! mv ../bootstrap/cacert.pem.new ../bootstrap/cacert.pem; then
-    echo "Failed to copy cacert.pem"
-fi
-
-echo "Updating bootstrap icannbundle.pem"
-if ! ${WGET} -q -O ../bootstrap/icannbundle.pem.new --ca-certificate="${ca_zoo}" \
-    'https://data.iana.org/root-anchors/icannbundle.pem';
-then
-    echo "icannbundle.pem download failed"
-    exit 1
-fi
-
-if [[ $(wc -c < ../bootstrap/icannbundle.pem.new) -eq 0 ]]; then
-    echo "icannbundle.pem download failed"
-    exit 1
-fi
-
-if ! mv ../bootstrap/icannbundle.pem.new ../bootstrap/icannbundle.pem; then
-    echo "Failed to copy icannbundle.pem"
-fi
-
-# Not correct:
-#   wget -O root-anchors.p7s https://data.iana.org/root-anchors/root-anchors.p7s
-#   openssl pkcs7 -print_certs -in root-anchors.p7s -inform DER -out root-anchors.pem
-#   sed -i -e 's/^subject/#subject/g' -e 's/^issuer/#issuer/g' root-anchors.pem
-
-UNBOUND_ANCHOR=$(command -v unbound-anchor 2>/dev/null)
-if [[ -z "${UNBOUND_ANCHOR}" ]]; then
-    UNBOUND_ANCHOR=/sbin/unbound-anchor;
-fi
-
-if [[ -f "${UNBOUND_ANCHOR}" ]]
-then
-    echo "Updating bootstrap dnsrootkey.pem"
-    "${UNBOUND_ANCHOR}" -a ../bootstrap/dnsroot.key -u data.iana.org
-    mv ../bootstrap/dnsroot.key ../bootstrap/dnsrootkey.pem
-else
-    echo "Failed to update bootstrap dnsrootkey.pem. Install unbound-anchor"
-    exit 1
-fi
-
-exit 0
diff --git a/reset-repo.sh b/reset-repo.sh
deleted file mode 100755
index 3b4decb4e..000000000
--- a/reset-repo.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-git fetch
-git reset --hard origin
-git gc
diff --git a/setup-bash.sh b/setup-bash.sh
deleted file mode 100755
index d7a0a614a..000000000
--- a/setup-bash.sh
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds a reduced functionality Bash from sources.
-# It may be needed on old machines, like Fedora 1 and Ubuntu 4.
-
-BASH_VER=5.1
-BASH_TAR="bash-${BASH_VER}.tar.gz"
-BASH_DIR="bash-${BASH_VER}"
-PKG_NAME=bash
-
-###############################################################################
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-if ! ./build-cacert.sh
-then
-    echo "Failed to install CA Certs"
-    exit 1
-fi
-
-###############################################################################
-
-echo ""
-echo "========================================"
-echo "================= Bash ================="
-echo "========================================"
-
-echo ""
-echo "**********************"
-echo "Downloading package"
-echo "**********************"
-
-echo ""
-echo "Bash ${BASH_VER}..."
-
-if ! "${WGET}" -q -O "$BASH_TAR" --ca-certificate="${LETS_ENCRYPT_ROOT}" \
-     "https://ftp.gnu.org/gnu/bash/$BASH_TAR"
-then
-    echo "Failed to download Bash"
-    exit 1
-fi
-
-rm -rf "$BASH_DIR" &>/dev/null
-gzip -d < "$BASH_TAR" | tar xf -
-cd "$BASH_DIR"
-
-if [[ -e ../patch/bash.patch ]]; then
-    echo ""
-    echo "**********************"
-    echo "Patching package"
-    echo "**********************"
-
-    patch -u -p0 < ../patch/bash.patch
-fi
-
-# Fix sys_lib_dlsearch_path_spec
-bash "${INSTX_TOPDIR}/fix-configure.sh"
-
-echo ""
-echo "**********************"
-echo "Configuring package"
-echo "**********************"
-
-# Bash has lots of other options. We should use what a distro uses.
-# TODO: figure out the options a distro like Debian or Red Hat uses...
-# https://www.gnu.org/software/bash/manual/html_node/Optional-Features.html
-
-if [[ "${INSTX_DEBUG_MAP}" -eq 1 ]]; then
-    bash_cflags="${INSTX_CFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BASH_DIR}"
-    bash_cxxflags="${INSTX_CXXFLAGS} -fdebug-prefix-map=${PWD}=${INSTX_SRCDIR}/${BASH_DIR}"
-else
-    bash_cflags="${INSTX_CFLAGS}"
-    bash_cxxflags="${INSTX_CXXFLAGS}"
-fi
-
-    PKG_CONFIG_PATH="${INSTX_PKGCONFIG}" \
-    CPPFLAGS="${INSTX_CPPFLAGS}" \
-    ASFLAGS="${INSTX_ASFLAGS}" \
-    CFLAGS="${bash_cflags}" \
-    CXXFLAGS="${bash_cxxflags}" \
-    LDFLAGS="${INSTX_LDFLAGS}" \
-    LDLIBS="${INSTX_LDLIBS}" \
-    LIBS="${INSTX_LDLIBS}" \
-./configure \
-    --build="${AUTOCONF_BUILD}" \
-    --prefix="${INSTX_PREFIX}" \
-    --libdir="${INSTX_LIBDIR}" \
-    --enable-multibyte \
-    --enable-largefile \
-    --enable-history
-
-if [[ "$?" -ne 0 ]]; then
-    echo ""
-    echo "************************"
-    echo "Failed to configure Bash"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Escape dollar sign for $ORIGIN in makefiles. Required so
-# $ORIGIN works in both configure tests and makefiles.
-bash "${INSTX_TOPDIR}/fix-makefiles.sh"
-
-echo ""
-echo "**********************"
-echo "Building package"
-echo "**********************"
-
-MAKE_FLAGS=("-j" "${INSTX_JOBS}")
-if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-then
-    echo ""
-    echo "************************"
-    echo "Failed to build Bash"
-    echo "************************"
-
-    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-    exit 1
-fi
-
-# Fix flags in *.pc files
-bash "${INSTX_TOPDIR}/fix-pkgconfig.sh"
-
-echo ""
-echo "**********************"
-echo "Testing package"
-echo "**********************"
-
-echo ""
-echo "**********************"
-echo "Bash not tested"
-echo "**********************"
-
-# https://git.savannah.gnu.org/cgit/bash.git/tree/INSTALL
-# MAKE_FLAGS=("PERL_USE_UNSAFE_INC=1" "tests")
-#if ! "${MAKE}" "${MAKE_FLAGS[@]}"
-#then
-#    echo "************************"
-#    echo "Failed to test Bash"
-#    echo "************************"
-#
-#    bash "${INSTX_TOPDIR}/collect-logs.sh" "${PKG_NAME}"
-#    exit 1
-#fi
-
-echo ""
-echo "**********************"
-echo "Installing anyways..."
-echo "**********************"
-
-MAKE_FLAGS=("install")
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S "${MAKE}" "${MAKE_FLAGS[@]}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BASH_DIR}"
-else
-    "${MAKE}" "${MAKE_FLAGS[@]}"
-    bash "${INSTX_TOPDIR}/fix-permissions.sh" "${INSTX_PREFIX}"
-    bash "${INSTX_TOPDIR}/copy-sources.sh" "${PWD}" "${INSTX_SRCDIR}/${BASH_DIR}"
-fi
-
-###############################################################################
-
-echo ""
-echo "*****************************************************************************"
-echo "Please run Bash's 'hash -r' to update program cache in the current shell"
-echo "*****************************************************************************"
-
-###############################################################################
-
-touch "${INSTX_PKG_CACHE}/${PKG_NAME}"
-
-cd "${CURR_DIR}" || exit 1
-
-###############################################################################
-
-# Set to false to retain artifacts
-if true;
-then
-    ARTIFACTS=("$BASH_TAR" "$BASH_DIR")
-    for artifact in "${ARTIFACTS[@]}"; do
-        rm -rf "$artifact"
-    done
-fi
-
-exit 0
diff --git a/setup-cacerts.sh b/setup-cacerts.sh
deleted file mode 100755
index d5f35a1fc..000000000
--- a/setup-cacerts.sh
+++ /dev/null
@@ -1,541 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script writes several Root CA certifcates needed
-# for other scripts and wget downloads over HTTPS.
-
-###############################################################################
-
-# setup-cacerts.sh does not source the environment, so we can't use the variables
-mkdir -p "$HOME/.build-scripts/cacert"
-cp ./bootstrap/cacert.pem "$HOME/.build-scripts/cacert"
-cd "$HOME/.build-scripts/cacert/"
-
-###############################################################################
-
-echo
-echo "********** Comodo DV Root **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
-hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
-BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
-MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
-EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
-6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
-pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
-9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
-/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
-Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
-+pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
-qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
-SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
-u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
-Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
-crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
-/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
-wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
-4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
-2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
-FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
-CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
-boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
-jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
-S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
-QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
-0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
-NVOFBkpdn627G190
------END CERTIFICATE-----' > comodo-rsa-root.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/comodo-rsa-root.pem"
-
-###############################################################################
-
-echo
-echo "********** Let's Encrypt Root **********"
-echo
-
-# This is the new "Let's Encrypt Authority R3"
-echo '-----BEGIN CERTIFICATE-----
-MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
-WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
-R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
-sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
-NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
-Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
-/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
-FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
-AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
-Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
-gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
-PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
-ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
-CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
-lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
-avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
-yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
-yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
-hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
-HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
-MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
-nLRbwHOoq7hHwg==
------END CERTIFICATE-----' > lets-encrypt-roots.pem
-
-# This is the original "Let's Encrypt Authority X3"
-echo '-----BEGIN CERTIFICATE-----
-MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
------END CERTIFICATE-----' >> lets-encrypt-roots.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/lets-encrypt-roots.pem"
-
-###############################################################################
-
-echo
-echo "********** Identrust Root **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----' > identrust-root-x3.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/identrust-root-x3.pem"
-
-###############################################################################
-
-echo
-echo "********** DigiTrust Root **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIEtjCCA56gAwIBAgIQDHmpRLCMEZUgkmFf4msdgzANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAw
-MFoXDTI4MTAyMjEyMDAwMFowdTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTE0MDIGA1UEAxMrRGlnaUNlcnQgU0hBMiBFeHRlbmRl
-ZCBWYWxpZGF0aW9uIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdT
-pARR+JmmFkhLZyeqk0nQOe0MsLAAh/FnKIaFjI5j2ryxQDji0/XspQUYuD0+xZkXMuwYjPrxDKZk
-IYXLBxA0sFKIKx9om9KxjxKws9LniB8f7zh3VFNfgHk/LhqqqB5LKw2rt2O5Nbd9FLxZS99RStKh
-4gzikIKHaq7q12TWmFXo/a8aUGxUvBHy/Urynbt/DvTVvo4WiRJV2MBxNO723C3sxIclho3YIeSw
-TQyJ3DkmF93215SF2AQhcJ1vb/9cuhnhRctWVyh+HA1BV6q3uCe7seT6Ku8hI3UarS2bhjWMnHe1
-c63YlC3k8wyd7sFOYn4XwHGeLN7x+RAoGTMCAwEAAaOCAUkwggFFMBIGA1UdEwEB/wQIMAYBAf8C
-AQAwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBLBgNVHR8ERDBC
-MECgPqA8hjpodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdoQXNzdXJhbmNlRVZS
-b290Q0EuY3JsMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5k
-aWdpY2VydC5jb20vQ1BTMB0GA1UdDgQWBBQ901Cl1qCt7vNKYApl0yHU+PjWDzAfBgNVHSMEGDAW
-gBSxPsNpA/i/RwHUmCYaCALvY2QrwzANBgkqhkiG9w0BAQsFAAOCAQEAnbbQkIbhhgLtxaDwNBx0
-wY12zIYKqPBKikLWP8ipTa18CK3mtlC4ohpNiAexKSHc59rGPCHg4xFJcKx6HQGkyhE6V6t9VypA
-dP3THYUYUN9XR3WhfVUgLkc3UHKMf4Ib0mKPLQNa2sPIoc4sUqIAY+tzunHISScjl2SFnjgOrWNo
-PLpSgVh5oywM395t6zHyuqB8bPEs1OG9d4Q3A84ytciagRpKkk47RpqF/oOi+Z6Mo8wNXrM9zwR4
-jxQUezKcxwCmXMS1oVWNWlZopCJwqjyBcdmdqEU79OX2olHdx3ti6G8MdOu42vi/hw15UJGQmxg7
-kVkn8TUoE6smftX3eg==
------END CERTIFICATE-----' > digitrust-root-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/digitrust-root-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** DigiCert Root **********"
-echo
-
-# This is the SHA256 EV Root, but wget rejects it because
-# the cert is signed by the SHA1 Root below. Sigh...
-if false; then
-echo '-----BEGIN CERTIFICATE-----
-MIIEtjCCA56gAwIBAgIQDHmpRLCMEZUgkmFf4msdgzANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAw
-MFoXDTI4MTAyMjEyMDAwMFowdTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTE0MDIGA1UEAxMrRGlnaUNlcnQgU0hBMiBFeHRlbmRl
-ZCBWYWxpZGF0aW9uIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdT
-pARR+JmmFkhLZyeqk0nQOe0MsLAAh/FnKIaFjI5j2ryxQDji0/XspQUYuD0+xZkXMuwYjPrxDKZk
-IYXLBxA0sFKIKx9om9KxjxKws9LniB8f7zh3VFNfgHk/LhqqqB5LKw2rt2O5Nbd9FLxZS99RStKh
-4gzikIKHaq7q12TWmFXo/a8aUGxUvBHy/Urynbt/DvTVvo4WiRJV2MBxNO723C3sxIclho3YIeSw
-TQyJ3DkmF93215SF2AQhcJ1vb/9cuhnhRctWVyh+HA1BV6q3uCe7seT6Ku8hI3UarS2bhjWMnHe1
-c63YlC3k8wyd7sFOYn4XwHGeLN7x+RAoGTMCAwEAAaOCAUkwggFFMBIGA1UdEwEB/wQIMAYBAf8C
-AQAwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBLBgNVHR8ERDBC
-MECgPqA8hjpodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdoQXNzdXJhbmNlRVZS
-b290Q0EuY3JsMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5k
-aWdpY2VydC5jb20vQ1BTMB0GA1UdDgQWBBQ901Cl1qCt7vNKYApl0yHU+PjWDzAfBgNVHSMEGDAW
-gBSxPsNpA/i/RwHUmCYaCALvY2QrwzANBgkqhkiG9w0BAQsFAAOCAQEAnbbQkIbhhgLtxaDwNBx0
-wY12zIYKqPBKikLWP8ipTa18CK3mtlC4ohpNiAexKSHc59rGPCHg4xFJcKx6HQGkyhE6V6t9VypA
-dP3THYUYUN9XR3WhfVUgLkc3UHKMf4Ib0mKPLQNa2sPIoc4sUqIAY+tzunHISScjl2SFnjgOrWNo
-PLpSgVh5oywM395t6zHyuqB8bPEs1OG9d4Q3A84ytciagRpKkk47RpqF/oOi+Z6Mo8wNXrM9zwR4
-jxQUezKcxwCmXMS1oVWNWlZopCJwqjyBcdmdqEU79OX2olHdx3ti6G8MdOu42vi/hw15UJGQmxg7
-kVkn8TUoE6smftX3eg==
------END CERTIFICATE-----' > digicert-root-ca.pem
-fi
-
-###############################################################################
-
-# This is "DigiCert High Assurance EV Root CA"
-# 02:AC:5C:26:6A:0B:40:9B:8F:0B:79:F2:AE:46:25:77
-echo '-----BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----' > digicert-root-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/digicert-root-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** DigiCert Hybrid ECC **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIQCidf5wTW7ssj1c1bSxpOBDANBgkqhkiG9w0BAQwFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0yMDA5MjMwMDAwMDBaFw0zMDA5MjIyMzU5NTlaMFYxCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBI
-eWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMTB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BMEbxppbmNmkKaDp1AS12+umsmxVwP/tmMZJLwYnUcu/cMEFesOxnYeJuq20ExfJ
-qLSDyLiQ0cx0NTY8g3KwtdD3ImnI8YDEe0CPz2iHJlw5ifFNkU3aiYvkA8ND5b8v
-c6OCAa4wggGqMB0GA1UdDgQWBBQKvAgpF4ylOW16Ds4zxy6z7fvDejAfBgNVHSME
-GDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwdgYI
-KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
-b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdp
-Q2VydEdsb2JhbFJvb3RDQS5jcnQwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Ny
-bDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDA3oDWgM4Yx
-aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNy
-bDAwBgNVHSAEKTAnMAcGBWeBDAEBMAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EM
-AQIDMA0GCSqGSIb3DQEBDAUAA4IBAQDeOpcbhb17jApY4+PwCwYAeq9EYyp/3YFt
-ERim+vc4YLGwOWK9uHsu8AjJkltz32WQt960V6zALxyZZ02LXvIBoa33llPN1d9R
-JzcGRvJvPDGJLEoWKRGC5+23QhST4Nlg+j8cZMsywzEXJNmvPlVv/w+AbxsBCMqk
-BGPI2lNM8hkmxPad31z6n58SXqJdH/bYF462YvgdgbYKOytobPAyTgr3mYI5sUje
-CzqJx1+NLyc8nAK8Ib2HxnC+IrrWzfRLvVNve8KaN9EtBH7TuMwNW4SpDCmGr6fY
-1h3tDjHhkTb9PA36zoaJzu0cIw265vZt6hCmYWJC+/j+fgZwcPwL
------END CERTIFICATE-----' > digicert-hybrid-ecc.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/digicert-hybrid-ecc.pem"
-
-###############################################################################
-
-echo
-echo "********** DigiCert Hybrid ECC **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaME8xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBS
-U0EgU0hBMjU2IDIwMjAgQ0ExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwUuzZUdwvN1PWNvsnO3DZuUfMRNUrUpmRh8sCuxkB+Uu3Ny5CiDt3+PE0J6a
-qXodgojlEVbbHp9YwlHnLDQNLtKS4VbL8Xlfs7uHyiUDe5pSQWYQYE9XE0nw6Ddn
-g9/n00tnTCJRpt8OmRDtV1F0JuJ9x8piLhMbfyOIJVNvwTRYAIuE//i+p1hJInuW
-raKImxW8oHzf6VGo1bDtN+I2tIJLYrVJmuzHZ9bjPvXj1hJeRPG/cUJ9WIQDgLGB
-Afr5yjK7tI4nhyfFK3TUqNaX3sNk+crOU6JWvHgXjkkDKa77SU+kFbnO8lwZV21r
-eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBgjCCAX4wEgYDVR0TAQH/BAgwBgEB
-/wIBADAdBgNVHQ4EFgQUt2ui6qiqhIx56rTaD5iyxZV2ufQwHwYDVR0jBBgwFoAU
-A95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2Nh
-Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBCBgNV
-HR8EOzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH
-bG9iYWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEB
-MAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IB
-AQCAMs5eC91uWg0Kr+HWhMvAjvqFcO3aXbMM9yt1QP6FCvrzMXi3cEsaiVi6gL3z
-ax3pfs8LulicWdSQ0/1s/dCYbbdxglvPbQtaCdB73sRD2Cqk3p5BJl+7j5nL3a7h
-qG+fh/50tx8bIKuxT8b1Z11dmzzp/2n3YWzW2fP9NsarA4h20ksudYbj/NhVfSbC
-EXffPgK2fPOre3qGNm+499iTcc+G33Mw+nur7SpZyEKEOxEXGlLzyQ4UfaJbcme6
-ce1XR2bFuAJKZTRei9AqPCCcUZlM51Ke92sRKw2Sfh3oius2FkOH6ipjv3U/697E
-A7sKPPcw7+uvTPyLNhBzPvOk
------END CERTIFICATE-----' > digicert-tls-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/digicert-tls-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** AddTrust Root CA **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----' > addtrust-root-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/addtrust-root-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** Go Daddy Certification Authority **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----' > godaddy-root-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/godaddy-root-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** USERTrust Certification Authority **********"
-echo
-
-echo '-----BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
-iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
-cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
-BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
-MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
-BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
-3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
-tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
-Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
-VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
-79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
-c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
-Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
-c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
-UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
-Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
-Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
-VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
-ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
-8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
-iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
-Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
-XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
-qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
-VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
-L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
-jjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----' > usertrust-root-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/usertrust-root-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** Baltimore Cybertrust Root **********"
-echo
-
-# DigiCert Baltimore CA-2 G2
-# https://www.digicert.com/digicert-root-certificates.htm
-
-echo '-----BEGIN CERTIFICATE-----
-MIIEYzCCA0ugAwIBAgIQAYL4CY6i5ia5GjsnhB+5rzANBgkqhkiG9w0BAQsFADBa
-MQswCQYDVQQGEwJJRTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJl
-clRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTE1
-MTIwODEyMDUwN1oXDTI1MDUxMDEyMDAwMFowZDELMAkGA1UEBhMCVVMxFTATBgNV
-BAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEjMCEG
-A1UEAxMaRGlnaUNlcnQgQmFsdGltb3JlIENBLTIgRzIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC75wD+AAFz75uI8FwIdfBccHMf/7V6H40II/3HwRM/
-sSEGvU3M2y24hxkx3tprDcFd0lHVsF5y1PBm1ITykRhBtQkmsgOWBGmVU/oHTz6+
-hjpDK7JZtavRuvRZQHJaZ7bN5lX8CSukmLK/zKkf1L+Hj4Il/UWAqeydjPl0kM8c
-+GVQr834RavIL42ONh3e6onNslLZ5QnNNnEr2sbQm8b2pFtbObYfAB8ZpPvTvgzm
-+4/dDoDmpOdaxMAvcu6R84Nnyc3KzkqwIIH95HKvCRjnT0LsTSdCTQeg3dUNdfc2
-YMwmVJihiDfwg/etKVkgz7sl4dWe5vOuwQHrtQaJ4gqPAgMBAAGjggEZMIIBFTAd
-BgNVHQ4EFgQUwBKyKHRoRmfpcCV0GgBFWwZ9XEQwHwYDVR0jBBgwFoAU5Z1ZMIJH
-WMys+ghUNoZ7OrUETfAwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMC
-AYYwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQu
-Y29tL09tbmlyb290MjAyNS5jcmwwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYB
-BQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwDQYJKoZIhvcNAQEL
-BQADggEBAC/iN2bDGs+RVe4pFPpQEL6ZjeIo8XQWB2k7RDA99blJ9Wg2/rcwjang
-B0lCY0ZStWnGm0nyGg9Xxva3vqt1jQ2iqzPkYoVDVKtjlAyjU6DqHeSmpqyVDmV4
-7DOMvpQ+2HCr6sfheM4zlbv7LFjgikCmbUHY2Nmz+S8CxRtwa+I6hXsdGLDRS5rB
-bxcQKegOw+FUllSlkZUIII1pLJ4vP1C0LuVXH6+kc9KhJLsNkP5FEx2noSnYZgvD
-0WyzT7QrhExHkOyL4kGJE7YHRndC/bseF/r/JUuOUFfrjsxOFT+xJd1BDKCcYm1v
-upcHi9nzBhDFKdT3uhaQqNBU4UtJx5g=
------END CERTIFICATE-----' > baltimore-root-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/baltimore-root-ca.pem"
-
-###############################################################################
-
-echo
-echo "********** Sectigo Secure Server CA **********"
-echo
-
-# GitLab: Sectigo RSA Domain Validation Secure Server CA
-# https://support.sectigo.com/Com_KnowledgeDetailPage?Id=kA01N000000rfBO
-
-echo '-----BEGIN CERTIFICATE-----
-MIIGEzCCA/ugAwIBAgIQfVtRJrR2uhHbdBYLvFMNpzANBgkqhkiG9w0BAQwFADCB
-iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
-cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
-BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx
-MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBjzELMAkGA1UEBhMCR0IxGzAZBgNV
-BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE
-ChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQDEy5TZWN0aWdvIFJTQSBEb21haW4g
-VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA1nMz1tc8INAA0hdFuNY+B6I/x0HuMjDJsGz99J/LEpgPLT+N
-TQEMgg8Xf2Iu6bhIefsWg06t1zIlk7cHv7lQP6lMw0Aq6Tn/2YHKHxYyQdqAJrkj
-eocgHuP/IJo8lURvh3UGkEC0MpMWCRAIIz7S3YcPb11RFGoKacVPAXJpz9OTTG0E
-oKMbgn6xmrntxZ7FN3ifmgg0+1YuWMQJDgZkW7w33PGfKGioVrCSo1yfu4iYCBsk
-Haswha6vsC6eep3BwEIc4gLw6uBK0u+QDrTBQBbwb4VCSmT3pDCg/r8uoydajotY
-uK3DGReEY+1vVv2Dy2A0xHS+5p3b4eTlygxfFQIDAQABo4IBbjCCAWowHwYDVR0j
-BBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFI2MXsRUrYrhd+mb
-+ZsF4bgBjWHhMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYGBFUdIAAw
-CAYGZ4EMAQIBMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRydXN0
-LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDB2Bggr
-BgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRydXN0LmNv
-bS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZaHR0cDov
-L29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAMr9hvQ5Iw0/H
-ukdN+Jx4GQHcEx2Ab/zDcLRSmjEzmldS+zGea6TvVKqJjUAXaPgREHzSyrHxVYbH
-7rM2kYb2OVG/Rr8PoLq0935JxCo2F57kaDl6r5ROVm+yezu/Coa9zcV3HAO4OLGi
-H19+24rcRki2aArPsrW04jTkZ6k4Zgle0rj8nSg6F0AnwnJOKf0hPHzPE/uWLMUx
-RP0T7dWbqWlod3zu4f+k+TY4CFM5ooQ0nBnzvg6s1SQ36yOoeNDT5++SR2RiOSLv
-xvcRviKFxmZEJCaOEDKNyJOuB56DPi/Z+fVGjmO+wea03KbNIaiGCpXZLoUmGv38
-sbZXQm2V0TP2ORQGgkE49Y9Y3IBbpNV9lXj9p5v//cWoaasm56ekBYdbqbe4oyAL
-l6lFhd2zi+WJN44pDfwGF/Y4QA5C5BIG+3vzxhFoYt/jmPQT2BVPi7Fp2RBgvGQq
-6jG35LWjOhSbJuMLe/0CjraZwTiXWTb2qHSihrZe68Zk6s+go/lunrotEbaGmAhY
-LcmsJWTyXnW0OMGuf1pGg+pRyrbxmRE1a6Vqe8YAsOf4vmSyrcjC8azjUeqkk+B5
-yOGBQMkKW+ESPMFgKuOXwIlCypTPRpgSabuY0MLTDXJLR27lk8QyKGOHQ+SwMj4K
-00u/I5sUKUErmgQfky3xxzlIPK1aEn8=
------END CERTIFICATE-----' > sectigo-ca.pem
-
-echo "Wrote $HOME/.build-scripts/cacert/sectigo-ca.pem"
-
-###############################################################################
-
-# GitHub takes folks to Amazon on occasion using HTTP 301 or 302
-# redirects. It seems to happen when a tarball is an archive versus
-# a release. We need three authorities to make it work.
-
-{
-    cat "$HOME/.build-scripts/cacert/lets-encrypt-roots.pem"
-    cat "$HOME/.build-scripts/cacert/digicert-root-ca.pem"
-    cat "$HOME/.build-scripts/cacert/digicert-tls-ca.pem"
-    cat "$HOME/.build-scripts/cacert/digicert-hybrid-ecc.pem"
-    cat "$HOME/.build-scripts/cacert/baltimore-root-ca.pem"
-
-} > "$HOME/.build-scripts/cacert/github-ca-zoo.pem"
-
-###############################################################################
-
-# Remove old CACERT directory
-rm -rf "$HOME/.cacert"
-
-echo ""
-
-exit 0
diff --git a/setup-directories.sh b/setup-directories.sh
deleted file mode 100755
index 74ccee524..000000000
--- a/setup-directories.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script creates directories in $prefix. A couple
-# of the packages are braindead and create files instead
-# of directories.
-
-# Get the environment as needed.
-if [[ "${SETUP_ENVIRON_DONE}" != "yes" ]]; then
-    if ! source ./setup-environ.sh
-    then
-        echo "Failed to set environment"
-        exit 1
-    fi
-fi
-
-# Early exit if directories already exist
-if [[ -d "${INSTX_PREFIX}/bin" && -d "${INSTX_PREFIX}/sbin" && \
-      -d "${INSTX_PREFIX}/etc" && -d "${INSTX_PREFIX}/share" && \
-      -d "${INSTX_PREFIX}/include" && -d "${INSTX_PREFIX}/src" && \
-      -d "${INSTX_LIBDIR}" && -d "${INSTX_PKGCONFIG}" ]];
-then
-    exit 0
-fi
-
-# The password should die when this subshell goes out of scope
-if [[ "${SUDO_PASSWORD_DONE}" != "yes" ]]; then
-    if ! source ./setup-password.sh
-    then
-        echo "Failed to process password"
-        exit 1
-    fi
-fi
-
-###############################################################################
-
-echo ""
-echo "**********************"
-echo "Creating directories"
-echo "**********************"
-
-# Try to locate fix-permissions.sh script
-if [[ -f ./fix-permissions.sh ]]; then
-    FIX_PERMISSIONS="./fix-permissions.sh"
-else
-    FIX_PERMISSIONS="${INSTX_TOPDIR}/fix-permissions.sh"
-fi
-
-if [[ -n "${SUDO_PASSWORD}" ]]; then
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "${INSTX_PREFIX}/"{bin,sbin,etc,include,var,libexec,share,src}
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "${INSTX_PREFIX}/share/"{doc,info,locale,man}
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S mkdir -p "${INSTX_LIBDIR}" "${INSTX_PKGCONFIG}"
-    printf "%s\n" "${SUDO_PASSWORD}" | sudo ${SUDO_ENV_OPT} -S bash ${FIX_PERMISSIONS} "${INSTX_PREFIX}"
-else
-    mkdir -p "${INSTX_PREFIX}/"{bin,sbin,etc,include,var,libexec,share,src}
-    mkdir -p "${INSTX_PREFIX}/share/"{doc,info,locale,man}
-    mkdir -p "${INSTX_LIBDIR}" "${INSTX_PKGCONFIG}"
-    bash ${FIX_PERMISSIONS} "${INSTX_PREFIX}"
-fi
-
-exit 0
diff --git a/setup-environ.sh b/setup-environ.sh
deleted file mode 100755
index e3a2197e6..000000000
--- a/setup-environ.sh
+++ /dev/null
@@ -1,1120 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script verifies most prerequisites and creates
-# an environment for other scripts to execute in.
-#
-# Generally speaking, a variable with uppercase INSTX_ is used
-# throughout the scripts, like INSTX_CFLAGS and INSTX_CXX11. The
-# INSTX_ variables are usually exported. A variable with lowercase
-# opt_ is used only in this file. The opt_variables stay local to
-# this file.
-#
-# We use Bash arrays, but we avoid ARR+=("$foo"). The '+=' operator
-# came after arrays in Bash history. Early machines will handle arrays
-# but not the '+=' operator.
-#
-# The 'grep' command is Posix, and the options -i, -c, and -E are Posix.
-# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html
-#
-# The 'command' command is Posix, and the option -v is Posix.
-# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
-#
-# The 'awk' command is Posix, and printing fields using NR is Posix.
-# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/awk.html
-
-###############################################################################
-
-# SC2034: XXX appears unused. Verify use (or export if used externally).
-# SC2086: Double quote to prevent globbing and word splitting.
-# shellcheck disable=SC2034,SC2086
-
-###############################################################################
-
-# `gcc ... -o /dev/null` does not work on Solaris.
-# `mktemp` is not available on AIX or Git Windows shell...
-infile="in.${RANDOM}${RANDOM}.c"
-outfile="out.${RANDOM}${RANDOM}"
-cp programs/test-stdc.c "${infile}"
-
-###############################################################################
-
-CURR_DIR=$(pwd); export CURR_DIR
-function finish {
-  rm  -f "${CURR_DIR}/${infile}" 2>/dev/null
-  rm  -f "${CURR_DIR}/${outfile}" 2>/dev/null
-  rm -rf "${CURR_DIR}/${outfile}.dSYM" 2>/dev/null
-}
-trap finish EXIT INT
-
-###############################################################################
-
-# We need to stash the top level directory for some scripts
-if [[ -z ${INSTX_TOPDIR} ]]; then
-    INSTX_TOPDIR=$(pwd)
-fi
-
-if [[ ! -d "${INSTX_TOPDIR}/programs" ]]; then
-        printf "INSTX_TOPDIR is not valid."
-        [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
-fi
-
-export INSTX_TOPDIR
-
-###############################################################################
-
-# Prerequisites needed for nearly all packages. Set to 1 to skip check.
-
-if [[ "${INSTX_DISABLE_PKGCONFIG_CHECK}" -ne 1 ]]; then
-    if [[ -z $(command -v pkg-config 2>/dev/null) ]]; then
-        printf "%s\n" "Some packages require Package-config. Please install pkg-config, pkgconfig or pkgconf."
-        [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
-    fi
-fi
-
-if [[ "${INSTX_DISABLE_GZIP_CHECK}" -ne 1 ]]; then
-    if [[ -z $(command -v gzip 2>/dev/null) ]]; then
-        printf "%s\n" "Some packages require Gzip. Please install Gzip."
-        [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
-    fi
-fi
-
-if [[ "${INSTX_DISABLE_TAR_CHECK}" -ne 1 ]]; then
-    if [[ -z $(command -v tar 2>/dev/null) ]]; then
-        printf "%s\n" "Some packages require Tar. Please install Tar."
-        [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
-    fi
-fi
-
-###############################################################################
-
-# Command line tools, like sed and awk, need this on OS X.
-if [[ $(uname -s | grep -i -c 'darwin') -ne 0 ]]; then
-    if [[ -z "$LC_ALL" ]]; then
-        if locale -a 2>/dev/null | grep -q en_US.UTF-8; then
-            export LC_ALL="en_US.UTF-8"
-        elif locale -a 2>/dev/null | grep -q '^C'; then
-            export LC_ALL="C"
-        fi
-    fi
-    if [[ -z "$LANG" ]]; then
-        if locale -a 2>/dev/null | grep -q en_US.UTF-8; then
-            export LANG="en_US.UTF-8"
-        elif locale -a 2>/dev/null | grep -q '^C'; then
-            export LANG="C"
-        fi
-    fi
-fi
-
-###############################################################################
-
-THIS_SYSTEM=$(uname -s 2>&1)
-IS_HURD=$(grep -i -c 'gnu' <<< "$THIS_SYSTEM")
-IS_LINUX=$(grep -i -c 'linux' <<< "$THIS_SYSTEM")
-IS_SOLARIS=$(grep -i -c 'sunos' <<< "$THIS_SYSTEM")
-IS_DARWIN=$(grep -i -c 'darwin' <<< "$THIS_SYSTEM")
-IS_AIX=$(grep -i -c 'aix' <<< "$THIS_SYSTEM")
-IS_CYGWIN=$(grep -i -c 'cygwin' <<< "$THIS_SYSTEM")
-IS_OPENBSD=$(grep -i -c 'openbsd' <<< "$THIS_SYSTEM")
-IS_FREEBSD=$(grep -i -c 'freebsd' <<< "$THIS_SYSTEM")
-IS_NETBSD=$(grep -i -c 'netbsd' <<< "$THIS_SYSTEM")
-IS_APPLE_M1=$(sysctl machdep.cpu.brand_string 2>/dev/null | grep -i -c 'Apple M1')
-THIS_SYSTEM=$(uname -v 2>&1)
-IS_ALPINE=$(grep -i -c 'alpine' <<< "$THIS_SYSTEM")
-
-export IS_LINUX IS_SOLARIS IS_DARWIN
-export IS_CYGWIN IS_OPENBSD IS_FREEBSD IS_NETBSD
-export IS_AIX IS_HURD IS_ALPINE
-
-###############################################################################
-
-GREP="${GREP:-"$(command -v grep 2>/dev/null)"}"
-EGREP="${EGREP:-"$(command -v grep 2>/dev/null) -E"}"
-SED="${SED:-"$(command -v sed 2>/dev/null)"}"
-AWK="${AWK:-"$(command -v awk 2>/dev/null)"}"
-
-# Non-anemic tools on Solaris
-if [[ -d /usr/gnu/bin ]]; then
-    GREP="/usr/gnu/bin/grep"
-    EGREP="/usr/gnu/bin/grep -E"
-    SED="/usr/gnu/bin/sed"
-    AWK="/usr/gnu/bin/awk"
-elif [[ -d /usr/sfw/bin ]]; then
-    GREP="/usr/sfw/bin/grep"
-    EGREP="/usr/sfw/bin/grep -E"
-    SED="/usr/sfw/bin/sed"
-    AWK="/usr/sfw/bin/awk"
-fi
-
-# Wget is special. We have to be able to bootstrap it and
-# use a modern version throughout these scripts. The Wget
-# we provide in ${HOME} is modern but crippled. However, it
-# is enough to download all the packages we need.
-
-if [[ -z "${WGET}" ]]; then
-    if [[ -e "${HOME}/.build-scripts/wget/bin/wget" ]]; then
-        WGET="${HOME}/.build-scripts/wget/bin/wget"
-    elif [[ -n "$(command -v wget 2>/dev/null)" ]]; then
-        WGET="$(command -v wget 2>/dev/null)"
-    fi
-fi
-
-# Automatically update the user's cacerts now. On occasion we need
-# to add or remove a certificate. Otherwise, there are unexplained
-# download failures.
-bash setup-cacerts.sh 1>/dev/null
-
-# OS X may not have a Wget available. However, a few build scripts
-# intelligently fallback to cURL on OS X to get a critical download.
-if [[ "${INSTX_DISABLE_WGET_CHECK}" -ne 1 && -z "${WGET}" ]]; then
-    echo "Failed to find Wget. If you have one, set WGET=/path/to/wget."
-    echo "If you don't have one, you can run ./setup-wget.sh."
-    exit 1
-fi
-
-export WGET
-
-###############################################################################
-
-# Paths are awful on Solaris. An unmodified environment only
-# has /usr/bin and /usr/sbin on-path with anemic tools. They
-# manage to provide fewer options than Posix...
-if [ "${IS_SOLARIS}" -ne 0 ]
-then
-    for path in /usr/gnu/bin /usr/sfw/bin /usr/ucb/bin /usr/xpg4/bin /bin /usr/bin /sbin /usr/sbin
-    do
-        if [ -d "$path" ]; then
-            SOLARIS_PATH="$SOLARIS_PATH:$path"
-        fi
-    done
-
-    # Add user's path in case a binary is in a non-standard location,
-    # like /opt/local. Place the PATH after SOLARIS_PATH so the anemic
-    # tools are last in the list.
-    PATH="$SOLARIS_PATH:$PATH"
-fi
-
-# Ensure Command Line Tools is on-path, if present.
-if [ "${IS_DARWIN}" -ne 0 ]
-then
-    for path in /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin \
-                /Library/Developer/CommandLineTools/usr/bin
-    do
-        if [ -d "$path" ]; then
-            DARWIN_PATH="$DARWIN_PATH:$path"
-        fi
-    done
-
-    # Add user's path in case a binary is in a non-standard location,
-    # like /opt/local. Place the PATH after SOLARIS_PATH so the anemic
-    # tools are last in the list.
-    PATH="$DARWIN_PATH:$PATH"
-fi
-
-# Strip duplicate, leading and trailing colons
-PATH=$(echo "$PATH" | tr -s ':' | ${SED} -e 's/^:\(.*\)/\1/' | ${SED} -e 's/:$//g')
-export PATH
-
-# echo "New PATH: $PATH"
-
-###############################################################################
-
-# OS X flavors. We delete everything prior to the
-# version number to normalize the stream for awk.
-# Old OS X uses 'System Version: Mac OS X 10.5.8'.
-# New OS X uses 'System Version: OS X 10.9.5'.
-# OS X 10.5 was last to support PowerPC.
-OSX_VERSION=$(system_profiler SPSoftwareDataType 2>&1 | ${GREP} 'System Version:' | ${SED} 's/^[^[:digit:]]*//' | ${AWK} '{print $1}')
-OSX_10p10_OR_ABOVE=$(${EGREP} -i -c -E "10\.1[0-9]|1[1-9]\.|[2-9][0-9]" <<< "$OSX_VERSION")
-OSX_10p8_OR_ABOVE=$(${EGREP} -i -c -E "10\.[8-9]|10\.1[0-9]|1[1-9]\.|[2-9][0-9]" <<< "$OSX_VERSION")
-OSX_10p9_OR_BELOW=$(${EGREP} -i -c -E "10\.[0-9]\." <<< "$OSX_VERSION")
-OSX_10p5_OR_BELOW=$(${EGREP} -i -c -E "10\.[0-5]\." <<< "$OSX_VERSION")
-OSX_10p5_OR_10p6=$(${EGREP} -i -c -E "10\.5|10\.6" <<< "$OSX_VERSION")
-
-export OSX_10p5_OR_BELOW OSX_10p5_OR_10p6 OSX_10p9_OR_BELOW
-export OSX_10p8_OR_ABOVE OSX_10p10_OR_ABOVE
-
-if [[ "${OSX_10p5_OR_10p6}" -eq 1 ]]; then
-    export MACOSX_DEPLOYMENT_TARGET="10.5"
-elif [[ "${OSX_10p5_OR_BELOW}" -eq 1 ]]; then
-    export MACOSX_DEPLOYMENT_TARGET="10.3"
-fi
-
-# Check for the BSD family members
-THIS_SYSTEM=$(uname -s 2>&1)
-IS_BSD_FAMILY=$(${EGREP} -i -c 'dragonfly|freebsd|netbsd|openbsd' <<< "$THIS_SYSTEM")
-
-# Red Hat and derivatives use /lib64, not /lib.
-IS_REDHAT=$(${GREP} -i -c 'redhat' /etc/redhat-release 2>/dev/null)
-IS_CENTOS=$(${GREP} -i -c 'centos' /etc/centos-release 2>/dev/null)
-IS_FEDORA=$(${GREP} -i -c 'fedora' /etc/fedora-release 2>/dev/null)
-IS_DRAGONFLY=$(uname -s | ${GREP} -i -c DragonFly 2>/dev/null)
-
-if [[ "$IS_REDHAT" -ne 0 || "$IS_CENTOS" -ne 0 || "$IS_FEDORA" -ne 0 ]]
-then
-    IS_RH_FAMILY=1
-else
-    IS_RH_FAMILY=0
-fi
-
-THIS_MACHINE=$(uname -m 2>&1)
-IS_IA32=$(${EGREP} -i -c 'i86pc|i.86|amd64|x86_64' <<< "$THIS_MACHINE")
-IS_AMD64=$(${EGREP} -i -c 'amd64|x86_64' <<< "$THIS_MACHINE")
-IS_MIPS=$(${EGREP} -i -c 'mips' <<< "$THIS_MACHINE")
-
-export IS_IA32 IS_AMD64 IS_MIPS
-
-# The BSDs and Solaris should have GMake installed if its needed
-if [[ -z "${MAKE}" ]]; then
-    if [[ $(command -v gmake 2>/dev/null) ]]; then
-        MAKE="gmake"
-    else
-        MAKE="make"
-    fi
-fi
-
-# Fix "don't know how to make w" on the BSDs
-if [[ "${MAKE}" == "make" ]]; then
-    MAKEOPTS=
-fi
-
-export MAKE MAKEOPTS
-
-USER_CC=${CC}
-USER_CXX=${CXX}
-
-# If CC and CXX are not set, then use default or assume Clang or GCC
-if [[ -z "${CC}" ]]; then
-    CC=$(make -p 2>/dev/null | ${EGREP} '^CC.*=' | head -n 1 | cut -f 2 -d '=' | ${AWK} '{$1=$1};1')
-fi
-if [[ -z "${CXX}" ]]; then
-    CXX=$(make -p 2>/dev/null | ${EGREP} '^CXX.*=' | head -n 1 | cut -f 2 -d '=' | ${AWK} '{$1=$1};1')
-fi
-
-# Fixup for Solaris
-if [[ -z "$(command -v "${CC}" 2>/dev/null)" ]]; then CC= ; fi;
-if [[ -z "$(command -v "${CXX}" 2>/dev/null)" ]]; then CXX= ; fi;
-
-# Use Clang as default on Darwin
-if [[ "${IS_DARWIN}" -ne 0 ]]; then
-    if [[ -n "$(command -v clang 2>/dev/null)" ]]; then CC='clang'; fi
-    if [[ -n "$(command -v clang++ 2>/dev/null)" ]]; then CXX='clang++'; fi
-fi
-
-# Use GCC as default elsewhere, or on Darwin if Clang fails
-if [[ -z "${CC}" ]] && [[ -n "$(command -v gcc 2>/dev/null)" ]]; then CC='gcc'; fi
-if [[ -z "${CXX}" ]] && [[ -n "$(command -v g++ 2>/dev/null)" ]]; then CXX='g++'; fi
-
-# After all the gyrations, use the user's choice
-if [[ -n "${USER_CC}" ]]; then CC=${USER_CC}; fi
-if [[ -n "${USER_CXX}" ]]; then CXX=${USER_CXX}; fi
-
-# Finally, use the full path
-CC="$(command -v "${CC}" 2>/dev/null)"
-CXX="$(command -v "${CXX}" 2>/dev/null)"
-
-TEST_CC="${CC}"
-TEST_CXX="${CXX}"
-
-export CC CXX
-
-IS_GCC=$(${CC} --version 2>&1 | ${EGREP} -i -c 'gnu|gcc')
-IS_CLANG=$(${CC} --version 2>&1 | ${EGREP} -i -c 'clang|llvm')
-IS_SUNC=$(${CC} -V 2>&1 | ${EGREP} -i -c 'sun|studio')
-
-if [[ "${IS_GCC}" -eq 1 ]]; then
-    GCC_4_OR_BELOW=$(${CC} --version 2>&1 | ${EGREP} -i -c '(GCC) 3\.|(GCC) 4\.')
-fi
-
-###############################################################################
-
-# Where the package will run. We need to override for 64-bit Solaris.
-# On Solaris some Autotools packages use 32-bit instead of 64-bit build.
-AUTOCONF_BUILD=$(bash programs/config.guess 2>/dev/null)
-
-# Use 64-bit for Solaris if available
-# https://docs.oracle.com/cd/E37838_01/html/E66175/features-1.html
-
-if [[ "${IS_SOLARIS}" -ne 0 ]]
-then
-    if [[ $(isainfo -b 2>/dev/null) = 64 ]]; then
-        CFLAGS64=-m64
-        CXXFLAGS64=-m64
-        TEST_CC="${TEST_CC} -m64"
-        TEST_CXX="${TEST_CXX} -m64"
-    fi
-fi
-
-IS_SUN_AMD64=$(isainfo -v 2>/dev/null | ${EGREP} -i -c 'amd64')
-IS_SUN_SPARCv9=$(isainfo -v 2>/dev/null | ${EGREP} -i -c 'sparcv9')
-
-# Solaris Fixup
-if [[ "${IS_SUN_AMD64}" -eq 1 ]]; then
-    IS_AMD64=1
-    AUTOCONF_BUILD=$(${SED} 's/i386/x86_64/g' <<< "${AUTOCONF_BUILD}")
-elif [[ "${IS_SUN_SPARCv9}" -eq 1 ]]; then
-    AUTOCONF_BUILD=$(${SED} 's/sparc/sparcv9/g' <<< "${AUTOCONF_BUILD}")
-fi
-
-# Apple M1 fixup
-if [[ ${IS_APPLE_M1} -eq 1 ]]; then
-    AUTOCONF_BUILD="aarch64-apple-darwin"
-fi
-export AUTOCONF_BUILD
-
-###############################################################################
-
-# Try to determine 32 vs 64-bit, /usr/local/lib, /usr/local/lib32,
-# /usr/local/lib64 and /usr/local/lib/64. We drive a test compile
-# using the supplied compiler and flags.
-if ${TEST_CC} ${CFLAGS} programs/test-64bit.c -o "${outfile}" 2>/dev/null
-then
-    IS_64BIT=1
-    IS_32BIT=0
-    INSTX_BITNESS=64
-else
-    IS_64BIT=0
-    IS_32BIT=1
-    INSTX_BITNESS=32
-fi
-
-# Some of the BSDs install user software into /usr/local.
-# We don't want to overwrite the system installed software.
-if [[ "${IS_BSD_FAMILY}" -ne 0 ]]; then
-    DEF_PREFIX="/opt/local"
-else
-    DEF_PREFIX="/usr/local"
-fi
-
-# Don't override a user choice of INSTX_PREFIX
-if [[ -z "${INSTX_PREFIX}" ]]; then
-    INSTX_PREFIX="$DEF_PREFIX"
-fi
-
-# RPATH's and their history at https://lekensteyn.nl/rpath.html.
-# $ORIGIN on Linux should be available back to about 1998.
-# We feature test for INSTX_OPATH and INSTX_RPATH below.
-# AIX also needs -bsvr4; while HP-UX uses -Wl,+b.
-
-if [[ "${IS_SOLARIS}" -ne 0 ]]; then
-    DEF_LIBDIR="${INSTX_PREFIX}/lib"
-    DEF_RPATH="${INSTX_PREFIX}/lib"
-    DEF_OPATH="'""\$ORIGIN/../lib""'"
-elif [[ "${IS_DARWIN}" -ne 0 ]]; then
-    DEF_LIBDIR="${INSTX_PREFIX}/lib"
-    DEF_RPATH="${INSTX_PREFIX}/lib"
-    DEF_OPATH="@loader_path/../lib"
-elif [[ "${IS_RH_FAMILY}" -ne 0 ]] && [[ "$IS_64BIT" -ne 0 ]]; then
-    DEF_LIBDIR="${INSTX_PREFIX}/lib64"
-    DEF_RPATH="${INSTX_PREFIX}/lib64"
-    DEF_OPATH="'""\$ORIGIN/../lib64""'"
-else
-    DEF_LIBDIR="${INSTX_PREFIX}/lib"
-    DEF_RPATH="${INSTX_PREFIX}/lib"
-    DEF_OPATH="'""\$ORIGIN/../lib""'"
-fi
-
-# Don't override a user choice of INSTX_LIBDIR. Also see
-# https://blogs.oracle.com/dipol/dynamic-libraries,-rpath,-and-mac-os
-if [[ -z "${INSTX_LIBDIR}" ]]; then
-    INSTX_LIBDIR="$DEF_LIBDIR"
-fi
-if [[ -z "${INSTX_SRCDIR}" ]]; then
-    INSTX_SRCDIR="$INSTX_PREFIX/src"
-fi
-if [[ -z "${INSTX_RPATH}" ]]; then
-    INSTX_RPATH="${DEF_RPATH}"
-fi
-if [[ -z "${INSTX_OPATH}" ]]; then
-    INSTX_OPATH="${DEF_OPATH}"
-fi
-
-# Remove duplicate and trailing slashes.
-INSTX_PREFIX="$(echo ${INSTX_PREFIX} | tr -s '/' | ${SED} -e 's/\/$//g')"
-INSTX_LIBDIR="$(echo ${INSTX_LIBDIR} | tr -s '/' | ${SED} -e 's/\/$//g')"
-INSTX_SRCDIR="$(echo ${INSTX_SRCDIR} | tr -s '/' | ${SED} -e 's/\/$//g')"
-INSTX_RPATH="$(echo ${INSTX_RPATH} | tr -s '/' | ${SED} -e 's/\/$//g')"
-INSTX_OPATH="$(echo ${INSTX_OPATH} | tr -s '/' | ${SED} -e 's/\/$//g')"
-
-export INSTX_BITNESS
-export INSTX_PREFIX INSTX_LIBDIR INSTX_SRCDIR
-export INSTX_RPATH INSTX_OPATH
-
-###############################################################################
-
-# Add our path since we know we are using the latest binaries.
-# Strip duplicate, leading and trailing colons. This will bite
-# us for the Wget we build for PREFIX. It is having problems
-# with some multibyte names on Ubuntu.
-PATH=$(echo "${INSTX_PREFIX}/bin:$PATH" | tr -s ':' | ${SED} -e 's/^:\(.*\)/\1/' | ${SED} -e 's/:$//g')
-export PATH
-
-###############################################################################
-
-cc_result=$(${TEST_CC} -fPIC -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_pic="-fPIC"
-else
-    cc_result=$(${TEST_CC} -qpic -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_pic="-qpic"
-    else
-        cc_result=$(${TEST_CC} -KPIC -o "${outfile}" "${infile}" 2>&1 | wc -w)
-        if [[ "$cc_result" -eq 0 ]]; then
-            opt_pic="-KPIC"
-        fi
-    fi
-fi
-
-# Ugh... C++11 support as required. Things may still break.
-cc_result=$(${TEST_CXX} -o "${outfile}" programs/test-cxx11.cpp 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    INSTX_CXX11=1
-fi
-
-cc_result=$(${TEST_CXX} -o "${outfile}" programs/test-cxx11-atomic.cpp 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    INSTX_CXX11_ATOMIC=1
-fi
-
-# Ugh... C++14 support as required. Things may still break.
-cc_result=$(${TEST_CXX} -o "${outfile}" programs/test-cxx14.cpp 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    INSTX_CXX14=1
-fi
-
-# patchelf needs C++11 support. BerkeleyDB needs atomics.
-INSTX_CXX11="${INSTX_CXX11:-0}"
-INSTX_CXX11_ATOMIC="${INSTX_CXX11_ATOMIC:-0}"
-INSTX_CXX14="${INSTX_CXX14:-0}"
-
-export INSTX_CXX11 INSTX_CXX11_ATOMIC INSTX_CXX14
-
-# For the benefit of the programs and libraries. Make them run faster.
-cc_result=$(${TEST_CC} -march=native -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_native="-march=native"
-fi
-
-# PowerMac's with 128-bit long double. Gnulib and GetText expect 64-bit long double.
-cc_result=$(${TEST_CC} -o "${outfile}" programs/test-128bit-double.c 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    if [[ $("./${outfile}") == "106" ]]; then
-        opt_64bit_dbl="-mlong-double-64"
-    fi
-fi
-
-cc_result=$(${TEST_CC} -pthread -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_pthread="-pthread"
-fi
-
-# Switch from -march=native to something more appropriate
-if [[ $(${EGREP} -i -c 'armv7' /proc/cpuinfo 2>/dev/null) -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -march=armv7-a -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_armv7="-march=armv7-a"
-    fi
-fi
-# See if we can upgrade to ARMv7+NEON
-if [[ $(${EGREP} -i -c 'neon' /proc/cpuinfo 2>/dev/null) -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -march=armv7-a -mfpu=neon -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        IS_ARM_NEON=1
-        opt_armv7="-march=armv7-a -mfpu=neon"
-    fi
-fi
-# See if we can upgrade to ARMv8
-if [[ $(${EGREP} -i -c 'asimd' /proc/cpuinfo 2>/dev/null) -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -march=armv8-a -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        IS_ARMV8=1
-        opt_armv8="-march=armv8-a"
-    fi
-fi
-if [[ $(sysctl -a 2>/dev/null | ${EGREP} -i -c 'hw.optional.arm64: 1') -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -arch arm64 -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        IS_ARMV8=1
-        opt_armv8="-arch arm64"
-    fi
-fi
-# See if we can upgrade to Altivec
-if [[ $(${EGREP} -i -c 'altivec' /proc/cpuinfo 2>/dev/null) -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -maltivec -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        IS_ALTIVEC=1
-        opt_altivec="-maltivec"
-    fi
-fi
-# See if we can upgrade to Altivec
-if [[ $(sysctl -a 2>/dev/null | ${EGREP} -i -c 'hw.optional.altivec: 1') -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -maltivec -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        IS_ALTIVEC=1
-        opt_altivec="-maltivec"
-    fi
-fi
-# See if we can upgrade to Power8
-if [[ $(${EGREP} -i -c 'crypto' /proc/cpuinfo 2>/dev/null) -ne 0 ]]; then
-    cc_result=$(${TEST_CC} -mcpu=power8 -maltivec -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        IS_POWER8=1
-        opt_power8="-mcpu=power8 -maltivec"
-    fi
-fi
-
-# See if -Wl,-rpath,$ORIGIN/../lib works
-cc_result=$(${TEST_CC} -Wl,-rpath,${INSTX_OPATH} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_opath="-Wl,-rpath,${INSTX_OPATH}"
-fi
-cc_result=$(${TEST_CC} -Wl,-R,${INSTX_OPATH} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_opath="-Wl,-R,${INSTX_OPATH}"
-fi
-cc_result=$(${TEST_CC} -Wl,-R,${INSTX_OPATH} -bsvr4 -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_opath="-Wl,-R,${INSTX_OPATH} -bsvr4"
-fi
-cc_result=$(${TEST_CC} -Wl,+b,${INSTX_OPATH} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_opath="-Wl,+b,${INSTX_OPATH}"
-fi
-
-# See if -Wl,-rpath,${libdir} works.
-cc_result=$(${TEST_CC} -Wl,-rpath,${INSTX_RPATH} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_rpath="-Wl,-rpath,${INSTX_RPATH}"
-fi
-cc_result=$(${TEST_CC} -Wl,-R,${INSTX_RPATH} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_rpath="-Wl,-R,${INSTX_RPATH}"
-fi
-cc_result=$(${TEST_CC} -Wl,-R,${INSTX_RPATH} -bsvr4 -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_rpath="-Wl,-R,${INSTX_RPATH} -bsvr4"
-fi
-cc_result=$(${TEST_CC} -Wl,+b,${INSTX_RPATH} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_rpath="-Wl,+b,${INSTX_RPATH}"
-fi
-
-# See if RUNPATHs are available. new-dtags convert a RPATH to a RUNPATH.
-cc_result=$(${TEST_CC} -Wl,--enable-new-dtags -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_new_dtags="-Wl,--enable-new-dtags"
-fi
-
-# http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#shobj_dependencies
-cc_result=$(${TEST_CC} ${opt_opath} -Wl,-z,origin -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_origin="-Wl,-z,origin"
-fi
-
-cc_result=$(${TEST_CC} -Wl,--no-as-needed -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_no_as_needed="-Wl,--no-as-needed"
-fi
-
-# OS X linker and install names
-cc_result=$(${TEST_CC} -headerpad_max_install_names -o "${outfile}" "${infile}" 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    opt_max_header_pad="-headerpad_max_install_names"
-fi
-
-# Debug versus release builds
-if [[ -n "${INSTX_DEBUG}" ]]; then
-    opt_cppflags_build="-DDEBUG"
-else
-    opt_cppflags_build="-DNDEBUG"
-fi
-
-# Debug symbols
-if [[ -z "$opt_sym" ]]; then
-    cc_result=$(${TEST_CC} -g2 -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_sym="-g2"
-    else
-        cc_result=$(${TEST_CC} -g -o "${outfile}" "${infile}" 2>&1 | wc -w)
-        if [[ "$cc_result" -eq 0 ]]; then
-            opt_sym="-g"
-        fi
-    fi
-
-    # If we are building under the sanitizers with GCC or Clang, just use -g3
-    if [[ -n "${INSTX_UBSAN}" || -n "${INSTX_ASAN}" || -n "$INSTX_MSAN" ]]; then
-        opt_sym="-g3"
-    fi
-
-    # If we are building a debug build with GCC or Clang, just use -g3
-    if [[ -n "${INSTX_DEBUG}" ]]; then
-        opt_sym="-g3"
-    fi
-fi
-
-# Optimizations
-if [[ -z "$opt_optimize" ]]; then
-    cc_result=$(${TEST_CC} -O2 -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_optimize="-O2"
-    else
-        cc_result=$(${TEST_CC} -O -o "${outfile}" "${infile}" 2>&1 | wc -w)
-        if [[ "$cc_result" -eq 0 ]]; then
-            opt_optimize="-O"
-        fi
-    fi
-
-    # If we are building under the sanitizers with GCC or Clang, just use -O1
-    if [[ -n "${INSTX_UBSAN}" || -n "${INSTX_ASAN}" || -n "$INSTX_MSAN" ]]; then
-        opt_optimize="-O1"
-    fi
-
-    # If we are building a debug build with GCC or Clang, just use -O0
-    if [[ -n "${INSTX_DEBUG}" ]]; then
-        opt_optimize="-O0"
-    fi
-fi
-
-# Location to install the sources. Limit to Linux for the moment.
-# https://alex.dzyoba.com/blog/gdb-source-path/
-if [[ "${IS_LINUX}" -ne 0 ]]; then
-  # No need to install sources for Sanitizer testing.
-  if [[ "${INSTX_ASAN}" -eq 0 && "${INSTX_MSAN}" -eq 0 && "${INSTX_UBSAN}" -eq 0 ]]; then
-    cc_result=$(${TEST_CC} -g -fdebug-prefix-map=${PWD}=${PWD} -o "${outfile}" "${infile}" 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        INSTX_DEBUG_MAP=1
-        export INSTX_DEBUG_MAP
-    fi
-  fi
-fi
-
-# Perl does not add -lm when needed
-cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -lm 2>&1 | wc -w)
-if [[ "$cc_result" -eq 0 ]]; then
-    INSTX_LIBM=1
-    export INSTX_LIBM
-fi
-
-# OpenBSD does not have -ldl
-if [[ -z "${opt_dl}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -ldl 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_dl="-ldl"
-    fi
-fi
-
-if [[ -z "${opt_libpthread}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -lpthread 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_libpthread="-lpthread"
-    fi
-fi
-
-# -fno-sanitize-recover causes an abort(). Useful for test
-# programs that swallow UBsan output and pretty print "OK"
-if [[ -z "${opt_san_no_recover}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -fsanitize=undefined -fno-sanitize-recover=all 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_san_no_recover="-fno-sanitize-recover=all"
-    else
-        cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -fsanitize=undefined -fno-sanitize-recover 2>&1 | wc -w)
-        if [[ "$cc_result" -eq 0 ]]; then
-            opt_san_no_recover="-fno-sanitize-recover"
-        fi
-    fi
-fi
-
-# IEEE-754 allows divide by 0
-if [[ -z "${opt_san_no_int_div_0}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -fno-sanitize=integer-divide-by-zero 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_san_no_int_div_0="-fno-sanitize=integer-divide-by-zero"
-    fi
-fi
-
-# IEEE-754 allows divide by 0
-if [[ -z "${opt_san_no_flt_div_0}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -fno-sanitize=float-divide-by-zero 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_san_no_flt_div_0="-fno-sanitize=float-divide-by-zero"
-    fi
-fi
-
-# Disable LTO, sometimes
-if [[ -z "$opt_no_lto" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -fno-lto 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_no_lto="-fno-lto"
-    fi
-fi
-
-# Msan option
-if [[ -z "$opt_msan_origin" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -fsanitize-memory-track-origins 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_msan_origin=1
-    fi
-fi
-
-# GOT and PLT hardening
-if [[ -z "${opt_relro}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -Wl,-z,relro 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_relro="-Wl,-z,relro"
-    fi
-fi
-
-if [[ -z "${opt_now}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -Wl,-z,now 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_now="-Wl,-z,now"
-    fi
-fi
-
-# NX stacks
-if [[ -z "${opt_as_nxstack}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -Wa,--noexecstack 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_as_nxstack="-Wa,--noexecstack"
-    fi
-fi
-
-if [[ -z "${opt_ld_nxstack}" ]]; then
-    cc_result=$(${TEST_CC} -o "${outfile}" "${infile}" -Wl,-z,noexecstack 2>&1 | wc -w)
-    if [[ "$cc_result" -eq 0 ]]; then
-        opt_ld_nxstack="-Wl,-z,noexecstack"
-    fi
-fi
-
-###############################################################################
-
-# CA cert path? Also see http://gagravarr.org/writing/openssl-certs/others.shtml
-# For simplicity use ${INSTX_PREFIX}/etc/pki. Avoid about 10 different places.
-
-INSTX_CACERT_PATH="${INSTX_PREFIX}/etc/pki"
-INSTX_CACERT_FILE="${INSTX_PREFIX}/etc/pki/cacert.pem"
-INSTX_ROOTKEY_PATH="${INSTX_PREFIX}/etc/unbound"
-INSTX_ROOTKEY_FILE="${INSTX_PREFIX}/etc/unbound/dnsrootkey.pem"
-INSTX_ICANN_PATH="${INSTX_PREFIX}/etc/unbound"
-INSTX_ICANN_FILE="${INSTX_PREFIX}/etc/unbound/icannbundle.pem"
-
-export INSTX_CACERT_PATH INSTX_CACERT_FILE
-export INSTX_ROOTKEY_PATH INSTX_ROOTKEY_FILE
-export INSTX_ICANN_PATH INSTX_ICANN_FILE
-
-###############################################################################
-
-opt_pkgconfig=("${INSTX_LIBDIR}/pkgconfig")
-opt_cppflags=("-I${INSTX_PREFIX}/include" "${opt_cppflags_build}")
-opt_cflags=("$opt_sym" "$opt_optimize")
-opt_cxxflags=("$opt_sym" "$opt_optimize")
-opt_asflags=()
-opt_ldflags=("-L${INSTX_LIBDIR}")
-opt_ldlibs=()
-
-if [[ -n "${CFLAGS64}" ]]
-then
-    opt_cflags[${#opt_cflags[@]}]="${CFLAGS64}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${CFLAGS64}"
-    opt_asflags[${#opt_asflags[@]}]="${CFLAGS64}"
-    opt_ldflags[${#opt_ldflags[@]}]="${CFLAGS64}"
-fi
-
-if [[ -n "${opt_64bit_dbl}" ]]
-then
-    opt_cflags[${#opt_cflags[@]}]="${opt_64bit_dbl}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_64bit_dbl}"
-fi
-
-# No common symbols on Darwin
-if [[ "${IS_DARWIN}" -ne 0 ]]; then
-    opt_cflags[${#opt_cflags[@]}]="-fno-common"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fno-common"
-fi
-
-# Debug, UBsan, Asan, Msan and Analyzer builds
-if [[ -n "${INSTX_DEBUG}" ]]; then
-    opt_cppflags[${#opt_cppflags[@]}]="-DTEST_DEBUG=1"
-    opt_cflags[${#opt_cflags[@]}]="-fno-omit-frame-pointer"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fno-omit-frame-pointer"
-
-elif [[ -n "${INSTX_UBSAN}" ]]; then
-    opt_cppflags[${#opt_cppflags[@]}]="-DTEST_UBSAN=1"
-    opt_cflags[${#opt_cflags[@]}]="-fsanitize=undefined"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fsanitize=undefined"
-    opt_ldflags[${#opt_ldflags[@]}]="-fsanitize=undefined"
-
-    if [[ -n "${opt_san_no_int_div_0}" ]]; then
-        opt_cflags[${#opt_cflags[@]}]="${opt_san_no_int_div_0}"
-        opt_cxxflags[${#opt_cxxflags[@]}]="${opt_san_no_int_div_0}"
-        opt_ldflags[${#opt_ldflags[@]}]="${opt_san_no_int_div_0}"
-    fi
-
-    if [[ -n "${opt_san_no_flt_div_0}" ]]; then
-        opt_cflags[${#opt_cflags[@]}]="${opt_san_no_flt_div_0}"
-        opt_cxxflags[${#opt_cxxflags[@]}]="${opt_san_no_flt_div_0}"
-        opt_ldflags[${#opt_ldflags[@]}]="${opt_san_no_flt_div_0}"
-    fi
-
-    if [[ -n "${opt_san_no_recover}" ]]; then
-        opt_cflags[${#opt_cflags[@]}]="${opt_san_no_recover}"
-        opt_cxxflags[${#opt_cxxflags[@]}]="${opt_san_no_recover}"
-        opt_ldflags[${#opt_ldflags[@]}]="${opt_san_no_recover}"
-    fi
-
-elif [[ -n "${INSTX_ASAN}" ]]; then
-    opt_cppflags[${#opt_cppflags[@]}]="-DTEST_ASAN=1"
-    opt_cflags[${#opt_cflags[@]}]="-fsanitize=address"
-    opt_cflags[${#opt_cflags[@]}]="-fno-omit-frame-pointer"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fsanitize=address"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fno-omit-frame-pointer"
-    opt_ldflags[${#opt_ldflags[@]}]="-fsanitize=address $opt_no_lto"
-
-# Requires GCC 10, like on Fedora 32
-elif [[ -n "$INSTX_ANALYZE" ]]; then
-    opt_cppflags[${#opt_cppflags[@]}]="-DTEST_ANALYZE=1"
-    opt_cflags[${#opt_cflags[@]}]="-fanalyzer"
-    opt_cflags[${#opt_cflags[@]}]="-fno-omit-frame-pointer"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fanalyzer"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fno-omit-frame-pointer"
-    opt_ldflags[${#opt_ldflags[@]}]="-fanalyzer"
-
-elif [[ -n "$INSTX_MSAN" ]]; then
-    opt_cppflags[${#opt_cppflags[@]}]="-DTEST_MSAN=1"
-    opt_cflags[${#opt_cflags[@]}]="-fsanitize=memory"
-    opt_cflags[${#opt_cflags[@]}]="-fno-omit-frame-pointer"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fsanitize=memory"
-    opt_cxxflags[${#opt_cxxflags[@]}]="-fno-omit-frame-pointer"
-    opt_ldflags[${#opt_ldflags[@]}]="-fsanitize=memory"
-    opt_ldflags[${#opt_ldflags[@]}]="-fno-omit-frame-pointer"
-
-    if [[ -n "$opt_msan_origin" ]]; then
-        opt_cflags[${#opt_cflags[@]}]="-fsanitize-memory-track-origins"
-        opt_cxxflags[${#opt_cxxflags[@]}]="-fsanitize-memory-track-origins"
-        opt_ldflags[${#opt_ldflags[@]}]="-fsanitize-memory-track-origins"
-    fi
-fi
-
-if [[ -n "${opt_armv8}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_armv8}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_armv8}"
-elif [[ -n "${opt_armv7}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_armv7}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_armv7}"
-elif [[ -n "${opt_native}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_native}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_native}"
-fi
-
-if [[ -n "${opt_power8}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_power8}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_power8}"
-elif [[ -n "${opt_altivec}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_altivec}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_altivec}"
-fi
-
-if [[ -n "${opt_pic}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_pic}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_pic}"
-fi
-
-if [[ -n "${opt_pthread}" ]]; then
-    opt_cflags[${#opt_cflags[@]}]="${opt_pthread}"
-    opt_cxxflags[${#opt_cxxflags[@]}]="${opt_pthread}"
-fi
-
-if [[ -n "${opt_as_nxstack}" ]]; then
-    opt_asflags[${#opt_asflags[@]}]="${opt_as_nxstack}"
-fi
-
-if [[ -n "${opt_opath}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_opath}"
-fi
-
-if [[ -n "${opt_rpath}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_rpath}"
-fi
-
-if [[ -n "${opt_new_dtags}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_new_dtags}"
-fi
-
-if [[ -n "${opt_relro}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_relro}"
-fi
-
-if [[ -n "${opt_now}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_now}"
-fi
-
-if [[ -n "${opt_ld_nxstack}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_ld_nxstack}"
-fi
-
-if [[ -n "${opt_origin}" ]]; then
-    opt_ldflags[${#opt_ldflags[@]}]="${opt_origin}"
-fi
-
-if [[ -n "${opt_dl}" ]]; then
-    opt_ldlibs[${#opt_ldlibs[@]}]="${opt_dl}"
-fi
-
-if [[ -n "${opt_libpthread}" ]]; then
-    opt_ldlibs[${#opt_ldlibs[@]}]="${opt_libpthread}"
-fi
-
-#if [[ "${IS_DARWIN}" -ne 0 ]] && [[ -n "${opt_max_header_pad}" ]]; then
-#    opt_ldflags[${#opt_ldflags[@]}]="${opt_max_header_pad}"
-#fi
-
-###############################################################################
-
-# Used to track packages that have been built by these scripts.
-# The accounting is local to a user account. There is no harm
-# in rebuilding a package under another account.
-if [[ -z "${INSTX_PKG_CACHE}" ]]; then
-    # Change / to - for CACHE_DIR
-    CACHE_DIR=$(cut -c 2- <<< "${INSTX_PREFIX}" | ${SED} 's/\//-/g')
-    INSTX_PKG_CACHE="${HOME}/.build-scripts/${CACHE_DIR}"
-    mkdir -p "${INSTX_PKG_CACHE}"
-fi
-
-export INSTX_PKG_CACHE
-
-# If the package is older than 7 days, then rebuild it. This sidesteps the
-# problem of continually rebuilding the same package when installing a
-# program like Git and SSH. It also avoids version tracking by automatically
-# building a package after 7 days (even if it is the same version).
-IFS= find "${INSTX_PKG_CACHE}" -type f -mtime +7 -print | while read -r pkg
-do
-    # printf "Setting %s for rebuild\n" "$pkg"
-    rm -f "$pkg" 2>/dev/null
-done
-
-###############################################################################
-
-# Solaris and OS X may have the GNU tools.
-if [[ -n "$(command -v glibtool 2>/dev/null)" ]];
-then
-    LIBTOOL=glibtool
-    export LIBTOOL
-    if [[ -n "$(command -v glibtoolize 2>/dev/null)" ]];
-    then
-        LIBTOOLIZE=glibtoolize
-        export LIBTOOLIZE
-    fi
-fi
-
-###############################################################################
-
-# setup-cacerts.sh does not source the environment, so we can't use the
-# variables in the setup-cacerts.sh script. Other scripts can use them.
-
-LETS_ENCRYPT_ROOT="${HOME}/.build-scripts/cacert/lets-encrypt-roots.pem"
-IDENTRUST_ROOT="${HOME}/.build-scripts/cacert/identrust-root-x3.pem"
-GO_DADDY_ROOT="${HOME}/.build-scripts/cacert/godaddy-root-ca.pem"
-DIGICERT_ROOT="${HOME}/.build-scripts/cacert/digicert-root-ca.pem"
-DIGITRUST_ROOT="${HOME}/.build-scripts/cacert/digitrust-root-ca.pem"
-USERTRUST_ROOT="${HOME}/.build-scripts/cacert/usertrust-root-ca.pem"
-GITLAB_ROOT="${HOME}/.build-scripts/cacert/sectigo-ca.pem"
-GITHUB_CA_ZOO="${HOME}/.build-scripts/cacert/github-ca-zoo.pem"
-
-# Some downloads need the CA Zoo due to multiple redirects
-THE_CA_ZOO="${HOME}/.build-scripts/cacert/cacert.pem"
-
-export LETS_ENCRYPT_ROOT IDENTRUST_ROOT GO_DADDY_ROOT
-export DIGICERT_ROOT DIGITRUST_ROOT USERTRUST_ROOT
-export GITLAB_ROOT GITHUB_CA_ZOO THE_CA_ZOO
-
-###############################################################################
-
-# Delete old log files from the last build
-find . -name '*.log.zip' -exec rm -f {} \;
-
-###############################################################################
-
-# Paydirt...
-export INSTX_PKGCONFIG="${opt_pkgconfig[*]}"
-export INSTX_CPPFLAGS="${opt_cppflags[*]}"
-export INSTX_CFLAGS="${opt_cflags[*]}"
-export INSTX_CXXFLAGS="${opt_cxxflags[*]}"
-export INSTX_ASFLAGS="${opt_asflags[*]}"
-export INSTX_LDFLAGS="${opt_ldflags[*]}"
-export INSTX_LDLIBS="${opt_ldlibs[*]}"
-export INSTX_JOBS="${INSTX_JOBS:-2}"
-
-# Print a summary
-
-if [[ "${IS_SOLARIS}" -ne 0 ]]; then
-    printf "\n"
-    printf "%s\n" "Solaris tools:"
-    printf "\n"
-    printf "%s\n" "     sed: ${SED}"
-    printf "%s\n" "     awk: ${AWK}"
-    printf "%s\n" "    grep: ${GREP}"
-    if [[ -n "${LEX}" ]]; then
-        printf "%s\n" "     lex: ${LEX}"
-    else
-        printf "%s\n" "     lex: $(command -v lex)"
-        printf "%s\n" "    flex: $(command -v flex)"
-    fi
-    if [[ -n "${YACC}" ]]; then
-        printf "%s\n" "     lex: ${YACC}"
-    else
-        printf "%s\n" "    yacc: $(command -v yacc)"
-        printf "%s\n" "   bison: $(command -v bison)"
-    fi
-fi
-
-printf "\n"
-printf "%s\n" "Common flags and options:"
-printf "\n"
-printf "%s\n" "  INSTX_BITNESS: ${INSTX_BITNESS}-bits"
-printf "%s\n" "   INSTX_PREFIX: ${INSTX_PREFIX}"
-printf "%s\n" "   INSTX_LIBDIR: ${INSTX_LIBDIR}"
-printf "%s\n" "    INSTX_OPATH: ${INSTX_OPATH}"
-printf "%s\n" "    INSTX_RPATH: ${INSTX_RPATH}"
-printf "\n"
-printf "%s\n" " AUTOCONF_BUILD: ${AUTOCONF_BUILD}"
-printf "%s\n" "PKG_CONFIG_PATH: ${INSTX_PKGCONFIG}"
-printf "%s\n" "       CPPFLAGS: ${INSTX_CPPFLAGS}"
-
-if [[ -n "${INSTX_ASFLAGS}" ]]; then
-    printf "%s\n" "        ASFLAGS: ${INSTX_ASFLAGS}"
-fi
-
-printf "%s\n" "         CFLAGS: ${INSTX_CFLAGS}"
-printf "%s\n" "       CXXFLAGS: ${INSTX_CXXFLAGS}"
-printf "%s\n" "        LDFLAGS: ${INSTX_LDFLAGS}"
-printf "%s\n" "         LDLIBS: ${INSTX_LDLIBS}"
-printf "\n"
-
-printf "%s\n" "   CC: $(command -v "${CC}")"
-printf "%s\n" "  CXX: $(command -v "${CXX}")"
-printf "%s\n" " WGET: ${WGET}"
-printf "\n"
-
-###############################################################################
-
-# Too many GNU programs and libraries leak.
-# The world must lower its standards to GNU.
-if [[ -n "${INSTX_ASAN}" ]]; then
-    echo "**********************************************************************"
-    echo "Disabling ASAN leak detection because GNU software leaks like a sieve."
-    echo "You must lower your standards to that of the GNU organization."
-    echo "https://www.gnu.org/prep/standards/standards.html#index-memory-usage."
-    echo "**********************************************************************"
-    echo ""
-
-    ASAN_OPTIONS='detect_leaks=0'
-    export ASAN_OPTIONS
-fi
-
-###############################################################################
-
-SETUP_ENVIRON_DONE="yes"
-export SETUP_ENVIRON_DONE
-
-[[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
diff --git a/setup-password.sh b/setup-password.sh
deleted file mode 100755
index 3fbc2339d..000000000
--- a/setup-password.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script prompts for credentials for other scripts to use
-
-# Only prompt if SUDO_PASSWORD_DONE is not set in the environment.
-if [[ "${SUDO_PASSWORD_DONE}" == "yes" ]]
-then
-    [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
-fi
-
-# AIX and some BSDs lack sudo.
-if [[ -z "$(command -v sudo 2>/dev/null)" ]]
-then
-    echo "Sudo is missing. Skipping password prompt."
-    export SUDO_PASSWORD_DONE=yes
-    [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
-fi
-
-# Don't prompt root user for a password
-if [[ "${EUID:-$(id -u)}" -eq 0 ]]
-then
-    echo "User is root. Skipping password prompt."
-    export SUDO_PASSWORD_DONE=yes
-    [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
-fi
-
-# Don't prompt for password if installing into user's $HOME
-if [[ "${INSTX_PREFIX}" == "${HOME}"/* ]]; then
-    echo "PREFIX is in \$HOME. Skipping password prompt."
-    export SUDO_PASSWORD_DONE=yes
-    [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
-fi
-
-# Some sudo are too old and can't handle -E option. Check for it now.
-# https://www.sudo.ws/pipermail/sudo-users/2020-March/006327.html.
-# Since we want to be language agnostic, check for the quoted argument.
-# If sudo is modern, the message is "usage: sudo...":
-#    $ sudo -E -h
-#    usage: sudo -h | -K | -k | -V
-#    ...
-# If sudo is too old, the message is "illegal option" and it will be
-# localized, but -E will not.
-#    $ sudo -E -h
-#    sudo: illegal option `-E'
-#    ...
-count=$(sudo -E -h 2>&1 | grep -E '\-K|\-E' | wc -l)
-if [ "$count" -eq 0 ]
-then
-    SUDO_ENV_OPT="-E"
-else
-    SUDO_ENV_OPT=""
-fi
-
-printf "\n"
-printf "If you enter a sudo password, then it will be used for installation.\n"
-printf "If you don't enter a password, then ensure INSTX_PREFIX is writable.\n"
-printf "To avoid sudo and the password, just press ENTER and it won't be used.\n"
-printf "\n"
-
-IFS= read -r -s -p "Please enter password for sudo: " SUDO_PASSWORD
-printf "\n"
-
-# Smoke test the password
-if [[ -n "${SUDO_PASSWORD}" ]]
-then
-    # Attempt to drop the cached authentication, if present.
-    # The -k option is not ubiquitous. It may fail.
-    printf "\n" | sudo -kS >/dev/null 2>&1
-
-    # Now, test the password
-    if printf "%s\n" "${SUDO_PASSWORD}" | sudo -S ls >/dev/null 2>&1;
-    then
-        printf "The sudo password appears correct\n"
-    else
-        printf "The sudo password appears incorrect\n"
-        [[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
-    fi
-else
-    printf "The sudo password was not provided\n"
-fi
-
-# I would like to avoid exporting this...
-export SUDO_PASSWORD
-
-# Export the option to use with sudo
-export SUDO_ENV_OPT
-
-# Don't prompt for future passwords
-export SUDO_PASSWORD_DONE=yes
-
-# Sneak this in here
-bash ./setup-directories.sh
-
-[[ "$0" == "${BASH_SOURCE[0]}" ]] && exit 0 || return 0
diff --git a/setup-wget.sh b/setup-wget.sh
deleted file mode 100755
index 23b81a385..000000000
--- a/setup-wget.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Written and placed in public domain by Jeffrey Walton
-# This script builds Wget and OpenSSL from sources.
-
-cd "bootstrap" || exit 1
-
-if ! ./bootstrap-wget.sh; then
-    echo "Bootstrap failed for Wget"
-    exit 1
-fi
-
-exit 0