- Adds gnupg v2.1.15, libassuan v2.4.3, libgcrypt v1.7.3, libgpg-error v1.24, libksba v1.3.5, and npth v1.2 (via Redfoxmoon.)

- Moves X11 dependencies to 350-399 and 3rd party packages to 400-499.

1 files changed, 36 insertions, 9 deletions

diff --git a/build.vars b/build.vars
index 28f978ee..034b7548 100644
--- a/build.vars
+++ b/build.vars
@@ -20,11 +20,13 @@ if [ "${BUILD:=debug}" = debug ]; then
 	PKG_LVL1_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 	PKG_LVL2_CFLAGS_CONFIGURE_DEFAULT="-g3 -O0";
 	PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
+	PKG_LVL4_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 elif [ "${BUILD}" = release ]; then
 	PKG_LVL0_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	PKG_LVL1_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	PKG_LVL2_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
+	PKG_LVL4_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 else
 	log_msg failexit "Error: unknown build type \`${BUILD}'.";
 fi;
@@ -50,7 +52,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};
 : ${GITROOT:=git://midipix.org};
 : ${GITROOT_HEAD:=git://midipix.org};
-: ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD PKG_LVL0_CFLAGS_CONFIGURE PKG_LVL1_CFLAGS_CONFIGURE PKG_LVL2_CFLAGS_CONFIGURE PKG_LVL3_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
+: ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD PKG_LVL0_CFLAGS_CONFIGURE PKG_LVL1_CFLAGS_CONFIGURE PKG_LVL2_CFLAGS_CONFIGURE PKG_LVL3_CFLAGS_CONFIGURE PKG_LVL4_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
 : ${LOG_MSG_FAIL_COLOUR:=91};
 : ${LOG_MSG_INFO_COLOUR:=93};
 : ${LOG_MSG_SUCC_COLOUR:=92};
@@ -93,6 +95,11 @@ PKG_LVL3_CFLAGS_CONFIGURE="${PKG_LVL3_CFLAGS_CONFIGURE_DEFAULT:+${PKG_LVL3_CFLAG
 PKG_LVL3_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 PKG_LVL3_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
 PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
+PKG_LVL4_PREFIX="${PREFIX_NATIVE}";
+PKG_LVL4_CFLAGS_CONFIGURE="${PKG_LVL4_CFLAGS_CONFIGURE_DEFAULT:+${PKG_LVL4_CFLAGS_CONFIGURE_DEFAULT} }--sysroot=${PREFIX_NATIVE}";
+PKG_LVL4_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+PKG_LVL4_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+PKG_LVL4_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 
 #
 # Build level 0 (cross-toolchain)
@@ -201,7 +208,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_PTYCON_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 
 #
-# Build level 3, 300-319 (3rd party packages)
+# Build level 3, 300-349 (3rd party packages)
 # Dependencies
 #
 : ${PKG_GDBM_VERSION:=1.12};
@@ -227,6 +234,9 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_LIBARCHIVE_CONFIGURE_ARGS_EXTRA:=--without-xml2};
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_LIBARCHIVE_MAKEFLAGS_INSTALL_EXTRA:="prefix=:DESTDIR=${PREFIX_NATIVE}:LIBTOOL=slibtool"};
+: ${PKG_LIBASSUAN_VERSION:=2.4.3};
+: ${PKG_LIBASSUAN_SHA256SUM:=22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71};
+: ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2};
 : ${PKG_LIBEVENT_VERSION:=2.0.22-stable};
 : ${PKG_LIBEVENT_SHA256SUM:=71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3};
 : ${PKG_LIBEVENT_URL:=https://github.com/libevent/libevent/releases/download/release-${PKG_LIBEVENT_VERSION}/libevent-${PKG_LIBEVENT_VERSION}.tar.gz};
@@ -242,6 +252,16 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_LIBFFI_URL=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
 : ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
 : ${PKG_LIBFFI_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
+: ${PKG_LIBGCRYPT_VERSION:=1.7.3};
+: ${PKG_LIBGCRYPT_SHA256SUM:=ddac6111077d0a1612247587be238c5294dd0ee4d76dc7ba783cc55fb0337071};
+: ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.3.tar.bz2};
+: ${PKG_LIBGCRYPT_CONFIGURE_ARGS_EXTRA:=--disable-asm --disable-padlock-support --disable-aesni-support --disable-pclmul-support --disable-sse41-support --disable-drng-support --disable-avx-support --disable-avx2-support gcry_cv_gcc_inline_asm_avx2=no gcry_cv_gcc_inline_asm_avx=no gcry_cv_gcc_inline_asm_bmi2=no gcry_cv_gcc_inline_asm_pclmul=no gcry_cv_gcc_inline_asm_sse41=no gcry_cv_gcc_inline_asm_ssse3=no --disable-amd64-as-feature-detection};
+: ${PKG_LIBGPG_ERROR_VERSION:=1.24};
+: ${PKG_LIBGPG_ERROR_SHA256SUM:=9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540};
+: ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2};
+: ${PKG_LIBKSBA_VERSION:=1.3.5};
+: ${PKG_LIBKSBA_SHA256SUM:=41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340};
+: ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2};
 : ${PKG_LIBNBCOMPAT_URL:=http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/pkgtools/libnbcompat/files};
 : ${PKG_LIBNBCOMPAT_URL_TYPE:=wget_recursive};
 : ${PKG_LIBNBCOMPAT_BUILD_DIR:=libnbcompat};
