- 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.

92 files changed, 733 insertions, 10 deletions

diff --git a/311.ncurses.build b/311.libgpg_error.build
index 52bb82e5..52bb82e5 120000
--- a/311.ncurses.build
+++ b/311.libgpg_error.build
diff --git a/312.ncursestw.build b/312.libassuan.build
index 52bb82e5..52bb82e5 120000
--- a/312.ncursestw.build
+++ b/312.libassuan.build
diff --git a/313.ncursesw.build b/313.libgcrypt.build
index 52bb82e5..52bb82e5 120000
--- a/313.ncursesw.build
+++ b/313.libgcrypt.build
diff --git a/314.xz.build b/314.libksba.build
index 52bb82e5..52bb82e5 120000
--- a/314.xz.build
+++ b/314.libksba.build
diff --git a/320.inputproto.build b/315.ncurses.build
index 52bb82e5..52bb82e5 120000
--- a/320.inputproto.build
+++ b/315.ncurses.build
diff --git a/321.kbproto.build b/316.ncursestw.build
index 52bb82e5..52bb82e5 120000
--- a/321.kbproto.build
+++ b/316.ncursestw.build
diff --git a/322.xcb_proto.build b/317.ncursesw.build
index 52bb82e5..52bb82e5 120000
--- a/322.xcb_proto.build
+++ b/317.ncursesw.build
diff --git a/313.ncursesw.vars b/317.ncursesw.vars
index 50024dec..50024dec 100644
--- a/313.ncursesw.vars
+++ b/317.ncursesw.vars
diff --git a/323.xproto.build b/318.npth.build
index 52bb82e5..52bb82e5 120000
--- a/323.xproto.build
+++ b/318.npth.build
diff --git a/324.libXau.build b/319.xz.build
index 52bb82e5..52bb82e5 120000
--- a/324.libXau.build
+++ b/319.xz.build
diff --git a/325.libpthread_stubs.build b/347.inputproto.build
index 52bb82e5..52bb82e5 120000
--- a/325.libpthread_stubs.build
+++ b/347.inputproto.build
diff --git a/326.xcb.build b/348.kbproto.build
index 52bb82e5..52bb82e5 120000
--- a/326.xcb.build
+++ b/348.kbproto.build
diff --git a/327.xextproto.build b/349.xcb_proto.build
index 52bb82e5..52bb82e5 120000
--- a/327.xextproto.build
+++ b/349.xcb_proto.build
diff --git a/328.xtrans.build b/350.xproto.build
index 52bb82e5..52bb82e5 120000
--- a/328.xtrans.build
+++ b/350.xproto.build
diff --git a/329.libX11.build b/351.libXau.build
index 52bb82e5..52bb82e5 120000
--- a/329.libX11.build
+++ b/351.libXau.build
diff --git a/330.libXext.build b/352.libpthread_stubs.build
index 52bb82e5..52bb82e5 120000
--- a/330.libXext.build
+++ b/352.libpthread_stubs.build
diff --git a/331.libICE.build b/353.xcb.build
index 52bb82e5..52bb82e5 120000
--- a/331.libICE.build
+++ b/353.xcb.build
diff --git a/332.libSM.build b/354.xextproto.build
index 52bb82e5..52bb82e5 120000
--- a/332.libSM.build
+++ b/354.xextproto.build
diff --git a/333.libXt.build b/355.xtrans.build
index 52bb82e5..52bb82e5 120000
--- a/333.libXt.build
+++ b/355.xtrans.build
diff --git a/334.libXmu.build b/356.libX11.build
index 52bb82e5..52bb82e5 120000
--- a/334.libXmu.build
+++ b/356.libX11.build
diff --git a/335.renderproto.build b/357.libXext.build
index 52bb82e5..52bb82e5 120000
--- a/335.renderproto.build
+++ b/357.libXext.build
diff --git a/336.Xrender.build b/358.libICE.build
index 52bb82e5..52bb82e5 120000
--- a/336.Xrender.build
+++ b/358.libICE.build
diff --git a/337.libXpm.build b/359.libSM.build
index 52bb82e5..52bb82e5 120000
--- a/337.libXpm.build
+++ b/359.libSM.build
diff --git a/338.libXaw.build b/360.libXt.build
index 52bb82e5..52bb82e5 120000
--- a/338.libXaw.build
+++ b/360.libXt.build
diff --git a/339.libxkbfile.build b/361.libXmu.build
index 52bb82e5..52bb82e5 120000
--- a/339.libxkbfile.build
+++ b/361.libXmu.build
diff --git a/340.apk_tools.build b/362.renderproto.build
index 52bb82e5..52bb82e5 120000
--- a/340.apk_tools.build
+++ b/362.renderproto.build
diff --git a/341.bash.build b/363.Xrender.build
index 52bb82e5..52bb82e5 120000
--- a/341.bash.build
+++ b/363.Xrender.build
diff --git a/342.bzip2.build b/364.libXpm.build
index 52bb82e5..52bb82e5 120000
--- a/342.bzip2.build
+++ b/364.libXpm.build
diff --git a/343.coreutils.build b/365.libXaw.build
index 52bb82e5..52bb82e5 120000
--- a/343.coreutils.build
+++ b/365.libXaw.build
diff --git a/345.cron.build b/366.libxkbfile.build
index 52bb82e5..52bb82e5 120000
--- a/345.cron.build
+++ b/366.libxkbfile.build
diff --git a/346.curl.build b/400.apk_tools.build
index 52bb82e5..52bb82e5 120000
--- a/346.curl.build
+++ b/400.apk_tools.build
diff --git a/347.dash.build b/401.bash.build
index 52bb82e5..52bb82e5 120000
--- a/347.dash.build
+++ b/401.bash.build
diff --git a/348.diffutils.build b/402.bzip2.build
index 52bb82e5..52bb82e5 120000
--- a/348.diffutils.build
+++ b/402.bzip2.build
diff --git a/349.dos2unix.build b/403.coreutils.build
index 52bb82e5..52bb82e5 120000
--- a/349.dos2unix.build
+++ b/403.coreutils.build
diff --git a/350.ed.build b/404.cron.build
index 52bb82e5..52bb82e5 120000
--- a/350.ed.build
+++ b/404.cron.build
diff --git a/351.file.build b/405.curl.build
index 52bb82e5..52bb82e5 120000
--- a/351.file.build
+++ b/405.curl.build
diff --git a/352.findutils.build b/406.dash.build
index 52bb82e5..52bb82e5 120000
--- a/352.findutils.build
+++ b/406.dash.build
diff --git a/353.gawk.build b/407.diffutils.build
index 52bb82e5..52bb82e5 120000
--- a/353.gawk.build
+++ b/407.diffutils.build
diff --git a/354.git.build b/408.dos2unix.build
index 52bb82e5..52bb82e5 120000
--- a/354.git.build
+++ b/408.dos2unix.build
diff --git a/355.grep.build b/409.ed.build
index 52bb82e5..52bb82e5 120000
--- a/355.grep.build
+++ b/409.ed.build
diff --git a/356.hexcurse.build b/410.file.build
index 52bb82e5..52bb82e5 120000
--- a/356.hexcurse.build
+++ b/410.file.build
diff --git a/357.htop.build b/411.findutils.build
index 52bb82e5..52bb82e5 120000
--- a/357.htop.build
+++ b/411.findutils.build
diff --git a/358.inetutils.build b/412.gawk.build
index 52bb82e5..52bb82e5 120000
--- a/358.inetutils.build
+++ b/412.gawk.build
diff --git a/359.infounzip.build b/413.git.build
index 52bb82e5..52bb82e5 120000
--- a/359.infounzip.build
+++ b/413.git.build
diff --git a/360.infozip.build b/414.gnupg.build
index 52bb82e5..52bb82e5 120000
--- a/360.infozip.build
+++ b/414.gnupg.build
diff --git a/361.irssi.build b/415.grep.build
index 52bb82e5..52bb82e5 120000
--- a/361.irssi.build
+++ b/415.grep.build
diff --git a/362.john.build b/416.hexcurse.build
index 52bb82e5..52bb82e5 120000
--- a/362.john.build
+++ b/416.hexcurse.build
diff --git a/363.less.build b/417.htop.build
index 52bb82e5..52bb82e5 120000
--- a/363.less.build
+++ b/417.htop.build
diff --git a/364.lua.build b/418.inetutils.build
index 52bb82e5..52bb82e5 120000
--- a/364.lua.build
+++ b/418.inetutils.build
diff --git a/365.lynx.build b/419.infounzip.build
index 52bb82e5..52bb82e5 120000
--- a/365.lynx.build
+++ b/419.infounzip.build
diff --git a/366.man_db.build b/420.infozip.build
index 52bb82e5..52bb82e5 120000
--- a/366.man_db.build
+++ b/420.infozip.build
diff --git a/367.make.build b/421.irssi.build
index 52bb82e5..52bb82e5 120000
--- a/367.make.build
+++ b/421.irssi.build
diff --git a/368.mc.build b/422.john.build
index 52bb82e5..52bb82e5 120000
--- a/368.mc.build
+++ b/422.john.build
diff --git a/369.mksh.build b/423.less.build
index 52bb82e5..52bb82e5 120000
--- a/369.mksh.build
+++ b/423.less.build
diff --git a/370.nano.build b/424.lua.build
index 52bb82e5..52bb82e5 120000
--- a/370.nano.build
+++ b/424.lua.build
diff --git a/371.netcat.build b/425.lynx.build
index 52bb82e5..52bb82e5 120000
--- a/371.netcat.build
+++ b/425.lynx.build
diff --git a/372.openssh.build b/426.man_db.build
index 52bb82e5..52bb82e5 120000
--- a/372.openssh.build
+++ b/426.man_db.build
diff --git a/373.pacman.build b/427.make.build
index 52bb82e5..52bb82e5 120000
--- a/373.pacman.build
+++ b/427.make.build
diff --git a/374.patch.build b/428.mc.build
index 52bb82e5..52bb82e5 120000
--- a/374.patch.build
+++ b/428.mc.build
diff --git a/375.perl.build b/429.mksh.build
index 52bb82e5..52bb82e5 120000
--- a/375.perl.build
+++ b/429.mksh.build
diff --git a/376.procps_ng.build b/430.nano.build
index 52bb82e5..52bb82e5 120000
--- a/376.procps_ng.build
+++ b/430.nano.build
diff --git a/377.python3.build b/431.netcat.build
index 52bb82e5..52bb82e5 120000
--- a/377.python3.build
+++ b/431.netcat.build
diff --git a/378.rsync.build b/432.openssh.build
index 52bb82e5..52bb82e5 120000
--- a/378.rsync.build
+++ b/432.openssh.build
diff --git a/379.rxvt_unicode.build b/433.pacman.build
index 52bb82e5..52bb82e5 120000
--- a/379.rxvt_unicode.build
+++ b/433.pacman.build
diff --git a/380.sed.build b/434.patch.build
index 52bb82e5..52bb82e5 120000
--- a/380.sed.build
+++ b/434.patch.build
diff --git a/381.tar.build b/435.perl.build
index 52bb82e5..52bb82e5 120000
--- a/381.tar.build
+++ b/435.perl.build
diff --git a/375.perl.vars b/435.perl.vars
index 853bef90..853bef90 100644
--- a/375.perl.vars
+++ b/435.perl.vars
diff --git a/382.tcsh.build b/436.procps_ng.build
index 52bb82e5..52bb82e5 120000
--- a/382.tcsh.build
+++ b/436.procps_ng.build
diff --git a/383.the_silver_searcher.build b/437.python3.build
index 52bb82e5..52bb82e5 120000
--- a/383.the_silver_searcher.build
+++ b/437.python3.build
diff --git a/377.python3.vars b/437.python3.vars
index 9cdc016f..9cdc016f 100644
--- a/377.python3.vars
+++ b/437.python3.vars
diff --git a/384.tmux.build b/438.rsync.build
index 52bb82e5..52bb82e5 120000
--- a/384.tmux.build
+++ b/438.rsync.build
diff --git a/385.util_linux.build b/439.rxvt_unicode.build
index 52bb82e5..52bb82e5 120000
--- a/385.util_linux.build
+++ b/439.rxvt_unicode.build
diff --git a/386.vim.build b/440.sed.build
index 52bb82e5..52bb82e5 120000
--- a/386.vim.build
+++ b/440.sed.build
diff --git a/387.which.build b/441.tar.build
index 52bb82e5..52bb82e5 120000
--- a/387.which.build
+++ b/441.tar.build
diff --git a/388.whois.build b/442.tcsh.build
index 52bb82e5..52bb82e5 120000
--- a/388.whois.build
+++ b/442.tcsh.build
diff --git a/389.xeyes.build b/443.the_silver_searcher.build
index 52bb82e5..52bb82e5 120000
--- a/389.xeyes.build
+++ b/443.the_silver_searcher.build
diff --git a/390.xwd.build b/444.tmux.build
index 52bb82e5..52bb82e5 120000
--- a/390.xwd.build
+++ b/444.tmux.build
diff --git a/391.zsh.build b/445.util_linux.build
index 52bb82e5..52bb82e5 120000
--- a/391.zsh.build
+++ b/445.util_linux.build
diff --git a/446.vim.build b/446.vim.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/446.vim.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/447.which.build b/447.which.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/447.which.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/448.whois.build b/448.whois.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/448.whois.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/449.xeyes.build b/449.xeyes.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/449.xeyes.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/450.xwd.build b/450.xwd.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/450.xwd.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/451.zsh.build b/451.zsh.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/451.zsh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/build.sh b/build.sh
index dc6ced53..6efcd837 100755
--- a/build.sh
+++ b/build.sh
@@ -130,7 +130,7 @@ BUILD_TIMES_SECS=$(command date +%s);
 log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}.";
 log_env_vars "build (global)" ${LOG_ENV_VARS};
 