@@ -275,6 +295,9 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NCURSESW_BUILD_DIR:=ncursesw-${PKG_NCURSESW_VERSION}-native-${TARGET}};
 : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --program-prefix= --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
+: ${PKG_NPTH_VERSION:=1.2};
+: ${PKH_NPTH_SHA256SUM:=6ddbdddb2cf49a4723f9d1ad6563c480d6760dcb63cb7726b8fc3bc2e1b6c08a};
+: ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
 : ${PKG_PCRE_VERSION:=8.39};
 : ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
@@ -283,7 +306,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_XZ_URL:=http://tukaani.org/xz/xz-${PKG_XZ_VERSION}.tar.gz};
 
 #
-# Build level 3, 320-339 (3rd party packages)
+# Build level 3, 350-399 (3rd party packages)
 # X11 dependencies
 #
 : ${PKG_INPUTPROTO_VERSION:=2.3.2};
@@ -352,7 +375,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_LIBXT_LDFLAGS_CONFIGURE:=-g};
 
 #
-# Build level 3, 340-399 (3rd party packages)
+# Build level 4, 400-499 (3rd party packages)
 # Leaf packages
 #
 : ${PKG_APK_TOOLS_VERSION:=2.6.6};
@@ -365,7 +388,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
 : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
 : ${PKG_BZIP2_BUILD_DIR:=bzip2-${PKG_BZIP2_VERSION}};
-: ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${PKG_LVL3_CFLAGS_CONFIGURE}};
+: ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${PKG_LVL4_CFLAGS_CONFIGURE}};
 : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless libbz2.so.1.0=lib/ libbz2.so.1.0.6=lib/"};
 : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
 : ${PKG_BZIP2_MAKEFLAGS_INSTALL_EXTRA:=PREFIX=${PREFIX_NATIVE}};
@@ -382,7 +405,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_CRON_URL:=git://anonscm.debian.org/pkg-cron/pkg-cron.git};
 : ${PKG_CRON_URL_TYPE:=git};
 : ${PKG_CRON_BUILD_DIR:=pkg-cron.git};
-: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PKG_LVL3_CFLAGS_CONFIGURE} -D__GNU__"};
+: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PKG_LVL4_CFLAGS_CONFIGURE} -D__GNU__"};
 : ${PKG_CRON_GIT_BRANCH:=debian/3.0pl1-128};
 : ${PKG_CURL_VERSION:=7.47.1};
 : ${PKG_CURL_SHA256SUM:=ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f};