-for BUILD_LVL in 0 1 2 3 9; do
+for BUILD_LVL in 0 1 2 3 4 9; do
 	for BUILD_SCRIPT_FNAME in ${BUILD_LVL}[0-9][0-9].*.build; do
 		if [ -n "${ARG_RESTART_SCRIPT}" ]					\
 		&& [ "${ARG_RESTART_SCRIPT}" != "ALL" ]					\
diff --git a/build.subr b/build.subr
index 401dd826..98c92583 100644
--- a/build.subr
+++ b/build.subr
@@ -159,8 +159,13 @@ remove_build_script_link() {
 			echo mv ${_rbsl_fname_cur}			\
 				$(printf "%03u"				\
 					$((${_rbsl_fname_cur_level#00}-1))).${_rbsl_fname_cur#*.};
+			mv ${_rbsl_fname_cur}				\
+				$(printf "%03u"				\
+					$((${_rbsl_fname_cur_level#00}-1))).${_rbsl_fname_cur#*.};
 		fi;
 	done; fi;
+	echo rm -- ${_rbsl_fname};
+	rm -- ${_rbsl_fname};
 };
 
 is_build_script_done() {
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}};
diff --git a/gnupg-2.1.15.local.patch b/gnupg-2.1.15.local.patch
new file mode 100644
index 00000000..b0bf6ca3
--- /dev/null
+++ b/gnupg-2.1.15.local.patch
@@ -0,0 +1,105 @@
+diff -ru gnupg-2.1.15.orig/tests/inittests gnupg-2.1.15/tests/inittests
+--- gnupg-2.1.15.orig/tests/inittests	2016-02-02 07:05:16.000000000 +0100
++++ gnupg-2.1.15/tests/inittests	2016-10-19 18:09:36.112010000 +0200
+@@ -1,99 +1,3 @@
+ #!/bin/sh
+-#     	Copyright (C) 2002 Free Software Foundation, Inc.
+-#
+-# This file is free software; as a special exception the author gives
+-# unlimited permission to copy and/or distribute it, with or without
+-# modifications, as long as this notice is preserved.
+-#
+-# This file is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-
+-set -e
+-
+-sample_certs='
+-cert_g10code_test1.pem
+-cert_g10code_pete1.pem
+-cert_g10code_theo1.pem
+-'
+-
+-private_keys='
+-32100C27173EF6E9C4E9A25D3D69F86D37A4F939
+-'
+-
+-clean_files='
+-gpgsm.conf gpg-agent.conf trustlist.txt pubring.kbx
+-msg msg.sig msg.unsig
+-'
+-
+-
+-[ -z "$srcdir" ] && srcdir=.
+-[ -z "$GPGSM" ] && GPGSM=../sm/gpgsm
+-
+-if [ -d $srcdir/samplekeys ] \
+-   && grep TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then
+- :
+-else
+-   # During make distclean the Makefile has already been removed,
+-   # so we need this extra test.
+-   if ! grep gnupg-test-directory testdir.stamp >/dev/null 2>&1; then
+-      echo "inittests: please cd to the tests directory first" >&2
+-      exit 1
+-   fi
+-fi
+-
+-if [ "$1" = "--clean" ]; then
+-    if [ -d private-keys-v1.d ]; then
+-       rm private-keys-v1.d/* 2>/dev/null || true
+-       rmdir private-keys-v1.d
+-    fi
+-    rm ${clean_files} testdir.stamp 2>/dev/null || true
+-    exit 0
+-fi
+-
+-if [ "$GNUPGHOME" != "`/bin/pwd`" ]; then
+-    echo "inittests: please set GNUPGHOME to the test directory" >&2
+-    exit 1
+-fi
+-
+-if [ -n "$GPG_AGENT_INFO" ]; then
+-    echo "inittests: please unset GPG_AGENT_INFO" >&2
+-    exit 1
+-fi
+-
+-# A stamp file used with --clean
+-echo gnupg-test-directory > testdir.stamp
+-
+-
+-# Create the private key directy if it does not exists and copy 
+-# the sample keys.
+-[ -d private-keys-v1.d ] || mkdir private-keys-v1.d
+-for i in ${private_keys}; do 
+-    cat ${srcdir}/samplekeys/$i.key >private-keys-v1.d/$i.key
+-done
+-
+-# Create the configuration scripts
+-# Note, die to an expired test certificate, we need to use
+-# the faked system time option.
+-cat > gpgsm.conf <<EOF
+-no-secmem-warning
+-disable-crl-checks
+-agent-program ../agent/gpg-agent
+-faked-system-time 1038835799
+-EOF
+-
+-cat > gpg-agent.conf <<EOF
+-no-grab
+-pinentry-program /home/wk/work/pinentry/gtk/pinentry-gtk
+-EOF
+-
+-cat > trustlist.txt <<EOF
+-# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE
+-3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E S
+-EOF
+-
+-# Make sure that the sample certs are available but ignore errors here
+-# because we are not a test script.
+-for i in ${sample_certs}; do 
+-    $GPGSM --import ${srcdir}/samplekeys/$i || true
+-done
++#testing cross compiled binaries, nope.
++exit 0
diff --git a/libassuan-2.4.3.local.patch b/libassuan-2.4.3.local.patch
new file mode 100644
index 00000000..8e0265b0
--- /dev/null
+++ b/libassuan-2.4.3.local.patch
@@ -0,0 +1,192 @@
+--- libassuan-2.4.3.orig/configure	2016-07-14 10:11:48.000000000 +0200
++++ libassuan-2.4.3/configure	2016-10-18 22:20:05.511896688 +0200
+@@ -14171,187 +14171,8 @@
+ 
+ # Checking for libgpg-error.
+ 
+-  gpg_error_config_prefix=""
+-
+-# Check whether --with-libgpg-error-prefix was given.
+-if test "${with_libgpg_error_prefix+set}" = set; then :
+-  withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval"
+-fi
+-
+-
+-
+-# Check whether --with-gpg-error-prefix was given.
+-if test "${with_gpg_error_prefix+set}" = set; then :
+-  withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval"
+-fi
+-
+-
+-  if test x$gpg_error_config_prefix != x ; then
+-     if test x${GPG_ERROR_CONFIG+set} != xset ; then
+-        GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config
+-     fi
+-  fi
+-
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}gpg-error-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gpg-error-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GPG_ERROR_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG
+-if test -n "$GPG_ERROR_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5
+-$as_echo "$GPG_ERROR_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_GPG_ERROR_CONFIG"; then
+-  ac_pt_GPG_ERROR_CONFIG=$GPG_ERROR_CONFIG
+-  # Extract the first word of "gpg-error-config", so it can be a program name with args.
+-set dummy gpg-error-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_GPG_ERROR_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $ac_pt_GPG_ERROR_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_ac_pt_GPG_ERROR_CONFIG="$ac_pt_GPG_ERROR_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_ac_pt_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-ac_pt_GPG_ERROR_CONFIG=$ac_cv_path_ac_pt_GPG_ERROR_CONFIG
+-if test -n "$ac_pt_GPG_ERROR_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GPG_ERROR_CONFIG" >&5
+-$as_echo "$ac_pt_GPG_ERROR_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_pt_GPG_ERROR_CONFIG" = x; then
+-    GPG_ERROR_CONFIG="no"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    GPG_ERROR_CONFIG=$ac_pt_GPG_ERROR_CONFIG
+-  fi
+-else
+-  GPG_ERROR_CONFIG="$ac_cv_path_GPG_ERROR_CONFIG"
+-fi
+-
+-  min_gpg_error_version=1.17
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
+-$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
+-  ok=no
+-  if test "$GPG_ERROR_CONFIG" != "no" \
+-     && test -f "$GPG_ERROR_CONFIG" ; then
+-    req_major=`echo $min_gpg_error_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
+-    req_minor=`echo $min_gpg_error_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
+-    gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+-    major=`echo $gpg_error_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
+-    minor=`echo $gpg_error_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
+-    if test "$major" -gt "$req_major"; then
+-        ok=yes
+-    else
+-        if test "$major" -eq "$req_major"; then
+-            if test "$minor" -ge "$req_minor"; then
+-               ok=yes
+-            fi
+-        fi
+-    fi
+-  fi
+-  if test $ok = yes; then
+-    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+-    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5
+-$as_echo "yes ($gpg_error_config_version)" >&6; }
+-    :
+-    gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+-    if test x"$gpg_error_config_host" != xnone ; then
+-      if test x"$gpg_error_config_host" != x"$host" ; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+-***
+-*** The config script $GPG_ERROR_CONFIG was
+-*** built for $gpg_error_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-gpg-error-prefix
+-*** to specify a matching config script.
+-***" >&5
+-$as_echo "$as_me: WARNING:
+-***
+-*** The config script $GPG_ERROR_CONFIG was
+-*** built for $gpg_error_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-gpg-error-prefix
+-*** to specify a matching config script.
+-***" >&2;}
+-      fi
+-    fi
+-  else
+-    GPG_ERROR_CFLAGS=""
+-    GPG_ERROR_LIBS=""
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-    as_fn_error $? "libgpg-error was not found" "$LINENO" 5
+-  fi
+-
+-
+-
++#Overcomplicated useless checking for gpg-error, use CFLAGS and LDFLAGS! >:(
++    GPG_ERROR_LIBS="-lgpg-error"
+ 
+ #
+ # Checks for library functions.
diff --git a/libgcrypt-1.7.3.local.patch b/libgcrypt-1.7.3.local.patch
new file mode 100644
index 00000000..ff81df03
--- /dev/null
+++ b/libgcrypt-1.7.3.local.patch
@@ -0,0 +1,172 @@
+Only in libgcrypt-1.7.3.orig: config.log
+diff -ru libgcrypt-1.7.3.orig/configure libgcrypt-1.7.3/configure
+--- libgcrypt-1.7.3.orig/configure	2016-08-17 13:34:20.000000000 +0200
++++ libgcrypt-1.7.3/configure	2016-10-18 22:58:40.255896688 +0200
+@@ -13067,7 +13067,9 @@
+     *-linux*)
+         PRINTABLE_OS_NAME="GNU/Linux"
+         ;;
+-
++    *-midipix*)
++        PRINTABLE_OS_NAME="Midipix"
++        ;;
+     *)
+         PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
+         ;;
+@@ -14141,155 +14143,8 @@
+ # gpg-error is required.
+ #
+ 
+-  gpg_error_config_prefix=""
+-
+-# Check whether --with-libgpg-error-prefix was given.
+-if test "${with_libgpg_error_prefix+set}" = set; then :
+-  withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval"
+-fi
+-
+-
+-
+-# Check whether --with-gpg-error-prefix was given.
+-if test "${with_gpg_error_prefix+set}" = set; then :
+-  withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval"
+-fi
+-
++    GPG_ERROR_LIBS="-lgpg-error"
+ 
+-  if test x"${GPG_ERROR_CONFIG}" = x ; then
+-     if test x"${gpg_error_config_prefix}" != x ; then
+-        GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
+-     else
+-       case "${SYSROOT}" in
+-         /*)
+-           if test -x "${SYSROOT}/bin/gpg-error-config" ; then
+-             GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
+-           fi
+-           ;;
+-         '')
+-           ;;
+-          *)
+-           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+-$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+-           ;;
+-       esac
+-     fi
+-  fi
+-
+-  # Extract the first word of "gpg-error-config", so it can be a program name with args.
+-set dummy gpg-error-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GPG_ERROR_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no"
+-  ;;
+-esac
+-fi
+-GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG
+-if test -n "$GPG_ERROR_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5
+-$as_echo "$GPG_ERROR_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  min_gpg_error_version="$NEED_GPG_ERROR_VERSION"
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
+-$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
+-  ok=no
+-  if test "$GPG_ERROR_CONFIG" != "no" \
+-     && test -f "$GPG_ERROR_CONFIG" ; then
+-    req_major=`echo $min_gpg_error_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
+-    req_minor=`echo $min_gpg_error_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
+-    gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+-    major=`echo $gpg_error_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
+-    minor=`echo $gpg_error_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
+-    if test "$major" -gt "$req_major"; then
+-        ok=yes
+-    else
+-        if test "$major" -eq "$req_major"; then
+-            if test "$minor" -ge "$req_minor"; then
+-               ok=yes
+-            fi
+-        fi
+-    fi
+-  fi
+-  if test $ok = yes; then
+-    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+-    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+-    GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
+-    GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5
+-$as_echo "yes ($gpg_error_config_version)" >&6; }
+-    :
+-    gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+-    if test x"$gpg_error_config_host" != xnone ; then
+-      if test x"$gpg_error_config_host" != x"$host" ; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+-***
+-*** The config script $GPG_ERROR_CONFIG was
+-*** built for $gpg_error_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-gpg-error-prefix
+-*** to specify a matching config script or use \$SYSROOT.
+-***" >&5
+-$as_echo "$as_me: WARNING:
+-***
+-*** The config script $GPG_ERROR_CONFIG was
+-*** built for $gpg_error_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-gpg-error-prefix
+-*** to specify a matching config script or use \$SYSROOT.
+-***" >&2;}
+-        gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
+-      fi
+-    fi
+-  else
+-    GPG_ERROR_CFLAGS=""
+-    GPG_ERROR_LIBS=""
+-    GPG_ERROR_MT_CFLAGS=""
+-    GPG_ERROR_MT_LIBS=""
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-    :
+-  fi
+-
+-
+-
+-
+-
+-if test "x$GPG_ERROR_LIBS" = "x"; then
+-  as_fn_error $? "libgpg-error is needed.
+-                See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ ." "$LINENO" 5
+-fi
+ 
+ 
+ $as_echo "#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT" >>confdefs.h
diff --git a/libgpg-error-1.24.local.patch b/libgpg-error-1.24.local.patch
new file mode 100644
index 00000000..208e47a1
--- /dev/null
+++ b/libgpg-error-1.24.local.patch
@@ -0,0 +1,56 @@
+diff -ru --new-file libgpg-error-1.24.orig/src/syscfg/lock-obj-pub.i686-nt64-midipix.h libgpg-error-1.24/src/syscfg/lock-obj-pub.i686-nt64-midipix.h
+--- libgpg-error-1.24.orig/src/syscfg/lock-obj-pub.i686-nt64-midipix.h	1970-01-01 01:00:00.000000000 +0100
++++ libgpg-error-1.24/src/syscfg/lock-obj-pub.i686-nt64-midipix.h	2015-03-06 10:36:24.000000000 +0100
+@@ -0,0 +1,23 @@
++## lock-obj-pub.i686-pc-linux-gnu.h
++## File created by gen-posix-lock-obj - DO NOT EDIT
++## To be included by mkheader into gpg-error.h
++
++typedef struct
++{
++  long _vers;
++  union {
++    volatile char _priv[24];
++    long _x_align;
++    long *_xp_align;
++  } u;
++} gpgrt_lock_t;
++
++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
++                                    0,0,0,0,0,0,0,0, \
++                                    0,0,0,0,0,0,0,0}}}
++##
++## Local Variables:
++## mode: c
++## buffer-read-only: t
++## End:
++##
+diff -ru --new-file libgpg-error-1.24.orig/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h libgpg-error-1.24/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h
+--- libgpg-error-1.24.orig/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h	1970-01-01 01:00:00.000000000 +0100
++++ libgpg-error-1.24/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h	2016-03-14 14:04:33.000000000 +0100
+@@ -0,0 +1,25 @@
++## lock-obj-pub.x86_64-pc-linux-musl.h
++## File created by gen-posix-lock-obj - DO NOT EDIT
++## To be included by mkheader into gpg-error.h
++
++typedef struct
++{
++  long _vers;
++  union {
++    volatile char _priv[40];
++    long _x_align;
++    long *_xp_align;
++  } u;
++} gpgrt_lock_t;
++
++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
++                                    0,0,0,0,0,0,0,0, \
++                                    0,0,0,0,0,0,0,0, \
++                                    0,0,0,0,0,0,0,0, \
++                                    0,0,0,0,0,0,0,0}}}
++##
++## Local Variables:
++## mode: c
++## buffer-read-only: t
++## End:
++##
diff --git a/libksba-1.3.5.local.patch b/libksba-1.3.5.local.patch
new file mode 100644
index 00000000..9c9420b0
--- /dev/null
+++ b/libksba-1.3.5.local.patch
@@ -0,0 +1,160 @@
+--- libksba-1.3.5/baconfigure.orig	2016-08-22 11:56:54.000000000 +0200
++++ libksba-1.3.5/configure	2016-10-18 22:46:31.763896688 +0200
+@@ -13852,155 +13852,9 @@
+ # Checks for libraries.
+ #
+ 
+-  gpg_error_config_prefix=""
++#Overcomplicated and useless check for gpg-error, use CFLAGS and LDFLAGS! >:(
++    GPG_ERROR_LIBS="-lgpg-error"
+ 
+-# Check whether --with-libgpg-error-prefix was given.
+-if test "${with_libgpg_error_prefix+set}" = set; then :
+-  withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval"
+-fi
+-
+-
+-
+-# Check whether --with-gpg-error-prefix was given.
+-if test "${with_gpg_error_prefix+set}" = set; then :
+-  withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval"
+-fi
+-
+-
+-  if test x"${GPG_ERROR_CONFIG}" = x ; then
+-     if test x"${gpg_error_config_prefix}" != x ; then
+-        GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
+-     else
+-       case "${SYSROOT}" in
+-         /*)
+-           if test -x "${SYSROOT}/bin/gpg-error-config" ; then
+-             GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
+-           fi
+-           ;;
+-         '')
+-           ;;
+-          *)
+-           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+-$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+-           ;;
+-       esac
+-     fi
+-  fi
+-
+-  # Extract the first word of "gpg-error-config", so it can be a program name with args.
+-set dummy gpg-error-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GPG_ERROR_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no"
+-  ;;
+-esac
+-fi
+-GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG
+-if test -n "$GPG_ERROR_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5
+-$as_echo "$GPG_ERROR_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  min_gpg_error_version="$NEED_GPG_ERROR_VERSION"
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
+-$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
+-  ok=no
+-  if test "$GPG_ERROR_CONFIG" != "no" \
+-     && test -f "$GPG_ERROR_CONFIG" ; then
+-    req_major=`echo $min_gpg_error_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
+-    req_minor=`echo $min_gpg_error_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
+-    gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+-    major=`echo $gpg_error_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
+-    minor=`echo $gpg_error_config_version | \
+-               sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
+-    if test "$major" -gt "$req_major"; then
+-        ok=yes
+-    else
+-        if test "$major" -eq "$req_major"; then
+-            if test "$minor" -ge "$req_minor"; then
+-               ok=yes
+-            fi
+-        fi
+-    fi
+-  fi
+-  if test $ok = yes; then
+-    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+-    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+-    GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
+-    GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5
+-$as_echo "yes ($gpg_error_config_version)" >&6; }
+-    :
+-    gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+-    if test x"$gpg_error_config_host" != xnone ; then
+-      if test x"$gpg_error_config_host" != x"$host" ; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+-***
+-*** The config script $GPG_ERROR_CONFIG was
+-*** built for $gpg_error_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-gpg-error-prefix
+-*** to specify a matching config script or use \$SYSROOT.
+-***" >&5
+-$as_echo "$as_me: WARNING:
+-***
+-*** The config script $GPG_ERROR_CONFIG was
+-*** built for $gpg_error_config_host and thus may not match the
+-*** used host $host.
+-*** You may want to use the configure option --with-gpg-error-prefix
+-*** to specify a matching config script or use \$SYSROOT.
+-***" >&2;}
+-        gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
+-      fi
+-    fi
+-  else
+-    GPG_ERROR_CFLAGS=""
+-    GPG_ERROR_LIBS=""
+-    GPG_ERROR_MT_CFLAGS=""
+-    GPG_ERROR_MT_LIBS=""
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-    :
+-  fi
+-
+-
+-
+-
+-
+-if test "x$GPG_ERROR_LIBS" = "x"; then
+-  as_fn_error $? "libgpg-error is needed.
+-                See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ ." "$LINENO" 5
+-fi
+ 
+ 
+ $as_echo "#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KSBA" >>confdefs.h