@@ -396,7 +419,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_DOS2UNIX_SHA256SUM:=8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5};
 : ${PKG_DOS2UNIX_URL=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${PKG_DOS2UNIX_VERSION}.tar.gz};
 : ${PKG_DOS2UNIX_BUILD_DIR:=dos2unix-${PKG_DOS2UNIX_VERSION}};
-: ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${PKG_LVL3_CFLAGS_CONFIGURE}};
+: ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${PKG_LVL4_CFLAGS_CONFIGURE}};
 : ${PKG_DOS2UNIX_INSTALL_FILES:="dos2unix=bin/ dos2unix=bin/ @dos2unix=bin/mac2unix @unix2dos=bin/unix2mac"};
 : ${PKG_ED_VERSION:=1.13};
 : ${PKG_ED_SHA256SUM:=c7a98062d0597b41295f03275a2ea07342b18b86653e3b9a51746b9983db8d48};
@@ -422,6 +445,10 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_GIT_BUILD_DIR:=git-${PKG_GIT_VERSION}};
 : ${PKG_GIT_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
 : ${PKG_GIT_SUBDIR:=${PKG_GIT_BUILD_DIR}};
+: ${PKG_GNUPG_VERSION:=2.1.15};
+: ${PKG_GNUPG_SHA256SUM:=c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd};
+: ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2};
+: ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"};
 : ${PKG_GREP_VERSION:=2.22};
 : ${PKG_GREP_SHA256SUM:=ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb};
 : ${PKG_GREP_URL:=https://ftp.gnu.org/gnu/grep/grep-${PKG_GREP_VERSION}.tar.xz};
@@ -502,7 +529,7 @@ fi;
 : ${PKG_MKSH_URL:=http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz};
 : ${PKG_MKSH_BUILD_CMDLINE:="sh Build.sh"};
 : ${PKG_MKSH_BUILD_DIR:=mksh};
-: ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PKG_LVL3_CFLAGS_CONFIGURE:+${PKG_LVL3_CFLAGS_CONFIGURE} }-DMKSH_NOPROSPECTOFWORK"};
+: ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PKG_LVL4_CFLAGS_CONFIGURE:+${PKG_LVL4_CFLAGS_CONFIGURE} }-DMKSH_NOPROSPECTOFWORK"};
 : ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"};
 : ${PKG_MKSH_NO_MAKE_INSTALL:=1};
 : ${PKG_MKSH_SUBDIR:=${PKG_MKSH_BUILD_DIR}};
@@ -515,7 +542,7 @@ fi;
 : ${PKG_NETCAT_BUILD_DIR:=nc110};
 : ${PKG_NETCAT_MAKEFLAGS_BUILD_EXTRA_DEBUG:="midipix CC=${TARGET}-gcc"};
 : ${PKG_NETCAT_MAKEFLAGS_BUILD_EXTRA_RELEASE:="midipix CC=${TARGET}-gcc LDFLAGS_DEBUG=-s"};
-: ${PKG_NETCAT_ENV_VARS_EXTRA:="CFLAGS_EXTRA=${PKG_LVL3_CFLAGS_CONFIGURE}:LDFLAGS=${PKG_LVL3_LDFLAGS_CONFIGURE}"};
+: ${PKG_NETCAT_ENV_VARS_EXTRA:="CFLAGS_EXTRA=${PKG_LVL4_CFLAGS_CONFIGURE}:LDFLAGS=${PKG_LVL4_LDFLAGS_CONFIGURE}"};
 : ${PKG_NETCAT_INSTALL_FILES:=nc=bin/};
 : ${PKG_NETCAT_NO_MAKE_INSTALL:=1};
 : ${PKG_NETCAT_SUBDIR:=${PKG_NETCAT_BUILD_DIR}};